touchups

6 files changed, 35 insertions, 69 deletions

diff --git a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
index 94d925f6872e..6c82273d7132 100644
--- a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.2 2003/03/15 17:31:02 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.3 2004/01/29 23:19:33 vapier Exp $
 
 inherit eutils
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Kernel 2.4 firewall, NAT and packet mangling tools"
-SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc alpha sparc hppa arm mips"
-LICENSE="GPL-2"
 
 # iptables is dependent on kernel sources.  Strange but true.
 DEPEND="virtual/os-headers"
diff --git a/net-firewall/iptables/iptables-1.2.7a-r4.ebuild b/net-firewall/iptables/iptables-1.2.7a-r4.ebuild
index a67e18871bfe..81426dfada42 100644
--- a/net-firewall/iptables/iptables-1.2.7a-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.2.7a-r4.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r4.ebuild,v 1.3 2003/04/19 06:59:10 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r4.ebuild,v 1.4 2004/01/29 23:19:33 vapier Exp $
 
 inherit eutils
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Kernel 2.4 firewall, NAT and packet mangling tools"
-SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~arm ~mips"
-LICENSE="GPL-2"
 
 # iptables is dependent on kernel sources.  Strange but true.
 DEPEND="virtual/os-headers"
diff --git a/net-firewall/iptables/iptables-1.2.8-r1.ebuild b/net-firewall/iptables/iptables-1.2.8-r1.ebuild
index 44202e8ae0ec..97a6829437f1 100644
--- a/net-firewall/iptables/iptables-1.2.8-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.2.8-r1.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8-r1.ebuild,v 1.8 2003/09/22 02:06:45 frogger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8-r1.ebuild,v 1.9 2004/01/29 23:19:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
-filter-flags "-fstack-protector"
-
-IUSE="ipv6"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Kernel 2.4 firewall, NAT and packet mangling tools"
-SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha sparc hppa ~arm ~mips ia64"
-LICENSE="GPL-2"
+IUSE="ipv6"
 
 # iptables is dependent on kernel sources.  Strange but true.
 DEPEND="virtual/os-headers"
 
 src_unpack() {
-	if [ -z $( get-flag O ) ]; then
-		append-flags -O2
-	fi
-
 	unpack ${A}
 	cd ${S}
 
@@ -36,6 +28,7 @@ src_unpack() {
 
 	chmod +x extensions/.IMQ-test*
 
+	filter-flags -fstack-protector
 	cp Makefile Makefile.new
 	sed -e "s:-O2:${CFLAGS}:g" -e "s:/usr/local::g" Makefile.new > Makefile
 }
diff --git a/net-firewall/iptables/iptables-1.2.8-r2.ebuild b/net-firewall/iptables/iptables-1.2.8-r2.ebuild
index bb4ae489a623..5907024c6f89 100644
--- a/net-firewall/iptables/iptables-1.2.8-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.2.8-r2.ebuild
@@ -1,32 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8-r2.ebuild,v 1.1 2003/10/15 16:02:34 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8-r2.ebuild,v 1.2 2004/01/29 23:19:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
-# prevent it from causing ICMP errors.
-# http://bugs.gentoo.org/show_bug.cgi?id=23645
-filter-flags "-fstack-protector"
-
-IUSE="ipv6"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~arm ~mips ~ia64"
-LICENSE="GPL-2"
+IUSE="ipv6"
 
 # iptables is dependent on kernel sources.  Strange but true.
 DEPEND="virtual/os-headers"
 
 src_unpack() {
-	if [ -z $( get-flag O ) ]; then
-		append-flags -O2
-	fi
-
 	unpack ${A}
 	cd ${S}
 
@@ -43,6 +33,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# prevent it from causing ICMP errors.
+	# http://bugs.gentoo.org/show_bug.cgi?id=23645
+	filter-flags "-fstack-protector"
+
 	# iptables and libraries are now installed to /sbin and /lib, so that
 	# systems with remote network-mounted /usr filesystems can get their
 	# network interfaces up and running correctly without /usr.
diff --git a/net-firewall/iptables/iptables-1.2.8.ebuild b/net-firewall/iptables/iptables-1.2.8.ebuild
index 264885fd7d4f..55acb3a2f84a 100644
--- a/net-firewall/iptables/iptables-1.2.8.ebuild
+++ b/net-firewall/iptables/iptables-1.2.8.ebuild
@@ -1,29 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8.ebuild,v 1.4 2003/09/10 04:57:39 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.8.ebuild,v 1.5 2004/01/29 23:19:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Kernel 2.4 firewall, NAT and packet mangling tools"
-SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~arm ~mips"
-LICENSE="GPL-2"
 
 # iptables is dependent on kernel sources.  Strange but true.
 DEPEND="virtual/os-headers"
 
 src_unpack() {
-
-	if [ -z $( get-flag O ) ]; then
-		append-flags -O2
-	fi
-
 	unpack ${A}
 	cd ${S}
 
diff --git a/net-firewall/iptables/iptables-1.2.9.ebuild b/net-firewall/iptables/iptables-1.2.9.ebuild
index d4906652e852..9d75355a98c8 100644
--- a/net-firewall/iptables/iptables-1.2.9.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9.ebuild
@@ -1,32 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.5 2004/01/28 13:51:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.6 2004/01/29 23:19:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
-# prevent it from causing ICMP errors.
-# http://bugs.gentoo.org/show_bug.cgi?id=23645
-filter-flags "-fstack-protector"
-
-IUSE="ipv6"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha sparc hppa ~arm ~mips ~ia64 amd64"
-LICENSE="GPL-2"
+IUSE="ipv6"
 
 # iptables is dependent on kernel sources.  Strange but true.
 DEPEND="virtual/os-headers"
 
 src_unpack() {
-	if [ -z $( get-flag O ) ]; then
-		append-flags -O2
-	fi
-
 	replace-flags -O0 -O2
 
 	unpack ${A}
@@ -44,6 +34,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# prevent it from causing ICMP errors.
+	# http://bugs.gentoo.org/show_bug.cgi?id=23645
+	filter-flags "-fstack-protector"
+
 	# iptables and libraries are now installed to /sbin and /lib, so that
 	# systems with remote network-mounted /usr filesystems can get their
 	# network interfaces up and running correctly without /usr.
@@ -91,4 +85,3 @@ pkg_postinst() {
 	einfo "If you are using the iptables initsscript you should save your"
 	einfo "rules using the new iptables version before rebooting."
 }
-