error check sed; use emake; modify Makefile to make parallel-friendly

3 files changed, 25 insertions, 12 deletions

diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index 90a6c66f5d51..b1598938ea75 100644
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tcp-wrappers
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.32 2004/07/01 21:40:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.33 2004/07/17 01:28:13 mr_bones_ Exp $
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  error check sed; use emake; modify Makefile to make parallel-friendly
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   tcp-wrappers-7.6-r3.ebuild, tcp-wrappers-7.6-r4.ebuild,
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 6b648ad63f64..1ea5f807549e 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,11 +1,11 @@
+MD5 ff0780e39a0eca8e49bd6e1fc0f660d3 ChangeLog 5015
+MD5 def919da672543e26cf30ae7df7fae5d tcp-wrappers-7.6-r3.ebuild 1256
 MD5 2d100f6d6d05e361d79c05427aa8a22e tcp-wrappers-7.6-r4.ebuild 1315
 MD5 25e150e571fa2f48f56d14e7f727ef6d tcp-wrappers-7.6-r6.ebuild 1966
-MD5 7ad9c81e8bd0bc718d9d4db246556b73 tcp-wrappers-7.6-r8.ebuild 2074
-MD5 def919da672543e26cf30ae7df7fae5d tcp-wrappers-7.6-r3.ebuild 1256
-MD5 34c2fca170d658d59dc3c8bf04f707ca ChangeLog 4858
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 da6fe337f8e6ddda00b5d52c588ca70a files/hosts.allow.example 585
+MD5 0b3757d9e07468946cfa0ad1fe99e697 tcp-wrappers-7.6-r8.ebuild 2279
 MD5 9ad8321e86bbd0c9a7bab821564b3fc1 files/digest-tcp-wrappers-7.6-r3 144
 MD5 d8f39ad34a5d8154665fb5bf431a781d files/digest-tcp-wrappers-7.6-r4 145
 MD5 dfac556cbaad927748c6d2345fb44e1b files/digest-tcp-wrappers-7.6-r6 142
 MD5 b4d27b4d9d3d841a7199217735e52049 files/digest-tcp-wrappers-7.6-r8 146
+MD5 da6fe337f8e6ddda00b5d52c588ca70a files/hosts.allow.example 585
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
index 8c7d16fb1ef3..8192dcc1c5ff 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-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/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.14 2004/07/01 21:40:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.15 2004/07/17 01:28:13 mr_bones_ Exp $
 
 inherit eutils
 
@@ -26,9 +26,11 @@ src_unpack() {
 	cd ${S}
 
 	chmod ug+w Makefile
-	sed -i -e "s:-O:${CFLAGS}:" \
+	sed -i \
+		-e "s:-O:${CFLAGS}:" \
 		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \
-	Makefile
+		Makefile \
+		|| die "sed Makefile failed"
 
 	PATCHDIR=${WORKDIR}/${PV}-patches
 
@@ -38,6 +40,13 @@ src_unpack() {
 
 	use static || epatch ${PATCHDIR}/${P}-shared.patch.bz2
 	use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff.bz2
+
+	# make it parallel-friendly.
+	sed -i \
+		-e 's:@make :@$(MAKE) :' \
+		-e 's:make;:$(MAKE);:' \
+		Makefile \
+		|| die "sed Makefile failed"
 }
 
 src_compile() {
@@ -46,17 +55,17 @@ src_compile() {
 	use static || myconf="${myconf} -DHAVE_WEAKSYMS"
 	use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
 
-	make ${MAKEOPTS} \
+	emake \
 		REAL_DAEMON_DIR=/usr/sbin \
 		GENTOO_OPT="${myconf}" \
 		MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
-		config-check || die
+		config-check || die "emake config-check failed"
 
-	make ${MAKEOPTS} \
+	emake \
 		REAL_DAEMON_DIR=/usr/sbin \
 		GENTOO_OPT="${myconf}" \
 		MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
-		linux || die
+		linux || die "emake linux failed"
 }
 
 src_install() {