gentoo resync : 11.05.2018

7 files changed, 2 insertions, 112 deletions

diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
index 51b27ce7e831..d278b4334697 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -1,9 +1,3 @@
-AUX arptables-0.0.3.4-arptables_save.patch 893 BLAKE2B a04b621cf62dcfc0887b93f2dc67ff39bbdc542eb68c33f1c17a80c22bf15d284fa0940689f47a26629d899888fa4c30cf1501d2334bfa6f5bf95190b75b7b13 SHA512 eb0c76d754a5370ab5967e4fcc3544d9dd72f16692c50a399177da57600eb28d4fe9bed5f510b6f23f18db3775433b399b09c679275b93c3fbabc77d81f550b1
-AUX arptables-0.0.3.4-ldflags.patch 372 BLAKE2B b618b21e569228520304be74b7e93676c09a44049f7394ec34315311d84a431ee39b24ef2d796365967d14c31a3b879fbc085876983fb02d93f53d7c833597b3 SHA512 7620d7f16c0a2d25070f32222935db49d2a8fd675612af72b5bea18a6b0db42cf30f4a854f2f5c2f1185e1fd5f7780ddd3e2d7d4eb335ddf24a53318f490bd06
-AUX arptables-0.0.3.4-manpage.patch 447 BLAKE2B d165642f0e97056edd11152a1c3bd429793d8061c4d06e502fe1ae0d6146b7f4048e70f102e4fc3c3ef4875b350135dc93e9d4a7628aff64aa010ed029324202 SHA512 72860d0f7b33e42bdfe1470399391eb64a3d5543b6b071aab1c9c428f7e56e7a0f115d82c1f5a57f5d324a13b1d58a23adc8a656a8c4f1d4a71a5d0810b5802f
-AUX arptables-0.0.3.4-type.patch 935 BLAKE2B 7534adfd33baba8b7ac30b739007f9e77c8d488bde0d6a5a9088557f9ae02523ba0604395e3c02ef974c1e29a9b4243f6db3d498573c15f0adfffee9c939e5a3 SHA512 4e87cac250cf6b23c54bf9d6b09360300e803cbb76ebb30d166525a6a1069b67eddb46e73d21be18926b2222386a5fee4ef249dff2fba9b03e1b40c2e64681ae
-DIST arptables-v0.0.3-4.tar.gz 44335 BLAKE2B a5764ad0976cddd10d0fc727609a5d6d68bd19422900401040990d464940c87855b82e8da994a23e62a233ace2a7f1fdecc20161855ed41925f34cf1e796a29f SHA512 a566b6df5c4b22c9c15d22c3801763e640f15b76043123c4ca8db1cc753a20a99b8b7b6dae2f0d9277cc6c49bcb269ba481958bcff3f6a516c7c9d8b553d35b5
 DIST arptables-v0.0.4.tar.gz 45380 BLAKE2B a256aa280aa65fae8c5b17477fedb3fed4973e8d76746d5832184858b77111eb22bec63211a1ddfb74d25bdc23b0f237caf5ac7effa85433d0f63c51e23a3ef1 SHA512 bd84e93ab5e0a038753aa17dae9e1f48364f2d2b1492dce2edac117e21edd5aa912be7b9e21bf4fb3698031d2f765a75fa067fe10ce20a1c8951ae7efcc5dbbd
-EBUILD arptables-0.0.3.4-r2.ebuild 1013 BLAKE2B 9d053f6db1ff97309d8995972a72356e4c7e4282ff0bf9a7e342c98cdb3c4a46c275b21afd1c0268f826c33a7866f7d9c87e5b03b13300cb3d4e3984783246b0 SHA512 8855aa2f610f8bdd5931cd0c6a8a78fffc711b49a8eaf34d65a47e4cae6b2a6cd50f94dc727a7cd5e700e56768192811aa42d2e399f17e0f8e1f61b93d37d83d
-EBUILD arptables-0.0.4.ebuild 768 BLAKE2B 2030d6c9db42cd42fa6a098c9feb3bcbe32563d09e9efd6cc3f003bc070c9734764237205cd1192e2b21c890e1a9fe1527c2b34f9caf50128f42b0dab877e715 SHA512 ae7eb923eeb1c9cedafcfbb1139dc9067955bd89c9d758448b04646cfa84d63e05651e1caeebc4d96bf30f6a29e5ee1ad9dbfc6190d1f822d1007a17d691f920
+EBUILD arptables-0.0.4.ebuild 767 BLAKE2B 643669923fb19fe90de6eed8acbba68e113cdd8572c025d694c2672fb053f71837980e88bd0991d7bc55376dbc785d72f1c51e8a2603831dfe4484463f8b7d6c SHA512 8e731f2562f779bb89abacb1de3fb7083959ef7b322c81186273f995f07b0cbbc7f30f5cece5118a4510f9a3914d4800f6b167c26e0098203adde3d02dfea557
 MISC metadata.xml 335 BLAKE2B 322b571e61e782fd11e8ddabf27e3c58827d150770bcc7f8c512564012d1cd927c5c518491f8546a64a38432ff0ffd1f06f0d52b54fdcd5f6cd96ef13b702de2 SHA512 840c9d22c1e29b4ddfd6b230e293766fb4b6d5cefc9a5839765629fa33adbddbaa3157d12be851e458030406af95c8e3356577fd20c0f876b43153e89ae298df
