gentoo resync : 30.09.2018

5 files changed, 5 insertions, 4 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 7e152d07a94e..fc69f01c62e8 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index b4573794bcb7..4eb7c8b42481 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -8,5 +8,5 @@ DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a214
 EBUILD firehol-3.1.3-r1.ebuild 1381 BLAKE2B 2fc08f6aff1de75c28548131a5ade1208997ab7d03ed16e6956d536ce25a0aa61dd2f12e607952395f23e7fd8e7a7418b2d74fcfbeed5b2913a5576bd06ae708 SHA512 e0fea503715dd17f301ed856ae2ad42035dc65ed6712896e884a6d9a8207925f5c30182333c887f64127cb34c38346d8a428e2c4ded7a97617f0de2c75b9df7d
 EBUILD firehol-3.1.3.ebuild 1328 BLAKE2B 13e1a54e2ba65475fe68c9c8930d80171d612d45501efec8fb1adc382787e4b5318b30d2c7b499c48ffcf794648aae39da988391ce10be1086ce9ae0bcd84e8a SHA512 3431ba2d4ef30125f45b4873795fb6e29d273a006857399f90d648d2d7a139dd07179e4cc3893139707340b92f4377d8d5004467bf0b6d7b67afe4eadf31df0b
 EBUILD firehol-3.1.4.ebuild 1380 BLAKE2B 39fe7d2ffd96488f407affce7762ba9a3c7a06c2b09988d0e9402c7a955b9db5f825cf1616f60e0b467b82bd32ccecbdd10f3bb5ccb695b7d7616c53577aaaf9 SHA512 9bd5e05c7f45a8be6ee2e93f46f5a78f49abdef24d61d3a4fa6b3f22249d7584b8f4c0f59af9117239e531d85fbed38c8c7d2fec2cbd0981ea9ad1cd6092da54
-EBUILD firehol-3.1.6.ebuild 1381 BLAKE2B a1883c0514bd9b6221838af99e0c018be62a44d9f244d994ebcc187dae548c1c00b1e05e798ddff69eef0105fc0157a0211786ac556cabb77c19761d6d9974b5 SHA512 8ee156b617e812e3a4578ad52410dcda9e37832ce46a385eea5b2b0b5e63fed91d80ec3c823115806e0e296630404c06dc09ca10e57b3b720128075ed0870416
+EBUILD firehol-3.1.6.ebuild 1382 BLAKE2B 63e7c43b7503052b9ab8f0573798639f529c3d0d00e41cc71d5b26b923a599c63c2733c930c74dafeab6e18100e5d349879f707081a9da521266b786e8ef82ac SHA512 b1e219c72f288475ba731dc2931fa9d511ae8d0b4efda40f3f0a72af67d0c75cc4bd0a23d8d5411e478daa025b3310467a8a86dc6c01e3c5e2883adc0c966dd5
 MISC metadata.xml 434 BLAKE2B 43111da215ea3d6d6af807ee1b629a3ff72dfefe15fa429a6ea5b112cbfb881d1bf848b50a266c32b820a7aec3e14e419c64657cc0a205c1e759c77b64a17b52 SHA512 9ab3275ada67cf2da92f07d9a332f098330caa81b0a7f5d17a321a03cf6b441e029efab9a8f3eaaff7d7181eb503721aa954c14e0a7982e4f35e16c8eaa57898
