Fix bash-completion installation (bug #424753) and cleanup old bash-completion files.

Package-Manager: portage-2.1.11/cvs/Linux x86_64

5 files changed, 18 insertions, 115 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index 7c8154b28632..b337b17eed0a 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/source-highlight
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.46 2012/07/04 09:46:37 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.47 2012/07/04 12:39:20 dev-zero Exp $
+
+*source-highlight-3.1.7-r1 (04 Jul 2012)
+
+  04 Jul 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +source-highlight-3.1.7-r1.ebuild,
+  -files/source-highlight-2.10.bash-completion,
+  -files/source-highlight-2.8.bash-completion, -source-highlight-3.1.7.ebuild:
+  Fix bash-completion installation (bug #424753) and cleanup old bash-completion
+  files.
 
 *source-highlight-3.1.7 (04 Jul 2012)
 
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 3df1cd0b0a06..18450509025d 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX source-highlight-2.10.bash-completion 2327 RMD160 28f80aa45d11d50cc1f0a761bbcfbdff6f3a92b5 SHA1 067db4969febe63aa7ee2b295d1eb4bda0593c45 SHA256 87a6ca976ba64f746d677d2a15849431571ea316fa7954517570dd042f6497e1
-AUX source-highlight-2.8.bash-completion 2299 RMD160 47df7804b1eccfc1bbae46f2878173efc4146fff SHA1 766277ba4312f9028c5a96f1febdd890a60b2d44 SHA256 df359fe48ac41e28c72e259313ec6185b001bca35d7a799c497aa37f604d0cd7
 DIST source-highlight-3.1.7.tar.gz 1600692 RMD160 96932976fb1c83443b0f1c65ada46c51ce469fd2 SHA1 71c637548be71afc3f895b0d8ada1a72a8dab4a0 SHA256 e1b2e007cdd94595393d42510e2a84763c36aad3409f0c3087f05fcb50a389e8
 DIST source-highlight-3.1.tar.gz 1453050 RMD160 799dc3894f134184f7627a2e937fc53c2063a713 SHA1 3389e2f3da9c8c2986abf9b75c2cd6097394c757 SHA256 cb591bddb13c811d9ff8daa9565b74639fdb99cf71c50e2d3df6225fc34506a6
-EBUILD source-highlight-3.1.7.ebuild 1607 RMD160 05c1dc4828e892a9b28a6a03ef30ae67564146eb SHA1 b06e24f32e10d9f56f81eac0c21f4580491396f3 SHA256 0035e684310e36149a3e59e30820622f56067be5edc0e35d4d133d12428516cc
+EBUILD source-highlight-3.1.7-r1.ebuild 1565 RMD160 806af61130d9057a0b99e3745bb4de3627d43675 SHA1 e624a9ef0b516cab3ebce85007a5d3767a48d989 SHA256 8b76ccac77c0feebb449d09ba532423b432fc575d129f2db7f6c06c0f31d5ff2
 EBUILD source-highlight-3.1.ebuild 1470 RMD160 051159b3d21ad2358cc0c7ed38b63bcdbe7d9f16 SHA1 96a7f85679202146be9b359edfa1364316343d01 SHA256 d0d16728864b716764f55c2d00198cfb8ad142c2a58a36d698a0a05b1b232aa5
-MISC ChangeLog 8867 RMD160 94c4034c623d845a43f7ceb22c07783107cd7ebf SHA1 358622868749f1fc3299db894949537b63a6ca68 SHA256 444567a737fd79d508179ba0e1f974d28a42761389543e02bce5c10937f7f262
+MISC ChangeLog 9217 RMD160 3cccf68df07c62eecc145ffd621da9cb5a66891a SHA1 4ab383c4bdf363badf921e9b73996941904b470c SHA256 bf7523faebd372e3d8ad866113d15d8e477d11ddee1d28ebc1057102a0398f11
 MISC metadata.xml 236 RMD160 f6480b45266f014fda8b31f12ee91c2f28a35cba SHA1 0817f4eccce10f1acfcc60e51ae595d7874d7d60 SHA256 8db85d348f1fcca741457358302188e30b7b1c0524a9a55820b935d8bcac959e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/0EQgACgkQGwVqY66cHjAp/wCfWq258fC3NM8ZRAC94ivvoaHc
-014An07LtI17ndennu6yA6NnvGeFJ0Tm
-=rucA
+iEYEARECAAYFAk/0OX4ACgkQGwVqY66cHjCEvACfekVr5g7hjD59altE+zLwgQ8k
+iccAnRZOLAxbw79VFq1qQ5wtKHfIao6M
+=LNpH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/source-highlight/files/source-highlight-2.10.bash-completion b/dev-util/source-highlight/files/source-highlight-2.10.bash-completion
deleted file mode 100644
index 5cbe2f9bf61f..000000000000
--- a/dev-util/source-highlight/files/source-highlight-2.10.bash-completion
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/files/source-highlight-2.10.bash-completion,v 1.1 2008/07/21 06:20:36 dev-zero Exp $
-# completion for source-highlight
-
-_source_highlight()
-{
-    local cur prev opts 
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    opts="-h --help -V --version -i --input -o --output -s --src-lang \
-    --lang-list --outlang-list -f --out-format -d --doc --no-doc -c --css \
-    -T --title -t --tab -H --header -F --footer --style-file --outlang-def \
-    --outlang-map --data-dir --output-dir --lang-def --lang-map --show-lang-elements \
-    --infer-lang -n --line-number --line-number-ref --gen-references --ctags-file \
-    --ctags -v --verbose --statistics --gen-version --check-lang --check-outlang \
-    --failsafe -g --debug-langdef --show-regex"
-
-    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
-	COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
-	return 0
-    fi
-
-    case "${prev}" in
-	-T|--title|-t|--tab|--gen-references)
-	    COMPREPLY=()
-	    ;;
-	-i|--input|-o|--output|-c|--css|-H|--header|-F|--footer|--style-file|--outlang-def|--outlang-map|--lang-def|--lang-map|--show-lang-elements|--ctags-file|--check-lang|--check-outlang|--show-regex)
-	    COMPREPLY=($(compgen -A file -- "${cur}"))
-	    ;;
-	-s|--src-lang)
-	    COMPREPLY=($(compgen -W "C H ac am autoconf bib bison c caml cc changelog cls cpp cs csh csharp css \
-		diff docbook dtx eps fixed-fortran flex fortran free-fortran glsl h haxe hh hpp htm html hx in ini java javascript js kcfg kdevelop kidl ksh l lang \
-		langdef latex ldap ldif lex lgt ll log logtalk lsm lua m4 ml mli moc outlang pas pascal patch perl php php3 php4 php5 \
-		pl pm postscript prolog properties ps py python rb rc ruby sh shell sig sl slang slsh sml spec sql sty style syslog tcl tcsh \
-		tex tk txt ui xhtml xml y yacc yy" -- "${cur}"))
-	    ;;
-	-f|--out-format)
-	    COMPREPLY=($(compgen -W "docbook esc html html-css htmltable\
-	    javadoc latex latexcolor texinfo xhtml xhtml-css xhtmltable" -- "${cur}"))
-	    ;;
-	--data-dir|--output-dir)
-	    COMPREPLY=($(compgen -A directory -- "${cur}"))
-	    ;;
-	*)
-	    COMPREPLY=($(compgen -W "${opts/${preprev}}" -- "${cur}"))
-	    ;;
-    esac
-}
-complete -F _source_highlight source-highlight
-
-# vim: set ft=sh tw=80 sw=4 et :
diff --git a/dev-util/source-highlight/files/source-highlight-2.8.bash-completion b/dev-util/source-highlight/files/source-highlight-2.8.bash-completion
deleted file mode 100644
index 4d1de8730561..000000000000
--- a/dev-util/source-highlight/files/source-highlight-2.8.bash-completion
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/files/source-highlight-2.8.bash-completion,v 1.1 2008/02/13 13:24:24 dev-zero Exp $
-# completion for source-highlight
-
-_source_highlight()
-{
-    local cur prev opts 
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    opts="-h --help -V --version -i --input -o --output -s --src-lang \
-    --lang-list --outlang-list -f --out-format -d --doc --no-doc -c --css \
-    -T --title -t --tab -H --header -F --footer --style-file --outlang-def \
-    --outlang-map --data-dir --output-dir --lang-def --lang-map --show-lang-elements \
-    --infer-lang -n --line-number --line-number-ref --gen-references --ctags-file \
-    --ctags -v --verbose --statistics --gen-version --check-lang --check-outlang \
-    --failsafe -g --debug-langdef --show-regex"
-
-    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
-	COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
-	return 0
-    fi
-
-    case "${prev}" in
-	-T|--title|-t|--tab|--gen-references)
-	    COMPREPLY=()
-	    ;;
-	-i|--input|-o|--output|-c|--css|-H|--header|-F|--footer|--style-file|--outlang-def|--outlang-map|--lang-def|--lang-map|--show-lang-elements|--ctags-file|--check-lang|--check-outlang|--show-regex)
-	    COMPREPLY=($(compgen -A file -- "${cur}"))
-	    ;;
-	-s|--src-lang)
-	    COMPREPLY=($(compgen -W "C H am bib bison c caml cc changelog cls cpp cs csh csharp css \
-		diff docbook dtx eps flex fortran h hh hpp htm html java javascript js ksh l lang \
-		langdef latex lex lgt ll log logtalk lua m4 ml mli outlang pas pascal patch perl php php3 php4 php5 \
-		pl pm postscript prolog ps py python rb ruby sh shell sig sl slang slsh sml sql sty style syslog tcl tcsh \
-		tex tk txt xhtml xml y yacc yy" -- "${cur}"))
-	    ;;
-	-f|--out-format)
-	    COMPREPLY=($(compgen -W "docbook docbook-doc esc esc-doc html html-css html-css-doc html-doc htmltable\
-	    javadoc latex latex-doc latexcolor latexcolor-doc texinfo xhtml xhtml-css xhtml-css-doc xhtml-doc xhtmltable" -- "${cur}"))
-	    ;;
-	--data-dir|--output-dir)
-	    COMPREPLY=($(compgen -A directory -- "${cur}"))
-	    ;;
-	*)
-	    COMPREPLY=($(compgen -W "${opts/${preprev}}" -- "${cur}"))
-	    ;;
-    esac
-}
-complete -F _source_highlight source-highlight
-
-# vim: set ft=sh tw=80 sw=4 et :
diff --git a/dev-util/source-highlight/source-highlight-3.1.7.ebuild b/dev-util/source-highlight/source-highlight-3.1.7-r1.ebuild
index e0194fa0499d..261d69ef924b 100644
--- a/dev-util/source-highlight/source-highlight-3.1.7.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-3.1.7.ebuild,v 1.1 2012/07/04 09:46:37 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-3.1.7-r1.ebuild,v 1.1 2012/07/04 12:39:20 dev-zero Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
-IUSE="bash-completion doc static-libs"
+IUSE="doc static-libs"
 
 DEPEND=">=dev-libs/boost-1.49.0
 	dev-util/ctags"
@@ -38,7 +38,7 @@ src_install () {
 
 	use static-libs || rm -rf "${D}"/usr/lib*/*.la
 
-	use bash-completion && dobashcompletion completion/source-highlight
+	dobashcomp completion/source-highlight
 
 	# That's not how we want it
 	rm -fr "${ED}/usr/share"/{aclocal,doc}