Fix bug #101635.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 25 insertions, 15 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index c82e9ffef3f8..5f4be4d8388f 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/ipp2p
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.11 2005/08/06 03:21:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.12 2005/08/07 17:32:34 eradicator Exp $
+
+  07 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ipp2p-0.7.4-r2.ebuild, ipp2p-0.8.0_rc3.ebuild:
+  Fix bug #101635.
 
   06 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -files/ipp2p-0.7-Makefile.patch, -ipp2p-0.7.1-r1.ebuild,
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 8dd5e6919384..210d8ac68883 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 38a730fa13b752c60be6a4c0ce98e38b ChangeLog 2325
+MD5 3bd2459420a6df2f8cb9f9f751ccf76c ChangeLog 2451
+MD5 e9541447485254e9099bde10333d7aae ipp2p-0.7.4-r2.ebuild 1498
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 2629b1e6300fda91043b0e8cf26637dd ipp2p-0.8.0_rc3.ebuild 1353
-MD5 1c6be4d00e321c300d7c2f183550f852 ipp2p-0.7.4-r2.ebuild 1349
+MD5 51788d16b9b7c86451c8b6b153720d39 ipp2p-0.8.0_rc3.ebuild 1502
 MD5 365ee13da4034ff82a0b8abd6055f9cc files/digest-ipp2p-0.7.4-r2 62
 MD5 a282b5a7786f803a6d63f41ee34251e2 files/digest-ipp2p-0.8.0_rc3 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC9Cz1ArHZZzCEUG0RAmMyAJ43xwVtEfJuwyVnszYMz3M0elb17gCfROhv
-+Pe1xUi2xfZBfOENePi/QyY=
-=AfqC
+iD8DBQFC9kXMArHZZzCEUG0RAqOWAJ9vBkcgIbZtQh1WLrl+I9bxPj/vjACcDNiH
+dByVA8CBMOEzcUjWNwK7iCk=
+=hwax
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild b/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild
index 1348dfad347a..fe984101d15d 100644
--- a/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild,v 1.2 2005/08/06 03:21:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild,v 1.3 2005/08/07 17:32:34 eradicator Exp $
 
 IUSE=""
 
@@ -33,14 +33,17 @@ src_unpack() {
 
 	cd ${S}
 	convert_to_m ${S}/Makefile
+
+	sed -i -e 's/^IPTABLES_VERSION/#IPTABLES_VERSION/' ${S}/Makefile
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" libipt_ipp2p.so || die "Failed to build iptables module"
+	local IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" 
+	emake CFLAGS="${CFLAGS}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" libipt_ipp2p.so || die "Failed to build iptables module"
 
-	xarch="${ARCH}"
+	local xarch="${ARCH}"
 	unset ARCH
-	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" IPTABLES_BIN="${ROOT}/sbin/iptables" || die "Failed to build kernel modle."
+	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" || die "Failed to build kernel modle."
 	ARCH="${xarch}"
 }
 
diff --git a/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild b/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild
index 264166ef1b98..51374c015027 100644
--- a/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild,v 1.1 2005/08/06 03:17:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild,v 1.2 2005/08/07 17:32:34 eradicator Exp $
 
 IUSE=""
 
@@ -33,14 +33,17 @@ src_unpack() {
 
 	cd ${S}
 	convert_to_m ${S}/Makefile
+
+	sed -i -e 's/^IPTABLES_VERSION/#IPTABLES_VERSION/' ${S}/Makefile
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" libipt_ipp2p.so || die "Failed to build iptables module"
+	local IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" 
+	emake CFLAGS="${CFLAGS}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" libipt_ipp2p.so || die "Failed to build iptables module"
 
-	xarch="${ARCH}"
+	local xarch="${ARCH}"
 	unset ARCH
-	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" IPTABLES_BIN="${ROOT}/sbin/iptables" || die "Failed to build kernel modle."
+	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" || die "Failed to build kernel modle."
 	ARCH="${xarch}"
 }