gentoo new year resync : 01.01.2021

12 files changed, 11 insertions, 12 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 81f10b4c8191..b9a08331378d 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 377ec013ea9a..881b2a0958c9 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -3,6 +3,6 @@ AUX conntrackd.confd-r2 441 BLAKE2B 5898c470f1d99beb47d01c9215c8e3da2e624455f65c
 AUX conntrackd.initd-r3 2238 BLAKE2B 711bf4ab403f61d5d528e0dc504d272a7e410be70c529d8f7a624f742ca66f4692b683f3283b79f000589bdab7f83598130e4ca1a0ae2bed9afce80ec78d00c8 SHA512 445c19ad42e92136e9dfd6b7885334075e72971b73ff7178c6bf16a31e0c037f17d9d039394fa8002f0ad5182a353f7c803d3f900e8873b671eecca94ced78fe
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 DIST conntrack-tools-1.4.6.tar.bz2 499806 BLAKE2B 7c1ee1c5fc2b6f9d33c6cf850eca80978b8763317b1a76892cefb776130564f15fbd4e4554fdb08dbba93d9f16b7e4624a1b4dd5a631f747f5fcc0a5b01b8d5e SHA512 a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a
-EBUILD conntrack-tools-1.4.5.ebuild 2189 BLAKE2B 3bbe8c531ceb6e20573b7a9a7ff0aca9713c38a1ad22dec26a189e2624517ddec93b72c7cf90e756d6dcd323a9916fd66210a91f9ce1d4485e4ead5d8d3bb4dc SHA512 942175e372ec7029c882d9c7ed808414ee24b64ad49b534847b03724263f43a50039dba64183df0ad08e157034cf3524289e6504202c9bcd48e40b7f0e4865cf
+EBUILD conntrack-tools-1.4.5.ebuild 2190 BLAKE2B 49e4d6cf2f37939da6d577c6de370d6a68e391a5c57c7f84a5d002befb231560d6e443d5070d0ccde1f888bcae67d9185d93aac4acfcc0dc4ae6359f49509f09 SHA512 7cdf3820923462eab080ab8c2b5ede6d3f4dd08247343aa7e0bcfdb0ed4f1e95538c1ea10a1d427470ce27df652f44bdcc9d1dfee1436adc3b51a5bf123c6e97
 EBUILD conntrack-tools-1.4.6.ebuild 2105 BLAKE2B 223f58db36bc8c537db0d3973891268847922858430e08c0aaa0705090ba1366bf2615d16d393c6ec502ea494ccd5b58273c331973d50ba935b7334cc8926f04 SHA512 d89dd57ca1648a064b507dc98f7762c49643756347c1d748321e0931326a1b1ea79c15ab30da6e251d6c0c321481ef71278c0d541dd8c43a874cfd9a6546545f
 MISC metadata.xml 1048 BLAKE2B beb5773ccddbbf517dd5a1e81672a502e3f728085d3c1128207bcd91c544dd8abc3fc3dead68c4bc44b86c3bda2c2f101620ecc86a03fae5c7231716c882f5bb SHA512 4fd1da860481f73d5a47422c93fb5051995884dd488b64d8cd80bc720f81fd37e15a9bb9b86192c37bdfdb024201f600900cd6bcf38b20979c40019b0b290338
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
index fcd27b22c1e6..373ac039b6b2 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa x86"
 IUSE="doc +cthelper +cttimeout +libtirpc"
 
 RDEPEND="
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index c57f4805f012..0dd86b1c76fb 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -4,5 +4,5 @@ AUX ebtables-2.0.11-remove-stray-atsign.patch 1120 BLAKE2B 14bac4aec87d44e5ca166
 AUX ebtables.confd-r1 288 BLAKE2B 72e0ad40f53058f1ede8a4d049badde04e69e307e9c24ffe5cdc7f61d918b0e1b3296f793c4dd46389b2dee69ad4730f563bd3891569612d7f9f8c7b39641a84 SHA512 088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3
 AUX ebtables.initd-r1 1991 BLAKE2B d044278249406982a7f1b83edab498ecad6368462451890d137bb3f03a404334b8e1f77bb4eef49375090b7499010dc4a4318caf53c9edd78b0fda73c8620c29 SHA512 82fa6298595ffdf0c286940f7a77b8246e274c3dc3f8c7448c1b36114cb9c8725b0466ba9feb34bd521bc3f7d9ae049ceae557a059d23acf2a2a97a167647b73
 DIST ebtables-2.0.11.tar.gz 428411 BLAKE2B 62af4c38ad21498e43f41ef96c8abb5704e8d8a48f1327c587b664f36fdfa9849a9a37e59958db56d38019465d8bf1775914f7387fde99a441615913702cf504 SHA512 43a04c6174c8028c501591ef260526297e0f018016f226e2a3bcf80766fddf53d4605c347554d6da7c4ab5e2131584a18da20916ffddcbf2d26ac93b00c5777f
