Install /etc/ethertypes even with USE=static, bug #367379 thank Dirk-Lüder Kreie for report. Respect LDFLAGS when USE=static. Drop old.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

10 files changed, 39 insertions, 370 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 70eff3cc9b52..57ce08052726 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.39 2010/07/11 12:07:23 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.40 2011/05/19 10:29:33 pva Exp $
+
+*ebtables-2.0.9.2-r2 (19 May 2011)
+
+  19 May 2011; Peter Volkov <pva@gentoo.org>
+  -files/ebtables-v2.0.9-1-LDFLAGS.diff, -ebtables-2.0.9.1.ebuild,
+  -ebtables-2.0.9.1-r1.ebuild, -ebtables-2.0.9.2.ebuild,
+  +ebtables-2.0.9.2-r2.ebuild, -files/ebtables-v2.0.8-2-LDFLAGS.diff,
+  files/ebtables-v2.0.9-2-LDFLAGS.diff, -files/ebtables.confd,
+  -files/ebtables.initd:
+  Install /etc/ethertypes even with USE=static, bug #367379 thank Dirk-Lüder
+  Kreie for report. Respect LDFLAGS when USE=static. Drop old.
 
   11 Jul 2010; Markus Meier <maekke@gentoo.org> ebtables-2.0.9.2-r1.ebuild:
   x86 stable, bug #323571
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index a2eca3cc7687..435aefb8665f 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,27 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 RMD160 d36bd4ee1f9c5640d960e0b537829faade9251c4 SHA1 efad4c40e92b42d59e044c78945aed00ef756ed8 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90
-AUX ebtables-v2.0.8-2-LDFLAGS.diff 1874 RMD160 9cb9c0b96a14a4cfc441dc4d02d1b169448ec1c2 SHA1 c0a955c56d553b45c024178ccd227666389800b7 SHA256 8279df45acdd0c089aa47295e6718ac9208298f269c0f066421f9d2be8c4b937
 AUX ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch 1619 RMD160 62f324507577cdcb9390b42fc87dd7f8017bf4e7 SHA1 7a68888f6ac2d2ee55105a957bcdec263992e266 SHA256 56905064c63c582240da2bc21d03ba66fc28716089ba743396fa67e9ea78b7ca
-AUX ebtables-v2.0.9-1-LDFLAGS.diff 1874 RMD160 e7c0fc175b1d44fbc4c91f50377b8e3fb74e54f2 SHA1 e8cddfd6ee81b13f0ccb3d3cb7cfc003eee0bd29 SHA256 988bf04df31a3696e12d8c8d856610291038c383956857ee3b239108213e8212
-AUX ebtables-v2.0.9-2-LDFLAGS.diff 1877 RMD160 fbe4771271a4b95cab0867a89e4dd7444ca2eeb8 SHA1 9500c735a7184c728f68602a438f833ba2916277 SHA256 083c2da165854376a49122f33dd5cd4e2dba1bb4c4a29141f6675d8a42b23dae
-AUX ebtables.confd 466 RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 SHA1 2bf5e4db2fde07a9791c43cb27575aefe30cc895 SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d
+AUX ebtables-v2.0.9-2-LDFLAGS.diff 2349 RMD160 db15610f89a004adff95cca96b3f0b59c1c79b9a SHA1 0bc0d680a60ce79439573efa78fda696153a8f6a SHA256 55a236e2d10d2ef1dd699d94c6079acd9ae6447b9a462feb3071cdbd7611231b
 AUX ebtables.confd-r1 288 RMD160 97d8fd8a00b48d70881aff05c1fa533e1da7172b SHA1 89b16bf882290bfc31c890948245552da5b26b4d SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58
-AUX ebtables.initd 2078 RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 SHA1 d8d3628cbdc251d22558fc5761be95d012586f7f SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53
 AUX ebtables.initd-r1 2071 RMD160 bbc77bbb64a2f73c97647d45e7707ee74da8573e SHA1 72e6b79826d47f7312947e5f2366e9130f690607 SHA256 cef208f784b24abcc7af313355d103ee1c78ade42fb1cee3936b209c012d7a80
-DIST ebtables-v2.0.9-1.tar.gz 101781 RMD160 9ec134cbb21be5eb085ad7f405c26363d29d38f9 SHA1 b0b011edb5872f266b9bbb127fe292d1e745dbc3 SHA256 8aefbc4480b1f6b6766fdb26779cd9eb9609278ad294b7585e533270e039bdc6
 DIST ebtables-v2.0.9-2.tar.gz 101529 RMD160 7dff076ab14dbc2c9e64813c745f1513498fdaa8 SHA1 93b684cf788592f976a12a5f71c3aa9d185a309c SHA256 98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3
