moved in the tree.

svn path=/; revision=40

11 files changed, 0 insertions, 483 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
deleted file mode 100644
index 3a03a31..0000000
--- a/net-firewall/ebtables/ChangeLog
+++ /dev/null
@@ -1,59 +0,0 @@
-# ChangeLog for net-firewall/ebtables
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.14 2007/08/12 10:11:21 pva Exp $
-
-*ebtables-2.0.8.1 (12 Aug 2007)
-
-  12 Aug 2007; <pva@gentoo.org> +files/ebtables-2.0.8.1-fix-textrel.patch,
-  +files/ebtables-2.0.8.1-scripts-build.patch, metadata.xml,
-  +ebtables-2.0.8.1.ebuild:
-  Version bump. Fixed bug #159371 and bug #167769. Thank Jochen Schlick,
-  Olivier Huber, Richard Benjamin Voigt and others mentioned in that bugs.
-
-  16 Jul 2007; <pva@gentoo.org> metadata.xml:
-  Grabed from solar.
-
-  25 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  ebtables-2.0.6-r1.ebuild:
-  Stable on amd64 and x86 wrt bug #142194.
-
-  31 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  ebtables-2.0.6-r1.ebuild:
-  ppc stable, bug #142194
-
-*ebtables-2.0.6-r1 (19 Jan 2006)
-
-  19 Jan 2006; <solar@gentoo.org> +files/ebtables-2.0.6-gcc4.patch,
-  +ebtables-2.0.6-r1.ebuild:
-  - ebtables-2.0.6 does not build with gcc-4.x; Bug #119489
-
-  07 Jun 2005; <solar@gentoo.org> ebtables-2.0.6.ebuild:
-  - ebtables used the host compiler vs the cross compiler while merging. We use
-  toolchain-funcs now
-
-  31 Dec 2004; Sven Wegener <swegener@gentoo.org> ebtables-2.0.6.ebuild:
-  Moved inherit to the top. Don't use variables in HOMEPAGE. Use MY_P.
-
-  11 Dec 2004; <solar@gentoo.org> ebtables-2.0.6.ebuild:
-  stable on x86
-
-  24 Jul 2004; <solar@gentoo.org> ebtables-2.0.6.ebuild:
-  update for ebtables -p support. bug 58116. Reported by Andrej Kacian
-
-  19 Jul 2004; Travis Tilley <lv@gentoo.org>
-  +files/ebtables-2.0.6-gcc34.patch, ebtables-2.0.6.ebuild:
-  added 'inherit eutils', fixed compiling with gcc 3.4, and added ~amd64 keyword
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  ebtables-2.0.6.ebuild:
-  virtual/glibc -> virtual/libc
-
-  19 Jun 2004; David Holm <dholm@gentoo.org> ebtables-2.0.6.ebuild:
-  Added to ~ppc.
-
-*ebtables-2.0.6 (28 Feb 2004)
-
-  28 Feb 2004; <solar@gentoo.org> ebtables-2.0.6.ebuild, metadata.xml:
-  initial import into portage of the ebtable utility that enables basic ethernet
-  frame filtering on a bridge, MAC NAT and brouting.
-
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
deleted file mode 100644
index ea6327f..0000000
--- a/net-firewall/ebtables/Manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-AUX ebtables-2.0.6-gcc34.patch 272 RMD160 c8268bc36d0a28cef499007c2b592cfc424a1671 SHA1 be4e49f857b29ed63df495cbafc204ab639f8206 SHA256 22fb00782948060f5350c5a7f0cd0414eb4e47d688e10af93dc7b27cb9f268a4
-MD5 0488ef6b4eb8aa41352527597cb5d2ad files/ebtables-2.0.6-gcc34.patch 272
-RMD160 c8268bc36d0a28cef499007c2b592cfc424a1671 files/ebtables-2.0.6-gcc34.patch 272
-SHA256 22fb00782948060f5350c5a7f0cd0414eb4e47d688e10af93dc7b27cb9f268a4 files/ebtables-2.0.6-gcc34.patch 272
-AUX ebtables-2.0.6-gcc4.patch 3966 RMD160 8df9ff094abcfe3c0c4c03b02997efacb542d6b0 SHA1 7a3db01e5dd7aa39dacf5d069bf7731bbf302bb6 SHA256 cbb3d36e1e2d511696e4ecd9e63450c7e495a3b629f96c62464046750ffaf411
-MD5 49410b65a0fadade808e745f1e309bb9 files/ebtables-2.0.6-gcc4.patch 3966
-RMD160 8df9ff094abcfe3c0c4c03b02997efacb542d6b0 files/ebtables-2.0.6-gcc4.patch 3966
-SHA256 cbb3d36e1e2d511696e4ecd9e63450c7e495a3b629f96c62464046750ffaf411 files/ebtables-2.0.6-gcc4.patch 3966
-AUX ebtables-2.0.8.1-fix-textrel.patch 521 RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 SHA1 f583e95e28c826d70ded4f96192e49205cab33ea SHA256 5fb4884ea95b5bc03a358eba8500a6c8b3c52b99ebc04e819f6ad925472d6b52
-MD5 24865a3af0d70f1ae8092afb436adda1 files/ebtables-2.0.8.1-fix-textrel.patch 521
-RMD160 7beb8cb14452ea33f622337d52dc9be354fb6c33 files/ebtables-2.0.8.1-fix-textrel.patch 521
-SHA256 5fb4884ea95b5bc03a358eba8500a6c8b3c52b99ebc04e819f6ad925472d6b52 files/ebtables-2.0.8.1-fix-textrel.patch 521
-AUX ebtables-2.0.8.1-scripts-build.patch 2628 RMD160 2d24b35c57231d06856bf6306b642cc8bd1ba298 SHA1 606ac72011dd6d3668706df0adade102e776d9ef SHA256 1d915fd72a90af6763009f801c7c4ef42a1deb82cd516cc09dc888b1de3f0916
-MD5 8443ec9a3253bae8f2644563e02133d7 files/ebtables-2.0.8.1-scripts-build.patch 2628
-RMD160 2d24b35c57231d06856bf6306b642cc8bd1ba298 files/ebtables-2.0.8.1-scripts-build.patch 2628
-SHA256 1d915fd72a90af6763009f801c7c4ef42a1deb82cd516cc09dc888b1de3f0916 files/ebtables-2.0.8.1-scripts-build.patch 2628
-AUX ebtables.confd 288 RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b SHA1 89b16bf882290bfc31c890948245552da5b26b4d SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58
-MD5 80ef574ef544679290108e73d2f2f377 files/ebtables.confd 288
-RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b files/ebtables.confd 288
-SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58 files/ebtables.confd 288
-AUX ebtables.initd 2277 RMD160 53c3be53585d464a26ccf128f3020b638313ce14 SHA1 18da9fa3fd2e151a6b9eb00ab135554411a51601 SHA256 4535d4893ac3ad092a60efe3fe1885653b26f8e8e38d86deab07b65f3544e257
-MD5 f1b83418cc231fd285817003094b6169 files/ebtables.initd 2277
-RMD160 53c3be53585d464a26ccf128f3020b638313ce14 files/ebtables.initd 2277
-SHA256 4535d4893ac3ad092a60efe3fe1885653b26f8e8e38d86deab07b65f3544e257 files/ebtables.initd 2277
-DIST ebtables-v2.0.8-1.tar.gz 96681 RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 SHA1 c70f012f274bfc277ee51f98fcffe0bfbbd36725 SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74
-EBUILD ebtables-2.0.8.1-r1.ebuild 1501 RMD160 bf0505bedef589cff8c8e4c7d49d320c0ca88384 SHA1 8466c27770b24d30179d7543891c3439fd09b7c6 SHA256 df674c73e318ff8faf33af558e5116cfab8d0384696c5caf8c18ea88e4fcb4c6
-MD5 1e049e797eed9024554348a58b63ede2 ebtables-2.0.8.1-r1.ebuild 1501
-RMD160 bf0505bedef589cff8c8e4c7d49d320c0ca88384 ebtables-2.0.8.1-r1.ebuild 1501
-SHA256 df674c73e318ff8faf33af558e5116cfab8d0384696c5caf8c18ea88e4fcb4c6 ebtables-2.0.8.1-r1.ebuild 1501
-MISC ChangeLog 2189 RMD160 eeacd0eb86678ef5be2e9abe30c83b62aaa93f8a SHA1 c476c143692662cffa426aaa28596623222622af SHA256 b3ebfdb70f392a9c4b6c92f5faebb632bf4baf77a81b44213a5a9cfea7534ec4
-MD5 e7ef13d8101770952ed930a55e1b9055 ChangeLog 2189
-RMD160 eeacd0eb86678ef5be2e9abe30c83b62aaa93f8a ChangeLog 2189
-SHA256 b3ebfdb70f392a9c4b6c92f5faebb632bf4baf77a81b44213a5a9cfea7534ec4 ChangeLog 2189
-MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
-MD5 26ae4c6a179a2e2cc5c19c56e978861d metadata.xml 251
-RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 metadata.xml 251
-SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504 metadata.xml 251
-MD5 c81b75dddac491771c6b189a3cb7a593 files/digest-ebtables-2.0.8.1-r1 250
-RMD160 2fec252859b3a19da36ce94a85ddffe2562c79e0 files/digest-ebtables-2.0.8.1-r1 250
-SHA256 cfb0bea2dc82ea6eb4a6f1879d783c62f683350662f4218fa3f592816fbdd630 files/digest-ebtables-2.0.8.1-r1 250
diff --git a/net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild
deleted file mode 100644
index 0f0e157..0000000
--- a/net-firewall/ebtables/ebtables-2.0.8.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.1.ebuild,v 1.1 2007/08/12 10:11:21 pva Exp $
-
-inherit versionator eutils toolchain-funcs multilib
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P="${PN}-v${MY_PV}"
-
-DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Kill two rabits: TEXTREL and compilation on amd64. bug #159371.
-	epatch "${FILESDIR}"/${P}-fix-textrel.patch
-
-	# Fix scripts to be built during make, thus paths inside are correct.
-	epatch "${FILESDIR}"/${P}-scripts-build.patch
-
-	sed -i -e "s,MANDIR:=/usr/local/man,MANDIR:=/usr/share/man," \
-		-e "s,BINDIR:=/usr/local/sbin,BINDIR:=/sbin," \
-		-e "s,INITDIR:=/etc/rc.d/init.d,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,SYSCONFIGDIR:=/etc/sysconfig,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,LIBDIR:=/usr/lib,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dodoc ChangeLog THANKS
-	make DESTDIR="${D}" install || die
-
-	newconfd "${FILESDIR}"/ebtables.confd ebtables
-	newinitd "${FILESDIR}"/ebtables.initd ebtables
-}
diff --git a/net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r1 b/net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r1
deleted file mode 100644
index 1d64e3b..0000000
--- a/net-firewall/ebtables/files/digest-ebtables-2.0.8.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 216e5d20fbd0e56dbe7e56b0d07b1909 ebtables-v2.0.8-1.tar.gz 96681
-RMD160 0ff0f5aeaa418157b0e791dfbe93450ef323da51 ebtables-v2.0.8-1.tar.gz 96681
-SHA256 e33edf08d5ae7974d3575f62468a981cc42afb1164bde3f0402e08fcfc404f74 ebtables-v2.0.8-1.tar.gz 96681
diff --git a/net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch b/net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch
deleted file mode 100644
index 33ff9a4..0000000
--- a/net-firewall/ebtables/files/ebtables-2.0.6-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ebtables-v2.0.6.old/ebtables.c	2004-07-19 22:38:16.955817128 -0400
-+++ ebtables-v2.0.6/ebtables.c	2004-07-19 22:38:55.241996744 -0400
-@@ -1170,7 +1170,7 @@
- 		if (!t->compare(t->t, u_e->t))
- 			continue;
- 		return i;
--letscontinue:
-+letscontinue:;
- 	}
- 	return -1;
- }
diff --git a/net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch b/net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch
deleted file mode 100644
index cf64aed..0000000
--- a/net-firewall/ebtables/files/ebtables-2.0.6-gcc4.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../ebtables/gcc4.patch
-# Copyright (C) 2004 - 2005 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-diff -Nur ebtables-v2.0.6.orig/extensions/ebt_ip.c ebtables-v2.0.6/extensions/ebt_ip.c
---- ebtables-v2.0.6.orig/extensions/ebt_ip.c	2003-11-02 20:22:56.000000000 +0200
-+++ ebtables-v2.0.6/extensions/ebt_ip.c	2005-11-01 18:48:56.000000000 +0200
-@@ -244,6 +244,7 @@
- 	struct ebt_ip_info *ipinfo = (struct ebt_ip_info *)(*match)->data;
- 	char *end;
- 	long int i;
-+	unsigned char j;
- 
- 	switch (c) {
- 	case IP_SOURCE:
-@@ -313,7 +314,7 @@
- 			ipinfo->invflags |= EBT_IP_PROTO;
- 		if (optind > argc)
- 			print_error("Missing IP protocol argument");
--		(unsigned char) i = strtoul(argv[optind - 1], &end, 10);
-+		j = strtoul(argv[optind - 1], &end, 10);
- 		if (*end != '\0') {
- 			struct protoent *pe;
- 
-@@ -324,7 +325,7 @@
- 				     argv[optind - 1]);
- 			ipinfo->protocol = pe->p_proto;
- 		} else {
--			ipinfo->protocol = (unsigned char) i;
-+			ipinfo->protocol = j;
- 		}
- 		ipinfo->bitmask |= EBT_IP_PROTO;
- 		break;
-diff -Nur ebtables-v2.0.6.orig/extensions/ebt_limit.c ebtables-v2.0.6/extensions/ebt_limit.c
---- ebtables-v2.0.6.orig/extensions/ebt_limit.c	2003-11-02 20:22:56.000000000 +0200
-+++ ebtables-v2.0.6/extensions/ebt_limit.c	2005-11-01 18:48:56.000000000 +0200
-@@ -203,15 +203,15 @@
- 
- static struct ebt_u_match limit_match =
- {
--	.name		EBT_LIMIT_MATCH,
--	.size		sizeof(struct ebt_limit_info),
--	.help		print_help,
--	.init		init,
--	.parse		parse,
--	.final_check	final_check,
--	.print		print,
--	.compare	compare,
--	.extra_ops	opts,
-+	.name	=	EBT_LIMIT_MATCH,
-+	.size	=	sizeof(struct ebt_limit_info),
-+	.help	=	print_help,
-+	.init	=	init,
-+	.parse	=	parse,
-+	.final_check =	final_check,
-+	.print	=	print,
-+	.compare =	compare,
-+	.extra_ops =	opts,
- };
- 
- static void _init(void) __attribute((constructor));
-diff -Nur ebtables-v2.0.6.orig/extensions/ebt_vlan.c ebtables-v2.0.6/extensions/ebt_vlan.c
---- ebtables-v2.0.6.orig/extensions/ebt_vlan.c	2003-11-02 20:22:56.000000000 +0200
-+++ ebtables-v2.0.6/extensions/ebt_vlan.c	2005-11-01 18:48:56.000000000 +0200
-@@ -135,14 +135,16 @@
- 	    (struct ebt_vlan_info *) (*match)->data;
- 	char *end;
- 	struct ebt_vlan_info local;
-+	unsigned short id, encap;
-+	unsigned char prio;
- 
- 	switch (c) {
- 	case VLAN_ID:
- 		check_option(flags, OPT_VLAN_ID);
- 		CHECK_INV_FLAG(EBT_VLAN_ID);
- 		CHECK_IF_MISSING_VALUE;
--		(unsigned short) local.id =
--		    strtoul(argv[optind - 1], &end, 10);
-+		id = strtoul(argv[optind - 1], &end, 10);
-+		local.id = (uint16_t) id;
- 		CHECK_RANGE(local.id > 4094 || *end != '\0');
- 		vlaninfo->id = local.id;
- 		SET_BITMASK(EBT_VLAN_ID);
-@@ -152,8 +154,8 @@
- 		check_option(flags, OPT_VLAN_PRIO);
- 		CHECK_INV_FLAG(EBT_VLAN_PRIO);
- 		CHECK_IF_MISSING_VALUE;
--		(unsigned char) local.prio =
--		    strtoul(argv[optind - 1], &end, 10);
-+		prio = strtoul(argv[optind - 1], &end, 10);
-+		local.prio = (uint8_t) prio;
- 		CHECK_RANGE(local.prio >= 8 || *end != '\0');
- 		vlaninfo->prio = local.prio;
- 		SET_BITMASK(EBT_VLAN_PRIO);
-@@ -163,8 +165,8 @@
- 		check_option(flags, OPT_VLAN_ENCAP);
- 		CHECK_INV_FLAG(EBT_VLAN_ENCAP);
- 		CHECK_IF_MISSING_VALUE;
--		(unsigned short) local.encap =
--		    strtoul(argv[optind - 1], &end, 16);
-+		encap = strtoul(argv[optind - 1], &end, 16);
-+		local.encap = (uint16_t) encap;
- 		if (*end != '\0') {
- 			ethent = getethertypebyname(argv[optind - 1]);
- 			if (ethent == NULL)
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch
deleted file mode 100644
index 97a5497..0000000
--- a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.orig	2007-08-12 13:02:55.000000000 +0400
-+++ ./Makefile	2007-08-12 13:03:04.000000000 +0400
-@@ -87,7 +87,7 @@
- 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -Iinclude/
- 
- ebtables.o: ebtables.c include/ebtables_u.h
--	$(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
- 
- ebtables-standalone.o: ebtables-standalone.c include/ebtables_u.h
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES)
diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch
deleted file mode 100644
index 798eefd..0000000
--- a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./Makefile.orig	2007-08-12 13:25:23.000000000 +0400
-+++ ./Makefile	2007-08-12 13:36:13.000000000 +0400
-@@ -15,15 +15,6 @@
- SYSCONFIGDIR:=/usr/share/doc/ebtables-2.0.8.1
- DESTDIR:=
- 
--# include DESTDIR param
--override LIBDIR:=$(DESTDIR)$(LIBDIR)/$(PROGNAME)
--override MANDIR:=$(DESTDIR)$(MANDIR)
--override BINDIR:=$(DESTDIR)$(BINDIR)
--override ETCDIR:=$(DESTDIR)$(ETCDIR)
--override INITDIR:=$(DESTDIR)$(INITDIR)
--override SYSCONFIGDIR:=$(DESTDIR)$(SYSCONFIGDIR)
--
--
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
-@@ -163,34 +154,34 @@
- .PHONY: scripts
- scripts: ebtables-save ebtables.sysv ebtables-config
- 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
--	install -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save
-+	install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
- 	cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
--	install -m 0755 -o root -g root ebtables.sysv_ $(INITDIR)/ebtables
-+	install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
- 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
--	install -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config
-+	install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
- 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
- 
- $(MANDIR)/man8/ebtables.8: ebtables.8
--	mkdir -p $(@D)
-+	mkdir -p $(DESTDIR)$(@D)
- 	sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
--	install -m 0644 -o root -g root ebtables.8_ $@
-+	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
- 	rm -f ebtables.8_
- 
- $(ETHERTYPESFILE): ethertypes
--	mkdir -p $(@D)
--	install -m 0644 -o root -g root $< $@
-+	mkdir -p $(DESTDIR)$(@D)
-+	install -m 0644 -o root -g root $< $(DESTDIR)$@
- 
- .PHONY: exec
- exec: ebtables ebtables-restore
--	mkdir -p $(BINDIR)
--	install -m 0755 -o root -g root $(PROGNAME) $(BINDIR)/$(PROGNAME)
--	install -m 0755 -o root -g root ebtables-restore $(BINDIR)/ebtables-restore
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
-+	install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
- 
- .PHONY: install
- install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
--	mkdir -p $(LIBDIR)
--	install -m 0755 extensions/*.so $(LIBDIR)
--	install -m 0755 *.so $(LIBDIR)
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR)
-+	install -m 0755 *.so $(DESTDIR)$(LIBDIR)
- 
- .PHONY: clean
- clean:
diff --git a/net-firewall/ebtables/files/ebtables.confd b/net-firewall/ebtables/files/ebtables.confd
deleted file mode 100644
index 645b26e..0000000
--- a/net-firewall/ebtables/files/ebtables.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/ebtables
-
-# Location in which ebtables initscript will save set rules on 
-# service shutdown
-EBTABLES_SAVE="/var/lib/ebtables/rules-save"
-
-# Options to pass to ebtables-save and ebtables-restore 
-SAVE_RESTORE_OPTIONS=""
-
-# Save state on stopping ebtables
-SAVE_ON_STOP="yes"
diff --git a/net-firewall/ebtables/files/ebtables.initd b/net-firewall/ebtables/files/ebtables.initd
deleted file mode 100644
index e88e00f..0000000
--- a/net-firewall/ebtables/files/ebtables.initd
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-opts="save reload panic"
-
-ebtables_bin="/sbin/ebtables"
-ebtables_save=${EBTABLES_SAVE}
-ebtables_tables=$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//)
-if [ ebtables_tables == "" ] ; then
-	ebtables_tables="filter nat broute"
-fi
-
-depend() {
-	before net
-	use logger
-}
-
-set_table_policy() {
-	local chains table=$1 policy=$2
-	case ${table} in
-		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
-		broute) chains="BROUTING";;
-		filter) chains="INPUT FORWARD OUTPUT";;
-		*)      chains="";;
-	esac
-	local chain
-	for chain in ${chains} ; do
-		${ebtables_bin} -t ${table} -P ${chain} ${policy}
-	done
-}
-
-checkkernel() {
-	if [ "$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//)" == "" ] ; then
-		eerror "Your kernel lacks ebtables  support, please load"
-		eerror "appropriate modules and try again."
-		return 1
-	fi
-	return 0
-}
-checkconfig() {
-	if [ ! -f ${ebtables_save} ] ; then
-		eerror "Not starting ebtables.  First create some rules then run:"
-		eerror "/etc/init.d/ebtables save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ebtables state and starting bridge firewall"
-	${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	checkkernel || return 1
-	ebegin "Stopping bridge firewall"
-	local a
-	for a in ${ebtables_tables}; do
-		set_table_policy $a ACCEPT
-
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-	done
-	eend $?
-}
-
-reload() {
-	checkkernel || return 1
-	ebegin "Flushing bridge firewall"
-	local a
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-	done
-	eend $?
-
-	start
-}
-
-save() {
-	ebegin "Saving ebtables state"
-	touch "${ebtables_save}"
-	chmod 0600 "${ebtables_save}"
-	${ebtables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
-	eend $?
-}
-
-panic() {
-	checkkernel || return 1
-	service_started ebtables && svc_stop
-
-	local a
-	ebegin "Dropping all packets forwarded on bridges"
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -X
-		${ebtables_bin} -t $a -X
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
deleted file mode 100644
index 2384f2c..0000000
--- a/net-firewall/ebtables/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
-  <email>pva@gentoo.org</email>
-  <name>Peter Volkov</name>
-</maintainer>
-</pkgmetadata>