Punt USE=imq. Use user-custom patch dir in /etc/.

(Portage version: 2.1.4_rc11)

3 files changed, 11 insertions, 27 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 21ff9edfc0d0..9254f0624bb2 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.155 2007/12/24 11:53:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.156 2007/12/27 21:48:28 vapier Exp $
+
+  27 Dec 2007; Mike Frysinger <vapier@gentoo.org> iptables-1.4.0.ebuild:
+  Punt USE=imq.  Use user-custom patch dir in /etc/.
 
   24 Dec 2007; <pva@gentoo.org> iptables-1.4.0.ebuild:
   Updated l7-filter patches for iptables-1.4.x.
diff --git a/net-firewall/iptables/files/digest-iptables-1.4.0 b/net-firewall/iptables/files/digest-iptables-1.4.0
index d850a23b6863..56c018717665 100644
--- a/net-firewall/iptables/files/digest-iptables-1.4.0
+++ b/net-firewall/iptables/files/digest-iptables-1.4.0
@@ -1,6 +1,3 @@
-MD5 133a27ce2aa95581e91d364827f68293 iptables-1.3.6-imq.diff 5723
-RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c iptables-1.3.6-imq.diff 5723
-SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7 iptables-1.3.6-imq.diff 5723
 MD5 90cfa8a554a29b0b859a625e701af2a7 iptables-1.4.0.tar.bz2 181610
 RMD160 6f6a29cbe0e55261607acc1183e04482c444286e iptables-1.4.0.tar.bz2 181610
 SHA256 fd9a978035e6a8f73344f986c84a222dc4ac3706b901e0c1ecae9647db5e5d52 iptables-1.4.0.tar.bz2 181610
diff --git a/net-firewall/iptables/iptables-1.4.0.ebuild b/net-firewall/iptables/iptables-1.4.0.ebuild
index 13990d5ebf57..18bd6b28829f 100644
--- a/net-firewall/iptables/iptables-1.4.0.ebuild
+++ b/net-firewall/iptables/iptables-1.4.0.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.2 2007/12/24 11:53:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.3 2007/12/27 21:48:28 vapier Exp $
 
 inherit eutils toolchain-funcs linux-info
 
 L7_PV=2.17
 L7_P=netfilter-layer7-v${L7_PV}
-IMQ_PATCH=iptables-1.3.6-imq.diff
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
+HOMEPAGE="http://www.iptables.org/ http://l7-filter.sf.net/"
 SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
-	imq? ( http://www.linuximq.net/patchs/${IMQ_PATCH} )
 	l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="extensions imq ipv6 l7filter static"
+IUSE="extensions ipv6 l7filter static"
 
 DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
+	l7filter? ( virtual/linux-sources )"
 RDEPEND=""
 
 pkg_setup() {
-	if use l7filter || use imq || use extensions ; then
+	if use l7filter || use extensions ; then
 		ewarn "WARNING: 3rd party extensions has been enabled."
 		ewarn "This means that iptables will use your currently installed"
 		ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
@@ -49,10 +46,6 @@ pkg_setup() {
 		[ ! -f "${L7FILE}" ]; then
 		die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
 	fi
-	if use imq && \
-		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
-		die "For IMQ support add a patch from http://www.linuximq.net/patches.html to your kernel"
-	fi
 }
 
 src_unpack() {
@@ -84,15 +77,6 @@ src_unpack() {
 		fi
 	done
 
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		for OA in extensions/.IMQ-test extensions/.IMQ-test6 ; do
-			mv ${OA} ${OA}.orig
-			tr '\015' '\012'  < ${OA}.orig > ${OA}
-			rm ${OA}.orig
-		done
-		chmod +x extensions/.IMQ-test*
-	fi
 	if use l7filter ; then
 		#yes choosing 2.6.20 was deliberate - upstream mistake possibly
 		if kernel_is ge 2 6 20
@@ -130,7 +114,7 @@ src_defs() {
 	use ipv6 || myconf="${myconf} DO_IPV6=0"
 	use static && myconf="${myconf} NO_SHARED_LIBS=0"
 	export myconf
-	if ! use l7filter && ! use imq && ! use extensions ; then
+	if ! use l7filter && ! use extensions ; then
 		export KERNEL_DIR=$(
 			# ugh -- iptables has scripts which check for the existence of
 			# files so we need to give it the right path to our toolchains
@@ -141,7 +125,7 @@ src_defs() {
 		export KBUILD_OUTPUT=${KERNEL_DIR}
 		diemsg="failure"
 	else
-		diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
+		diemsg="failure - with l7filter and/or other miscellanious patches added"
 	fi
 	export diemsg
 }