-EBUILD ebtables-2.0.11-r2.ebuild 2515 BLAKE2B 495e9e8f4c96696d301b984a20adcda785c48e753b9ae5eee80424f1bc32dea2c54e876d2052d65021d9614c2f6b35f5772b981ce07da358d86932ad61f16268 SHA512 e92bc5c8d403c1e4e3524ce397cbf227423f7df30ed1eb8549193e4c9a6958ecde8c4b7938b3b78df8d4ddb2fdcc566615ef0e5a29ab0085529ffee193ab93b8
+EBUILD ebtables-2.0.11-r2.ebuild 2516 BLAKE2B 4191cbaef5d9728a31d69af5ee9b5023f5ad7e93eaf7e633392ce3fa7f3c8870f7c25a5cbb9fcfb55b92b1d52d8f86cc0323049953b4d35c0350c6cef2bf815b SHA512 722620358c898567cc0286d2cecdf72a05542861197bd2721185eb205414708e4d20da9e15b21834be9b6d56d1e4687c090299245ed40f2d41286a0ca8bf9ad1
 MISC metadata.xml 488 BLAKE2B 683d7552083e64daf3e41f9c1e7c53033ac4059a1f3ae248e666001424725f21efb1ec0d35c28492ac80c19998692c00e795818501b0c9f0df1037175b8bda93 SHA512 88d08269d25c3f4a22d89b5774e21c4af048c2e39beba41514780d3dac72494cb39e993becd49b0a73cb9c2d0b2e7e46c7bbe1b3a40fe6d7094431a9fb384f35
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
index 722542153e9d..b4d908e63ccc 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
@@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
 HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index aa338af10488..294c55e0d6da 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -16,4 +16,4 @@ EBUILD ipset-7.5-r1.ebuild 3242 BLAKE2B 741d3b5448d52fea420e6283f6f1efe15edbdb44
 EBUILD ipset-7.6-r1.ebuild 3242 BLAKE2B 741d3b5448d52fea420e6283f6f1efe15edbdb44078bb74194aac447e0b3115733ee32a29d28d052abe65a0b686517b9f749c44bebefa88369bf853cf755f3e5 SHA512 efae400a718183a41cd0a5df90872532721b1d7730aa87467f50216d8b455e8a359b4dece03fb332766b4da6350e59a54c1f9e5dba1f170a1313c90090df7fb2
 EBUILD ipset-7.7.ebuild 3242 BLAKE2B 741d3b5448d52fea420e6283f6f1efe15edbdb44078bb74194aac447e0b3115733ee32a29d28d052abe65a0b686517b9f749c44bebefa88369bf853cf755f3e5 SHA512 efae400a718183a41cd0a5df90872532721b1d7730aa87467f50216d8b455e8a359b4dece03fb332766b4da6350e59a54c1f9e5dba1f170a1313c90090df7fb2
 EBUILD ipset-7.9.ebuild 3323 BLAKE2B 091e143637baefc38ef29f59c4a24c0c90f0a173e2289cfb818ccc04646c890dbd01ef9d7da641580893b6393295bc627563d3f6b8c2aaf14c97b0c1ff99e699 SHA512 9222c42ce4bc279f813f797dd5a8f13be92032af025dd63737c37bf6261f5439af62045c0cad4d1f62228e8f839d6320dff99dd22ba5908c4a2412824e5ab982
