gentoo resync : 08.06.2019

7 files changed, 8 insertions, 7 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 42753fc2452b..c2c453ec4e1c 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 49cb9a739aa4..22272008b5bd 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -11,7 +11,7 @@ EBUILD ipset-6.29.ebuild 2961 BLAKE2B 0dc2faad4795f837c731bfb80a2925c0d7a6e44151
 EBUILD ipset-6.30.ebuild 2888 BLAKE2B 05654ce7430037c17fd9ea5fd42804397750a9091bfdea063001001370c6264de3006af3853d60eca5a6ffa90cf509f83c8721d141b4f604cc45c25f29f27d52 SHA512 abd9526b8b6576ed497a8679a903b34fe7330343b91c925bebb2be9a2efaea32472384ed3a6b74cb7b59ddcac5bd865594690597492c78853895f2afc5197efd
 EBUILD ipset-6.32.ebuild 2888 BLAKE2B 05654ce7430037c17fd9ea5fd42804397750a9091bfdea063001001370c6264de3006af3853d60eca5a6ffa90cf509f83c8721d141b4f604cc45c25f29f27d52 SHA512 abd9526b8b6576ed497a8679a903b34fe7330343b91c925bebb2be9a2efaea32472384ed3a6b74cb7b59ddcac5bd865594690597492c78853895f2afc5197efd
 EBUILD ipset-6.34.ebuild 3007 BLAKE2B e39e4e2e8d31d333364ed22ba11db1e8dfac476716ec1631b409ae19d5114f0b16f8d25fc82314e7b4afdf0a2536097f6e0101d6687171157167466e67db3dee SHA512 94827fe7e36189e965ac275c6edf3761bdb8c7d1ac78adf8978e0b6113437bc9670923647e9ac87ac575be8a568f9b0f9c86b5db033e45e30c6fbe525bc7e031
-EBUILD ipset-6.38.ebuild 3003 BLAKE2B 593553f385f9665003be5757e3a684fdaff7de5b0f11b86bd7f5ee4c97555104cea66db7602bb16948f24814be0b42c00f8018cf9b5de3ad8c1cbdacd888b8d5 SHA512 5fb1e8030b8f3a9742824a3a9f06ae5ebc3278bb3c4d512279f3c4f313f938c2aa6f68150348be9e605574160ff1749e8b58279d2ea47b7422f0c194206bb64f
+EBUILD ipset-6.38.ebuild 3002 BLAKE2B 49d85c8124e1db1c32849fa056a89092f4f9c78472d8d9056910f40d511d5d8c8f78d4a41425c97ab984d522b2e159d5c40ef955a93e594ba7106bd36b63aa4c SHA512 4c7334ebcf925969cb58ed60365da59a48d32432519d82c812c6dbf613abfd408ec9f1f23b6e19cb2aa88c9e9ea5ca18befdf7bedf5ed8b2ec23ae6994875df6
 EBUILD ipset-7.0.ebuild 3004 BLAKE2B a40d7f6bced82e0e5013ac9efc4c97c699e6190897991202b3f836537bbc84213b417a822a73f9ec405dbaed417874b3a4012c3d08c329b6d1b68e44d3b2cdeb SHA512 666ffa27fe1bcc6ddf674e3c72e922b72d4153c47d5d8a1d238f59e495d05111bfb795f32493256950bf3dff4a6856559039f77fc7d9a6fa6054298da7393f26
 EBUILD ipset-7.1.ebuild 3004 BLAKE2B a40d7f6bced82e0e5013ac9efc4c97c699e6190897991202b3f836537bbc84213b417a822a73f9ec405dbaed417874b3a4012c3d08c329b6d1b68e44d3b2cdeb SHA512 666ffa27fe1bcc6ddf674e3c72e922b72d4153c47d5d8a1d238f59e495d05111bfb795f32493256950bf3dff4a6856559039f77fc7d9a6fa6054298da7393f26
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-firewall/ipset/ipset-6.38.ebuild b/net-firewall/ipset/ipset-6.38.ebuild
index a2ebc6e6e4f5..687c9290f434 100644
--- a/net-firewall/ipset/ipset-6.38.ebuild
+++ b/net-firewall/ipset/ipset-6.38.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
 	net-libs/libmnl"
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 7160495599d6..6d8e22047c24 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,5 +1,5 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
 DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9 SHA512 e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
 EBUILD ipt_netflow-2.3.ebuild 2434 BLAKE2B 8b179099f7f4aec0468d98beb3dfb8493bf28d51f54341aa513acaf1f8e56c290ae408e1f58f8a28014ee0e7de24855c1398ce083bc38e12c07c0b714ea9cd51 SHA512 f7a9e554e6c31391714ebef1e71c76314992f37d1a8a4a590e4a3e755735a1dc5cc65df6da4c9749d283cdb1aa9ec4dd357eb98ba4133df5ac9da5933674993f
