Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key )

7 files changed, 9 insertions, 344 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/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)
-