gentoo resync : 11.05.2021

4 files changed, 3 insertions, 72 deletions

diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
index 98edb0cfec9b..9e72871d281f 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -1,6 +1,3 @@
 DIST arptables-0.0.5.tar.gz 52247 BLAKE2B 860aac1af315f188ecb7f17956f9225c2a9ec007882d102be8edc9fecc9400928f4200e95283f0ecc27c4c3ae0b409887445ed79a330cef2e2d00444db83c01f SHA512 fe7f909b45a1bdc435a8307352fe2dc9c292bb7c6cf4a4d13cc2728f447b3da14a07a4dd6dc25b7872895e4e26561681f1fed25ce517102ae762701bcbcbf104
-DIST arptables-v0.0.4.tar.gz 45380 BLAKE2B a256aa280aa65fae8c5b17477fedb3fed4973e8d76746d5832184858b77111eb22bec63211a1ddfb74d25bdc23b0f237caf5ac7effa85433d0f63c51e23a3ef1 SHA512 bd84e93ab5e0a038753aa17dae9e1f48364f2d2b1492dce2edac117e21edd5aa912be7b9e21bf4fb3698031d2f765a75fa067fe10ce20a1c8951ae7efcc5dbbd
-EBUILD arptables-0.0.4.ebuild 767 BLAKE2B 643669923fb19fe90de6eed8acbba68e113cdd8572c025d694c2672fb053f71837980e88bd0991d7bc55376dbc785d72f1c51e8a2603831dfe4484463f8b7d6c SHA512 8e731f2562f779bb89abacb1de3fb7083959ef7b322c81186273f995f07b0cbbc7f30f5cece5118a4510f9a3914d4800f6b167c26e0098203adde3d02dfea557
-EBUILD arptables-0.0.5-r1.ebuild 1418 BLAKE2B 9c009e742e19d2ce5669bbee94de33d1f8484955b07f1422860c86562c469d446d2fb83a506c296a64b6a3bf617024eb20eb23d9ee1310e47027060d1c0c414c SHA512 7669b3c1c046773ad10dcf87d76a26831b33a2961624ebf38d44cca5b89285d55098c265951404e19832345acbf86d00ea099f482b71e97c9a182a3d3e1a6e5a
-EBUILD arptables-0.0.5.ebuild 857 BLAKE2B d21755c0c819e5fe3e2884bfbffd0b9ec3798a23617c44fced54694d1ad554cc8135b3115e4222558f70d678f6dc21138e68d22ccbca11ce44866b9110f919bb SHA512 cc04fcf591915be667f54bf7a79d51c919d8b69cd58d06d819fd963a6195c65093ca7425a8ea08e789778e1750f3cc370cfcaedf8dc6a7dce5afe0e93b542421
+EBUILD arptables-0.0.5-r1.ebuild 1415 BLAKE2B 0f64002720b87725f2b0d2d03beefd10502abd845a5b6c2db078b8504c5ccb5b9652e2f203d5d502e401cbdcf8bde148b92d3f12a738c761006e0052d57c38d7 SHA512 cbb01cd59e0d02f4d95bfa99c50ab0c1be436db12006fbb8fefe8c3c7e0f9bbdebe28a165f67c150ba50870eebb9387d00687c84d3ebdd8d41687109ee444eb2
 MISC metadata.xml 335 BLAKE2B 322b571e61e782fd11e8ddabf27e3c58827d150770bcc7f8c512564012d1cd927c5c518491f8546a64a38432ff0ffd1f06f0d52b54fdcd5f6cd96ef13b702de2 SHA512 840c9d22c1e29b4ddfd6b230e293766fb4b6d5cefc9a5839765629fa33adbddbaa3157d12be851e458030406af95c8e3356577fd20c0f876b43153e89ae298df
diff --git a/net-firewall/arptables/arptables-0.0.4.ebuild b/net-firewall/arptables/arptables-0.0.4.ebuild
deleted file mode 100644
index f53623192423..000000000000
--- a/net-firewall/arptables/arptables-0.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# -O0 does not work and at least -O2 is required, bug #240752
-	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}"
-	sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
-		|| die "sed failed"
-}
-
-src_install() {
-	into /
-	dosbin arptables arptables-restore arptables-save
-	doman arptables.8
-}
diff --git a/net-firewall/arptables/arptables-0.0.5-r1.ebuild b/net-firewall/arptables/arptables-0.0.5-r1.ebuild
index 9bfd2df4fba0..42dcb668a2df 100644
--- a/net-firewall/arptables/arptables-0.0.5-r1.ebuild
+++ b/net-firewall/arptables/arptables-0.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 BDEPEND=">=app-eselect/eselect-iptables-20200508"
diff --git a/net-firewall/arptables/arptables-0.0.5.ebuild b/net-firewall/arptables/arptables-0.0.5.ebuild
deleted file mode 100644
index 8484f81cf19b..000000000000
--- a/net-firewall/arptables/arptables-0.0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_compile() {
-	# -O0 does not work and at least -O2 is required, bug #240752
-	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}"
-	sed -e 's:__EXEC_PATH__:/sbin:g' \
-		-i arptables-save arptables-restore || die "sed failed"
-}
-
-src_install() {
-	emake \
-		PREFIX="${ED}"/ \
-		LIBDIR="${ED}/$(get_libdir)" \
-		SYSCONFIGDIR="${ED}"/etc \
-		MANDIR="${ED}"/usr/share/man \
-		install
-
-	dosym arptables-legacy /sbin/arptables
-	newman arptables-legacy.8 arptables.8
-}