old

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26.2 x86_64

15 files changed, 11 insertions, 1714 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 9c418b93d856..75e57142037e 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,43 +1,31 @@
+-----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
-AUX 1.3.1-files/iptables-1.3.1-compilefix.patch 358 RMD160 359adb7cc1876e664a69bba472fa97155df808ab SHA1 977b9685e03b8f4653abcb1f7fab70695d0c5ef5 SHA256 b0e802e86e601f5229a8f1bbbdfbe4c97b13ede4931e5ee2d73f176c7f121e99
-AUX 1.3.5-files/iptables-1.3.5-errno.patch 689 RMD160 67ce38c86fbef574e8f7d2f4ebffbecff35bf59f SHA1 7a45e68e5d332529ab5697886417cff59ef53fe1 SHA256 09eff37038db0fd66cb68f5e84dd93c031445f29e3a50afe18d3d389fe5cded1
-AUX 1.3.5-files/iptables-1.3.5-linux-headers.patch 326 RMD160 f2b26ab8603ff910bc10a9fe478635ccb2982a0a SHA1 06c78ad9156aa5f0c06c0bb7933eb36258ca4ad3 SHA256 deb8a15c8368fa0d790d684a9dcfb5dc0e7e37b5786f59f66ef0d112c5fd3059
-AUX 1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607 RMD160 9624733334644b55136724a665e15afa7156f86a SHA1 5cc4fd5fabb44fe72c8a3695e0bd63d06b28c1bd SHA256 5c7617471f98413f1af9ab2846336cbcdf8b2449402967a03b460683aa225bec
 AUX ip6tables-1.3.2.confd 293 RMD160 2e5399355a930ab3c804c9cc46fe37763555a97e SHA1 0e82dbe8538f9168bb97939a03b73dd291e82760 SHA256 c93827ac2b8fdd83e2c36788053ee7567ceb13b3cbc5fcf40d186500e05c8104
 AUX iptables-1.3.2.confd 290 RMD160 cb180068f86a608b16d850635ae909ea7b9cc059 SHA1 cb56dba4799eb3998b28e492c61265574c37d522 SHA256 351e123ba9e0ec7db2bcff42849aa627d29a3b2e77a47b82386f5e3a7e21bd30
 AUX iptables-1.3.2.init 2570 RMD160 84d06807fae0455009476cfa63dfcda9fe016dc3 SHA1 da7c4fca4049c4d3f45e32d29403c8bb05047f15 SHA256 1137517483c0d312e3d396d953e9ee197b84f64ed17adfd48f25dbb60e114697
 AUX iptables-1.3.7-kernel-dir.patch 552 RMD160 4d4b4444c5eb91b7bd24829b1d564263a540d5ef SHA1 8949bcafbc899878023a68b16452557a49a88f63 SHA256 13e7108c871fc4203abea57f711010a125fd1856c68f94a5dfd40613f8f27d6a
-AUX iptables-1.3.7-more-exact-check-grep.patch 602 RMD160 80c80f9d2a2567b164932adc1e9ddb1392b34791 SHA1 5bb693f7ddc641b793334d072b106ab998f4202e SHA256 aa26f352dc2b870363b7de1586105a4bf19eb9a6c6703a23f64ef9656017021d
 AUX iptables-1.3.7-sparc64.patch 629 RMD160 15655e9ef5047055f9930de11d313e7e9377f083 SHA1 7ca7c7d54840c94a3bd4054f0e0ef38067937b49 SHA256 cd76d6b43d55f77df0af7ad493df3f6f07756b1e410121a2a6045a97b7ce7647
