Fixed version detection of iptables. Moved iptables to RDEPEND.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 17 insertions, 13 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 8f48e8f8142f..edb8064b17e5 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2005/06/24 17:27:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.8 2005/06/25 02:06:16 eradicator Exp $
+
+*ipp2p-0.7.4-r1 (25 Jun 2005)
+
+  25 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ipp2p-0.7.4.ebuild, +ipp2p-0.7.4-r1.ebuild:
+  Fixed version detection of iptables.  Moved iptables to RDEPEND.
 
 *ipp2p-0.7.4 (24 Jun 2005)
 
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index f7f6d8837a3f..ae3aa13e1719 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b0533e591ed68b5bb04cdaf7d25ec195 ChangeLog 1521
-MD5 4d3cb7e62ee9e1ca1c0d9568a89304c2 ipp2p-0.7.4.ebuild 1280
+MD5 0adcd0da1fa8d8446fea8a851d6b4368 ChangeLog 1724
+MD5 9900c78fed74b29d91872f1aedd19126 ipp2p-0.7.4-r1.ebuild 1273
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 3189d79995aa9e51c7b68f9279b851e8 ipp2p-0.7.1-r1.ebuild 1134
 MD5 09c45d9dd51a824d5f46627efc141020 files/digest-ipp2p-0.7.1-r1 62
-MD5 365ee13da4034ff82a0b8abd6055f9cc files/digest-ipp2p-0.7.4 62
+MD5 365ee13da4034ff82a0b8abd6055f9cc files/digest-ipp2p-0.7.4-r1 62
 MD5 ab7e8116b2ec2c738835b5facdfbf3d3 files/ipp2p-0.7-Makefile.patch 1069
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCvEKVArHZZzCEUG0RAjAVAJ9DEnMDiHD27tBXveqPr+YaM00VAwCfbAPs
-f6q1mqcL/ldw/ubhj/K0+C0=
-=EcVP
+iD8DBQFCvLwuArHZZzCEUG0RAlmCAKCAUY8B4rq057C/v/W46x9G39BD6wCfTsEv
+03seva1+oJbusc6hcziY2JQ=
+=ZeeG
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.7.4 b/net-firewall/ipp2p/files/digest-ipp2p-0.7.4-r1
index 6ac7a7fa45eb..6ac7a7fa45eb 100644
--- a/net-firewall/ipp2p/files/digest-ipp2p-0.7.4
+++ b/net-firewall/ipp2p/files/digest-ipp2p-0.7.4-r1
diff --git a/net-firewall/ipp2p/ipp2p-0.7.4.ebuild b/net-firewall/ipp2p/ipp2p-0.7.4-r1.ebuild
index 0cc6741d0f0f..c096a47de8bc 100644
--- a/net-firewall/ipp2p/ipp2p-0.7.4.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.7.4-r1.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.ebuild,v 1.1 2005/06/24 17:27:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.4-r1.ebuild,v 1.1 2005/06/25 02:06:16 eradicator Exp $
 
 IUSE=""
 
@@ -14,12 +14,10 @@ SLOT="${KV}"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-RDEPEND="virtual/modutils"
-
-IPTABLES_VERSION="1.2.11"
+RDEPEND="virtual/modutils
+	 >=net-firewall/iptables-1.2.11"
 
 DEPEND="${RDEPEND}
-	>=net-firewall/iptables-${IPTABLES_VERSION}
 	virtual/linux-sources"
 
 pkg_setup() {
@@ -40,7 +38,7 @@ src_unpack() {
 src_compile() {
 	xarch="${ARCH}"
 	unset ARCH
-	emake KERNEL_SRC="${KV_DIR}" CFLAGS="${CFLAGS}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" IPTABLES_BIN="${ROOT}/sbin/iptables" || die "Parallel Make Failed"
+	emake KERNEL_SRC="${KV_DIR}" CFLAGS="${CFLAGS}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" IPTABLES_BIN="${ROOT}/sbin/iptables" || die "Parallel Make Failed"
 	ARCH="${xarch}"
 }