bump, fix

7 files changed, 20 insertions, 45 deletions

diff --git a/sys-apps/tcb/ChangeLog b/sys-apps/tcb/ChangeLog
index 2956e31686e6..53dc1ee8dda3 100644
--- a/sys-apps/tcb/ChangeLog
+++ b/sys-apps/tcb/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
 
+*tcb-0.9.8.7 (08 Jan 2004)
+
+  08 Jan 2004; Joshua Brindle <method@gentoo.org> tcb-0.9.7.4.ebuild,
+  tcb-0.9.7.4.ebuild, tcb-0.9.8.3.ebuild, tcb-0.9.8.3.ebuild,
+  tcb-0.9.8.7.ebuild:
+  This one should actually work, and is an upstream bump also
+
 *tcb-0.9.8.3 (18 Dec 2002)
 
   18 Dec 2002; Joachim Blaabjerg <styx@gentoo.org> tcb-0.9.8.3.ebuild :
diff --git a/sys-apps/tcb/Manifest b/sys-apps/tcb/Manifest
index 70fb8f9853d9..73ff1489131b 100644
--- a/sys-apps/tcb/Manifest
+++ b/sys-apps/tcb/Manifest
@@ -1,4 +1,4 @@
-MD5 b66187ca27a592b92068a50b12062591 tcb-0.9.8.7.ebuild 960
-MD5 71dfb8e50fbe69b28faa8bb62eed0c82 ChangeLog 543
+MD5 72cb3240bea5a54f777505234da27414 tcb-0.9.8.7.ebuild 958
+MD5 3620fa89935df45e0992e3844ec61806 ChangeLog 788
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 efd6f409cc1a1bd237628142daeb2382 files/digest-tcb-0.9.8.7 62
diff --git a/sys-apps/tcb/files/digest-tcb-0.9.7.4 b/sys-apps/tcb/files/digest-tcb-0.9.7.4
deleted file mode 100644
index c2831cf253d0..000000000000
--- a/sys-apps/tcb/files/digest-tcb-0.9.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3cf3796b92df2d7857441894245e776 tcb-0.9.7.4.tar.bz2 30319
diff --git a/sys-apps/tcb/files/digest-tcb-0.9.8.3 b/sys-apps/tcb/files/digest-tcb-0.9.8.3
deleted file mode 100644
index 50aeda0f69d7..000000000000
--- a/sys-apps/tcb/files/digest-tcb-0.9.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63b68b9ea4cdfc45fa6869bac5074cb0 tcb-0.9.8.3.tar.gz 35776
diff --git a/sys-apps/tcb/files/digest-tcb-0.9.8.7 b/sys-apps/tcb/files/digest-tcb-0.9.8.7
new file mode 100644
index 000000000000..4ef5755e2b23
--- /dev/null
+++ b/sys-apps/tcb/files/digest-tcb-0.9.8.7
@@ -0,0 +1 @@
+MD5 b298233918113959a395360f210713b7 tcb-0.9.8.7.tar.gz 36561
diff --git a/sys-apps/tcb/tcb-0.9.7.4.ebuild b/sys-apps/tcb/tcb-0.9.7.4.ebuild
deleted file mode 100644
index 5a2b85412c94..000000000000
--- a/sys-apps/tcb/tcb-0.9.7.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.7.4.ebuild,v 1.6 2003/06/21 21:19:41 drobbins Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Libraries and tools implementing the tcb password shadowing scheme."
-# This is a bad solution, but the original source archive is in the Owl cvs
-SRC_URI="http://www.SuxOS.org/~styx/gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.openwall.com"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-libs/pam-0.75"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-pkg_preinst() {
-	# might want to add these into baselayout eventually...
-	for group in auth chkpwd shadow; do
-		if ! grep -q ^${group}: /etc/group ; then
-			 groupadd ${group} || die "problem adding group $group"
-		fi
-	done
-}
-
-src_compile() {
-#	cd ${WORKDIR}
-	emake || die
-}
-
-src_install () {
-	make FAKEROOT=${D} install || die
-	dodoc ChangeLog LICENSE
-}
diff --git a/sys-apps/tcb/tcb-0.9.8.3.ebuild b/sys-apps/tcb/tcb-0.9.8.7.ebuild
index 3a10e8200250..4ffd1c541a53 100644
--- a/sys-apps/tcb/tcb-0.9.8.3.ebuild
+++ b/sys-apps/tcb/tcb-0.9.8.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.8.3.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.8.7.ebuild,v 1.1 2004/01/08 22:41:43 method Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 
@@ -13,12 +15,10 @@ DEPEND=">=sys-libs/pam-0.75"
 SLOT="0"
 KEYWORDS="x86 amd64"
 
-pkg_preinst() {
+pkg_setup() {
 	# might want to add these into baselayout eventually...
 	for group in auth chkpwd shadow; do
-		if ! grep -q ^${group}: /etc/group ; then
-			 groupadd ${group} || die "problem adding group $group"
-		fi
+			 enewgroup ${group} || die "error adding group ${group}"
 	done
 }
 
@@ -27,6 +27,9 @@ src_compile () {
 }
 
 src_install () {
-	make FAKEROOT=${D} install || die
+	make DESTDIR=${D} install || die
 	dodoc ChangeLog LICENSE
+
+	einfo "You must now run /sbin/tcb_convert to convert your shadow to tcb"
+	einfo "To remove this you must first run /sbin/tcp_unconvert and then unmerge"
 }