gentoo resync : 23.12.2017

5 files changed, 16 insertions, 13 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index dc4063b8a7ce..bd344a773918 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index 58eac0860280..ae09e244c21d 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,6 +1,6 @@
 AUX arno-iptables-firewall 404 BLAKE2B 20ae4750d99c8edd3edf4f0e96354aa6a3f0df151bbbfe46f27fa3b1e0c8aaa5bdd7e3292b2e1fc1b5c735ae2b3d512117a5457b42593848829cc2808e7b6ec7 SHA512 3491c556150ac4c39447f17cb48caa2542c42c632d960f604ccdd475cbec239b8fec8523606c146427e644a929b2c5522f3c21a47712fd67880ac3815d3ab983
+DIST arno-iptables-firewall-2.0.2a.tar.gz 138141 BLAKE2B 1dad35b86ff5d93991b01ed0b3f4cd61eeab0d896b7c270d809600de972cae13828f192e8962199563b7ebf55f961a4cd96af9b15234e504df23615827aec638 SHA512 56ba669101375cccd29183e7069198f27d0656021310a90a82cb03ce417d4dec241084f3332f57d52f889b125836a6a08bb116453aaa9a4c3860204e109322e5
 DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 BLAKE2B 0c8263004d2294f6eedd7f40e6c339da3a57db803ce1d064ac0bf4a3d2191b26fcd0b59185e51240bd0378365f9ca115c80c5edc256aa68359728c960ab8e6e3 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70
-DIST arno-iptables-firewall_2.0.1f-rc1.tar.gz 129834 BLAKE2B b4d0c11074e0f1102800708253a0f49f09d8c7fc0feac2818d076aafe22ef7792cffff2809c73ad1c1c066f85727f5e4f2a76fd46d88ac1dc56095a74ed597b6 SHA512 cf7c2f97e74e01be48a8206be3116156740dfd2022df957651b587de1492157363249c067a778209c1e239f53c30426c32e6b1f901949c37ab2b5d690542d620
 EBUILD arno-iptables-firewall-2.0.1e.ebuild 2345 BLAKE2B 2e3044adbfa8caad15e4795acc57ad135a645418ef8ebeaf2f3553296ce17a89fa3ce58bbb8fd1f4aac60ac4fe7fd82423036640e350994ad3a43b5fe92510c9 SHA512 9392101cb729e11ed1aaa688b96489241cfe4d9e08038b787a6793f292ca9f2c5fe0c03e93f87a6f8c1bac9ef191bb92ca28a41598165762ee9a0ad20263033b
-EBUILD arno-iptables-firewall-2.0.1f_rc1.ebuild 2382 BLAKE2B 1740db1076eaa96a16ef365f3fae96f7ee16944d1c9fc4d34f082ad843c8a963cb973aab8ae99b76e45a418408836d69544cbaf3f2a3385f6aee78615918c151 SHA512 ffa821cda34330f02d5973d40959def681690afcb5c8f0f3352459bf3a35027ff8c1528cda612bef66d9f9b471c121721d47182aca8f5aaeb9333be44a299240
+EBUILD arno-iptables-firewall-2.0.2a.ebuild 2435 BLAKE2B 12ef96ffecffab0b9f9034cc83ffacb2b94f2b0970b1c6a73556d21b593889f0220de84a4d8dd7f2e23ca9de5c3e155353d21ab33680f41d748eb83d22e0f8f2 SHA512 9d487e6bc4ec2b355989775c05040e89edf9b2e276977b063557458ad168a957b0a85061ea50ffa0f13f67c928bdb910bd072184963ebfc0612bf0a8b27ee0a2
 MISC metadata.xml 423 BLAKE2B 5d1e73ade844870734bfcef03b2955e201f1e8679add93edd74b8cc91840ca7824fd33c674ed2327c2c102166830937af13033380d56bed00c497098faa846d0 SHA512 4d3402711020fd7ddecf5eae405bf4f72246347ea887f2f803c317c8b2d94ff830f68cf39e97526522f2d30845d95319e117efd49f06f685c046d0752c67546a
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1f_rc1.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.2a.ebuild
index 6ed34cb59a3b..b7750479cd0a 100644
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1f_rc1.ebuild
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.2a.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit readme.gentoo systemd versionator
+EAPI=6
+inherit readme.gentoo-r1 systemd versionator
 
 DESCRIPTION="Arno's iptables firewall script"
 HOMEPAGE="http://rocky.eld.leidenuniv.nl"
 
 MY_PV=$(replace_version_separator 3 -)
-SRC_URI="http://rocky.eld.leidenuniv.nl/${PN}/${PN}_${MY_PV}.tar.gz"
+MY_PV=${MY_PV/rc/RC}
+SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,12 +20,13 @@ IUSE="+plugins"
 # https://bugs.gentoo.org/show_bug.cgi?id=448716
 
 DEPEND=""
-RDEPEND="net-firewall/iptables
-		>sys-apps/coreutils-8.20-r1
-		sys-apps/iproute2
-		plugins? ( net-dns/bind-tools )"
+RDEPEND="net-firewall/ipset
+	net-firewall/iptables
+	>=sys-apps/coreutils-8.21
+	sys-apps/iproute2
+	plugins? ( net-dns/bind-tools )"
 
-S="${WORKDIR}/${PN}_${MY_PV/rc/RC}"
+S="${WORKDIR}/aif-${MY_PV}"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
@@ -43,6 +45,7 @@ src_prepare() {
 		etc/"${PN}"/firewall.conf || die "Sed failed!"
 	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
 		lib/systemd/system/"${PN}.service" || die "Sed failed!"
+	eapply_user
 }
 
 src_install() {
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 99ebd5cf5727..354d5e24d1a5 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -20,6 +20,6 @@ DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f75
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975
-EBUILD shorewall-5.1.9-r1.ebuild 16206 BLAKE2B 47d95dc2dd532966b4717c0f5ffb666bc234486a42c56bf3c65971f92efb0eefeb90af8b6253bc46308785496c55fb45a5ef6cfa1ef3b0ffcda34e1797f20564 SHA512 9c9149d96486ea7fca7a3291a02c59001d21c9d5c5c469117e32bb59256460ab1d203d791830d6c2cfb5134cc4c7af94a7deaa08e0cc1d4adb8f59a243e2768e
+EBUILD shorewall-5.1.9-r1.ebuild 16200 BLAKE2B a931f89d20368834293d50faa37f38d4224146f9ab11d247f6be5d85fab6bf258e60f5aedbaa28f5245a9ece5d4a3bdb0634ad7d90a32e203980417ceee70bf1 SHA512 9f3e31d7991a3960f8cfff37eb10b791c8f8f2fc260be12f7dc57a032ee16ef20fd618e905268f59d716b5aa132557d4d210bbbb3dccb34b042012deb959e1bc
 EBUILD shorewall-5.1.9.ebuild 16131 BLAKE2B 66da436b07968eb3cc2f17e7b18b30d1bf345c00d5df68f33ef0bba04d1ea99b08ad3b1b9269ec2967ef63ede1df8fbf5f6c6bd36dc848f0a66f87b2926d3d6f SHA512 4b7290fde74bb035b8c4b2e9b4d7865b3c45eba0f9814f2f046fa482a3d89606fdb42faeadbfe8cb3b39dd85a95171a1e05f6db2432def12e076784dcd93e8e3
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
index 7b0058bd0239..22419c59ec5f 100644
--- a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
 fi
 
 SRC_URI="