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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 9 insertions, 56 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/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() {