5 files changed, 24 insertions, 70 deletions
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index b53c5893f6e6..6d68faecdf94 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,14 +1,22 @@
-MD5 d2aef3ebc8f9f6d5aafc78e69b92cb2a portmap-5b-r7.ebuild 1412
-MD5 52c732b046eb02bb6a0dd5017d5f95a6 portmap-5b-r9.ebuild 2529
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d6b1be51edb14cea7264848f6c07d19e ChangeLog 3384
-MD5 dfde57172c858cae8c83435ef0089c50 portmap-5b-r8.ebuild 1906
-MD5 49ef87c468b07ca837a1282faca5647b files/portmap-4.0-rpc_user.patch 1779
-MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
-MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
-MD5 5017d0469cab57678279e74e5cabd10b files/portmap.rc6 1080
-MD5 d0820fd449ae88e56f2a3e78b96bb9d1 files/portmap-4.0-sigpipe.patch 353
-MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
+MD5 2cc9ee030123783580c9c97bb20a7acf portmap-5b-r8.ebuild 1903
+MD5 52c732b046eb02bb6a0dd5017d5f95a6 portmap-5b-r9.ebuild 2529
 MD5 887940376974bf01ecf94fd032f224eb files/portmap-5b-include-errno_h.patch 403
-MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r7 64
+MD5 3efd943304c00e9b9cd468e62adf96bb files/portmap.rc6 1111
+MD5 0ec47652f96bfda762a2ffc72a78f002 files/portmap_5beta.dif 8871
 MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r8 64
+MD5 c4cab1b374730a709460d95211200852 files/portmap-4.0-cleanup.patch 2193
+MD5 7667fe1c5070f9f57c1beb25015bb7be files/portmap-4.0-malloc.patch 9067
+MD5 49ef87c468b07ca837a1282faca5647b files/portmap-4.0-rpc_user.patch 1779
+MD5 d0820fd449ae88e56f2a3e78b96bb9d1 files/portmap-4.0-sigpipe.patch 353
 MD5 44dae63001c0ad007604a7ba55403838 files/digest-portmap-5b-r9 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBTx+WHTu7gpaalycRAocTAKDdutWNFFjjyqEXeAerYgLfzYtMjQCbBMJF
+PzE65wX4Y5sR90ZQ99kWci8=
+=rLrI
+-----END PGP SIGNATURE-----
diff --git a/net-nds/portmap/files/digest-portmap-5b-r7 b/net-nds/portmap/files/digest-portmap-5b-r7
deleted file mode 100644
index 61f9e105bbe8..000000000000
--- a/net-nds/portmap/files/digest-portmap-5b-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 781e16ed4487c4caa082c6fef09ead4f portmap_5beta.tar.gz 18702
diff --git a/net-nds/portmap/files/portmap.rc6 b/net-nds/portmap/files/portmap.rc6
index 436314d36a4c..ca8b2f692c01 100644
--- a/net-nds/portmap/files/portmap.rc6
+++ b/net-nds/portmap/files/portmap.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.7 2004/07/15 00:18:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.8 2004/09/20 18:20:26 vapier Exp $
 
 depend() {
 	need net
@@ -12,10 +12,12 @@ depend() {
 start() {
 	ebegin "Starting portmap"
 	start-stop-daemon --start --quiet --exec /sbin/portmap
-	eend $?
+	local ret=$?
+	eend ${ret}
 	#without, if a service depending on portmap is started too fast,
 	#connecting to portmap will fail -- azarah
 	sleep 1
+	return ${ret}
 }
 
 stop() {
diff --git a/net-nds/portmap/portmap-5b-r7.ebuild b/net-nds/portmap/portmap-5b-r7.ebuild
deleted file mode 100644
index 28dfed0613fb..000000000000
--- a/net-nds/portmap/portmap-5b-r7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r7.ebuild,v 1.16 2004/07/01 22:37:51 eradicator Exp $
-
-inherit eutils
-
-IUSE="selinux"
-MY_P=${PN}_${PV}eta
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Netkit - portmapper"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64"
-
-DEPEND="virtual/libc
-	sys-apps/tcp-wrappers"
-
-RDEPEND="selinux? ( sec-policy/selinux-portmap )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}_5beta.dif
-
-	# Should include errno.h, and not define as external.  Fix
-	# relocation error and build problem with glibc-2.3.2 cvs ...
-	# <azarah@gentoo.org> (31 Dec 2002).
-	epatch ${FILESDIR}/${P}-include-errno_h.patch
-
-	# Get portmap to use our CFLAGS ...
-	mv Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile || die
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	into / ; dosbin portmap
-	into /usr ; dosbin pmap_dump pmap_set
-	doman portmap.8 pmap_dump.8 pmap_set.8
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/portmap.rc6 portmap
-
-	# Is this really the sort of thing we wanna be doing? :)
-	# ln -s ../../init.d/portmap ${D}/etc/runlevels/default/portmap
-
-	dodoc BLURB CHANGES README
-}
diff --git a/net-nds/portmap/portmap-5b-r8.ebuild b/net-nds/portmap/portmap-5b-r8.ebuild
index c10cee18a051..31c3082cb8ff 100644
--- a/net-nds/portmap/portmap-5b-r8.ebuild
+++ b/net-nds/portmap/portmap-5b-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r8.ebuild,v 1.15 2004/08/02 04:21:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r8.ebuild,v 1.16 2004/09/20 18:20:26 vapier Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE="selinux"
 
 DEPEND="virtual/libc