8 files changed, 10 insertions, 363 deletions
diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 80caf57c901e..b8b68f153ef8 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.52 2014/08/10 20:55:27 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.53 2015/05/30 23:57:12 mrueg Exp $
+
+  30 May 2015; Manuel Rüger <mrueg@gentoo.org> -ebtables-2.0.10.2.ebuild,
+  -ebtables-2.0.9.2-r1.ebuild, -ebtables-2.0.9.2-r2.ebuild,
+  -files/ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch,
+  -files/ebtables-v2.0.9-2-LDFLAGS.diff,
+  -files/ebtables-v2.0.9-2-compilation.patch:
+  Remove old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ebtables-2.0.10.2.ebuild,
   ebtables-2.0.10.4-r1.ebuild, ebtables-2.0.10.4.ebuild,
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index 8c75c5a21fb7..8217f4770b14 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ebtables-2.0.8.1-ebt-save.diff 1089 SHA256 b4d7022a616152ca439d2b09f14fda8a3ef479b823c2da44eb0e9e22b256be90 SHA512 904cb936ca6fc39dc4fa6e287ef70df9e1dacbd9dc464f839f25213f5525d4020f819dd893b784c5f611f1185c05ffbaa49423afcd6db2ef328950408a07e6a7 WHIRLPOOL df0664bc20dcd36bf640c8c88dea1e7d17b55c686403bceb77f5416b95ce0e2fc3292755e5986822b794628fc31aff25f7dab4d70d742fc93e78bac9fcdea4b2
-AUX ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch 1619 SHA256 56905064c63c582240da2bc21d03ba66fc28716089ba743396fa67e9ea78b7ca SHA512 d7894d354ab510f1115f6884451d60fdf0b48a0ae29f1a4b97c6ff9825ce94a21483e50c2cee2f4317a455fb26b3d5927ac410c3f75ac298586e8d6bc3c070ae WHIRLPOOL 34d88692a32d6ef4bf25211003756b2a9be0505134f5bbec98b5442d70a18ac3a97ff462769c2aa0a0fdf35168c64a88b1391a2e0ce79ad247d8b8ffd4d441f0
-AUX ebtables-v2.0.9-2-LDFLAGS.diff 2349 SHA256 55a236e2d10d2ef1dd699d94c6079acd9ae6447b9a462feb3071cdbd7611231b SHA512 b458662d58ec222999605c25c468f8aa4663c6e437cf3cd27634e46e6d9a8d2d9e5a3de65a0d36b3824cbb6b8755efd92a00a3092e932ee004b6c620a8f4e849 WHIRLPOOL 0edd15a4a793fa47007b55056bab3e6de703c803c564277bed2ac52dc586d4736765761320369ba2481fda6a992b180061f0a8de08fefebf1f301cacd477d14f
-AUX ebtables-v2.0.9-2-compilation.patch 1495 SHA256 8f0a3e8dc3035fa875a11bebe3f697019f6979225f8779ba58ab73cfcfd871c4 SHA512 c0b2a8e919c015f58d33b4b8d5397dc2a722b930bfc3bfdd152f129359d5cd037a3cf50909328877cb664f009e22f745c4a06bc0960e08d50cee426af25a1d6c WHIRLPOOL 4ae2aae85a330f6a148aef12ad9384a5dfaabd1f1bcaa2eedb29d2c8a4e5722ed7b503cb381ee7ffff9b794ad1e6ddda710314f97e463fcfabdd5ff052a44243
 AUX ebtables.confd-r1 288 SHA256 c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58 SHA512 088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3 WHIRLPOOL f6353fcc69beff674227544b36c3e2289f094758b02087d57b44fd0a73d7aa47500592404125bd2570ac2fa0da74aa18138e80c292ff5b21ee1ede13fa1125c4
 AUX ebtables.initd-r1 2109 SHA256 b5436fea0bf5e282a37d92504c8102122446490e6b0be907570fb5ea7cec9274 SHA512 9d6779bd864b1a1dcc414e8a946afe30ddff0298e59c3c31f0930b3d263f9217a640e156c5cbe271be5b2a95cadd7ef3c1aee8b79186ef35b08ba8fc17ac007d WHIRLPOOL ebfe5bd2a5dc1778a5283e70773b4c657da298dd04b5b5d2f845f5a4c634cd2dcf6bd529936d8a4c8b2a4614c05d5be7175551a672bd087eeffdeec136a58b38
-DIST ebtables-v2.0.10-2.tar.gz 104435 SHA256 cc26cc0646c0f6ce6ddd2f29f96d7399d6938f7503f7a8443e959c8ea2d66b61
 DIST ebtables-v2.0.10-4.tar.gz 103764 SHA256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d SHA512 a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a WHIRLPOOL 5a1e0703e3fd5c79e149824e789646d042660081fb8a9f301fa4cc2716e84fbf842216d5b6b4c8c33de3b6949bfbfcaa2eb7293fe7afa71a2305de8f70abd57d