-AUX iptables-1.3.7-test-dir.patch 890 RMD160 9767d237580dfe162f1377dd65bc928b57db8c19 SHA1 4782ddbc85e832b84020adb477224f713aae5784 SHA256 1ad36b68840396e45ca71fe93984caaaac105fddf102fda92fe24067206bccf1
 AUX iptables-1.4.0-dev-files.patch 1523 RMD160 ad3dd979f20f87d78bc19f6cf906bc2fc6206389 SHA1 c0f8e615c65dd43e9b25bcf3c7f44e9f32b7b6fd SHA256 bce920b13a4b94411f23177fb03ca19084508c6121de634d7de1df19bb468afa
 AUX iptables-1.4.0-in6-glibc-2.8.patch 707 RMD160 fe02ae798356522734237fee1bd4b6c9efa47437 SHA1 5c929e66e1176dd3aba6bb4bae8964d2c0bc9891 SHA256 d6bd6fb4fc9002a9aad2bd41830d50610486c200ea5ff104bb691f5da8ff62a8
-DIST iptables-1.3.0-imq1.diff 5369 RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 SHA1 bdf665cacc985fceaadf119ae7a756caca1589ad SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b
-DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 SHA1 6dbeeee13517fa02852960b6f6e51115c7548a09 SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c
 DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c SHA1 1a2d7d9bcb10e7d4e69f445d4882ab598b57855e SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7
-DIST iptables-1.3.6.tar.bz2 185438 RMD160 54d9777f2116ad57253446c42619c726f68ae8f0 SHA1 d0c873b4ce1a928424f38fa8419c96be22fef5d0 SHA256 4394c3de8c55776e54a36a6fcd4f9eeed381f451883049f8268c34c3482f5f1b
-DIST iptables-1.3.7.tar.bz2 196205 RMD160 8109f2d58eb33905bbbbc0cf871abc8172e7ddc0 SHA1 2f25e7a81fb3e81f92b0121d9dcd5a536854dc60 SHA256 0e00cea0029eaf7923a4a901265d5aa8159804b520fda9c12df54d350073ce02
 DIST iptables-1.3.8.tar.bz2 172584 RMD160 851b223eef0ca008ad1f375aa0ebdab46ff6f886 SHA1 948f361b194e989b39de4cfa3e95dbe634269ed0 SHA256 c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
 DIST iptables-1.4.0-imq.diff 5345 RMD160 71e012358cb0ed274feb46f862d300cf0d877818 SHA1 8e243b15c20400402d60f627a40b08957ac96c10 SHA256 e23d5bce7845cbe6fecf9e93e4e8e329948adb8282efec932d629b3bb4cb9c82
 DIST iptables-1.4.0.tar.bz2 181610 RMD160 6f6a29cbe0e55261607acc1183e04482c444286e SHA1 b61064885ab20b62d6ac2a590ea429117248d9d7 SHA256 fd9a978035e6a8f73344f986c84a222dc4ac3706b901e0c1ecae9647db5e5d52
 DIST iptables-1.4.1.1.tar.bz2 436366 RMD160 3986c7023b82037acb931c06e792f019b927fbd3 SHA1 61a8680b2aa578d1ff8d242b9ddf6b682c60eba7 SHA256 f9e11ccdf60a9f118bbee8d80dc76cf7c0c649f0e18fa34a8450df271a70b582
-DIST netfilter-layer7-v2.13.tar.gz 159622 RMD160 fbb27da483636729ca0cbf04d88f8b5bcfe95bce SHA1 30d6a046d11b3256192d96c45d88c41953642c86 SHA256 41ca603d745018e0d60e90ab042e8d23abbe7db428c06800b9f15e0d727493a6
 DIST netfilter-layer7-v2.17.tar.gz 160408 RMD160 9823d7b411e18160dc8501a6a5d2129f75e727e1 SHA1 fd05e5b5027ec5c143f2f63f5e48c05ffea8d50f SHA256 2e2893757a3b22f2786ead2045efae1d6a52942a89d0159c39ba907531b60c01
-DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
-DIST netfilter-layer7-v2.6.tar.gz 122514 RMD160 31b68ae3baa0a340f2e4a555fd5124c3b977629d SHA1 6120eae8bd405d35d079774d191830d137643147 SHA256 c5a842c037e915eb72576e5861f0b048837719f1edf448775d9218b42c48e0aa
-DIST netfilter-layer7-v2.9.tar.gz 122497 RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d SHA1 c4a1d92855ad51413fbd7229fe9decfe45aac084 SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969
-EBUILD iptables-1.3.5-r4.ebuild 5914 RMD160 52cbd6a104a6112c7a51334f383548c7a180b99c SHA1 6ce861bbc3a1b7ced8618fd60be4c59238537e55 SHA256 fb6457335c56d2be78ac1bdf1c799bbe6fe1b4f470670c5453e3bcc5b087ea06
-EBUILD iptables-1.3.6-r1.ebuild 5789 RMD160 f29ea64894fdea9d558fe780109a5bb89b26ed6a SHA1 4e6b5df961575561260b74b6e87ed2e79d189085 SHA256 46e64a82f6a1d41baf86571134be3b8f01c77cafd52fa1c97d830117e7a62e28
-EBUILD iptables-1.3.6.ebuild 5787 RMD160 1c64853e182b8ce800126d23c0cfad85f2688715 SHA1 212dd0a2c39d3d7c2dc1e8e156e1df95164db121 SHA256 175b04e547e2abc407d78827e66c874225b90d2c49d37fb43cf9433e5f682f1b
-EBUILD iptables-1.3.7.ebuild 5931 RMD160 8e8a4810edb09c47836473b2b60cf6a01deba92b SHA1 455adacfac9e03f16125ba7bfced0faa74e39069 SHA256 f062c011807873a1a7bee175b30e605125a741d3c7c093e75ffb2369815acb1a
-EBUILD iptables-1.3.8-r1.ebuild 6289 RMD160 92795ad9ef062ccae3e5ceb07785fc9ca3cd9ba4 SHA1 35540ddbdf14c5538e737424d1f1c36110bdbdc6 SHA256 a68e23811f563dd336ad6cf7700a6a63509b7dff61bd94580bef56459958cea1
-EBUILD iptables-1.3.8-r2.ebuild 7120 RMD160 dfa304a41ce108a880d112644ac1f7e8fe22e186 SHA1 f2602e509f3eeff29d53a11ca4538eac2d20eea0 SHA256 2e608672368b336c0f75bdf477d4d20cf5cd6338f4326f5c3a55054fd0d1da02
 EBUILD iptables-1.3.8-r3.ebuild 7128 RMD160 64d5bb2f5e8eb5421c930b6d8df0e19dfb83a67a SHA1 c1166af8498cba39492296559245a7bf57bc80d3 SHA256 8085bd074ab9b190e0274d73df311335300644b6a731718667efdba0454a66bc
-EBUILD iptables-1.3.8.ebuild 5725 RMD160 4584b79966009a9ddf034a5b3f0dbeff90586091 SHA1 86713d6b1b1bf9cf4af5df87b1ca404eef6f46ea SHA256 7bcd00072be49f1c6f34d4ec80564f1f7357ab1eb7e1725d3833a109aa6a3343
-EBUILD iptables-1.4.0-r1.ebuild 6240 RMD160 b7dc0d49c9a672b0ae3f64d7f63c183cfd1e55bd SHA1 63f0321985f4af647ccb77fc6279318537a6754a SHA256 9a216a21e0f085ffc8000ed5b1a15771e88c8ba6dcd00585770b840671c26ee3
-EBUILD iptables-1.4.0.ebuild 6045 RMD160 db798d096d84c86c29e8bf5324a5a3eafffaf66a SHA1 29c876d6721ac91853b1086934c7699a9b5a4e3d SHA256 7c1b1aee43540940ee8499b5f6ffae79eeb6704fe6d6aaac40a5d7439e73477d
+EBUILD iptables-1.4.0-r1.ebuild 6235 RMD160 9ca2520dc41d9d2b71aa6d9262ba5f3b00537042 SHA1 f4ab4ca463933e0a4370a5d553eea7ed8be5e00c SHA256 f73139637c70ab27f06a53496335915acf39f4fc564a3ec7d98e4134cb076557
 EBUILD iptables-1.4.1.1.ebuild 1646 RMD160 3e0c302b1e766445b91c8bf9798089e4efa91381 SHA1 a0d2be782633920f1816a96685e43f13863ae03c SHA256 044362f3b320f1bcea7bc0ed2932bef9b47a294eb784c3f21852b895a9c57614
 MISC ChangeLog 33445 RMD160 5bbbfe6c64e45337723ef8f7b61a475864533161 SHA1 563c07c2844329d37039ca8d45aaeee34d77d0cc SHA256 39bd3828200d10ad4465cb339991dad58055fd64f7250c3167bd8219f73fad9e
 MISC metadata.xml 1015 RMD160 0bb4f52ba327423420cdcc23db5cee7063c44d57 SHA1 5b4bae641caf5a6e8b55e1f152097b439ec64fed SHA256 5f5208578deb289580374039a678ee613fe0ed13fe131e24b82a4c5b3ee72a9c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkioMtMACgkQ67wieSYcaxcWeQCfVhGiAYIAJhM7qyKO0fPKve6L
