gentoo resync : 28.04.2019

18 files changed, 28 insertions, 222 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ab984538f05d..9712f3680394 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 0a8ea6acb033..bb0a84f6b801 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -5,5 +5,5 @@ AUX conntrackd.initd-r3 2238 BLAKE2B 711bf4ab403f61d5d528e0dc504d272a7e410be70c5
 DIST conntrack-tools-1.4.4.tar.bz2 1010504 BLAKE2B 4190672f017f434b6b4a1841022d64256eac1953c6f62aecb087e2ef0f5c83ad57809c9170de816eb7e0f934c41de0a541328bab7e064243e48e9f18ade3f5fb SHA512 f53bd620bfd4e854e792416527a3090d883c5f00d1d8365e52ce3ba204218dc431490703985d3fdae44decbcddb24ed610bf81a6a99bd7ea01482f95f71df0f5
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 EBUILD conntrack-tools-1.4.4-r1.ebuild 2087 BLAKE2B f30c6468219e9020d40f73f5a2977d04825da1a7d2e6a9765c90a6b3104c8f4bfe7b49c9d4b234ca076f02ac252b72c27faab601dac06ab12e9a5f9bfe04adcc SHA512 6a0cc74bc6bd2e6fe30ecf4c54309d57ec4dd82d3189a890f2ce600ee9c73ffdb1c06eba081cf0ccb1bf39797a5676d7cc12d7317fea4633c0ffe157abc42e79
-EBUILD conntrack-tools-1.4.5.ebuild 2195 BLAKE2B 2e3e6340ef8e79f0a5335c1b88e6e95f1cda785ed72c934dae2e36ec88090ebde4b9d01218969f2bb1e96fdeec7b7f653e9c4be4eee5c11c2f6349982b70dbe8 SHA512 ff4197793e82372c6e16546390a26c970be22eb5b889eb26fa8f9a8cc04d5961e9614fc677ef677a011fe0f8ac0e95d5a27201fe3880f0467e789217f6fa3e74
+EBUILD conntrack-tools-1.4.5.ebuild 2188 BLAKE2B 1faf2dc4138283ca08d36a9384d7bf4f88c2f5566f00a563e4779ec9dfb44a2bfca86bb1ba451b0a6d8d87a088f8dd86e670fccbc85bd4f93b1dd4eaebeb71b0 SHA512 3d72e57cd130c034f86176f6a583bc43ed7d063c203b3450bee2ca2f6afe3b130636d5e6f5399143ead765838eef10c5606e3cd789c98a50f21c96bf6b11711f
 MISC metadata.xml 958 BLAKE2B 61cf89e7c192b663fd573ba7be767cd359786ba0fff20e72212fbc24e07c0c69e3bc2ee2226d39ac1744620cb1f5c63a480fc073860af665064853f5b780332d SHA512 19c68ca3bc373de0b9d533c7a36cdbe1da52871fb985641fa725c6208ffc09536696b02cce37e836300a2809bab117be2f0046ef329d2a739de5827cf0ee189a
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 859d974d0023..fb22fa51a3c0 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/firehol/Manifest b/net-firewall/firehol/Manifest
index 65467c1fdbea..0830e59704f1 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -2,11 +2,6 @@ AUX firehol.confd 70 BLAKE2B 4cac98cfe930a9309fc38989c2887278018d757b3981d352a0f
 AUX firehol.initd 1141 BLAKE2B 4bdeb545542780b4544c07ad675a2ab63c80177126841eaeab63cefb7755d5a55a4c74e4c2344b250823dfae1a074e53c7cfbaf0ff43315993e442da22337519 SHA512 db1aa27c4923a229c15db268e97e848f50f0515b75b84a6422c8e338c679ff71943286c9a2483c0d88b157cc925dc2d532923e14a559f33456f977680516b7c6
 AUX fireqos.confd 65 BLAKE2B 121c8df85e9c110e45633c84f3fd4ba9e006bb70dffbdee1507f92d763c13ae9ce370a5807753d31b0033e23d39004ea147d9fb75bf4f2fbadc6baf070ccaca3 SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c
 AUX fireqos.initd 829 BLAKE2B f09905f02189f155455886dd1896a183f2f529d0737939a7065bb52b57870f22805e3e6c029510cc5b57b36e596eb829bcc7651c6a80657ff4e399acc542fa90 SHA512 8364537d3e10c68d309fc40f4b2f88a2a593c38fd6f134b1c09cf937be00f7d96eeba05c83824c9460367bf892a8f79547321784c8f8a4708f856df9a88693f4
