old

19 files changed, 0 insertions, 1022 deletions

diff --git a/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 b/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
deleted file mode 100644
index 61b3d0934730..000000000000
--- a/net-firewall/iptables/files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
+++ /dev/null
@@ -1,67 +0,0 @@
---- /dev/null
-+++ extensions/libipt_stealth.c
-@@ -0,0 +1,64 @@
-+/* Shared library add-on to iptables to add stealth support.
-+ * Copyright (C) 2002 Brad Spengler  <spender@grsecurity.net>
-+ * This netfilter module is licensed under the GNU GPL.
-+ */
-+
-+#include <stdio.h>
-+#include <netdb.h>
-+#include <stdlib.h>
-+#include <getopt.h>
-+#include <iptables.h>
-+
-+/* Function which prints out usage message. */
-+static void
-+help(void)
-+{
-+	printf("stealth v%s takes no options\n\n", IPTABLES_VERSION);
-+}
-+
-+static struct option opts[] = {
-+	{0}
-+};
-+
-+/* Initialize the match. */
-+static void
-+init(struct ipt_entry_match *m, unsigned int *nfcache)
-+{
-+	*nfcache |= NFC_UNKNOWN;
-+}
-+
-+static int
-+parse(int c, char **argv, int invert, unsigned int *flags,
-+	const struct ipt_entry *entry,
-+	unsigned int *nfcache,
-+	struct ipt_entry_match **match)
-+{
-+	return 0;
-+}
-+
-+static void
-+final_check(unsigned int flags)
-+{
-+	return;
-+}
-+
-+static
-+struct iptables_match stealth = {
-+	.next			= NULL,
-+	.name			= "stealth",
-+	.version		= IPTABLES_VERSION,
-+	.size			= IPT_ALIGN(0),
-+	.userspacesize	= IPT_ALIGN(0),
-+	.help			= &help,
-+	.init			= &init, 
-+	.parse			= &parse,
-+	.final_check	= &final_check,
-+	.print			= NULL,
-+	.save			= NULL,
-+	.extra_opts		= opts  
-+};
-+
-+void _init(void)
-+{
-+	register_match(&stealth);
-+}
diff --git a/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1 b/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1
deleted file mode 100644
index d60b45385b87..000000000000
--- a/net-firewall/iptables/files/1.3.1-files/install_all_dev_files.patch-1.3.1
+++ /dev/null
@@ -1,80 +0,0 @@
---- iptables-1.3.1/Makefile
-+++ iptables-1.3.1/Makefile
-@@ -38,8 +38,10 @@
- CFLAGS += -DNO_SHARED_LIBS=1
- endif
- 
--EXTRAS+=iptables iptables.o iptables.8
-+EXTRAS+=iptables iptables.o iptables.8 libiptables.a
- EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
-+DEVEL_HEADERS+=include/iptables.h include/iptables_common.h
-+DEVEL_LIBS+=libiptables.a
- 
- # No longer experimental.
- ifneq ($(DO_MULTI), 1)
-@@ -48,10 +50,12 @@
- EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
- 
- ifeq ($(DO_IPV6), 1)
--EXTRAS+=ip6tables ip6tables.o ip6tables.8
-+EXTRAS+=ip6tables ip6tables.o ip6tables.8 libip6tables.a
- EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
- EXTRAS+=ip6tables-save ip6tables-restore
- EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
-+DEVEL_HEADERS+=include/ip6tables.h
-+DEVEL_LIBS+=libip6tables.a
- endif
- 
- # Sparc64 hack
-@@ -113,6 +117,8 @@
- print-extensions:
- 	@[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
- 
-+libiptables.a: libiptables.a(iptables.o)
-+
- iptables.o: iptables.c
- 	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
- 
-@@ -154,6 +160,8 @@
- 	cp $< $@
- endif
- 
-+libip6tables.a: libip6tables.a(ip6tables.o)
-+
- ip6tables.o: ip6tables.c
- 	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
- 
-@@ -202,7 +210,7 @@
- .PHONY: install-devel-headers
- install-devel-headers: $(DEVEL_HEADERS)
- 	@[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR)
--	@cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR)
-+	@cp -v --parents $(DEVEL_HEADERS) `echo $(DESTDIR)$(INCDIR) | sed  -e "s:/include/\?::"`
- 
- .PHONY: install-devel-libs
- install-devel-libs: $(DEVEL_LIBS)
---- iptables-1.3.1/libipq/Makefile
-+++ iptables-1.3.1/libipq/Makefile
-@@ -17,7 +17,7 @@
- 
- DEVEL_LIBS+=libipq/libipq.a
- 
--DEVEL_HEADERS+=include/libipq/libipq.h
-+DEVEL_HEADERS+=include/libipq/libipq.h include/libipq/ip_queue_64.h
- 
- ifndef TOPLEVEL_INCLUDED
- local:
---- iptables-1.3.1/libiptc/Makefile
-+++ iptables-1.3.1/libiptc/Makefile
-@@ -16,8 +16,11 @@
- ifeq ($(DO_IPV6), 1)
- EXTRA_DEPENDS+= libiptc/libip6tc.d
- libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
-+DEVEL_HEADERS+=include/libiptc/libip6tc.h
- endif
- 
-+DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h
-+
- libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c
- 	@-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@
- endif
diff --git a/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch b/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch
deleted file mode 100644
index ac5357283575..000000000000
--- a/net-firewall/iptables/files/1.3.1-files/install_ipv6_apps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -63,8 +63,8 @@
- ifeq ($(DO_IPV6), 1)
- EXTRAS+=ip6tables ip6tables.o
- EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
--EXTRAS_EXP+=ip6tables-save ip6tables-restore
--EXTRA_INSTALLS_EXP+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
-+EXTRAS+=ip6tables-save ip6tables-restore
-+EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
- endif
- 
- # Sparc64 hack
diff --git a/net-firewall/iptables/files/iptables-1.3.7-kernel-dir.patch b/net-firewall/iptables/files/iptables-1.3.7-kernel-dir.patch
deleted file mode 100644
index 758bc3a0a228..000000000000
--- a/net-firewall/iptables/files/iptables-1.3.7-kernel-dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-let the toolchain figure out the default header location
-
-http://bugs.gentoo.org/172209
-
---- Makefile
-+++ Makefile
-@@ -37,7 +37,10 @@
- endif
- 
- COPT_FLAGS:=-O2
--CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
-+CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -Iinclude/ -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DIPTC_DEBUG
-+ifneq ($(KERNEL_DIR),)
-+CFLAGS += -I$(KERNEL_DIR)/include
-+endif
- 
- ifdef NO_SHARED_LIBS
- CFLAGS += -DNO_SHARED_LIBS=1
diff --git a/net-firewall/iptables/files/iptables-1.3.7-sparc64.patch b/net-firewall/iptables/files/iptables-1.3.7-sparc64.patch
deleted file mode 100644
index 68e81644f18b..000000000000
--- a/net-firewall/iptables/files/iptables-1.3.7-sparc64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura iptables-1.3.7/Makefile iptables-1.3.7-sparc64/Makefile
---- iptables-1.3.7/Makefile	2006-12-04 08:16:01.000000000 -0300
-+++ iptables-1.3.7-sparc64/Makefile	2007-02-13 23:01:09.000000000 -0300
-@@ -65,7 +65,7 @@
- 	32bituser := $(shell echo -e "\#include <stdio.h>\n\#if !defined(__sparcv9) && !defined(__arch64__) && !defined(_LP64)\nuserspace_is_32bit\n\#endif" | $(CC) $(CFLAGS) -E - | grep userspace_is_32bit)
- 	ifdef 32bituser
- 		# The kernel is 64-bit, even though userspace is 32.
--		CFLAGS+=-DIPT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-+		CFLAGS+=-DIPT_MIN_ALIGN=8
- 	else
- 		EXT_LDFLAGS+=-Wl,-m,elf64_sparc
- 	endif
diff --git a/net-firewall/iptables/files/iptables-1.4.0-2.6.26-kernel.patch b/net-firewall/iptables/files/iptables-1.4.0-2.6.26-kernel.patch
deleted file mode 100644
index 1e0346856c99..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.0-2.6.26-kernel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'extensions/libxt_sctp.c'
---- extensions/libxt_sctp.c	2008-11-11 13:32:29 +0000
-+++ extensions/libxt_sctp.c	2008-11-11 13:32:40 +0000
-@@ -13,6 +13,7 @@
- #include <getopt.h>
- #include <netdb.h>
- #include <ctype.h>
-+#include <stdbool.h>
- 
- #include <xtables.h>
- 
-
diff --git a/net-firewall/iptables/files/iptables-1.4.0-dev-files.patch b/net-firewall/iptables/files/iptables-1.4.0-dev-files.patch
deleted file mode 100644
index 6669adde8378..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.0-dev-files.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-install headers and make a small archive for people to use
-
---- iptables/Makefile
-+++ iptables/Makefile
-@@ -102,6 +102,17 @@
- print-extensions:
- 	@[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
- 
-+EXTRAS+=libiptables.a
-+DEVEL_HEADERS+=include/iptables.h include/xtables.h include/libipulog/libipulog.h
-+DEVEL_LIBS+=libiptables.a
-+ifeq ($(DO_IPV6), 1)
-+EXTRAS+=libip6tables.a
-+DEVEL_HEADERS+=include/ip6tables.h
-+DEVEL_LIBS+=libip6tables.a
-+endif
-+libiptables.a: libiptables.a(iptables.o)
-+libip6tables.a: libip6tables.a(ip6tables.o)
-+
- iptables.o: iptables.c
- 	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
- 
-@@ -221,7 +232,7 @@
- .PHONY: install-devel-headers
- install-devel-headers: $(DEVEL_HEADERS)
- 	@[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR)
--	@cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR)
-+	@cd include && cp -v --parents $(patsubst include/%,%,$(DEVEL_HEADERS)) $(DESTDIR)$(INCDIR)
- 
- .PHONY: install-devel-libs
- install-devel-libs: $(DEVEL_LIBS)
---- iptables/libiptc/Makefile
-+++ iptables/libiptc/Makefile
-@@ -16,8 +16,12 @@
- ifeq ($(DO_IPV6), 1)
- EXTRA_DEPENDS+= libiptc/libip6tc.d
- libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
-+DEVEL_HEADERS+=include/libiptc/libip6tc.h
- endif
- 
-+DEVEL_LIBS+=libiptc/libiptc.a
-+DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h include/libiptc/libxtc.h
-+
- libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c
- 	@-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@
- endif
diff --git a/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch b/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch
deleted file mode 100644
index a46a146409e3..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-use the proper api to access the data structures
-
-http://bugs.gentoo.org/225505
-
---- libiptc/libip6tc.c
-+++ libiptc/libip6tc.c
-@@ -113,7 +113,7 @@
- #include "libiptc.c"
- 
- #define BIT6(a, l) \
-- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
-+ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
- 
- int
- ipv6_prefix_length(const struct in6_addr *a)
---- ip6tables.c
-+++ ip6tables.c
-@@ -678,7 +678,7 @@
- 	for (i = 0, j = 0; i < n; i++) {
- 		int k;
- 		for (k = 0; k < 4; k++)
--			addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k];
-+			addrp[j].s6_addr32[k] &= maskp->s6_addr32[k];
- 		j++;
- 		for (k = 0; k < j - 1; k++) {
- 			if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) {
diff --git a/net-firewall/iptables/files/iptables-1.4.2-as-needed.patch b/net-firewall/iptables/files/iptables-1.4.2-as-needed.patch
deleted file mode 100644
index df194c65b70d..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://bugs.gentoo.org/244431
-
-patch by Arfrever Frehtes Taifersar Arahesis
-
---- Makefile.in
-+++ Makefile.in
-@@ -87,7 +87,7 @@
- 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libxtables_la_LIBADD =
-+libxtables_la_DEPENDENCIES =
- am_libxtables_la_OBJECTS = xtables.lo
- libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -353,11 +353,12 @@
- lib_LTLIBRARIES = libxtables.la
- libxtables_la_SOURCES = xtables.c
- libxtables_la_LDFLAGS = -version 0:0:0
-+libxtables_la_LIBADD = -ldl
- 
- # iptables, dynamic
- iptables_SOURCES = iptables-standalone.c iptables.c
- iptables_LDFLAGS = -rdynamic
--iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
-+iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm
- iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
-                             iptables-restore.c iptables-xml.c \
-                             iptables-standalone.c iptables.c
-@@ -375,13 +376,13 @@
- # iptables-multi, semi-static
- iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c
- iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
--iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a
-+iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm
- iptables_xml_SOURCES = iptables-xml.c
- 
- # ip6tables, dynamic
- ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
- ip6tables_LDFLAGS = -rdynamic
--ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
-+ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm
- ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
-                             ip6tables-restore.c ip6tables-standalone.c \
-                             ip6tables.c
-@@ -399,7 +400,7 @@
- # iptables-multi, semi-static
- ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c
- ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
--ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a
-+ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm
- noinst_LIBRARIES := libiptc/libiptc.a
- man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \
-                     iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
diff --git a/net-firewall/iptables/files/iptables-1.4.2-glibc.patch b/net-firewall/iptables/files/iptables-1.4.2-glibc.patch
deleted file mode 100644
index e200bbed4e72..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-glibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-pull in in.h as it sets up some proto defines that iptables relies on
-
---- include/xtables.h.in
-+++ include/xtables.h.in
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <stdbool.h>
- #include <net/if.h>
-+#include <netinet/in.h>
- #include <linux/types.h>
- #include <linux/netfilter/x_tables.h>
- 
diff --git a/net-firewall/iptables/files/iptables-1.4.2-hashlimit.patch b/net-firewall/iptables/files/iptables-1.4.2-hashlimit.patch
deleted file mode 100644
index d5a77c6eb0e8..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-hashlimit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: pva@gentoo.org
-Fixes bug http://bugs.gentoo.org/show_bug.cgi?id=254496
-
-=== modified file 'extensions/libxt_hashlimit.c'
---- extensions/libxt_hashlimit.c	2009-01-21 18:23:22 +0000
-+++ extensions/libxt_hashlimit.c	2009-01-21 18:23:32 +0000
-@@ -636,7 +636,7 @@
- 	if (info->cfg.max != 0)
- 		printf("--hashlimit-htable-max %u ", info->cfg.max);
- 	if (info->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL)
--		printf("--hashlimit-htable-gcinterval %u", info->cfg.gc_interval);
-+		printf("--hashlimit-htable-gcinterval %u ", info->cfg.gc_interval);
- 	if (info->cfg.expire != XT_HASHLIMIT_EXPIRE)
- 		printf("--hashlimit-htable-expire %u ", info->cfg.expire);
- 
-
diff --git a/net-firewall/iptables/files/iptables-1.4.2-libxt_TOS-compilation.patch b/net-firewall/iptables/files/iptables-1.4.2-libxt_TOS-compilation.patch
deleted file mode 100644
index 9ae3955452c7..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-libxt_TOS-compilation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jirí Moravec <jim.lkml@gmail.com>
-Date: Wed, 22 Oct 2008 06:57:38 +0000 (+0200)
-Subject: libxt_TOS: fix compilation error
-X-Git-Tag: v1.4.3-rc1~15
-X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=56156cda196154aa015b7df030a2a9bbf34f4fcc
-
-libxt_TOS: fix compilation error
-
-Fix compilation error caused by double definition of IPPROTO_SCTP:
-
-In file included from /usr/include/netinet/ip.h:25,
-                 from /usr/include/linux/ip.h:19,
-                 from tos_values.c:4,
-                 from libxt_TOS.c:15:
-/usr/include/netinet/in.h:84: error: expected identifier before numeric constant
-make[2]: *** [libxt_TOS.oo] Error 1
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/extensions/libxt_TOS.c b/extensions/libxt_TOS.c
-index 9ce8473..55a7172 100644
---- a/extensions/libxt_TOS.c
-+++ b/extensions/libxt_TOS.c
-@@ -8,6 +8,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <netinet/in.h>
- 
- #include <xtables.h>
- #include <linux/netfilter/xt_DSCP.h>
diff --git a/net-firewall/iptables/files/iptables-1.4.2-libxt_iprange.c-build.patch b/net-firewall/iptables/files/iptables-1.4.2-libxt_iprange.c-build.patch
deleted file mode 100644
index 2a22848d0472..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-libxt_iprange.c-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Thomas Jarosch <thomas.jarosch@intra2net.com>
-Date: Thu, 23 Oct 2008 13:40:52 +0000 (+0200)
-Subject: Fix compile error in libxt_iprange.c using gcc 4.3.2
-X-Git-Tag: v1.4.3-rc1~12
-X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=240eee607ab7e5bb9f671b7ceba40e2940182f61
-
-Fix compile error in libxt_iprange.c using gcc 4.3.2
-
-In file included from libxt_iprange.c:9:
-../include/linux/netfilter.h:43: error: field 'in' has incomplete type
-../include/linux/netfilter.h:44: error: field 'in6' has incomplete type
-libxt_iprange.c: In function 'parse_iprange':
-libxt_iprange.c:46: error: dereferencing pointer to incomplete type
-libxt_iprange.c:53: error: dereferencing pointer to incomplete type
-libxt_iprange.c: In function 'iprange_mt4_parse':
-libxt_iprange.c:117: error: dereferencing pointer to incomplete type
-libxt_iprange.c:121: error: dereferencing pointer to incomplete type
-libxt_iprange.c:136: error: dereferencing pointer to incomplete type
-libxt_iprange.c:140: error: dereferencing pointer to incomplete type
-libxt_iprange.c: In function 'iprange_mt6_parse':
-libxt_iprange.c:167: error: dereferencing pointer to incomplete type
-libxt_iprange.c:171: error: dereferencing pointer to incomplete type
-libxt_iprange.c:186: error: dereferencing pointer to incomplete type
-libxt_iprange.c:190: error: dereferencing pointer to incomplete type
-
-Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
----
-
-diff --git a/extensions/libxt_iprange.c b/extensions/libxt_iprange.c
-index 503372f..ee87a6f 100644
---- a/extensions/libxt_iprange.c
-+++ b/extensions/libxt_iprange.c
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <getopt.h>
- 
-+#include <netinet/in.h>
- #include <xtables.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter/xt_iprange.h>
diff --git a/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch b/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch
deleted file mode 100644
index 06a3be51b90d..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-no-ldconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-avoid pointless overhead for DESTDIR builds
-
-http://bugzilla.netfilter.org/show_bug.cgi?id=560
-
---- Makefile.in
-+++ Makefile.in
-@@ -1530,7 +1530,7 @@
- # ldconfig may fail when we are not root (as is the case in build systems)
- # so add appropriate protection that it does not let `make` fail.
- install-exec-hook:
--	-/sbin/ldconfig || :;
-+	-[ -z "$(DESTDIR)" ] && /sbin/ldconfig
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net-firewall/iptables/files/iptables-1.4.2-owner-restore.patch b/net-firewall/iptables/files/iptables-1.4.2-owner-restore.patch
deleted file mode 100644
index 47f77c08f782..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.2-owner-restore.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Daniel Drake <dsd@gentoo.org>
-Date: Mon, 19 Jan 2009 14:36:41 +0000 (+0100)
-Subject: libxt_owner: add more spaces to output
-X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=cfb9cf0509ad8100cd8d6ab52d60a8ffbb318578
-
-libxt_owner: add more spaces to output
-
-Commit bb9284d1 ("libxt_owner: add spaces to output") moved the printing
-of spaces away from the owner_mt_print() function family, but forgot to
-add spaces in all of the print_item() functions that are called.
-
-This is likely to be at least the partial cause of
-https://bugs.gentoo.org/show_bug.cgi?id=254435
-
-Signed-off-by: Daniel Drake <dsd@gentoo.org>
-Approves-of-this-patch: Jan Engelhardt <jengelh@medozas.de>
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/extensions/libxt_owner.c b/extensions/libxt_owner.c
-index 298075e..4cd173e 100644
---- a/extensions/libxt_owner.c
-+++ b/extensions/libxt_owner.c
-@@ -324,7 +324,7 @@ owner_mt_print_item_v0(const struct ipt_owner_info *info, const char *label,
- 		return;
- 	if (info->invert & flag)
- 		printf("! ");
--	printf(label);
-+	printf("%s ", label);
- 
- 	switch (info->match & flag) {
- 	case IPT_OWNER_UID:
-@@ -375,7 +375,7 @@ owner_mt6_print_item_v0(const struct ip6t_owner_info *info, const char *label,
- 		return;
- 	if (info->invert & flag)
- 		printf("! ");
--	printf(label);
-+	printf("%s ", label);
- 
- 	switch (info->match & flag) {
- 	case IP6T_OWNER_UID:
diff --git a/net-firewall/iptables/iptables-1.3.8-r3.ebuild b/net-firewall/iptables/iptables-1.3.8-r3.ebuild
deleted file mode 100644
index 724b2f56e667..000000000000
--- a/net-firewall/iptables/iptables-1.3.8-r3.ebuild
+++ /dev/null
@@ -1,215 +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.3.8-r3.ebuild,v 1.12 2009/08/27 08:57:51 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-L7_PV=2.21
-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"
-
-	epatch_user
-
-	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-1.3-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
-		else
-			L7_PATCH=iptables-1.3-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.4.0-r1.ebuild b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
deleted file mode 100644
index 1d05bb6cabce..000000000000
--- a/net-firewall/iptables/iptables-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,180 +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.0-r1.ebuild,v 1.16 2009/08/27 08:57:51 vapier Exp $
-
-inherit eutils toolchain-funcs linux-info
-
-L7_PV=2.21
-L7_P=netfilter-layer7-v${L7_PV}
-IMQ_PATCH=iptables-1.4.0-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.actusa.net/~linuximq/${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 ; then
-		if kernel_is lt 2 6 20 ; then
-			eerror "Currently there is no l7-filter patch available for iptables-1.4.x"
-			eerror "and kernel version before 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
-		[ ! -f "${KERNEL_DIR}/include/linux/netfilter/xt_layer7.h" ] && \
-			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
-			eerror "For IMQ support add a patch from http://www.actusa.net/~linuximq/ or from"
-			eerror "http://www.linuximq.net/patches.html (for older kernels) to your kernel."
-			die "Please, patch your kernel to support IMQ."
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	if use l7filter ; then
-		unpack ${L7_P}.tar.gz
-	fi
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-dev-files.patch
-	epatch "${FILESDIR}"/${P}-in6-glibc-2.8.patch #225505
-	epatch "${FILESDIR}"/${P}-2.6.26-kernel.patch #246395
-
-	# 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_user
-
-	if use imq ; then
-		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
-		chmod +x extensions/.IMQ-test*
-	fi
-
-	if use l7filter ; then
-		EPATCH_OPTS="-p1" epatch \
-			"${WORKDIR}"/${L7_P}/iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.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 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::
-		)
-		export KBUILD_OUTPUT=${KERNEL_DIR}
-		diemsg="failure"
-	else
-		export KERNEL_DIR
-		diemsg="failure - with l7filter and/or imq patch 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_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
-}
diff --git a/net-firewall/iptables/iptables-1.4.2-r2.ebuild b/net-firewall/iptables/iptables-1.4.2-r2.ebuild
deleted file mode 100644
index 4cf7a62d8500..000000000000
--- a/net-firewall/iptables/iptables-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,90 +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.2-r2.ebuild,v 1.10 2009/08/27 08:57:51 vapier Exp $
-
-inherit eutils toolchain-funcs linux-info
-
-L7_PV=2.21
-L7_P=netfilter-layer7-v${L7_PV}
-
-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
-	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="l7filter"
-
-DEPEND="virtual/os-headers"
-RDEPEND=""
-
-pkg_setup() {
-	if use l7filter ; 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."
-		linux-info_pkg_setup
-
-		if kernel_is lt 2 6 20 ; then
-			eerror "Currently there is no l7-filter patch available for iptables-1.4.x"
-			eerror "and kernel version before 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
-
-		[[ ! -f ${KERNEL_DIR}/include/linux/netfilter/xt_layer7.h ]] && \
-			die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this."
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use l7filter && unpack ${L7_P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-glibc.patch
-	epatch "${FILESDIR}"/${P}-no-ldconfig.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch #244431
-	epatch "${FILESDIR}"/${P}-owner-restore.patch #255113
-	epatch "${FILESDIR}"/${P}-libxt_TOS-compilation.patch
-	epatch "${FILESDIR}"/${P}-libxt_iprange.c-build.patch
-	epatch "${FILESDIR}"/${P}-hashlimit.patch #254496
-
-	epatch_user
-
-	if use l7filter ; then
-		cp "${WORKDIR}/${L7_P}/iptables-1.4.1.1-for-kernel-2.6.20forward"/* extensions \
-			|| die "Failed to copy l7filter sources"
-	fi
-}
-
-src_compile() {
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_with l7filter kernel ${KERNEL_DIR})
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/include
-	doins include/iptables.h include/ip6tables.h || die
-	dolib.a libiptc/libiptc.a || die
-	insinto /usr/include/libiptc
-	doins include/libiptc/*.h || die
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-	keepdir /var/lib/ip6tables
-	newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
-	newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-}
diff --git a/net-firewall/iptables/iptables-1.4.4.ebuild b/net-firewall/iptables/iptables-1.4.4.ebuild
deleted file mode 100644
index ee9e35c8b8c7..000000000000
--- a/net-firewall/iptables/iptables-1.4.4.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.4.ebuild,v 1.3 2009/08/27 08:57:51 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
-}