diff --git a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
deleted file mode 100644
index 14b31b9b2647..000000000000
--- a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit versionator eutils
-
-MY_P=${PN}-v$(replace_version_separator 3 - )
-
-DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-arptables_save.patch"
-	epatch "${FILESDIR}/${P}-manpage.patch"
-	epatch "${FILESDIR}/${P}-type.patch"
-}
-
-src_compile() {
-	# -O0 does not work and at least -O2 is required, bug #240752
-	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}" || die "make failed"
-	sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
-		|| die "sed failed"
-}
-
-src_install() {
-	into /
-	dosbin arptables arptables-restore arptables-save || die
-	doman arptables.8 || die
-}
diff --git a/net-firewall/arptables/arptables-0.0.4.ebuild b/net-firewall/arptables/arptables-0.0.4.ebuild
index c69397f10400..f53623192423 100644
--- a/net-firewall/arptables/arptables-0.0.4.ebuild
+++ b/net-firewall/arptables/arptables-0.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch b/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
deleted file mode 100644
index a1b60b24ea10..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-arptables_save.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Don't resolve host names and don't convert '*' interface names to any.
-# Remove '*' interface names.
-
-diff -urNad arptables-0.0.3.3~/arptables-save arptables-0.0.3.3/arptables-save
---- arptables-0.0.3.3~/arptables-save	2009-08-19 14:17:17.000000000 +0200
-+++ arptables-0.0.3.3/arptables-save	2009-08-19 14:19:58.000000000 +0200
-@@ -35,6 +35,8 @@
- 	# Due to arptables "issues" with displaying device names
-         # we need to use -v and then do some processing
- 	$line =~ s/\s,\s.*//;
-+	$line =~ s/-i\s\*//;
-+	$line =~ s/-o\s\*//;
-         $rules = $rules . "-A $chain $line\n";
-     }
- 
-@@ -47,7 +49,7 @@
- # ========================================================
- 
- unless (-x "$tool") { print "ERROR: Tool $tool isn't executable"; exit -1; };
--$table =`$tool -t filter -L -v`;
-+$table =`$tool -t filter -L -v -n`;
- unless ($? == 0) { print $table; exit -1 };
- &process_table($table);
- 
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch b/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch
deleted file mode 100644
index b5ced69c504b..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2010-09-15 11:51:49 +0000
-+++ Makefile	2010-09-15 11:52:56 +0000
-@@ -31,7 +31,7 @@
- 	$(CC) $(CFLAGS) -c -o $@ $<
- 
- arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
- 	mkdir -p $(@D)
-
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch b/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
deleted file mode 100644
index 76295b6d9b5c..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-manpage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad arptables-0.0.3.3~/arptables.8 arptables-0.0.3.3/arptables.8
---- arptables-0.0.3.3~/arptables.8	2007-08-19 15:04:51.000000000 +0200
-+++ arptables-0.0.3.3/arptables.8	2008-05-08 18:56:35.000000000 +0200
-@@ -22,7 +22,7 @@
- .\"
- .\"
- .SH NAME
--arptables (v.0.0.3-3) \- ARP table administration
-+arptables \- ARP table administration
- .SH SYNOPSIS
- .BR "arptables " [ "-t table" ] " -" [ AD ] " chain rule-specification " [ options ]
- .br
diff --git a/net-firewall/arptables/files/arptables-0.0.3.4-type.patch b/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
deleted file mode 100644
index 851bf0ee247f..000000000000
--- a/net-firewall/arptables/files/arptables-0.0.3.4-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Patch from Jeroen van Wolffelaar <jeroen@wolffelaar.nl> to make
-# arptables --proto-type also accept hexadecimal inputs (ethernet protocol
-# numbers are often specfied in hex, not decimal), using standard strtol()
-# behaviour (hex iff starts with 0x).
-
-diff -urNad arptables-0.0.3.3~/arptables.c arptables-0.0.3.3/arptables.c
---- arptables-0.0.3.3~/arptables.c	2007-08-19 15:04:51.000000000 +0200
-+++ arptables-0.0.3.3/arptables.c	2008-05-08 19:16:43.000000000 +0200
-@@ -2039,7 +2039,7 @@
- 			check_inverse(optarg, &invert, &optind, argc);
- 			set_option(&options, OPT_P_TYPE, &fw.arp.invflags,
- 				   invert);
--			if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 10)) {
-+			if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 0)) {
- 				if (strcasecmp(argv[optind-1], "ipv4"))
- 					exit_error(PARAMETER_PROBLEM, "Problem with specified protocol type");
- 				fw.arp.arpro = htons(0x800);