summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2006-10-13 15:00:13 +0000
committerSven Wegener <swegener@gentoo.org>2006-10-13 15:00:13 +0000
commitfb1729bdcb8b6e8a49d96837c11e1c0884acac47 (patch)
tree1de5dcafc6300b792c1dc58145eb9ccd22c37b86 /app-crypt/shash
parentAdded missing pkgconfig dep, bug #150278. (diff)
downloadgentoo-2-fb1729bdcb8b6e8a49d96837c11e1c0884acac47.tar.gz
gentoo-2-fb1729bdcb8b6e8a49d96837c11e1c0884acac47.tar.bz2
gentoo-2-fb1729bdcb8b6e8a49d96837c11e1c0884acac47.zip
Touchup bash completion support.
(Portage version: 2.1.2_pre2-r9)
Diffstat (limited to 'app-crypt/shash')
-rw-r--r--app-crypt/shash/ChangeLog6
-rw-r--r--app-crypt/shash/files/digest-shash-0.2.6-r12
-rw-r--r--app-crypt/shash/files/shash.bash-completion17
-rw-r--r--app-crypt/shash/shash-0.2.6-r1.ebuild4
4 files changed, 16 insertions, 13 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/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() {