Add USE=ipv6 support by Christian Affolter #277366.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 26 insertions, 10 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 21d8ff4954e8..4cb02ab02ff0 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.203 2009/07/23 14:59:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.204 2009/07/27 18:16:07 vapier Exp $
+
+  27 Jul 2009; Mike Frysinger <vapier@gentoo.org> iptables-1.4.4.ebuild:
+  Add USE=ipv6 support by Christian Affolter #277366.
 
   23 Jul 2009; Raúl Porcel <armin76@gentoo.org> iptables-1.4.3.2.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #274403
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index f157f2346b45..e4f8723814a7 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315 RMD160 3665aaa6788261f16372c1e34810fe99fd60453c SHA1 b3c88dc5ceebc15aca73fcc02afdf8d0fa6a389f SHA256 f86e32f84af0e68b927b712a60e5d02d1bc27972537f476c71a311711fdcfc12
 AUX 1.3.1-files/install_all_dev_files.patch-1.3.1 2748 RMD160 9df4ee7b0a26e83b02ef6cbe071d00841d9a070b SHA1 c854c1d520a923d1616ba1d374bfa5729a122767 SHA256 c61769413e3a71e008f927b0639d26db6586f921f371a89b3db0e892d064af28
 AUX 1.3.1-files/install_ipv6_apps.patch 826 RMD160 505c5832d20fad96839936da900a12b5f4209045 SHA1 6e5808694e17002f2312ea9a45b46fb577694a83 SHA256 0a7f666962e586b2be8d2d3d2947497b3e3837c78b57056ce065455518c78722
@@ -28,6 +31,13 @@ EBUILD iptables-1.3.8-r3.ebuild 7132 RMD160 9da9caa232f1fc421828715a74d18db0d10f
 EBUILD iptables-1.4.0-r1.ebuild 6295 RMD160 60d28cb1ba3e54acdee3a7afeebeb82fe4956eb4 SHA1 29f2cf21aeeea06733811f7757af8fd5412d0ddf SHA256 171847cdcc42344ff5d7ea38c230b7ce0a1bd43ec93a0d00434486592ab7f5e6
 EBUILD iptables-1.4.2-r2.ebuild 3262 RMD160 f28cd3243ae6c6028a6537f0d07f00c40d8b5ae7 SHA1 87dada8cc221dd9faec7df0b77cdb38b2be5b62f SHA256 7249be2d9c37d0a5c705603cf8b079cd8d2205baff380445d36f6b5264184b69
 EBUILD iptables-1.4.3.2.ebuild 1814 RMD160 1598f494077f5e256c0d0a39a2589d4193376465 SHA1 157d1e402ef72637732976cde63f05e94b804def SHA256 9039f12f3c3f518d0771205a8370c16432e6acae0eac90db2031cde90bedb984
-EBUILD iptables-1.4.4.ebuild 1819 RMD160 0946f1e4b454c7bb1bdfef62c7f0bd211513a995 SHA1 6fb7de987de064ac6c8950442ad3bf55a5dc807d SHA256 38d1fa02389b445174c1095eac88cab5626ccd64b090241b976428099de3f0f9
-MISC ChangeLog 37511 RMD160 f1941b0d1c829e34d63f2bd2296e5880fe2c102b SHA1 f6597be27e20f8400b21184a19c254fcbe238ac9 SHA256 f3dbf1a76b09dd127c2c857681c68300ab2e5e287b913d0faab846acfacbe056
+EBUILD iptables-1.4.4.ebuild 1896 RMD160 9a2d6c056425da93c99def151c3227fc86b7d1c3 SHA1 e8a1555cb8ae4fe9f750ee9b3be5bb88cae48f83 SHA256 23779610d84d57356b11df023f02200b2491e9051118d2f4420e0f782c4e8f11
+MISC ChangeLog 37638 RMD160 34cd6c0756420760bfde032953fa6ced4088ccd4 SHA1 e9d722c39f7bfcfcab7628e874765520ad22dced SHA256 e0b02009a550b99b2890cd4733d0022f08a12a80602be7e5df33c8f86fa78691
 MISC metadata.xml 1278 RMD160 5453b196b5ae00ad8fc8dd0d27731cb5425339d4 SHA1 3e0dabdca50df87aa78c5c9236e04ed747f3bc82 SHA256 d6d81511d3e81d6bb2097be63ea6bc9a8871519f1727e6d0b89bf231bd6ba92b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpt7vEACgkQlPl3HsVfCDrZJACeLj/KCsrj+fFVg9CsqDT/rwzP
+dDIAniwlDJ0ci3gxGUebiqB9KpVWj0v2
+=vNz9
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.4.4.ebuild b/net-firewall/iptables/iptables-1.4.4.ebuild
index 87dd2f2975e9..268f56878c59 100644
--- a/net-firewall/iptables/iptables-1.4.4.ebuild
+++ b/net-firewall/iptables/iptables-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.4.ebuild,v 1.1 2009/06/17 06:46:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.4.ebuild,v 1.2 2009/07/27 18:16:07 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
+IUSE="ipv6"
 
 DEPEND="virtual/os-headers"
 RDEPEND=""
@@ -42,7 +42,8 @@ src_compile() {
 		--enable-devel \
 		--enable-libipq \
 		--enable-shared \
-		--enable-static
+		--enable-static \
+		$(use_enable ipv6)
 	emake V=1 || die
 }
 
@@ -50,14 +51,16 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 
 	insinto /usr/include
-	doins include/iptables.h include/ip6tables.h || die
+	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
 	insinto /usr/include/iptables
 	doins include/iptables/internal.h || die
 
 	keepdir /var/lib/iptables
 	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
 	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
-	keepdir /var/lib/ip6tables
-	newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
-	newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
+		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
+	fi
 }