-EBUILD ipt_netflow-9999.ebuild 2334 BLAKE2B 853a417a9ae479fdbab2027296966e2fdda142ed2dbaa251f714a2e54130cace5705b55bb42a806a2e86c89670a5f42ead51fe78dc5a464139986897164e7553 SHA512 6769b4fc013895913d177bcbb4648e8ceb410719f3020b48e99eaa129ac0405f93ab831927dbe06668e06a49d0fb461693164dc6bfe0dbca52260e35e55d490e
+EBUILD ipt_netflow-9999.ebuild 2348 BLAKE2B fd64885b7311febbf232b7c3abe90571d62a92bef9cc40e6547fb90a3550d388e2f15421aef48821055be33efe23a83080b2a0562c714ee3fdeea061093d5bb2 SHA512 5d7db5bdab7c432f39eb1819b9c4aea68ceb1e27a765988dfb491929a2b4d66202517d2a88536e4fbe56fd9809cddc984d8e0d6fd54fbfec50970a5db9b5eafc
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index a40ff34ae21a..6d8feeb6e0a2 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -58,6 +58,7 @@ src_prepare() {
 }
 
 do_conf() {
+	tc-export CC
 	echo ./configure $*
 	./configure $* ${EXTRA_ECONF} || die 'configure failed'
 }
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 980377077f15..a8d065e9f90e 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -18,5 +18,5 @@ DIST iptables-1.8.3.tar.bz2 716257 BLAKE2B 58c606a5753ae2cb8ada9039e4653d2abe03c
 EBUILD iptables-1.6.1-r3.ebuild 3251 BLAKE2B a9c05bf1263b59ef1a1005bc87705ec68d951e4462f9ee1f04a54396cd729cd74c0318837a8199530be4ccb2ee2bcc22dae9012670e6a920bf7bee52c7c56b77 SHA512 464f18812e42886f7eebb636bd56f91c668cb9ce22037fb824ac9ade50813cb105cb08bc82566628d63ba8bc97b5dc64ec3b59efb0451e4bf9856a4e592e1a00
 EBUILD iptables-1.6.2-r2.ebuild 3327 BLAKE2B c4d683d81f4d3be5efb9d043d63b8ee7b20f4b735cce0d7e31c85e159d2693568b83b28fe1e517ba658ee240dfd063b7810590cbf94029975992b0e5aeab479e SHA512 dc12b299d205f5404bd6486b36a933b611d567be45e00f8f02dd010036c701510824184a3d3d0d52798c89e5b57bfbe402e79bbfbeb50e4f0d26de1627b387d3
 EBUILD iptables-1.8.2-r2.ebuild 3460 BLAKE2B d60479345dc2a7cf42927e43efd6ae405d04f620d489a0801830882357590f44f06afe4b88bc7ac5a5043eaec68c15b1e9714eb954057c540eaa3b91208ba085 SHA512 1bf426c57327331a5bdb651150571fcd399ce2c92ee405122d34d3bbb247f43d88120a9c9704bb1c674ce4a00749b2e84af91e973f938910ff745b6776750cc5
-EBUILD iptables-1.8.3.ebuild 3478 BLAKE2B 0e4c8c887e582bcedb8ecd199aaf3ec67546e4a244c7f17f6eb3c71f0dcacf5f493453786997f56aaf3fbf8590a3872c577381e2153a17e72f0b7f61ebd4cb1d SHA512 32bcd11eb6df18a4502bcc1d1559307d0c5e3ee5b51d0ef8f6cb455efeda0b083156b6922ba10ae68aaec1fa9d4523c7ea25d2040d48a633b93f43724835a208
+EBUILD iptables-1.8.3-r1.ebuild 3409 BLAKE2B fdfee225671d04d0e7cceb4c33f7981d84676c5ca704d25dbe27744b044dccfa13996b97ee86f567c2a55b55e8183bef2336e1b98b4f43774ae0d4934ab1de03 SHA512 e404e1e46a3c0483d2bafa78d28b286c84c7027f95992388c22659df48b78e8bffc357cda37f6d96eb6d0b590bf27322ce23b278a82432efc19d6bc2d7e3ef27
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/iptables-1.8.3.ebuild b/net-firewall/iptables/iptables-1.8.3-r1.ebuild
index 51b1a40e408a..bd4baa71ef07 100644
--- a/net-firewall/iptables/iptables-1.8.3.ebuild
+++ b/net-firewall/iptables/iptables-1.8.3-r1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.netfilter.org/projects/iptables/"
 SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
 
 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"
+# Subslot reflects PV when libxtables and/or libip*tc was changed
+# the last time.
+SLOT="0/1.8.3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"