-MISC metadata.xml 436 BLAKE2B 08cc2ac4e8d2b06725d52d46064c36cd2305fdfac6c54d5acfb23637462d02d4612cdfd59655555caf31a2cb48506c0cd371de321abef828f52e8da1958f3cb6 SHA512 e44b21f404cce6acae531e2436124b929473bc2bbaadedbe8465a629242faf491f01682c0ac34579a0b85e0d1fabc7e069d2eb60b988eec1ab65a607236acd0e
+MISC metadata.xml 368 BLAKE2B fd3ff78ab724fc8cb35326703b2605e894cdfacc3d306659ba128765aa7c88fc5fe397492caf3b7e11c6aadbc750c7bd7d578c4a47e4bcce05da708887863e52 SHA512 5ab08e27c87cd00f4ed9c9f7268692b20947554bf778579f138de82356eb9ee531a1e4da3ac65c25cdadc8ad9ccc2cb24397ce4842e7a559f1d5f77947481f63
diff --git a/net-firewall/ipset/metadata.xml b/net-firewall/ipset/metadata.xml
index 879b385bee96..fc15f61f5e07 100644
--- a/net-firewall/ipset/metadata.xml
+++ b/net-firewall/ipset/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
-		<description>Please assign bugs to this mail alias.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 3e6f5a56187e..27f09682e89d 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -17,9 +17,9 @@ DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86
 DIST iptables-1.8.4.tar.bz2 704312 BLAKE2B f677bb9ed2c86e6a39953c0565766991e9647224effdc7db2b563f3f491f6ace2f9073ecc8e865d489101a9f80cf964d9775ab81536412dbd4ca85937432de94 SHA512 a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb
 DIST iptables-1.8.5.tar.bz2 713769 BLAKE2B 49659fc2f1f284f31637048fa1e6edb4853e9bf6ac0b6ada5599a7af34a4449205b5eb6b85b630ce4757b49cf3f8ac9ad6220e07c2c22abb688a3aeb5cf99cd2 SHA512 6a6baa541bb7aa331b176e0a91894e0766859814b59e77c71351ac34d6ebd337487981db48c70e476a48c67bcf891cfc663221a7582feb1496ad1df56eb28da8
 DIST iptables-1.8.6.tar.bz2 715744 BLAKE2B 72167610b396054fe18c495d7a9e23051d217116074ee39198af989a3e50b9908cb75f42b9172d3cfd76343835386a78a2c51d1153ed5d219a6d68209e11dc9c SHA512 d06e4cddb69822c4618664a35877fc5811992936cade2040bb0e4eb25a4d879eadc7c84401c40fb39ffac7888568505adcb1cfe995cd166a15c702237daf6acf
-EBUILD iptables-1.6.1-r3.ebuild 3269 BLAKE2B e4718479b62cc529f17a5f407409053b9cdc8e08d5b72ead86fe447d1fdd96cc31447ed354d4fcbc8005a2d3fa37ef50cebbd454283fc3a0ed1d9abe375412d5 SHA512 9721db9b6c0f908119d19b6b1e3f592810a64e5aa4f3ca7879fa62622e9f34864ecb3f8a0d56f5c61a449b9b9d1545837cbf07c3d05c3d3896a600d79aee7d87
+EBUILD iptables-1.6.1-r3.ebuild 3270 BLAKE2B 89b12269171ebcd4ecbb8f1caaf9fe7b8cd9dd70601730b8725d05795b905fa90cf8e1490b7f215680c935059bea46475b3ed361d5fe4088883704e6e8aa1728 SHA512 60607830b4f0693f9bdb2367a0081f2c1d856d4c8eb9e4c437ddb44a15a6884e1378f3d7e60b738e174db4c31c6d38d3a41fe5c00a643df5a4c74c22b990e218
 EBUILD iptables-1.6.2-r2.ebuild 3333 BLAKE2B 21d4bd596b61da1409a797c9883d612f5688ec15e144621028ba11872a184493440d636d998795b74be7f8856b39a184a24f25ac6ff56ff756fe66e3eaefc041 SHA512 6153c18419f192db0b9fccd7827ad41da201d3c25a298f0e2b823a97dd0b3d9bd6fa4dc9987ff62a0b8a0c1265b10ee71170385c2b5c5272c6183c0e21ae41bd
 EBUILD iptables-1.8.4-r2.ebuild 4650 BLAKE2B be3da4097de99e04dd3f684db117e592a0e810e5e6cc3a774ea44f23319c13aa6718f1401f93ba2f5c310c84e1ebc04c8863802152bcd1a59460a97cdab618f5 SHA512 1f07a463a5ee2f3cf8a8cdbdb7f63e312475d9eae3eba3f2874d9cb8e7e26f264b385f95e82fbc3e202e9330b2efb1ea61011b26549583cd4ae6574f02d929fa
