Add blocker on >=linux-headers-2.6.33, bug #323333, thank Jack Lloyd for report. Drop old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 11 insertions, 60 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index a59067ff48ce..109d629228af 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.217 2010/05/25 13:20:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.218 2010/06/10 07:20:36 pva Exp $
+
+  10 Jun 2010; Peter Volkov <pva@gentoo.org> -iptables-1.4.5.ebuild,
+  iptables-1.4.6.ebuild:
+  Add blocker on >=linux-headers-2.6.33, bug #323333, thank Jack Lloyd for
+  report. Drop old.
 
   25 May 2010; Peter Volkov <pva@gentoo.org> iptables-1.4.8-r1.ebuild,
   +files/iptables-1.4.8-build.patch:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index d0a19a26b74b..32a92603462e 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -3,14 +3,12 @@ AUX iptables-1.3.2.confd 290 RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 SHA
 AUX iptables-1.3.2.init 2570 RMD160 84d06807fae0455009476cfa63dfcda9fe016dc3 SHA1 da7c4fca4049c4d3f45e32d29403c8bb05047f15 SHA256 1137517483c0d312e3d396d953e9ee197b84f64ed17adfd48f25dbb60e114697
 AUX iptables-1.4.8-build.patch 371 RMD160 94610dddde4b4da42334a7593c156d9fe8ae54e9 SHA1 a463e212b897c2e3cafb90fae0e56c71a3f0f5d8 SHA256 241a531a1d7013901ec5f9d46612b460516b1770bcdf66ab1fc18f78ee44a92f
 DIST iptables-1.4.3.2.tar.bz2 432131 RMD160 d276516a56d9b173f5ffdf9777650d9a000c22c1 SHA1 4e274ac40ccc1c04a063bd98d38f97301bbb75cc SHA256 dec9b2248ba6824825011b73034bb43ca97d9c2d02e4024dc01549afd09ed3b1
-DIST iptables-1.4.5.tar.bz2 461480 RMD160 64ff4c9b5f32903edade33d91b0789aa78b783f3 SHA1 d1354584a901ffc1bf6c3b3b55a1d0dcee778d21 SHA256 a7eff2176cf6e04336081417413ef69d730eac55b21888b7262d2a8a4f2a3fc0
 DIST iptables-1.4.6.tar.bz2 463758 RMD160 05e2e46f71f04e7675ed6f1d9f43b1142bcb14e0 SHA1 3372dca2ba3769e53ffbcae08ee418b53338327a SHA256 6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4
 DIST iptables-1.4.7.tar.bz2 462420 RMD160 fc3c0e1fa2eadd2819b83eececa87334e8956d23 SHA1 825594a2c5017852b03ce441f592c67070b4b29c SHA256 9f61f389cabdde79e26ca78c336db1b6373b67f80f7cfcb3e9d9ff520b325452
 DIST iptables-1.4.8.tar.bz2 474980 RMD160 5c0893207ae41c25c7613f8dc5215d06125b24a3 SHA1 53d756938e6dc748364ca1e1952f28dd9daad6a4 SHA256 342926b3f9635f89f479660835b0ba518ccd465552e41c29aa83c5af7d506496
 EBUILD iptables-1.4.3.2.ebuild 1325 RMD160 46c2121e30c3bb1cc1065ffda130531ae87cdd4f SHA1 9a4e288c896b20eadae64b3f8a5eddb47e055dc7 SHA256 d0f9f6287270b9aeb6a92156c63d4f090186efd409bed6d3323c007e5714a6c4
-EBUILD iptables-1.4.5.ebuild 1409 RMD160 7f6d29469d03248cdd5025c9ca30a93ab61d273b SHA1 0c5d92a44abeaef72674763a98bdc97b79aa9417 SHA256 b84a9045667fbd694347c80abe4ff91ba290c5758e81e62d5a8f9bae02359794
-EBUILD iptables-1.4.6.ebuild 1399 RMD160 97a178e763136a0b7b59dfd55495d0f0d9c3d3da SHA1 bd2577ece0b4d14b08e0b959e1e1aa90ad30d03a SHA256 e09060469955c1684c9b5119b0e20eb0de65628d5c93a5ee4cdd6f7bfe502c90
+EBUILD iptables-1.4.6.ebuild 1432 RMD160 cc3b7d648bc90013e4310489386ddcf7ddc06e79 SHA1 4e266aae46051f0a1e2aab3ea39d951a7bfcdb12 SHA256 eba1153ad5e54bf7f21da101c58dc9ec76ff3e26191a2cc9ebc0ada3680106da
 EBUILD iptables-1.4.7.ebuild 1508 RMD160 6893caabf8179547030981bf6bb7814d8ff605b7 SHA1 84abcb6ab8d48dc995b71838779c82e0c9e8cc58 SHA256 72962815748eb80eeffd6562800783ee0439f6564922cf9a433b55ea9c38934c
 EBUILD iptables-1.4.8-r1.ebuild 1585 RMD160 3441580e6c3ce1bd8fec196826197c415dd6f28a SHA1 e9f54a5a0ab4e41943093ef13a9a1da1583200a0 SHA256 6230e5ae3a57eec76d98cdc7156afad10f0bccdb7698cbe3b30cc68174d0e396
-MISC ChangeLog 39399 RMD160 9637cefc704bddeac9a04235f66d62982eb43a0c SHA1 8aad8f2554da9d904dba190e51512ef77efb8a53 SHA256 7fac01d26e7143d0840cac7ea68d5fa1ae68d70463073f47087135f11827e95a
+MISC ChangeLog 39589 RMD160 cf093087a566d86df5a608a33a04b7fdf0f9f2c3 SHA1 55226629e0ed5715bc619dfc0c61f38e034a9076 SHA256 23bf5b278821880d6a882313bb652be8bba5ca95b9a94901a6e36ebdf9891d22
 MISC metadata.xml 932 RMD160 9fa7b0149bae1514716bc386607938017f4fe0a4 SHA1 b0f2555a2bf413de7d92a219339215cc66921e3a SHA256 5267377b7e871cb78d7a974cab7c842e152bda22d598102c3487b9039cc16c48
diff --git a/net-firewall/iptables/iptables-1.4.5.ebuild b/net-firewall/iptables/iptables-1.4.5.ebuild
deleted file mode 100644
index fc7ca1a7b0e4..000000000000
--- a/net-firewall/iptables/iptables-1.4.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.5.ebuild,v 1.1 2009/09/23 20:32:15 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-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="ipv6"
-
-DEPEND="virtual/os-headers"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	epatch_user
-}
-
-src_compile() {
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/include
-	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
-	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
-}
diff --git a/net-firewall/iptables/iptables-1.4.6.ebuild b/net-firewall/iptables/iptables-1.4.6.ebuild
index aec6d3b77d9f..6281eeb39d14 100644
--- a/net-firewall/iptables/iptables-1.4.6.ebuild
+++ b/net-firewall/iptables/iptables-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.6.ebuild,v 1.5 2010/05/24 12:10:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.6.ebuild,v 1.6 2010/06/10 07:20:36 pva Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86"
 IUSE="ipv6"
 
-DEPEND="virtual/os-headers"
+DEPEND="virtual/os-headers
+	!>=sys-kernel/linux-headers-2.6.33"
 RDEPEND=""
 
 src_unpack() {