Touchup bash completion support.

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 42 insertions, 29 deletions

diff --git a/app-crypt/shash/ChangeLog b/app-crypt/shash/ChangeLog
index 7e044c3e8470..ddef64dd0e6e 100644
--- a/app-crypt/shash/ChangeLog
+++ b/app-crypt/shash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/shash
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.17 2006/09/29 15:26:50 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.18 2006/10/13 15:00:13 swegener Exp $
+
+  13 Oct 2006; Sven Wegener <swegener@gentoo.org>
+  files/shash.bash-completion, shash-0.2.6-r1.ebuild:
+  Touchup bash completion support.
 
   29 Sep 2006; Daniel Drake <dsd@gentoo.org> shash-0.2.6-r1.ebuild:
   Fix RDEPEND
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 1ad5040fe203..98b80ce1c393 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -1,24 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.2.6-manpage-fixes.patch 1451 RMD160 4a906e6a23c09d72b9f98f58c737edfa6c2ac83a SHA1 d7052c1f1d26158c6701904ce8fa09c470817218 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317
 MD5 6a686d232cbb0eeadba51ea32851c8a9 files/0.2.6-manpage-fixes.patch 1451
 RMD160 4a906e6a23c09d72b9f98f58c737edfa6c2ac83a files/0.2.6-manpage-fixes.patch 1451
 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317 files/0.2.6-manpage-fixes.patch 1451
-AUX shash.bash-completion 1003 RMD160 7801dc412912ed97154096051e2ed7f63c727c0f SHA1 6e6bb46f12ada519739514f87c34abb7074aa6e4 SHA256 a7e3191e8b56ef9551861b256e38655797008900e4513593717bde73e843b910
-MD5 1f217dc9a5042927a1cf690a44da380f files/shash.bash-completion 1003
-RMD160 7801dc412912ed97154096051e2ed7f63c727c0f files/shash.bash-completion 1003
-SHA256 a7e3191e8b56ef9551861b256e38655797008900e4513593717bde73e843b910 files/shash.bash-completion 1003
-DIST shash-0.2.6.tar.gz 105641
-EBUILD shash-0.2.6-r1.ebuild 1129 RMD160 fb610bea0f66202fde386985b9d587af5606629c SHA1 1d07a5c6fb701065beddfabf023026a3ea8bb7b1 SHA256 1aec43a863c90afbedcad0117874feed56292c479e925d8ed766777fda70a30f
-MD5 ea820c3008c5982e39630d4a9ef5b8eb shash-0.2.6-r1.ebuild 1129
-RMD160 fb610bea0f66202fde386985b9d587af5606629c shash-0.2.6-r1.ebuild 1129
-SHA256 1aec43a863c90afbedcad0117874feed56292c479e925d8ed766777fda70a30f shash-0.2.6-r1.ebuild 1129
-MISC ChangeLog 2066 RMD160 c38ea231e7716ff7954dfdcedf363a3868a508d0 SHA1 8c5f37027df930d4c6bfab1e0211ac154d94ba78 SHA256 b1e7fa9e70c9fd0d47e8970c4d0e2421acc9b38fbb7d3d34cf06c77b12c04d77
-MD5 1899a1f0ca09d54312f5b881ba4d633e ChangeLog 2066
-RMD160 c38ea231e7716ff7954dfdcedf363a3868a508d0 ChangeLog 2066
-SHA256 b1e7fa9e70c9fd0d47e8970c4d0e2421acc9b38fbb7d3d34cf06c77b12c04d77 ChangeLog 2066
+AUX shash.bash-completion 993 RMD160 71a35551e47213e6baec5deaad4c92fff7440450 SHA1 0c356a4307a97b14d73de6af2e2315e75351123c SHA256 5f3d0bb5a202ba3365c81945ec2f0318893f1f372f11c8b4d7bc524888d8d228
+MD5 9b3ab78e2744ef22e8cdfc36d8fa970f files/shash.bash-completion 993
+RMD160 71a35551e47213e6baec5deaad4c92fff7440450 files/shash.bash-completion 993
+SHA256 5f3d0bb5a202ba3365c81945ec2f0318893f1f372f11c8b4d7bc524888d8d228 files/shash.bash-completion 993
+DIST shash-0.2.6.tar.gz 105641 RMD160 9b17e84ca8a6deb312e26f037f4f15056f6838e9 SHA1 306baa20823832627e861f7d20ab3316eaa57b9e SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc
+EBUILD shash-0.2.6-r1.ebuild 1000 RMD160 5d034650b564064927b8755b5313c9198af7faf8 SHA1 0e495f92daf4ff03604e067d4cf1d06ba4b8db92 SHA256 4f8f42f65ca993b2a8d3b416f24b688dd0ab152471d899639f600201a83a9129
+MD5 0a19621e5eddefc032886303f476f68b shash-0.2.6-r1.ebuild 1000
+RMD160 5d034650b564064927b8755b5313c9198af7faf8 shash-0.2.6-r1.ebuild 1000
+SHA256 4f8f42f65ca993b2a8d3b416f24b688dd0ab152471d899639f600201a83a9129 shash-0.2.6-r1.ebuild 1000
+MISC ChangeLog 2211 RMD160 2620bd254232d62ebf79dd2481d568f5348eadb6 SHA1 e087c1955b66f26ed209be2046ee09137f33d5de SHA256 55cca56ee79b71e75bd7435e6604405f0b04f32046f1042ca6077790c676b928
+MD5 b2cdc675956c3444d71c012d00056245 ChangeLog 2211
+RMD160 2620bd254232d62ebf79dd2481d568f5348eadb6 ChangeLog 2211
+SHA256 55cca56ee79b71e75bd7435e6604405f0b04f32046f1042ca6077790c676b928 ChangeLog 2211
 MISC metadata.xml 445 RMD160 8fe3514acbfd6d8af3ebaa9dcdd0a5f19c1b8e05 SHA1 6c6dc372a6a73c35caf1ac26d370550d549cf7fa SHA256 0f32465ca38e78d722e961d48820997094b6bf2191f15a0645600ad7910790c0
 MD5 5aa9af147b815004b0cf0a2dfd88124a metadata.xml 445
 RMD160 8fe3514acbfd6d8af3ebaa9dcdd0a5f19c1b8e05 metadata.xml 445
 SHA256 0f32465ca38e78d722e961d48820997094b6bf2191f15a0645600ad7910790c0 metadata.xml 445