-DIST firehol-3.1.3.tar.xz 1476220 BLAKE2B 19ac9db805fc4452b447a45a7ed35c781bc8595f3ede0af7de0ff5a89ab50a9f8a634e0754869774d767b50d720019a5ac466e9d1726a75a34a283473b17a94b SHA512 6c75b57650d918cfc485f6eb01d69694acd5c7b487a10a566fc26b8d5e0cd6a6a9a09bd8d3219bf4e78aa4fe47f83e5ac399107a07770b787e1ccba3078c5f3f
-DIST firehol-3.1.4.tar.xz 1481320 BLAKE2B 0fabef4a853aece966a8f273cc82947a6e63ac44ccac2494d5d6a2f0916658a78cfe0c28cc2414e797411e4795216400b1fa95193a619f7e26fe545182a5fc44 SHA512 1a17b6e810274b346f66788c4c4736421583e6a4ed76df7a1d7f46dcb99e434460998c05755c8342941413d23c02e2ca0d0bf2123cb555a6c7513d24983a13ed
 DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe
-EBUILD firehol-3.1.3-r1.ebuild 1374 BLAKE2B 5d4bb0400ffd486fea5302bd4288fdfdbf3839f5e6c30aa967afe7d5a613e42eaeada633e5c913e4eeed6123c4bd671f041769c2e424c9ef902c693c6229078b SHA512 17c008ecb04c267b5568360d1f89d6809a9aec17ccf3beb98979df91d5c5df568cca4b3c5df91e5ee6644dbb76cc7644de3fd22cbfd8c35bb5aae84d7d2ca919
-EBUILD firehol-3.1.3.ebuild 1321 BLAKE2B 5160111e2939d25a8cca9d4479d88facd80ae7c5dcd93a0e278481edaf1c912266d76157ab3db0d7908782946d6632d3abae71f0b64033cb7bceaec30b21f45e SHA512 6be61cbef86add228244d129e7ff9060cd90d74edc563f568aa55a1f17bd2a483c5c035d396feefefe6a5f92aca9fd63e1c9b0eec1aefd0f76721aa3a606deed
-EBUILD firehol-3.1.4.ebuild 1372 BLAKE2B f3249920863d8736d21da864e390828f05a368e58f8ab3d857151410a840c6c84a18d455b344a9a2ccc5516cb27a7b86a18d22cd67156b13a33e121e7a6e3fec SHA512 b9f5c95333e0f287eef761ae036bface8ec9e549786c1937f695fd37199cbcb3cd3d70a46fb56cb7224a1badf0e43ab4ad2cfacb171ed81c696bcdf2e2d374c1
 EBUILD firehol-3.1.6.ebuild 1431 BLAKE2B 914416fa6cc1a66da86a6e984d73296279bb7457bd39b1714e2a3633d123d734d52eb3367fa5b07f318d2ffa5714879fbec530b1268ee2b233985154651b94ce SHA512 c20b6f70f9c290acc2412cdeaeb6a69012558435bb52e1d6ec3c9aadc3017a6c06c1dd91a9d0bc7c1fed08155b88ba67c726691811a285215d8ddc86097aea6a
 MISC metadata.xml 434 BLAKE2B 43111da215ea3d6d6af807ee1b629a3ff72dfefe15fa429a6ea5b112cbfb881d1bf848b50a266c32b820a7aec3e14e419c64657cc0a205c1e759c77b64a17b52 SHA512 9ab3275ada67cf2da92f07d9a332f098330caa81b0a7f5d17a321a03cf6b441e029efab9a8f3eaaff7d7181eb503721aa954c14e0a7982e4f35e16c8eaa57898