-EBUILD ebtables-2.0.9.1-r1.ebuild 2000 RMD160 3e150a35ffe727f6695e59a96be13165987da19a SHA1 391427ed49a6bbd9090196629ef93b0108fc5185 SHA256 9da82fcced6e9b3ad769fe7c321775ec26c1806d8b6882a24879071f2ff91f11
-EBUILD ebtables-2.0.9.1.ebuild 1703 RMD160 7bd7b57d7b2117cbf5f44a0f5aea57f1db713ca0 SHA1 3e16ccc4dff504aa8e8683989ee5fb7d238ec878 SHA256 25807c88a348854d3b58ba1e0e99ae2ace4f6d4b85ea05f1573864aea2b9ae52
 EBUILD ebtables-2.0.9.2-r1.ebuild 1959 RMD160 6ddab669bc1cb64490475bdc5544ce46ccb63e31 SHA1 7f90002f76ac87ff30dea2631aec686ea3b713dd SHA256 e4ec3bda2c6eec70ec889667a98f0bf272bc6a91a2152188e21ee447b509f221
-EBUILD ebtables-2.0.9.2.ebuild 1950 RMD160 00ab06c4531c3aa875bbc9b555a98d62c06f506e SHA1 584b4631e5db26720212bf001fdef976d266978a SHA256 8ebb637de0fe50c4b9b131d2b04ee27e2981497e3fd00fe9ce99c2805719e294
-MISC ChangeLog 6437 RMD160 36248f86d309599f7d40b1c7043a973616d3a8ad SHA1 231e7d05202d38b8ff4158bfe2fd118f45bb52c3 SHA256 5d22ff752540ec77655ec75a0185107edecac0b640847fb5f8e9bb8214803c41
+EBUILD ebtables-2.0.9.2-r2.ebuild 1939 RMD160 224bd6095bc38b35dbca4ca030cd26d5deab774d SHA1 8fc0b8fb0de4847be3d5dd76ecc435986bf286ea SHA256 ab87fa014764dff8df9702edcb5e078cf2cff361a80154b8c4f8405c163a3909
+MISC ChangeLog 6939 RMD160 1230252cdd9e9fa6e0b9c3761cb0a85ddf550933 SHA1 cdacc5d731d06e74af0a09b8e8a33a7e73d0c25e SHA256 131b6a3f08e339122af4c2cea93a70ed753ebcd6f30c0eb2ef1faefcffb9f2a7
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw5s5YACgkQkKaRLQcq0GJHegCglkfTF8aRntYx4uALEsGlf1F3
-Jm8AnRDAZEvXnCJQOOvAaLn/WvHpkAzV
-=I4Vp
------END PGP SIGNATURE-----
diff --git a/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild
deleted file mode 100644
index 6c1fc9df9c15..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild
+++ /dev/null
@@ -1,63 +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/ebtables/ebtables-2.0.9.1-r1.ebuild,v 1.3 2009/12/06 22:47:01 flameeyes Exp $
-
-EAPI="2"
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-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."
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static"
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use static; then
-		ewarn "You've chosen static build which is useful for embedded devices."
-		ewarn "It has no init script. Make sure that's really what you want."
-	fi
-}
-
-src_prepare() {
-	# Enhance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.9-1-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
-
-	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-	sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile
-	sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	emake $(use static && echo static) || die "emake failed"
-}
-
-src_install() {
-	if ! use static; then
-		make DESTDIR="${D}" install || die
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd ebtables || die
-		newconfd "${FILESDIR}"/ebtables.confd ebtables || die
-	else
-		into /
-		newsbin static ebtables || die
-	fi
-	dodoc ChangeLog THANKS || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.9.1.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1.ebuild
deleted file mode 100644
index 1986bea23e1d..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.9.1.ebuild
+++ /dev/null
@@ -1,52 +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/ebtables/ebtables-2.0.9.1.ebuild,v 1.4 2009/11/08 19:20:20 nixnut Exp $
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-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."
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Enchance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.9-1-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
-
-	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-	sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile
-	sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog THANKS || die
-	keepdir /var/lib/ebtables/
-	newinitd "${FILESDIR}"/ebtables.initd ebtables || die
-	newconfd "${FILESDIR}"/ebtables.confd ebtables || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.9.2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
index 1f1ae2bf3c67..97aad4c6f6ab 100644
--- a/net-firewall/ebtables/ebtables-2.0.9.2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2.ebuild,v 1.1 2010/03/16 07:49:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild,v 1.1 2011/05/19 10:29:33 pva Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit versionator eutils toolchain-funcs multilib flag-o-matic
 
@@ -47,19 +47,20 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		$(use static && echo static) \
-		|| die "emake failed"
+		$(use static && echo static)
 }
 
 src_install() {
 	if ! use static; then
-		make DESTDIR="${D}" install || die
+		make DESTDIR="${D}" install
 		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd ebtables || die
-		newconfd "${FILESDIR}"/ebtables.confd ebtables || die
+		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
+		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
 	else
 		into /
-		newsbin static ebtables || die
+		newsbin static ebtables
+		insinto /etc
+		doins ethertypes
 	fi
 	dodoc ChangeLog THANKS || die
 }
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.8-2-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.8-2-LDFLAGS.diff
deleted file mode 100644
index f5ccb9375dbe..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.8-2-LDFLAGS.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2008-08-12 12:30:44 +0000
-+++ Makefile	2008-08-12 12:30:56 +0000
-@@ -18,7 +18,6 @@
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
--LD:=ld
- 
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -85,10 +84,10 @@
- 
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
--	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
-+	$(CC) -shared  $(LDFLAGS) -Wl,-soname=libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
--	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- ebtablesu: ebtablesu.c
-@@ -105,7 +104,7 @@
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
- ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
--	$(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- .PHONY: daemon
-
-=== modified file 'extensions/Makefile'
---- extensions/Makefile	2008-08-12 12:30:44 +0000
-+++ extensions/Makefile	2008-08-12 12:30:45 +0000
-@@ -11,13 +11,13 @@
- EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
- 
- extensions/ebt_%.so: extensions/ebt_%.o
--	$(CC) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
- 
- extensions/libebt_%.so: extensions/ebt_%.so
- 	mv $< $@
- 
- extensions/ebtable_%.so: extensions/ebtable_%.o
--	$(CC) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
- 
- extensions/libebtable_%.so: extensions/ebtable_%.so
- 	mv $< $@
-
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff
deleted file mode 100644
index 1e42fe58a046..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2009-06-22 14:41:37 +0000
-+++ Makefile	2009-06-22 14:52:59 +0000
-@@ -18,7 +18,6 @@
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
--LD:=ld
- 
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -85,10 +84,10 @@
- 
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
--	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
-+	$(CC) -shared  $(LDFLAGS) -Wl,-soname=libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
--	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- ebtablesu: ebtablesu.c
-@@ -105,7 +104,7 @@
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
- ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
--	$(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- .PHONY: daemon
-
-=== modified file 'extensions/Makefile'
---- extensions/Makefile	2009-06-22 14:41:37 +0000
-+++ extensions/Makefile	2009-06-22 14:55:36 +0000
-@@ -11,13 +11,13 @@
- EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
- 
- extensions/ebt_%.so: extensions/ebt_%.o
--	$(CC) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
- 
- extensions/libebt_%.so: extensions/ebt_%.so
- 	mv $< $@
- 
- extensions/ebtable_%.so: extensions/ebtable_%.o
--	$(CC) -shared -o $@ -lc $< -nostartfiles
-+	$(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
- 
- extensions/libebtable_%.so: extensions/ebtable_%.so
- 	mv $< $@
-
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
index ab5d9aafe575..e29909474b7f 100644
--- a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
+++ b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
@@ -1,6 +1,6 @@
 === modified file 'Makefile'
---- Makefile	2010-03-16 07:37:01 +0000
-+++ Makefile	2010-03-16 07:39:15 +0000
+--- Makefile	2011-05-17 11:10:15 +0000
++++ Makefile	2011-05-17 11:47:00 +0000
 @@ -18,7 +18,6 @@
  CFLAGS:=-Wall -Wunused
  CFLAGS_SH_LIB:=-fPIC
@@ -31,10 +31,19 @@
  	-Wl,-rpath,$(LIBDIR)
  
  .PHONY: daemon
+@@ -134,7 +133,7 @@
+ 	printf "extern void %s();\n" _t_$${arg}_init >> include/ebtables_u.h ; \
+ 	done ; \
+ 	printf "\n\tpseudomain(argc, argv);\n\treturn 0;\n}\n" >> ebtables-standalone.c ;\
+-	$(CC) $(CFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(PROGSPECS) -o $@ $^ -I$(KERNEL_INCLUDES) -Iinclude ; \
+ 	for arg in $(EXT_FUNC) \
+ 	; do \
+ 	sed "s/ .*_init/ _init/" extensions/ebt_$${arg}.c > extensions/ebt_$${arg}.c_ ; \
 
 === modified file 'extensions/Makefile'
---- extensions/Makefile	2010-03-16 07:37:01 +0000
-+++ extensions/Makefile	2010-03-16 07:37:43 +0000
+--- extensions/Makefile	2011-05-17 11:10:15 +0000
++++ extensions/Makefile	2011-05-17 11:46:36 +0000
 @@ -11,13 +11,13 @@
  EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
  
diff --git a/net-firewall/ebtables/files/ebtables.confd b/net-firewall/ebtables/files/ebtables.confd
deleted file mode 100644
index db46ffb58793..000000000000
--- a/net-firewall/ebtables/files/ebtables.confd
+++ /dev/null
@@ -1,15 +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"
-
-# Tables to be saved and restored. If you have built ebtables as modules, you
-# may leave it blank. Otherwise, you MUST define which to control.
-TABLE_NAMES="filter nat broute"
diff --git a/net-firewall/ebtables/files/ebtables.initd b/net-firewall/ebtables/files/ebtables.initd
deleted file mode 100644
index 27c743c91014..000000000000
--- a/net-firewall/ebtables/files/ebtables.initd
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.2 2007/09/28 19:22:14 pva Exp $
-
-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=${TABLE_NAMES}
-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
-}
-
-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
-	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() {
-	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 ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
-	eend $?
-}
-
-panic() {
-	service_started ebtables && svc_stop
-
-	local a
-	ebegin "Dropping all packets forwarded on bridges"
-	for a in ${ebtables_tables}; do
-		${ebtables_bin} -t $a -F
-		${ebtables_bin} -t $a -X
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}