-MD5 d49dfbc3613b62886594562719104b4a files/digest-shash-0.2.6-r1 63
-RMD160 2d11f542bc8d15c65a0f2d54d1cb1f277ddd8e92 files/digest-shash-0.2.6-r1 63
-SHA256 da3a7682ef8c0bdae429393a348bccf0efb051c143066d9f57ab89f10cc774e1 files/digest-shash-0.2.6-r1 63
+MD5 0044163d611684d51f0b94c3f50ac4c8 files/digest-shash-0.2.6-r1 235
+RMD160 e5918834870a44da1355ca9d746be70e8d26f449 files/digest-shash-0.2.6-r1 235
+SHA256 68e12e192ef1c6f44ab008946f852b6843bf730e10c6099080ad193ed42fed22 files/digest-shash-0.2.6-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFL6oDI1lqEGTUzyQRAnGKAKC00cT8ECa42JkuKADffqFglaOBVgCeNXhX
+Ma0RD/pQwbKpgiY8k8vvaRU=
+=asXS
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/shash/files/digest-shash-0.2.6-r1 b/app-crypt/shash/files/digest-shash-0.2.6-r1
index b1befd302513..6abaf5d33ba6 100644
--- a/app-crypt/shash/files/digest-shash-0.2.6-r1
+++ b/app-crypt/shash/files/digest-shash-0.2.6-r1
@@ -1 +1,3 @@
 MD5 8f38ec66b989fa38275f5170e15241b4 shash-0.2.6.tar.gz 105641
+RMD160 9b17e84ca8a6deb312e26f037f4f15056f6838e9 shash-0.2.6.tar.gz 105641
+SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc shash-0.2.6.tar.gz 105641
diff --git a/app-crypt/shash/files/shash.bash-completion b/app-crypt/shash/files/shash.bash-completion
index 9f2212a002be..d57701fc08f7 100644
--- a/app-crypt/shash/files/shash.bash-completion
+++ b/app-crypt/shash/files/shash.bash-completion
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/files/shash.bash-completion,v 1.1 2004/09/27 00:49:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/files/shash.bash-completion,v 1.2 2006/10/13 15:00:13 swegener Exp $
 #
 # shash(1) completion.
 
@@ -12,17 +12,17 @@ _shash() {
 	cur=${COMP_WORDS[COMP_CWORD]}
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-	case "$prev" in
+	case "${prev}" in
 	-c|--config)
 		_filedir
 		return 0 ;;
 	-o|--keymode)
 		COMPREPLY=( $( compgen -W "$( shash --listkeygen | tail -n +2 )" \
-			-- $cur ) )
+			-- ${cur} ) )
 		return ;;
 	-a|--algorithm)
 		COMPREPLY=( $( compgen -W "$( shash --list )" \
-			-- $cur ) )
+			-- ${cur} ) )
 		return ;;
 	*)
 		;;
@@ -33,9 +33,8 @@ _shash() {
 		--verbose --quiet --nosalt --time --hmac --doublecheck \
 		--check --binary --text --keymode --config --algorithm \
 		--list --key --listkeygen --help --version --license' \
-		-- $cur ) )
+		-- ${cur} ) )
 	_filedir
 	return 0
-}
-
-[ -n "${have:-}" ] && complete -F _shash $filenames shash
+} &&
+complete -F _shash ${filenames} shash
diff --git a/app-crypt/shash/shash-0.2.6-r1.ebuild b/app-crypt/shash/shash-0.2.6-r1.ebuild
index 0a32329d1255..a2dd77ce7ebe 100644
--- a/app-crypt/shash/shash-0.2.6-r1.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r1.ebuild,v 1.16 2006/09/29 15:26:50 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r1.ebuild,v 1.17 2006/10/13 15:00:13 swegener Exp $
 
 inherit bash-completion eutils
 
@@ -14,8 +14,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
-# the following is required because bash-completion.eclass overwrites
-# default RDEPEND, and this package depends on mhash at runtime
 RDEPEND="${DEPEND}"
 
 src_unpack() {