diff --git a/net-firewall/firehol/firehol-3.1.6.ebuild b/net-firewall/firehol/firehol-3.1.6.ebuild
index b4f770df4003..4bc872ba5334 100644
--- a/net-firewall/firehol/firehol-3.1.6.ebuild
+++ b/net-firewall/firehol/firehol-3.1.6.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit linux-info
 
 DESCRIPTION="iptables firewall generator"
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 56fdf8d67988..4303bdf63169 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -18,7 +18,7 @@ DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86
 DIST iptables-1.8.0.tar.bz2 677980 BLAKE2B ce874572d736087f46ea5a6e393cf9b32bf7328efda0fd9faee94dfa11428fc0e124d5ed81329484032ac4ebe89b2604b26dbb135e152c0e0f4c74d88db52d00 SHA512 5f3fe4c15f02e29a2e6ee2905a242f450f8a3b51553618e0cdc59301c35b8bb663e8f2ea70dfcaed8d4e53192c01519906b60ff649385c693e0602622742890f
 EBUILD iptables-1.4.21-r1.ebuild 2442 BLAKE2B caa1b23d35ccb9a8e5631f932fe4a6816358782ea620d71ad1d64498df64b18015b3610f48b345a13caafaca51bb504d364ed4167804383c03d70439ca4154c2 SHA512 b0d5b1de2c24dbe4aa3eec29e3adefac12f72529fa850fbe5b956d1835fc5ea25ceed8172d8b5bc2d5c1bff63a609cae04c3da923c783ccdfeed126ef2bde831
 EBUILD iptables-1.4.21-r5.ebuild 2975 BLAKE2B f9fdeaf8c242b1553b59586346e81735dae31100a435a9cf2d0817c69a8fb6a0652b76944f5261eca8b5c5be60f38db50fb22a3940573e493c3326ec068396e0 SHA512 dab27d6601b69dae4c0be6b48f0cbc7daf7b93066ad398d962f81ec625628d6d2ce9e0188810941364e1cbc7d9c6b4511f3ab832ee736d69d8b977f80d52657d
-EBUILD iptables-1.6.1-r3.ebuild 3255 BLAKE2B 22f3a3f15aa807f19797f03076e298d05ffce0171b11006b18f2781fb73ea1512679fd7f0f33836526f18531617107ed8fde1d644185f6039c481364a268ed4f SHA512 d5d7ca73878ca1ed81d98b9ce7e6a8de7d4d8ff7eb9ef058c068df9e9fe02f3fc9490329076823cdb9e35539dc85402e3919dfc7b88671e6d72810031cf967c3
+EBUILD iptables-1.6.1-r3.ebuild 3252 BLAKE2B f563c16417790e7f44eae5f0492e39b76cbcf88173e29d4e7321aa9cedce927d8c0fd96a342e6c654ba99cae50a92373b935e68c8b057a3f3d01bf4a1f59dda4 SHA512 5d338acc6ac76f184086d244d23a7634af7b7001c4e9520125a284329636275aca456cb3a36f6801e94ef840d4625d5d4eb27aed57172bf2f49dd948e8801861
 EBUILD iptables-1.6.2-r2.ebuild 3327 BLAKE2B c4d683d81f4d3be5efb9d043d63b8ee7b20f4b735cce0d7e31c85e159d2693568b83b28fe1e517ba658ee240dfd063b7810590cbf94029975992b0e5aeab479e SHA512 dc12b299d205f5404bd6486b36a933b611d567be45e00f8f02dd010036c701510824184a3d3d0d52798c89e5b57bfbe402e79bbfbeb50e4f0d26de1627b387d3
 EBUILD iptables-1.8.0-r1.ebuild 3657 BLAKE2B 4ba94eef2bf4cf41b4d102932cec1e913f1b0296115e665feedc8f1f719b4185e3c79bc4482e201a8ef419227b56722f8c40737182ad82fb9265ffb0b9d7a7dc SHA512 0701b7c7400b189a14f74e9c56b446bb52e75f7a9b8d7522354254371af8fb1f24eadad0655d6d68b103287f6d6ccc1a1c38e8945a28092d3034363fba9b87b0
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
index 7d3ba830e63e..e919344e870b 100644
--- a/net-firewall/iptables/iptables-1.6.1-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 # Subslot tracks libxtables as that's the one other packages generally link
 # against and iptables changes.  Will have to revisit if other sonames change.
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 COMMON_DEPEND="