-DIST ebtables-v2.0.9-2.tar.gz 101529 SHA256 98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3
-EBUILD ebtables-2.0.10.2.ebuild 1990 SHA256 b2eb091b6dadfcfbe9fa2a583e8191c92e6fbebde8e940b7f042e9672c02ea6d SHA512 d7ec1cb7f879f2ac949657f785b5badbadae65408b7260044d9dd8ebca8d085597adc0cd0769c534b8f40da40226f12329d61934d6c77762e1c5fd84ee125a47 WHIRLPOOL 8eb56ef6adb7974129cb963873afb31e2913a740547fd068ad68b638d165ee1c9dd1ee3a6e7519c035e066707f43473b56a4c8c89648dab0b9e62490c6ab9d64
 EBUILD ebtables-2.0.10.4-r1.ebuild 1994 SHA256 bea288286037265d4c2c7ac3214f3aeef55e21923b41be4825ff56cd0ed75bc5 SHA512 8623e485e146a1b2e3abb8a1c5aa6de3fe1854b2e2f17bcdb311ab5163ea07b6abebb0b2cd370bef32f841c2879dbcb6e2b29f332e831de2545b926fdbe35998 WHIRLPOOL 7603da6ac38f4ef406293347855f2a8de44b7fcb75857c995ad131fab5633798b1742e547a2f86a9cedc10a5658cbbd9ad2b2c530a9c756095fb6708cbd6366f
 EBUILD ebtables-2.0.10.4.ebuild 1988 SHA256 c65d4806c320541d264781883591ac83a709b6e48d6be271734eded5817eab30 SHA512 34bd9e0fe6178167e2d383e2701fe4596ce22e4e15deedb26e29830af12a49a8736f2c60480d954efa2c6ebb9241e2e8e9de2a9c106f76a07a56aaa5bb35525c WHIRLPOOL 9ae167dea0186855701baf7e8e734b74bd075dc8e5470bcb39044b97b07a4be59b0938296e065be8286f959d73dec0fc4184e834b6d893fb935fe60efbf0b64f
