4 files changed, 9 insertions, 54 deletions
diff --git a/app-crypt/shash/ChangeLog b/app-crypt/shash/ChangeLog
index e5eb4939e962..a995cf1b9c80 100644
--- a/app-crypt/shash/ChangeLog
+++ b/app-crypt/shash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/shash
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.7 2004/10/17 10:04:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/ChangeLog,v 1.8 2004/11/06 13:33:50 swegener Exp $
+
+  06 Nov 2004; Sven Wegener <swegener@gentoo.org> shash-0.2.6-r1.ebuild,
+  -shash-0.2.6.ebuild:
+  Marked stable on x86. Removed old ebuild.
 
   17 Oct 2004; David Holm <dholm@gentoo.org> shash-0.2.6-r1.ebuild:
   Added to ~ppc.
diff --git a/app-crypt/shash/files/digest-shash-0.2.6 b/app-crypt/shash/files/digest-shash-0.2.6
deleted file mode 100644
index b1befd302513..000000000000
--- a/app-crypt/shash/files/digest-shash-0.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f38ec66b989fa38275f5170e15241b4 shash-0.2.6.tar.gz 105641
diff --git a/app-crypt/shash/shash-0.2.6-r1.ebuild b/app-crypt/shash/shash-0.2.6-r1.ebuild
index 8cac4c499706..1d28a7c5e802 100644
--- a/app-crypt/shash/shash-0.2.6-r1.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.2 2004/10/17 10:04:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r1.ebuild,v 1.3 2004/11/06 13:33:50 swegener Exp $
 
-inherit eutils
+inherit bash-completion
 
 DESCRIPTION="Generate or check digests or MACs of files"
 HOMEPAGE="http://mcrypt.hellug.gr/shash/"
@@ -10,7 +10,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="static"
 
 RDEPEND="virtual/libc
@@ -36,14 +36,5 @@ src_compile() {
 src_install() {
 	make install DESTDIR=${D} || die "install failed"
 	dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
-	insinto /usr/share/bash-completion
-	newins ${FILESDIR}/shash.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To enable bash command-line completion for ${PN}, execute"
-	einfo "the following command as root:"
-	einfo "  ln -s /usr/share/bash-completion/${PN} /etc/bash_completion.d/"
-	einfo
+	dobashcompletion ${FILESDIR}/shash.bash-completion ${PN}
 }
diff --git a/app-crypt/shash/shash-0.2.6.ebuild b/app-crypt/shash/shash-0.2.6.ebuild
deleted file mode 100644
index a1a7ff65618e..000000000000
--- a/app-crypt/shash/shash-0.2.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.6 2004/09/24 18:18:22 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="Generate or check digests or MACs of files"
-HOMEPAGE="http://mcrypt.hellug.gr/shash/"
-SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="static"
-
-RDEPEND="virtual/libc
-	>=app-crypt/mhash-0.8.18-r1"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	sys-devel/automake
-	sys-devel/autoconf
-	sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/0.2.6-manpage-fixes.patch
-}
-
-src_compile() {
-	econf $(use_enable static static-link) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
-}