-EBUILD iptables-1.8.5.ebuild 4641 BLAKE2B b5c2c268977571044129ee80fed8355aaa9d7e4ff0997470e74a333dc99e9268c77c75e22c9e284c226219fb0ff322d7f266b5d6a80b8a97ba5ee3a82668d8da SHA512 b72156cfd180c11ebef86b189082296c216cc727cffe1404884a0b0d1d7620d4ec688c0162d5dabf4e697343d9d4a2bbb4199a1f48efbda9044c84a1b1fd5d72
+EBUILD iptables-1.8.5.ebuild 4642 BLAKE2B fdf23291db32382be4ed5330de672c7bbf0acb55e5f440bc082ae5cdc43e2743f0d6c72c4e634eae4ea983ce0d4f9b010d95bc445b516d83972925c6d877be89 SHA512 81a43b87bc7bff7dbf3b285fbe5cf0b0033e2998233fd6d26268d8a7fbcef4bcb29057d4402334862938e61b6c2bfced034b7bf3efc3ff7cff43c836cecfc5fe
 EBUILD iptables-1.8.6.ebuild 4650 BLAKE2B 0fc25d74924b729fe9cf892946f0df8c495617e419b16d3c8c491c718493df891044ef4b0b4c6ebf47affdaccf8037ff51687eea571503b59890d5d978f1c3d3 SHA512 2f4e7e2ec09a069f969db5f5e8c9e4d383073a6796bccddad59ce5ca3fdfca2321920ba5ebdac33e93a377cc698830900af2cdace15819728464e33121806dbc
 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 388e2f7dba85..d024b756fa02 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 COMMON_DEPEND="
diff --git a/net-firewall/iptables/iptables-1.8.5.ebuild b/net-firewall/iptables/iptables-1.8.5.ebuild
index e0479ebf7388..26f59275fe57 100644
--- a/net-firewall/iptables/iptables-1.8.5.ebuild
+++ b/net-firewall/iptables/iptables-1.8.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 # 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 BUILD_DEPEND="
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index ba8e213314d7..a6023749851f 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -22,5 +22,5 @@ DIST shorewall-init-5.2.8.tar.bz2 42589 BLAKE2B 74e265ed9d938b6130800f548f5f4765
 DIST shorewall-lite-5.2.8.tar.bz2 47250 BLAKE2B 2fff00d7a6248a3db0aa5d6b3ed041b06bdfa35b71195088659afd4036cf61c6bc2f3de739803d4e26e56785aa90c87ec6a2120239183351fae7a54065f1a629 SHA512 d72f260b095f1dfb2b0a0c967ae80bfd7f5f3469a08eb446c0b3e1b1e662cb500510b75f2979a00a9ef57b16e6a23a95483c34e2a5c5d2d090bc1e071ea87292
 DIST shorewall6-5.2.8.tar.bz2 203102 BLAKE2B d9117d42cd25e18aa1104ec3f4498227eedcce5c3531623e2e4d6ec27ba5221f98e1ae2e596ac90d7415cd366b2dbfdd024adaaef0c1c2756900188bde105903 SHA512 7044efe84b2c585fcd0bfb661666c71cea140157f22ba7d4881006e24d785eb0091c071c825fa5948bc1383e7fd4617cc8f3d4e68865cf472ddea3811bf1833d
 DIST shorewall6-lite-5.2.8.tar.bz2 47178 BLAKE2B 47026c3fdab7564c8e48b653a4c67db99fe5ff07de723169f65185aea563691806164a637a38c419d19619cf1380462fa7287b0993d9389dd311393bac911602 SHA512 a80ffc7baf7800e024e41a0f9736543b15d10f2d403540e48e8a2cd2ba0196ce04ff01ac98fc03852c7d268bb4954714dd428375e768b80aa4792683b8775935
-EBUILD shorewall-5.2.8.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b
+EBUILD shorewall-5.2.8.ebuild 16950 BLAKE2B 4902057f397f18376a18dda99a3a1d7ea1e0fa1d72c6152326ce350cd982c9bc2f153bca737ec8463ab5cb7f85a978ee1a59a9687054e77455754bb8f0c33946 SHA512 f219befed5ff5c4a9635bbd5404e276abc241ca91eac03724de03748854ed5227297b489e0f03796e5662e3c59572ccd6f46c4411da08906bd2af657976c19c7
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
index c6f9c3e5bed0..a388cba86f32 100644
--- a/net-firewall/shorewall/shorewall-5.2.8.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.8.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="