-EBUILD ebtables-2.0.9.2-r1.ebuild 1958 SHA256 b6d516fb8adbfda642fea4abe95421fb7fae70b7b95236d961a25c4a90657ba0 SHA512 498ef955753389329776f1b32fb7c1c2feaf9b6a1cbf93af3639a7acb7b4024aa615d9aff8d0ccc9343ce86c4cf96295399ebedc4e9308417198c81d6ed08e24 WHIRLPOOL f95a43906abae3d749866fe1ed662925e50480099133d78584bf1729e087bf22f915ba65a90ca6d8bc9d555f635933f8fb081a0f3a19b478261dc92f4f265b31
-EBUILD ebtables-2.0.9.2-r2.ebuild 2169 SHA256 cd04c23c54e1051539ebaefb3205a2268e460c8b6274f71191901d223ba6b98c SHA512 e542a86bb0956850983dc017c7cce081d1719fbda5d9cdb674ae8a9e932894cf225061941a31152e85f2e641d2be67ec4bcdf0350e3ee307f9f08a17e7c41d67 WHIRLPOOL f2668ecbf4ab2c07790cb047fb9392ae4a020bb261397c68dd3062f8ce1e539b45b0053a480a45ce7d125d47db31609a6c0f4acab460587ee678f1e6e7a42f37
-MISC ChangeLog 8649 SHA256 c289cc7bd8886998d70f6f56d708f52035911706c30952dd9abd9240c3d88253 SHA512 c3e4d32b2fc6483f47b00096e00ae5d403ff0646b30ddb561ce43105a1b8d7aeac4343550d466d6b8ef106bf99b0cdaab3507f1f660d051e6cdc99756038ed05 WHIRLPOOL eb3c305a6f9377e7bcfede764abd96ab61498787d33d38bab992bc054891e7cea96904c118c370aea557a4dd41dbd8d6f95563e862e2a88aaed767c3cbc3b140
+MISC ChangeLog 8943 SHA256 d7edb6a0880d5fcdadd33a672f24af11c9cef96b755cbe3dfaca66da2783ad74 SHA512 53e6543413542132e962f63594585e4f727bca471ba43c4a54ca093e196adf3e47ce9e6a6ad6c70df1348e2f3c5bf636c6826a87a6f23e76771a9e225cccce91 WHIRLPOOL 17140ef1391513e37b4c1e30ec665fd30d7d9a3e564d20ece083960bf7941b6f6ced424287788e1aff1a148914a0c390714630b21b9b49c551df2435a60c615e
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn3EAACgkQcaHudmEf86pJGgCfTyWuSP/fQP7eGuZLzcAoLYd8
-x30AniF89i/Eviq9FFbnGYDsKJOWCnfQ
-=smaZ
------END PGP SIGNATURE-----
diff --git a/net-firewall/ebtables/ebtables-2.0.10.2.ebuild b/net-firewall/ebtables/ebtables-2.0.10.2.ebuild
deleted file mode 100644
index 020d43e10f4f..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.10.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.10.2.ebuild,v 1.2 2014/08/10 20:55:27 slyfox Exp $
-
-EAPI="4"
-
-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"
-
-	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
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	# This package correctly aliases pointers, but gcc is unable to know that:
-	# unsigned char ip[4];
-	# if (*((uint32_t*)ip) == 0) {
-	append-cflags -Wno-strict-aliasing
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		$(use static && echo static)
-}
-
-src_install() {
-	if ! use static; then
-		make DESTDIR="${D}" install
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
-		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
-	else
-		into /
-		newsbin static ebtables
-		insinto /etc
-		doins ethertypes
-	fi
-	dodoc ChangeLog THANKS || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.9.2-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2-r1.ebuild
deleted file mode 100644
index 64474d0aa3ff..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.9.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 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-r1.ebuild,v 1.5 2014/08/10 20:55:27 slyfox 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-2-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
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		$(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-r1 ebtables || die
-		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables || die
-	else
-		into /
-		newsbin static ebtables || die
-	fi
-	dodoc ChangeLog THANKS || die
-}
diff --git a/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
deleted file mode 100644
index 34056c989f77..000000000000
--- a/net-firewall/ebtables/ebtables-2.0.9.2-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 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-r2.ebuild,v 1.6 2014/08/10 20:55:27 slyfox Exp $
-
-EAPI="4"
-
-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-2-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
-	epatch "${FILESDIR}/${PN}-v2.0.9-2-compilation.patch" #370953
-
-	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
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	# This package correctly aliases pointers, but gcc is unable to know that:
-	# unsigned char ip[4];
-	# if (*((uint32_t*)ip) == 0) {
-	append-cflags -Wno-strict-aliasing
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		$(use static && echo static)
-}
-
-src_install() {
-	if ! use static; then
-		make DESTDIR="${D}" install
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
-		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
-	else
-		into /
-		newsbin static ebtables
-		insinto /etc
-		doins ethertypes
-	fi
-	dodoc ChangeLog THANKS || die
-}
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch b/net-firewall/ebtables/files/ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch
deleted file mode 100644
index 310454087ee1..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2008-08-13 04:20:07 +0000
-+++ Makefile	2008-08-13 04:28:51 +0000
-@@ -153,10 +153,13 @@
- .PHONY: scripts
- scripts: ebtables-save ebtables.sysv ebtables-config
- 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
-+	mkdir -p $(DESTDIR)$(BINDIR)
- 	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_
-+	mkdir -p $(DESTDIR)$(INITDIR)
- 	install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
- 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
-+	mkdir -p $(DESTDIR)$(SYSCONFIGDIR)
- 	install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
- 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
- 
-@@ -166,9 +169,9 @@
- 	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
- 	rm -f ebtables.8_
- 
--$(ETHERTYPESFILE): ethertypes
--	mkdir -p $(DESTDIR)$(@D)
--	install -m 0644 -o root -g root $< $(DESTDIR)$@
-+$(DESTDIR)$(ETHERTYPESFILE): ethertypes
-+	mkdir -p $(@D)
-+	install -m 0644 -o root -g root $< $@
- 
- .PHONY: exec
- exec: ebtables ebtables-restore
-@@ -177,7 +180,7 @@
- 	install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
- 
- .PHONY: install
--install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
-+install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts
- 	mkdir -p $(DESTDIR)$(LIBDIR)
- 	install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR)
- 	install -m 0755 *.so $(DESTDIR)$(LIBDIR)
-
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
deleted file mode 100644
index e29909474b7f..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-=== modified file 'Makefile'
---- 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
- 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)
--	$(CC) -shared -Wl,-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
-@@ -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	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))
- 
- 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-compilation.patch b/net-firewall/ebtables/files/ebtables-v2.0.9-2-compilation.patch
deleted file mode 100644
index 38970d2904b6..000000000000
--- a/net-firewall/ebtables/files/ebtables-v2.0.9-2-compilation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://ebtables.cvs.sourceforge.net/viewvc/ebtables/ebtables2/userspace/ebtables2/Makefile?r1=1.62&r2=1.63
-
---- Makefile	2010/03/18 08:58:44	1.62
-+++ Makefile	2011/06/19 11:35:21	1.63
-@@ -82,11 +82,10 @@
- ebtables-standalone.o: ebtables-standalone.c include/ebtables_u.h
- 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES)
- 
--.PHONY: libebtc
--libebtc: $(OBJECTS2)
-+libebtc.so: $(OBJECTS2)
- 	$(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
--ebtables: $(OBJECTS) ebtables-standalone.o libebtc
-+ebtables: $(OBJECTS) ebtables-standalone.o libebtc.so
- 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
-@@ -96,14 +95,14 @@
- ebtablesd.o: ebtablesd.c include/ebtables_u.h
- 	$(CC) $(CFLAGS) $(PROGSPECSD) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
--ebtablesd: $(OBJECTS) ebtablesd.o libebtc
-+ebtablesd: $(OBJECTS) ebtablesd.o libebtc.so
- 	$(CC) $(CFLAGS) -o $@ ebtablesd.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
- 
- ebtables-restore.o: ebtables-restore.c include/ebtables_u.h
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
--ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
-+ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc.so
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- 	-Wl,-rpath,$(LIBDIR)
-