+V4wAoMG4TYxig3EhlTBDHqoHHSqn57TZ
+=OGl7
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch b/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch
deleted file mode 100644
index e21c36cceb2c..000000000000
--- a/net-firewall/iptables/files/1.3.1-files/iptables-1.3.1-compilefix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- iptables-1.3.1/extensions/libipt_conntrack.c
-+++ iptables-1.3.1/extensions/libipt_conntrack.c
-@@ -9,6 +9,7 @@
- #include <getopt.h>
- #include <ctype.h>
- #include <iptables.h>
-+#include <linux/types.h> // for u8
- #include <linux/netfilter_ipv4/ip_conntrack.h>
- #include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
- /* For 64bit kernel / 32bit userspace */
diff --git a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-errno.patch b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-errno.patch
deleted file mode 100644
index 5897bb1ecb97..000000000000
--- a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-errno.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: libiptc/libiptc.c
-===================================================================
---- libiptc/libiptc.c	(revision 6587)
-+++ libiptc/libiptc.c	(revision 6588)
-@@ -2096,10 +2096,8 @@
- 
- 	ret = setsockopt(sockfd, TC_IPPROTO, SO_SET_REPLACE, repl,
- 			 sizeof(*repl) + repl->size);
--	if (ret < 0) {
--		errno = ret;
-+	if (ret < 0)
- 		goto out_free_newcounters;
--	}
- 
- 	/* Put counters back. */
- 	strcpy(newcounters->name, (*handle)->info.name);
-@@ -2190,10 +2188,8 @@
- 
- 	ret = setsockopt(sockfd, TC_IPPROTO, SO_SET_ADD_COUNTERS,
- 			 newcounters, counterlen);
--	if (ret < 0) {
--		errno = ret;
-+	if (ret < 0)
- 		goto out_free_newcounters;
--	}
- 
- 	free(repl->counters);
- 	free(repl);
diff --git a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-linux-headers.patch b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-linux-headers.patch
deleted file mode 100644
index 7137d1919307..000000000000
--- a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-linux-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- extensions/libipt_iprange.c.orig	2007-03-01 00:19:36.000000000 +1100
-+++ extensions/libipt_iprange.c	2007-03-01 00:19:58.000000000 +1100
-@@ -6,6 +6,7 @@
- #include <getopt.h>
- 
- #include <iptables.h>
-+#include <linux/types.h>
- #include <linux/netfilter_ipv4/ipt_iprange.h>
- 
- /* Function which prints out usage message. */
diff --git a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch
deleted file mode 100644
index cc397007292f..000000000000
--- a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugs.gentoo.org/148169
-https://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=516
-
---- extensions/libip6t_LOG.c
-+++ extensions/libip6t_LOG.c
-@@ -143,6 +143,10 @@ parse(int c, char **argv, int invert, un
- 				   "Maximum prefix length %u for --log-prefix",
- 				   (unsigned int)sizeof(loginfo->prefix) - 1);
- 
-+		if (strlen(optarg) == 0)
-+			exit_error(PARAMETER_PROBLEM,
-+				   "No prefix specified for --log-prefix");
-+
- 		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
- 			exit_error(PARAMETER_PROBLEM,
- 				   "Newlines not allowed in --log-prefix");
---- extensions/libipt_LOG.c
-+++ extensions/libipt_LOG.c
-@@ -143,6 +143,10 @@ parse(int c, char **argv, int invert, un
- 				   "Maximum prefix length %u for --log-prefix",
- 				   (unsigned int)sizeof(loginfo->prefix) - 1);
- 
-+		if (strlen(optarg) == 0)
-+			exit_error(PARAMETER_PROBLEM,
-+				   "No prefix specified for --log-prefix");
-+
- 		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
- 			exit_error(PARAMETER_PROBLEM,
- 				   "Newlines not allowed in --log-prefix");
---- extensions/libipt_ULOG.c
-+++ extensions/libipt_ULOG.c
-@@ -110,6 +110,14 @@ static int parse(int c, char **argv, int
- 				   "Maximum prefix length %u for --ulog-prefix",
- 				   (unsigned int)sizeof(loginfo->prefix) - 1);
- 
-+		if (strlen(optarg) == 0)
-+			exit_error(PARAMETER_PROBLEM,
-+				   "No prefix specified for --ulog-prefix");
-+
-+		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
-+			exit_error(PARAMETER_PROBLEM,
-+				   "Newlines not allowed in --ulog-prefix");
-+
- 		strcpy(loginfo->prefix, optarg);
- 		*flags |= IPT_LOG_OPT_PREFIX;
- 		break;
diff --git a/net-firewall/iptables/files/iptables-1.3.7-more-exact-check-grep.patch b/net-firewall/iptables/files/iptables-1.3.7-more-exact-check-grep.patch
deleted file mode 100644
index 2f1b46f73f59..000000000000
--- a/net-firewall/iptables/files/iptables-1.3.7-more-exact-check-grep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-if `uname -r` contains a '-g' in it, the check target fails
-
-http://bugs.gentoo.org/159162
-https://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=527
-
---- Makefile
-+++ Makefile
-@@ -249,7 +249,7 @@ distrib: check distclean delrelease $(RE
- # -g -pg -DIPTC_DEBUG
- .PHONY: check
- check:
--	@if echo $(CFLAGS) | egrep -e '-g|-pg|IPTC_DEBUG' >/dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
-+	@if echo $(CFLAGS) | egrep -e '(^|[[:space:]])(-g|-pg|-DIPTC_DEBUG)([[:space:]]|$)' >/dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
- 
- .PHONY: nowhitespace
- nowhitespace:
diff --git a/net-firewall/iptables/files/iptables-1.3.7-test-dir.patch b/net-firewall/iptables/files/iptables-1.3.7-test-dir.patch
deleted file mode 100644
index f9e4b010796b..000000000000
--- a/net-firewall/iptables/files/iptables-1.3.7-test-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
--a isn't a valid test here, god knows why bash allows it
-
-http://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=569
-
---- Makefile.orig	2007-05-09 16:44:59.000000000 +0100
-+++ Makefile	2007-05-09 16:45:06.000000000 +0100
-@@ -79,7 +79,7 @@
- # Generic test if arch wasn't found above
- ifneq ($(POINTERTEST),1)
- 	# Try to determine if kernel is 64bit and we are compiling for 32bit
--	ifeq ($(shell [ -a $(KERNEL_DIR)/include/asm ] && echo YES), YES)
-+	ifeq ($(shell [ -d $(KERNEL_DIR)/include/asm ] && echo YES), YES)
- 		64bitkernel := $(shell echo -e "\#include <asm/types.h>\n\#if BITS_PER_LONG == 64\nkernel_is_64bits\n\#endif" | $(CC) $(CFLAGS) -D__KERNEL__ -E - | grep kernel_is_64bits)
- 		ifdef 64bitkernel
- 			32bituser := $(shell echo -e "\#include <stdio.h>\n\#if !defined(__arch64__) && !defined(_LP64)\nuserspace_is_32bit\n\#endif" | $(CC) $(CFLAGS) -E - | grep userspace_is_32bit)
diff --git a/net-firewall/iptables/iptables-1.3.5-r4.ebuild b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
deleted file mode 100644
index 97cb1489de47..000000000000
--- a/net-firewall/iptables/iptables-1.3.5-r4.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.17 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV="2.3"
-L7_P="netfilter-layer7-v${L7_PV}"
-L7_PATCH="iptables-layer7-${L7_PV}.patch"
-IMQ_PATCH="iptables-1.3.0-imq1.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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use l7filter && \
-		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; 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() {
-	unpack ${P}.tar.bz2
-	use l7filter && unpack ${L7_P}.tar.gz
-	cd "${S}"
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
-
-	epatch "${FILESDIR}"/1.3.5-files/${P}-errno.patch #139726
-	epatch "${FILESDIR}"/1.3.5-files/${P}-log-prefix-no-empty-strings.patch #148169
-	use extensions && epatch "${FILESDIR}"/1.3.5-files/${P}-linux-headers.patch #165590
-
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
-	fi
-	if use l7filter ; then
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		export KERNEL_DIR="/usr"
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter or imq patch added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	elog "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.3.6-r1.ebuild b/net-firewall/iptables/iptables-1.3.6-r1.ebuild
deleted file mode 100644
index efabf580971b..000000000000
--- a/net-firewall/iptables/iptables-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.6-r1.ebuild,v 1.3 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV="2.6"
-L7_P="netfilter-layer7-v${L7_PV}"
-L7_PATCH="iptables-layer7-${L7_PV}.patch"
-IMQ_PATCH="iptables-1.3.0-imq1.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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use l7filter && \
-		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; 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() {
-	unpack ${P}.tar.bz2
-	use l7filter && unpack ${L7_P}.tar.gz
-	cd "${S}"
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
-
-	epatch "${FILESDIR}"/1.3.5-files/${PN}-1.3.5-log-prefix-no-empty-strings.patch #148169
-
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
-	fi
-	if use l7filter ; then
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		export KERNEL_DIR="/usr"
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter or imq patch added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		echo
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.3.6.ebuild b/net-firewall/iptables/iptables-1.3.6.ebuild
deleted file mode 100644
index 8e96dee3eedb..000000000000
--- a/net-firewall/iptables/iptables-1.3.6.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.6.ebuild,v 1.3 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV="2.3"
-L7_P="netfilter-layer7-v${L7_PV}"
-L7_PATCH="iptables-layer7-${L7_PV}.patch"
-IMQ_PATCH="iptables-1.3.0-imq1.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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use l7filter && \
-		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; 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() {
-	unpack ${P}.tar.bz2
-	use l7filter && unpack ${L7_P}.tar.gz
-	cd "${S}"
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
-
-	epatch "${FILESDIR}"/1.3.5-files/${PN}-1.3.5-log-prefix-no-empty-strings.patch #148169
-
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
-	fi
-	if use l7filter ; then
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		export KERNEL_DIR="/usr"
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter or imq patch added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.3.7.ebuild b/net-firewall/iptables/iptables-1.3.7.ebuild
deleted file mode 100644
index 4cee90ddad94..000000000000
--- a/net-firewall/iptables/iptables-1.3.7.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.12 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV="2.9"
-L7_P="netfilter-layer7-v${L7_PV}"
-L7_PATCH="iptables-layer7-${L7_PV}.patch"
-IMQ_PATCH="iptables-1.3.0-imq1.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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use l7filter && \
-		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; 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() {
-	unpack ${P}.tar.bz2
-	use l7filter && unpack ${L7_P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-more-exact-check-grep.patch #159162
-	epatch "${FILESDIR}"/${P}-sparc64.patch #166201
-	epatch "${FILESDIR}"/${P}-kernel-dir.patch #172209
-	epatch "${FILESDIR}"/${P}-test-dir.patch # Find include/asm without bash
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
-
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
-	fi
-	if use l7filter ; then
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		export KERNEL_DIR=""
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter or imq patch added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.3.8-r1.ebuild b/net-firewall/iptables/iptables-1.3.8-r1.ebuild
deleted file mode 100644
index dc32140296b7..000000000000
--- a/net-firewall/iptables/iptables-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r1.ebuild,v 1.11 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV=2.13
-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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if kernel_is ge 2 6 20
-	then
-		L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
-	else
-		L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
-	fi
-	if use l7filter && \
-		[ ! -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() {
-	unpack ${P}.tar.bz2
-	if use l7filter
-	then
-		unpack ${L7_P}.tar.gz
-	fi
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.3.7-sparc64.patch #166201
-	epatch "${FILESDIR}"/${PN}-1.3.7-kernel-dir.patch #172209
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	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
-		then
-			L7_PATCH=iptables-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
-		else
-			L7_PATCH=iptables-for-kernel-pre2.6.20-layer7-${L7_PV}.patch
-		fi
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		export KERNEL_DIR=""
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-	# cannot work with the following according to Makefile near check:
-	# -g -pg -DIPTC_DEBUG
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.3.8-r2.ebuild b/net-firewall/iptables/iptables-1.3.8-r2.ebuild
deleted file mode 100644
index 0613a669018f..000000000000
--- a/net-firewall/iptables/iptables-1.3.8-r2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild,v 1.12 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV=2.13
-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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if kernel_is ge 2 6 20
-	then
-		L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
-	else
-		L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
-	fi
-	if use l7filter && \
-		[ ! -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() {
-	unpack ${P}.tar.bz2
-	if use l7filter
-	then
-		unpack ${L7_P}.tar.gz
-	fi
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.3.7-sparc64.patch #166201
-	epatch "${FILESDIR}"/${PN}-1.3.7-kernel-dir.patch #172209
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		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
-		then
-			L7_PATCH=iptables-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
-		else
-			L7_PATCH=iptables-for-kernel-pre2.6.20-layer7-${L7_PV}.patch
-		fi
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		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
-			# include dir where the linux headers are.
-			# FYI IPTABLES: YOU FAIL
-			echo '#include <linux/limits.h>' | $(tc-getCPP) - | grep -o '/[^"]*linux/limits.h' | sed s:/include/linux/limits.h::
-		)
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-	# cannot work with the following according to Makefile near check:
-	# -g -pg -DIPTC_DEBUG
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.3.8.ebuild b/net-firewall/iptables/iptables-1.3.8.ebuild
deleted file mode 100644
index b70479355351..000000000000
--- a/net-firewall/iptables/iptables-1.3.8.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8.ebuild,v 1.3 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV="2.9"
-L7_P="netfilter-layer7-v${L7_PV}"
-L7_PATCH="iptables-layer7-${L7_PV}.patch"
-IMQ_PATCH="iptables-1.3.0-imq1.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/"
-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"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )
-	imq? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter || use imq || 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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use l7filter && \
-		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; 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() {
-	unpack ${P}.tar.bz2
-	use l7filter && unpack ${L7_P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.3.7-sparc64.patch #166201
-	epatch "${FILESDIR}"/${PN}-1.3.7-kernel-dir.patch #172209
-
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
-	EPATCH_OPTS="-p1" \
-	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
-	fi
-	if use l7filter ; then
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	# the net directory is moving around so account for new/old locations
-	cd "${S}"/extensions
-	local x
-	for x in .*-test* ; do
-		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
-		if cmp ${x} .new-${x} > /dev/null ; then
-			rm -f .new-${x}
-		else
-			chmod a+rx .new-${x}
-		fi
-	done
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	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
-		export KERNEL_DIR=""
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter or imq patch added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-
-	# iptables will NOT work correctly unless -O[123] are present!
-	replace-flags -O0 -O2
-	get-flag -O || append-flags -O2
-
-	emake -j1 \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	make ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}
diff --git a/net-firewall/iptables/iptables-1.4.0.ebuild b/net-firewall/iptables/iptables-1.4.0.ebuild
deleted file mode 100644
index e18a089b2422..000000000000
--- a/net-firewall/iptables/iptables-1.4.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2008 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.5 2008/06/14 14:04:51 zmedico Exp $
-
-inherit eutils toolchain-funcs linux-info
-
-L7_PV=2.17
-L7_P=netfilter-layer7-v${L7_PV}
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/ http://l7-filter.sf.net/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
-	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 ipv6 l7filter static"
-
-DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )"
-RDEPEND=""
-
-pkg_setup() {
-	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."
-		ewarn
-		if use extensions ; then
-			ewarn "You may have to patch your kernel to allow iptables to build."
-			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
-			ewarn "for your kernel."
-			ewarn
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if kernel_is ge 2 6 20
-	then
-		L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
-	else
-		L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
-	fi
-	if use l7filter && \
-		[ ! -f "${L7FILE}" ]; then
-		die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	if use l7filter
-	then
-		unpack ${L7_P}.tar.gz
-	fi
-	cd "${S}"
-
-	# this provide's grsec's stealth match
-	EPATCH_OPTS="-p0" \
-	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
-	sed -i \
-		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile || die "failed to enable stealth extension"
-
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
-
-	if use l7filter ; then
-		#yes choosing 2.6.20 was deliberate - upstream mistake possibly
-		if kernel_is ge 2 6 20
-		then
-			L7_PATCH=iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
-		else
-			eerror "Currently there is no l7-filter patch available for this"
-			eerror "kernel iptables-1.4 and kernel version pre 2.6.20."
-			eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
-			eerror "or earlier, with l7-filter patch, please, report upstream."
-			die "No patch available."
-		fi
-		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
-		chmod +x extensions/.layer7-test*
-	fi
-
-	if ! use extensions ; then
-		cat <<-EOF > "${S}"/include/linux/compiler.h
-		#define __user
-		EOF
-	fi
-}
-
-src_defs() {
-	# these are used in both of src_compile and src_install
-	myconf=""
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	# 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.
-	use ipv6 || myconf="${myconf} DO_IPV6=0"
-	use static && myconf="${myconf} NO_SHARED_LIBS=0"
-	export myconf
-	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
-			# include dir where the linux headers are.
-			# FYI IPTABLES: YOU FAIL
-			echo '#include <linux/limits.h>' | $(tc-getCPP) - | grep -o '/[^"]*linux/limits.h' | sed s:/include/linux/limits.h::
-		)
-		export KBUILD_OUTPUT=${KERNEL_DIR}
-		diemsg="failure"
-	else
-		diemsg="failure - with l7filter and/or other miscellanious patches added"
-	fi
-	export diemsg
-}
-
-src_compile() {
-	src_defs
-	emake \
-		COPT_FLAGS="${CFLAGS}" ${myconf} \
-		CC="$(tc-getCC)" \
-		|| die "${diemsg}"
-}
-
-src_install() {
-	src_defs
-	emake ${myconf} \
-		DESTDIR="${D}" \
-		KERNEL_DIR="${KERNEL_DIR}" \
-		install install-devel || die "${diemsg}"
-
-	dodir /usr/$(get_libdir)
-	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2_x=$?
-}
-
-pkg_postinst() {
-	elog "This package now includes an initscript which loads and saves"
-	elog "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
-	elog "This location can be changed in /etc/conf.d/iptables"
-	elog
-	elog "If you are using the iptables initsscript you should save your"
-	elog "rules using the new iptables version before rebooting."
-	elog
-	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
-	elog "iptables."
-	elog
-	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
-	ewarn
-	ewarn "To enable ipforwarding at bootup:"
-	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
-	if use ipv6 ; then
-		ewarn "and/or"
-		ewarn "  net.ipv6.ip_forward = 1"
-		ewarn "for ipv6."
-	fi
-	if [[ $upgrade_from_1_2_x = 0 ]] ; then
-		ewarn
-		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
-		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
-		ewarn "http://bugs.gentoo.org/92535"
-	fi
-}