diff --git a/net-firewall/firehol/firehol-3.1.3-r1.ebuild b/net-firewall/firehol/firehol-3.1.3-r1.ebuild
deleted file mode 100644
index db92d61855d5..000000000000
--- a/net-firewall/firehol/firehol-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal,ipv6?]
-	net-misc/iputils[ipv6?]
-	net-misc/iprange
-	net-analyzer/traceroute
-	virtual/modutils
-	app-arch/gzip
-	ipset? (
-		net-firewall/ipset
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~IP_NF_FILTER \
-		~IP_NF_IPTABLES \
-		~IP_NF_MANGLE \
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REDIRECT \
-		~IP_NF_TARGET_REJECT \
-		~NETFILTER_XT_MATCH_LIMIT \
-		~NETFILTER_XT_MATCH_OWNER \
-		~NETFILTER_XT_MATCH_STATE \
-		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
-		~NF_CONNTRACK_MARK \
-		~NF_NAT \
-		~NF_NAT_FTP \
-		~NF_NAT_IRC \
-	"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-vnetbuild \
-		$(use_enable ipset update-ipsets) \
-		$(use_enable doc) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.confd firehol
-	newinitd "${FILESDIR}"/firehol.initd firehol
-	newconfd "${FILESDIR}"/fireqos.confd fireqos
-	newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-firewall/firehol/firehol-3.1.3.ebuild b/net-firewall/firehol/firehol-3.1.3.ebuild
deleted file mode 100644
index 11a79fd5b628..000000000000
--- a/net-firewall/firehol/firehol-3.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6"
-KEYWORDS="amd64 arm ppc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal,ipv6?]
-	net-misc/iputils[ipv6?]
-	net-misc/iprange
-	net-analyzer/traceroute
-	virtual/modutils
-	app-arch/gzip"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~IP_NF_FILTER \
-		~IP_NF_IPTABLES \
-		~IP_NF_MANGLE \
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REDIRECT \
-		~IP_NF_TARGET_REJECT \
-		~NETFILTER_XT_MATCH_LIMIT \
-		~NETFILTER_XT_MATCH_OWNER \
-		~NETFILTER_XT_MATCH_STATE \
-		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
-		~NF_CONNTRACK_MARK \
-		~NF_NAT \
-		~NF_NAT_FTP \
-		~NF_NAT_IRC \
-	"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-vnetbuild \
-		--disable-update-ipsets \
-		$(use_enable doc) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.confd firehol
-	newinitd "${FILESDIR}"/firehol.initd firehol
-	newconfd "${FILESDIR}"/fireqos.confd fireqos
-	newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-firewall/firehol/firehol-3.1.4.ebuild b/net-firewall/firehol/firehol-3.1.4.ebuild
deleted file mode 100644
index d9c5fb2ca8de..000000000000
--- a/net-firewall/firehol/firehol-3.1.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="amd64 arm ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal,ipv6?]
-	net-misc/iputils[ipv6?]
-	net-misc/iprange
-	net-analyzer/traceroute
-	virtual/modutils
-	app-arch/gzip
-	ipset? (
-		net-firewall/ipset
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~IP_NF_FILTER \
-		~IP_NF_IPTABLES \
-		~IP_NF_MANGLE \
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REDIRECT \
-		~IP_NF_TARGET_REJECT \
-		~NETFILTER_XT_MATCH_LIMIT \
-		~NETFILTER_XT_MATCH_OWNER \
-		~NETFILTER_XT_MATCH_STATE \
-		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
-		~NF_CONNTRACK_MARK \
-		~NF_NAT \
-		~NF_NAT_FTP \
-		~NF_NAT_IRC \
-	"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-vnetbuild \
-		$(use_enable ipset update-ipsets) \
-		$(use_enable doc) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.confd firehol
-	newinitd "${FILESDIR}"/firehol.initd firehol
-	newconfd "${FILESDIR}"/fireqos.confd fireqos
-	newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 758d595d3463..07023c5271a3 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -3,6 +3,6 @@ AUX firewalld-0.5.1-errorcodes2.patch 1465 BLAKE2B 67da2f57a445113ac0334af5f58cd
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
-EBUILD firewalld-0.5.1-r2.ebuild 2846 BLAKE2B 34acbe45a138d3a70fa394843844ba7174de03e1c4aff26a9b2020baefaaff1e3781c0d053580b32bbb584094d6d633b46ba765237b06c80adf27f2719ca7a86 SHA512 08aaa0728b191bfbd69804ca359d634c828b0e7ad9e8ffd78927d6b2d192a80404dee0c15a629290e05332bc7e6717f38a334ed329a0dddb1fdab9873dfe5a22
-EBUILD firewalld-0.6.3.ebuild 2513 BLAKE2B e61b18cc5301d6d9df97b82ea44afa60c78a5c80dc5465b996bd7ac39a50edd4ccc13e5240d1a811c6743405004b2ae68add6d5cb2f659df6e5789a72fcdaa79 SHA512 8a696ecb03b7175eafe50588aedd84380b25cadec103f0c74c854baf286ff653a962c9f03e2f1b8393a5d2d335e17376b7039018a9d89d4b841938d85d1a288a
+EBUILD firewalld-0.5.1-r2.ebuild 2839 BLAKE2B 5560e10a2c297e5f0c1f51ee28a2ecbdcfb14b5f38235b19719b1c33bc12f763c7138e50cdf2795157ab09f4e4cad4d49f05e0a6036ae22fb60b74f03b14386d SHA512 2d26fbf9c9d2fb507d8da8c036ddb3ea81a4d95c5dc64fec2baf2bdce76271a69d40fc6ba8979da0e8d17d6f989cc036ce7eb3fbc81630365cbcafdc926e23f9
+EBUILD firewalld-0.6.3.ebuild 2516 BLAKE2B 1a3b1e90c0aec734ae894882df0a3232bbdc127129bf8fd410301f5626ed06e3c373e547fe12996d11a23bf6c0891e22d71824c887aa3cdf9d2a14ae44b64b17 SHA512 eb673b8b344b8dce8dc297fee4f19766080a1cbb53b1cfbdbdff094618f5f41c2b0dc0a9030694808f21d46dc098d512865fc7e877e8b704cd52b2bddb145833
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index 40994d87e221..7f2c39160ee6 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit autotools gnome2-utils python-r1 systemd bash-completion-r1
 
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index f652630c3f4f..fad09052c3b5 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 6133c590408e..735435e58e44 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -13,5 +13,5 @@ EBUILD nftables-0.8.5.ebuild 1937 BLAKE2B b24ea2b8978dc0294c2d27a90aa205916ddeb0
 EBUILD nftables-0.9.0-r1.ebuild 2079 BLAKE2B 303d82b14d13f49c7ed5222d69025eaf0d73e3ec617655b33224b8a1f14e4a16a9d9e71a60270cb3e015bb009efb43ccb419a722a4780cdba50cc2ea341a3eda SHA512 68386a156baa050c83f6233516f8e37f871a2be203d71c751eeefbfbbfe52f114201c2a6eced8bfa194ca8e87c9ad62d6370096c0ceab6e60927cf236c12dfe6
 EBUILD nftables-0.9.0-r3.ebuild 2343 BLAKE2B d726f8bef9ddd5860fff0d91cf29185a32432fc24ad31b173330dd4f881809f66e62e805dcbb9d1e4bbc9f0c3c8185ceadaa4db7882266a1747f9d5f522e1e9e SHA512 953a2e64cf4ddc2591335b245ca8a0b18056cb55c46f7796fd1e4de2f774ab3bb2b3bb6be70b49c7c7d1b4d4780f1e5e3335b84d1d97e9a4a99443aecadc91e1
 EBUILD nftables-0.9.0-r4.ebuild 2494 BLAKE2B 7afd80b8e98ca1c45f3024fad2d0cc05a9f198f10a779e410ce9b7d8a4df7f5b13e67dd3c24a985207ec24bd2aac4e59cc5eb7265f9d29b165a8258aec79e335 SHA512 3a27cb493a3d1e386c845891fdcc66b112e724c08258bfea8d7cd7dd8977704bd08efd6ce504b3132d7421a79117c4fee4864fa547f8f4d968676b664cd754cd
-EBUILD nftables-0.9.0.ebuild 1989 BLAKE2B 3c1e318030d8287b0db2b2ebda3e528703ac73bdf146c147c5c7f8929e9339f9c4c6df08fc829a0ad55f4634b0910e8acfeeb9a31577ba6e61663839c6978a5f SHA512 627c70f4bb60fdbea3f57e676acfb84ed0a4779b6b98b352be766463ca2c564ebcd1a540719e2085b59b8b87fd8dfe7bb1cc6b6d91ec5fe4aac79f53c3c1c496
+EBUILD nftables-0.9.0.ebuild 1993 BLAKE2B b0e94b4b45f247a02fb77980141647c65a97dd291343decc7baf510421e5e33f8314c25e7cece5ea794a243baa2dae939389e1e876e13105333c4edb68f7ffbe SHA512 5283b79acc5e71f3b6eb197ce21ddd4be71888bf693d62485dc516bdb67ce2808d1ff136173975e7bfaabdb565ca1b400c3aea9e68d83cca9e994e7d03cf8a08
 MISC metadata.xml 701 BLAKE2B 14244e9f37e87bc6e4a9cc917b7f2e55bcb61135af3a9ff258334ef9d40ade40312760f30ddab907d75f4c4492cc8d8d2217d022f5e04672988c25d65ec1d85a SHA512 070e4dcaf6f323f93fac80352d2c2ae1512611ffc3261e7b3c85acee9f490f90e238b39aad2a7d4959c75fe7c96545b8c12318b09d4c56d8116df80364bf09a6
diff --git a/net-firewall/nftables/nftables-0.9.0.ebuild b/net-firewall/nftables/nftables-0.9.0.ebuild
index e50541dcd2f5..3a8ef1f307a2 100644
--- a/net-firewall/nftables/nftables-0.9.0.ebuild
+++ b/net-firewall/nftables/nftables-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 IUSE="debug doc +gmp json +readline"
 
 RDEPEND=">=net-libs/libmnl-1.0.3:0=
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 26dcaf02e48d..c5b81dd8a4d2 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,12 +15,12 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
-DIST shorewall-5.2.3.2.tar.bz2 556260 BLAKE2B 4a210acea452c93bc3161ae4386e3f9337ba759bbddde6fc4dfca712d26bf8b99d48b4395b08f351e095155d71a9c0fb014ee16880224ec9d52e88743ca789ef SHA512 187af5eadf1b7717ec02c2532aa65f89a93a4ec6a7dbff11eceabc92309179297f748accf9bd0e35a6c6b8f5f99fa045550c9eb19b08885dd1ecb8206b97de89
-DIST shorewall-core-5.2.3.2.tar.bz2 69128 BLAKE2B 6a5caf31f415094071584d740c56551214326c8b6376cbd770fb4a7b72607bbdb1e53dfe863e40c1b65e874915fdcb0364779efe22c807fa5c8ed810c6cc4d2d SHA512 1de38fb74282a67d4596bc6ddb3b73b88d9d9d31ef4d40555199cba923a600fdfcf19b922d29fa47e9e3f25048404299dadced27ffa0c0ca93368bb80694c17b
-DIST shorewall-docs-html-5.2.3.2.tar.bz2 4302686 BLAKE2B 73d20e4a6a28771963e2fb79b251d42b7c7c7e47df446e5f400f299cbc334567505bb50d2bc5c9c834baf6d8d6208283b86ea0e873c194e9dfbd3d1da2720c2f SHA512 ede1eeb8444832839bdd0642809fbb960300f289c0a9e8c979d92fa376a3ba28648b7c89d4ff8caca4bc4d6ce15d4205e4d4679628b9080e3f41919105850aaa
-DIST shorewall-init-5.2.3.2.tar.bz2 34418 BLAKE2B 1657bf055f2f5aa9206392a4cdf4a2a03185d964e01edc93455b587e5004aab146f6da65d8b70c72414a74887696ad9dbaca729ab063fe4016f3e45a8bb732d9 SHA512 ed46184535a0cc7197f4c7513604574b0ba862a99ac3cd1d0437f12dca17e9b1d249df77ac0152d4cfd257a1de1310af07c1bd70e763e4d663e7114dd26c617c
-DIST shorewall-lite-5.2.3.2.tar.bz2 39201 BLAKE2B a50fdfe8498e745daed93166c5bd3d4cabebcc13f54bf3c00360f6e2fbaaa4327f0b40496308ca00915d35abdff2e37b3e85b29a77828d1bdacd0b36cdcac2f5 SHA512 2ce235153546c35a4fe440ec4b0dc66f6d0807b50dc3a7f148296e341f6a264bf63da36cac1ed9cbb4b857df7843209f818101ff6d342c5673d8b1134de67073
-DIST shorewall6-5.2.3.2.tar.bz2 190178 BLAKE2B 587902f4d0ac799f499520964e33db5251d1e5e3022a2cb2413a1349893bea13a7f1995fe3a70ae0b23d4ab3936e55233f208e9162bd51877d01b3eec4f7137e SHA512 3dc5bb4996ea251aef323241a855a2efaf4db3772e94050403faf040cf8f18fa4e38d7b2cae8733f0557b79c6330b10cf545d51338d4df1ebea19ba20bd66b05
-DIST shorewall6-lite-5.2.3.2.tar.bz2 39069 BLAKE2B 3647156f673cfce29a1bebddeef81de911146d707e5c917ce01a93ed807bc67ee7f9107c9010a396f000fd76286ef167f43b2432954c17bc2a3a5cf085acc073 SHA512 1d47bb005655bf863ec41601b7e49c91508d330f80f0b9b5a546ed366d06fe04a4005598fc5b34b271ccf7f5f4798ccee83917b0988b03fd36cb53e12c44334d
-EBUILD shorewall-5.2.3.2.ebuild 17106 BLAKE2B aa979e5dec0e76a93db5bb2a4671158e792bb76e23e0fc05460f3ddcda9d2638c5608eacd18822aaf8e0dd5ff314925494ead63b39060b131be5ab454b3bb2ce SHA512 8c881b26cb893c6f1660481334440225b7cbce5012f2fcf20e8cce8403baab12fa21ee489b287eb1604b0d85a05d05c1120fc51617a6001cd35fcaab61e09b43
+DIST shorewall-5.2.3.3.tar.bz2 556424 BLAKE2B 0a172f0e70449af91421308c5308420a8de7af405eb74107201966b10df2fa7a0fd6042337c182bfa30a92cce3e611e46f8f5b910fb1bbc282513e3fc2d77d0c SHA512 d4166332160cbbc9e36f0c7f8fb6db8573dda17f80bbfb062465bba42f748c4f6815c9467da8a072b9eb01f3745fad67e00eea657ef61d9f90b49ad3a4668300
+DIST shorewall-core-5.2.3.3.tar.bz2 69043 BLAKE2B 6e84490258bc5cff88ef081bae11520463ff63a079fa8884d5976fa8c812d85e029636abe1092f2fd97a8529e935dc16f877cb75d7f9a3c0aa2236b2a9636d22 SHA512 c8c03273f686a8fa4151686b2426e437b3169ec78831e2d2f4a5bb20bb5265f4ede4a701bca5d21d0d8cafb4bb1e2c460c1b7ebb72ff042ec47221304dfbddd5
+DIST shorewall-docs-html-5.2.3.3.tar.bz2 4303296 BLAKE2B 26fa00d1226fee0a60c5c352bb6d625a365641837a3e7cc9b0a9ec249f45926bb5230e53052597cda098e8bcbc171c9909b98436af75a3ceff6407bab3cbc8ad SHA512 e43c48cad4abb4e8455ff5f012af8cc466737b0c0ff130cadeb5860cee7f3fc38a7d6eacde5fa49c8afbbb6c49cc9df310eb9bcf992bb12422ade26ae003740e
+DIST shorewall-init-5.2.3.3.tar.bz2 34456 BLAKE2B 5e7bf650de96973cfe211e4cbb9927c78a9cbae4a4436b8d556ac3df679a999294205f61532906dcbd0fa1027608dfa087b35c31bf64065cb0ccd6d5689905d0 SHA512 6c7017a6ac2df5611910132d9e5d2281b3210dda5e31ce26b15eed9ccd302ca9e1ddfbf92c093e6a751080e6f5a745516db2110bf30154f077d078b607087485
+DIST shorewall-lite-5.2.3.3.tar.bz2 39290 BLAKE2B f499ead6ee21323847b314793cd3250c08eda5e66c335effd72d9df92629e041377cbace0a6a647f5f791489a50663570d79eca7b4c59e1b75d017e47af82706 SHA512 12e87dc80fc347dd8077c9de9d87435bfe689c9115a5e88460f46f58a406ed66ce67f9b9847960bc50bee09eba7f1fe526a871f4852c2978392e7c10929f6617
+DIST shorewall6-5.2.3.3.tar.bz2 190274 BLAKE2B be44782454dff686a769e0f84298d5bb6217a85953e67acc7d2df16bcb4ebafc0867c62fc308f24690ba1d3b71444779fd5df1c6bce6545e3f269b0efbe49bd3 SHA512 ceb887f479841ed4998e488019bf3ec6874585c552f67be60af39f6414b40d24e2f6595812241d2f5fdf021beed2e0e2af8d98b03cdc66e72c7aedecbad8d3b1
+DIST shorewall6-lite-5.2.3.3.tar.bz2 39210 BLAKE2B de02932cfc5315f1db0a21b6ec2f20e393ab041c3634a2bfee3bb309de73614f5da0e8e60ced697d16f82ff19f8257e7fff943fdae983bf64e8b7a18d43811be SHA512 044d793bfd98c0698713adf2aea8837fac970f39956db6f44c9e5b68c4435c65ebf594f5c3091f58dbd3e4d34c2d178052c5af28b568f591c290359cc1418e61
+EBUILD shorewall-5.2.3.3.ebuild 17106 BLAKE2B aa979e5dec0e76a93db5bb2a4671158e792bb76e23e0fc05460f3ddcda9d2638c5608eacd18822aaf8e0dd5ff314925494ead63b39060b131be5ab454b3bb2ce SHA512 8c881b26cb893c6f1660481334440225b7cbce5012f2fcf20e8cce8403baab12fa21ee489b287eb1604b0d85a05d05c1120fc51617a6001cd35fcaab61e09b43
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.3.2.ebuild b/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
index 14bfe9b234c5..14bfe9b234c5 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index fc1c46642c93..a2335e5816e2 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -17,7 +17,7 @@ AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f
 DIST ufw-0.34_pre805.tar.gz 335875 BLAKE2B a2b654fe35a299ffd9978ef14a8d5667f799b654b6285bc81756c8081d9f4417b2fa9c05a234351d42709c2c57ff624b4fe7bca8ffe4d13cd12436feead6e4da SHA512 b8bba3bb8c423070d6434d1df7274423edf3a356415f54c6448fa0ff2d13a4b2ac21c4bb627cba01d6955b04f793eeaf2fc535c6221e7de48f11bef745035263
 DIST ufw-0.35.tar.gz 375310 BLAKE2B 3babf22e860ead6970c1386b0ab9fc3de364ba3f5c8bc0237be4a9446358fe058d216e7928d16eed8a148fbee5b82fc1d9e3b358f357c2fac236ae6f6b942a01 SHA512 b36c82559910634505648f717d19eb5a0cb1ce739a804359087e74c966869d0375c4ed5811954b32d2b5b51866f6ae1bec62a4a464f226b2eecc56b096f303fc
 DIST ufw-0.36.tar.gz 580338 BLAKE2B a7e07ac11539061a69bb83d45c0affc54793503b31c9e9f9f8b34fa890a3fe97682f9133102e74e5f6e1eb372a929cfc8619baa2cc9efc1dc289d9f4a1766efd SHA512 b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3
-EBUILD ufw-0.34_pre805-r2.ebuild 5375 BLAKE2B 8f58b7a30d61112af687860824cca03eb9a692aadd14ed94c166da6f3f00482bb9d978c58d7dec3c606fa6cf0c85a93743f2038a9a63f9ca91adb763440e56cd SHA512 63d693768d88d6503cd50ce18bbdd048ed94f44d943e5d36e4523c0ee4918db37ba14616ecbd57df018d6144396285e1c34495813f456035c3a1bb42a6472951
-EBUILD ufw-0.35-r1.ebuild 5637 BLAKE2B 510db5eac08e6ebf38ed2226e9be799cd474929d91ffd39b99ec91a88be9c5bfded0699b7970c51a8558aa76362e1016500812bfb06b7b50c1e0bad7d42bf2cf SHA512 63b5f8bb520c1a509aefb282fab119aa6325d18c46d4b9ad681c91cdc2dddf340f05f93d48212766acb96fd86161ffa2e932d1fb2ba07cc36b35b400b4bc5c4a
-EBUILD ufw-0.36.ebuild 5728 BLAKE2B 6d4b07dca183774f306a78a517737806790cc0bc52e05354cfd78a490eb44898b61495774848789d816df9be65eae277cf2c1a61a655bff9576a7d6c7a971fac SHA512 0d152a10f11d8a93ef4cf5d85cc79d41d677c523c7bdbe1f2701e04bc290c95ae53fd1ca813aefecf583976acf40f020f6a65140be86e2991ce4295a31ce93ca
+EBUILD ufw-0.34_pre805-r2.ebuild 5366 BLAKE2B d69ad68267ea2c9f5d895b61556216ce6050e65af50ff87685ff10f37060453d95d7fb75c62c23e40ebd7633ad6e2a29348a59be78d641f3d0060334d30f2f19 SHA512 35de933ed90973de520e74c99d3049957b3027c4f605f84c16e61289bdd3bdb2da3b5855099d5693625948cb7dd0e244e97a0470724b17192c000bc7fd69386e
+EBUILD ufw-0.35-r1.ebuild 5633 BLAKE2B c341332bb14990b28cb2a00a67069ed4b9369ea69b6f3b655c5379e0ceea48560b475442e431e5a16c8b1c2811fb124bed52bcee1c254fd4a30cc03abf04e9cb SHA512 4ae8fe284f05e22f86bfefbdc048594f8eef2ba55b0a990b4d0f9796e92497aa3462f35dac78a49073ba71c7631fabc5b849c2616746ce477e18112efd533046
+EBUILD ufw-0.36.ebuild 5724 BLAKE2B 2b24fbc2b668063fdb4b4c294fd0212e853acbe6e495d4ccdd9d112d415c05d42d925d30ab6730959178094957d175bd633b3e87e110c789b7571bbc56807a7b SHA512 0aa8224ca490a6c295df5070a2017824cb6078131efbd3b5787005f19c289dc67e274801e24173ebcde917c53458eb11901f57aef2d59715ebb5ecd13df454e2
 MISC metadata.xml 867 BLAKE2B 803f1809161a81c013989270661d5e17bc74c9f02dd7c2cf9e7847b86072ea56fc5ad980a6f2d285ee1d806902621ff1100ac20bbc27465e828aec4537e846c6 SHA512 e11ddde14aa8fb8aa187537f3cfeb01b26b4421489d69223fc77ab4400b002105d2b8161ebf489748eb42b615899f87c1abc65d10d7ef40b2f107f0d85c17c77
diff --git a/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild b/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
index ec748222d329..73f230e669df 100644
--- a/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
+++ b/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit bash-completion-r1 eutils linux-info distutils-r1 systemd
diff --git a/net-firewall/ufw/ufw-0.35-r1.ebuild b/net-firewall/ufw/ufw-0.35-r1.ebuild
index f0c9b79e35ff..2265a2786702 100644
--- a/net-firewall/ufw/ufw-0.35-r1.ebuild
+++ b/net-firewall/ufw/ufw-0.35-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit bash-completion-r1 eutils linux-info distutils-r1 systemd
diff --git a/net-firewall/ufw/ufw-0.36.ebuild b/net-firewall/ufw/ufw-0.36.ebuild
index 3afeac0ab6dd..6621087845da 100644
--- a/net-firewall/ufw/ufw-0.36.ebuild
+++ b/net-firewall/ufw/ufw-0.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit bash-completion-r1 distutils-r1 eutils linux-info systemd