gentoo resync : 15.01.2020

36 files changed, 221 insertions, 264 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 144e30087ba3..747d74fe95a4 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 eec6186d4799..2d5bad82459f 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,8 +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.3.tar.gz 139445 BLAKE2B 57dade49a4aaacb1354129efeb5ca013060d51baa8c23dea1fc326e52a693c7137047883ea7bbca6cc3221f70a83f7283123a345e22ceac4bb99d3b43410b65d SHA512 c88a560d4c0a2644dd1ec35e0a6e2b1883e52dc6c71075207c3b98a59964a4be3787620e9414ad5e926bddb9dbc7c2674fd8687828526c35f0fb4a53a05aa929
-DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 BLAKE2B 0c8263004d2294f6eedd7f40e6c339da3a57db803ce1d064ac0bf4a3d2191b26fcd0b59185e51240bd0378365f9ca115c80c5edc256aa68359728c960ab8e6e3 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70
-EBUILD arno-iptables-firewall-2.0.1e.ebuild 2227 BLAKE2B 9033d3fb372461bb7f711a604b12d2f12f79fd7421e4fcbbfb9306675cbc95db3362ceb421973b4ee4c06a2b1898c84a8038e2fdcee519086b6d08196bfc04c6 SHA512 aed017650ce04dfff747602c33bd9dcfdd73990fee4dd015609baf4f46e447255922c8247933565a6d656d86a590dc4ec0903302cdb0da2033351d298166ab02
-EBUILD arno-iptables-firewall-2.0.2a.ebuild 2435 BLAKE2B 12ef96ffecffab0b9f9034cc83ffacb2b94f2b0970b1c6a73556d21b593889f0220de84a4d8dd7f2e23ca9de5c3e155353d21ab33680f41d748eb83d22e0f8f2 SHA512 9d487e6bc4ec2b355989775c05040e89edf9b2e276977b063557458ad168a957b0a85061ea50ffa0f13f67c928bdb910bd072184963ebfc0612bf0a8b27ee0a2
+DIST arno-iptables-firewall-2.1.0.tar.gz 140015 BLAKE2B 46ff89db6928bd4f86a5b26a06fa1ab2a88ecc5043f6f92543151c3ca6b74d9704c4b7046e1c5e1371e0b5de552e414cbe0524305947b026ec7953f9d779055d SHA512 b59644e78f281dacdd32045254be15dbd31ecb5f2b26d88a3c9bab60aaf19ea879d87127040db5f72292668e22026d982c17d3ad34c83da16720cdbccebdd07f
 EBUILD arno-iptables-firewall-2.0.3.ebuild 2412 BLAKE2B 1430a24434888fdab011a4af6f84db467da9dfd62f3383643045015b9ab362f27a3db90b7d6ea815fbe7b1146b3336c0fd447f231f1259f77a7278bf6984b920 SHA512 de9daecb896725649cf7d263f87ca8f1da6dd56fd0a81657635c995491fdd929cea19c6be8f4e1b1b4ce009c50b2bb89f999f5047a570368e68b0e5bdff63f28
-MISC metadata.xml 423 BLAKE2B 5d1e73ade844870734bfcef03b2955e201f1e8679add93edd74b8cc91840ca7824fd33c674ed2327c2c102166830937af13033380d56bed00c497098faa846d0 SHA512 4d3402711020fd7ddecf5eae405bf4f72246347ea887f2f803c317c8b2d94ff830f68cf39e97526522f2d30845d95319e117efd49f06f685c046d0752c67546a
+EBUILD arno-iptables-firewall-2.1.0.ebuild 2421 BLAKE2B e6223f6361a3c7d5b7b4dbc03139eebd6c980f9e2b9a93a28da3c7a6ba096b0f4bdc44a032305ee6680ee54f10e04c638204eff3d8b5275e7a8ea14243406c34 SHA512 eaf77b34a8060a1d6cec2432796afb5a1b2520f666cc1735378e9ee20fe283edb916a18d35995f5a32b12bf1affeeaccee39474e1f278d6af9714387b1cf0a09
+MISC metadata.xml 515 BLAKE2B c904370936eddef69630141ec61bdfe911a29bdc2425238b2a973ffcb89702183e0e36c42799cfc6cfaae403bdfb5a8fcefa1a576dd6a547a6b161ca9a967464 SHA512 c0d63d340e8fa318e276d3bd2e526dfa2dd5e8d810a75d75301cef8983d5bc851aae90e7f29685f8c2c21c21fadfa1c3d033156d44fb289eb9890465ea49e3bf
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
deleted file mode 100644
index 9659d70d0b5f..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo systemd
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.eld.leidenuniv.nl"
-SRC_URI="http://rocky.eld.leidenuniv.nl/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins"
-
-DEPEND=""
-RDEPEND="net-firewall/iptables
-	>sys-apps/coreutils-8.20-r1
-	sys-apps/iproute2
-	plugins? ( net-dns/bind-tools )"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
-before using this package. To start the script, run:
-
-/etc/init.d/${PN} start (for OpenRC)
-systemctl start ${PN} (for systemd)
-
-If you want to start this script at boot, run:
-
-rc-update add ${PN} default (for OpenRC)
-systemctl enable ${PN} (for systemd)"
-
-src_prepare() {
-	sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
-		etc/"${PN}"/firewall.conf || die "Sed failed!"
-	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
-		lib/systemd/system/"${PN}.service" || die "Sed failed!"
-}
-
-src_install() {
-	insinto /etc/"${PN}"
-	doins etc/"${PN}"/firewall.conf
-	doins etc/"${PN}"/custom-rules
-
-	doinitd "${FILESDIR}/${PN}"
-	systemd_dounit lib/systemd/system/"${PN}.service"
-
-	dobin bin/arno-fwfilter
-	dosbin bin/"${PN}"
-
-	insinto /usr/libexec/"${PN}"
-	doins share/"${PN}"/environment
-
-	dodoc CHANGELOG README
-	readme.gentoo_create_doc
-
-	if use plugins
-	then
-		insinto /etc/"${PN}"/plugins
-		doins etc/"${PN}"/plugins/*
-
-		insinto /usr/libexec/"${PN}"/plugins
-		doins share/"${PN}"/plugins/*.plugin
-
-		exeinto /usr/libexec/"${PN}"/plugins
-		doexe share/"${PN}"/plugins/dyndns-host-open-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-helper
-		doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
-		doexe share/"${PN}"/plugins/traffic-accounting-show
-
-		docinto plugins
-		dodoc share/"${PN}"/plugins/*.CHANGELOG
-	fi
-
-	doman share/man/man1/arno-fwfilter.1 \
-		share/man/man8/"${PN}".8
-}
-
-pkg_postinst () {
-	ewarn "When you stop this script, all firewall rules are flushed!"
-	ewarn "Make sure to not use multiple firewall scripts simultaneously"
-	ewarn "unless you know what you are doing!"
-	readme.gentoo_print_elog
-}
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.2a.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
index b7750479cd0a..b5cdcda849b2 100644
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.2a.ebuild
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit readme.gentoo-r1 systemd versionator
+EAPI=7
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.eld.leidenuniv.nl"
+HOMEPAGE="https://rocky.eld.leidenuniv.nl"
 
-MY_PV=$(replace_version_separator 3 -)
+MY_PV=$(ver_rs 3 -)
 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"
 KEYWORDS="~amd64 ~x86"
-IUSE="+plugins"
-
-# sys-apps/coreutils dependency wrt
-# https://bugs.gentoo.org/show_bug.cgi?id=448716
+IUSE="+plugins rsyslog"
 
 DEPEND=""
 RDEPEND="net-firewall/ipset
 	net-firewall/iptables
-	>=sys-apps/coreutils-8.21
+	sys-apps/coreutils
 	sys-apps/iproute2
 	plugins? ( net-dns/bind-tools )"
 
@@ -83,6 +80,12 @@ src_install() {
 		dodoc share/"${PN}"/plugins/*.CHANGELOG
 	fi
 
+	if use rsyslog
+	then
+		insinto /etc/rsyslog.d
+		newins etc/rsyslog.d/"${PN}".conf 60-"${PN}".conf
+	fi
+
 	doman share/man/man1/arno-fwfilter.1 \
 		share/man/man8/"${PN}".8
 }
diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 46b4fd2b7b23..5f877c6af9c9 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/metadata.xml
@@ -11,5 +11,6 @@
 </maintainer>
 <use>
 	<flag name="plugins">Install optional plugins</flag>
+	<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index e065ec9e42d9..71f2b9f0e4d1 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -9,5 +9,5 @@ DIST ebtables-v2.0.10-4.tar.gz 103764 BLAKE2B 01995c701c6dbc7495bdf1f0fce61dce51
 EBUILD ebtables-2.0.10.4-r1.ebuild 1914 BLAKE2B 799fe8c074cb8ad34821007296c192345925f66645bcf52f584aabcbac9099f98214a6cf80b1f31e8d55f58ab894d2ba4bd975ff4f710848afa88ade2817749e SHA512 a57f925dae0e290422cd79944963510de853b19b81eacc219aacfdd00f5a456f6b5f18c4cbf71c8d7129f317f33d71709fb6d5d3c5712f11115acd3c1eff93fa
 EBUILD ebtables-2.0.10.4-r2.ebuild 1888 BLAKE2B 59fb0004f531ea9a19e3fd6fcb6d4b11c9345d04e3c5692a8a6028f343e8a4d02b4b9f4a3a0d5bdda280519218b80dfb97726f91c6eb78387521538784f28dc9 SHA512 f3464a20c8b33fb55931efd5fb86e4edece9f3c8243f6b15c008c0d100953385fb6f915073055e9d481b6ba8e12d6a67c96d378783474178aaff112f0f5b3675
 EBUILD ebtables-2.0.10.4.ebuild 1755 BLAKE2B 4801b2df1f8dfa4db9c9ea4fe5fea274487b999247ec48c0c2da6123883dc50b60c85738f4a1fda5d164e05018eafb9b5cc78123a3761c5adcefb729633dc188 SHA512 b4b9dada0a1179c7e3df58fefb49a34f85fcc05b184c003c261f58e6394b5006633bf5a7e9ae7a94fc0b49df82569999e0f59178296e38f6856fa1e72f5d52fa
-EBUILD ebtables-2.0.11.ebuild 2079 BLAKE2B 7cc66b495b80ce0c8558ce572b2a91eda992a3e824fc83775e0ce560e6a3e28fdc5db5215de13677fba546f80bc1207d3aa9c8fe0270b06a6ea423caec490854 SHA512 984657371347bd80238ba4ec68dc4538baa901a7919206a65e29f084297f0726b1490ee110e75f0e6fdaba80bc3677cc2f212fb8e5f34093292ba2f9bceaae18
+EBUILD ebtables-2.0.11.ebuild 2086 BLAKE2B 5a6c010cf562b09b8041f34e8063260da5dce78f2cdabe37596324da534d92481b7e0382c21773dc500a17678899794b415814cf8b968ffb5341e9ba0e63d685 SHA512 45f34debaeecab1f99b3e8ac0073b94a404c09e2aa8911161296b30985d785844ca854939a702172e1a44700a98efb2b1bf9d1c4ac5151a282d02e9604856138
 MISC metadata.xml 426 BLAKE2B 24e49caa32476577c848484c9b0749742b3eed3dfb80b67a6c595abcce49081bfa2d50d37a22624754fa06e76cc9bc4af2ac755a0b9c562d696a32e8dbcf4a2f SHA512 77ff48216c32448cf2e2aa580f0b3afd6de7aa9bda2c2379c89f77282c417d385bb8c3d3218cf6d30021e472163bc8f2b450f0e43d944adb336f49fb695ba231
diff --git a/net-firewall/ebtables/ebtables-2.0.11.ebuild b/net-firewall/ebtables/ebtables-2.0.11.ebuild
index fc30080735cc..c9be4be12cce 100644
--- a/net-firewall/ebtables/ebtables-2.0.11.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+perl static"
 
 # The ebtables-save script is written in perl.
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 5f674d26e39e..1a2f91aefed7 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +1,6 @@
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
-EBUILD firewalld-0.6.3.ebuild 2553 BLAKE2B 1669bed72abbd2bf430504fc7f89cc5404f3468af70b6b72f52b0269c91a463e17ff714659ba2ce99f1d87216224f9b942759e4491529923d96293dae17c0a7a SHA512 12e36c15e3be88d8d215c7c1fcaf8eba87af29eba3b5ef089dcbcf5d99c14194c24d22412f150ffd63abfcff64825a0867756bc6b87c103f76a84946b902e1a4
-EBUILD firewalld-0.7.1.ebuild 2537 BLAKE2B 3f6de216cfc1bb8de84c5498589c865fc36496a38053ae3972a59dc9a02b78735472046ae9744c399639230dede1ba8d843d596bae405afe964f9dda793204d8 SHA512 63de5926880c0a7b155330407ab2b210c23075ef4e7c3321d2f3234a7d047ee8963295ce5c1b11ea3c7e4b7e4577f2591106009143abecc109b397a8727480b1
-MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
+EBUILD firewalld-0.6.3.ebuild 2549 BLAKE2B 568f2cca76e45714bbc137d977ff626725200943c29efaafe45237a700af162c2fda6c58f582d6937b11c6ddd82cea0532f377b7b46943587ff801944735e00f SHA512 26904a7bfc9ce31d972466ad8e25bd8d8cd2cd4b3885c89e8b0fa77e1a6bc208fde6886102698ab3927f8793302b1b3bbf66b2dc0824f9eb179a6e46cd8fc0aa
+EBUILD firewalld-0.7.1.ebuild 2540 BLAKE2B 7ad7acc7c1f796603c21f33f5b2da9500d2ba19909f0f9758b51a3bdf3abb9d8eafc61a4e15b504df06a81d67a390969885040243d36b91544803ebc234a9124 SHA512 d5a2d14001a75af6808b53026aa10a4d418d0732df6874505c130550633865191e6c67d2c2ec1e8f0417c82a47397d585376ca9ca244d2d8dbe03a5c2c9ba205
+MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index cd1dbb2e527e..1623b9983834 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
 
diff --git a/net-firewall/firewalld/firewalld-0.7.1.ebuild b/net-firewall/firewalld/firewalld-0.7.1.ebuild
index 275e832e3802..2e7f5223fef9 100644
--- a/net-firewall/firewalld/firewalld-0.7.1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
@@ -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 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 1d49811fa2be..121cd46cb5e1 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -5,7 +5,4 @@
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
-	<use>
-		<flag name="gui">Builds and installs GUI configurator and GTK+ applet</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index f49923886b40..b46025bee1ae 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -17,5 +17,5 @@ EBUILD ipset-6.34.ebuild 3007 BLAKE2B e39e4e2e8d31d333364ed22ba11db1e8dfac476716
 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
-EBUILD ipset-7.4.ebuild 3235 BLAKE2B 3d0cef6220d8328bc84dc428c9adfb671f10537dc826220a9b59046af966dc682c25e041aeac1653dd961a31765a537a7e29dbc5976a2f1b092fe7278a9db5a2 SHA512 6d43f411ed4649d00911e81d4e0118f3a07871b688faae5b86294e8a03fa23cfbcbf4d58b81952c2b7468e66710ab5e8ff4e083bf31d0fcdf1b963cffdbce0fd
+EBUILD ipset-7.4.ebuild 3242 BLAKE2B 4bdf8ecd53f8ecc9525627ecce5d317927c1e094b3711c7bd6d6caef96836b0b4f36059d5053e27ffb31789e241237a521488b88cc2d2d038a98a2e752025805 SHA512 83a16dc722e4b1e5f9e8d989cd7d15c918b01b4f898f57ec8aaceee9225cbebc1764ddac9fc3c1e654745466172cf0d956980809c0b318c3f700b281c9aae58a
 MISC metadata.xml 436 BLAKE2B 08cc2ac4e8d2b06725d52d46064c36cd2305fdfac6c54d5acfb23637462d02d4612cdfd59655555caf31a2cb48506c0cd371de321abef828f52e8da1958f3cb6 SHA512 e44b21f404cce6acae531e2436124b929473bc2bbaadedbe8465a629242faf491f01682c0ac34579a0b85e0d1fabc7e069d2eb60b988eec1ab65a607236acd0e
diff --git a/net-firewall/ipset/ipset-7.4.ebuild b/net-firewall/ipset/ipset-7.4.ebuild
index dbc327ccc298..827969dce4b9 100644
--- a/net-firewall/ipset/ipset-7.4.ebuild
+++ b/net-firewall/ipset/ipset-7.4.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 ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 8ac1121d14ac..f0fe326bd7db 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,8 +1,7 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
 AUX ipt_netflow-2.3-flags.patch 1743 BLAKE2B 5c2cf2b603aae5017e685fbfcb76bf0a5be29b0e3f1299d2e72a516d80cd5479b92c463d4bb4ab192b9cd7b59ef59eeef673c12696a79d6517ec7346dbbe3b5c SHA512 b8a74b0f9daf0e532a8015b576b59e13948684bee8d22a2a62cd8d2a11e4d8d5a2d4b257842dab4df379c3549bdb39d9814bebe24573714e3bff2d2d765021ad
-DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9 SHA512 e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
+AUX ipt_netflow-9999-flags.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
 DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74
-EBUILD ipt_netflow-2.3.ebuild 2434 BLAKE2B 8b179099f7f4aec0468d98beb3dfb8493bf28d51f54341aa513acaf1f8e56c290ae408e1f58f8a28014ee0e7de24855c1398ce083bc38e12c07c0b714ea9cd51 SHA512 f7a9e554e6c31391714ebef1e71c76314992f37d1a8a4a590e4a3e755735a1dc5cc65df6da4c9749d283cdb1aa9ec4dd357eb98ba4133df5ac9da5933674993f
-EBUILD ipt_netflow-2.4.ebuild 2218 BLAKE2B f75562f6e3f2e850eceda97757489f5c242e4aec46b535a06226ea00b23e9e18ca2e6d133d1ea7b2989e0b43958f58f1a44b6cc76a948aee129674c127df69cd SHA512 b9252e3108c1a4541eee41d22cfcf73aeafc035616d2b2e6d2defed2e804adecbbbc279754813ae6ed62c824cf9188ade2c3ea35f65ca4146ac362337b31f27a
-EBUILD ipt_netflow-9999.ebuild 2213 BLAKE2B 86d31675a1eaaf8784877c9ab79fa145ecd8b0b642538c6c55f948bbc363e80b40f9246e83f9c72ccb2714f2d54204fdfe0678191ebbe7dbe6950574f1ea5c10 SHA512 b32559221c6fb4daa34785bec8993aebf376ae071c071279d95e507835d3cc5b31e515fcfc5ec047f49f93b247531a8c87f8409c688df0b8898d306a9b6b4e10
+EBUILD ipt_netflow-2.4.ebuild 2340 BLAKE2B 7abc0b0e4577043dd7f83ef2ece5ceb211f0e0420ab0fc303403683825a4d415fd810050368c0e59dbfcf8ab082806e83d5cf12cbc26fe2642e63a1ae79e65bc SHA512 ef541ed5900c75b531f33e97bb5b5c24877807a7154f94e9c13b9af288fc0002e6afe9fb3de79d3a6278168867e81e49a5a26036dc3f55a9b32f844471fee66b
+EBUILD ipt_netflow-9999.ebuild 2364 BLAKE2B a88838239348fe309a4fd6efe1d6133af629e884a35429f9a7c7577ab840fa5c219dc582169d48a010970e31e78e3fd47676642fa2e4eceaadb0836ac96964e9 SHA512 02f9f6ff65516e90a7143db1b7a91225589d91e1d41d10ede3e16986f0eeba1dc948a9f415fe1239950359a9389f5f7f522fd1408122a15f43cfd024dddb13ab
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch b/net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch
new file mode 100644
index 000000000000..675e8b16f725
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch
@@ -0,0 +1,57 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@ CARGS = @CARGS@
+ SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
+ SNMPCONF = /etc/snmp/snmpd.conf
+ SNMPLINE = dlmod netflow $(SNMPTGSO)
+-CC = gcc
++$(CC) ?= gcc
+ 
+ # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
+ # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
+@@ -22,31 +22,31 @@ all: ipt_NETFLOW.ko libipt_NETFLOW.so libip6t_NETFLOW.so @SNMPTARGET@
+ 
+ ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat_def.h compat.h Makefile
+ 	@echo Compiling for kernel $(KVERSION)
+-	make -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
++	$(MAKE) -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
+ 	@touch $@
+ compat_def.h: gen_compat_def
+ 	./gen_compat_def > $@
+ sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
+ 	@rm -f ipt_NETFLOW.ko ipt_NETFLOW.o
+ 	@echo Compiling for kernel $(KVERSION)
+-	make -C $(KDIR) M=$(CURDIR) modules C=1
++	$(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
+ 	@touch ipt_NETFLOW.ko
+ coverity:
+ 	coverity-submit -v
+ 
+ minstall: | ipt_NETFLOW.ko
+ 	@echo " *"
+-	make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
++	$(MAKE) -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
+ 	$(DEPMOD)
+ mclean:
+-	make -C $(KDIR) M=$(CURDIR) clean
++	$(MAKE) -C $(KDIR) M=$(CURDIR) clean
+ lclean:
+ 	-rm -f *.so *_sh.o
+ clean: mclean lclean
+ 	-rm -f *.so *.o modules.order version.h compat_def.h
+ 
+ snmp_NETFLOW.so: snmp_NETFLOW.c
+-	$(CC) -fPIC -shared -o $@ $< -lnetsnmp
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
+ 
+ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+ 	@echo " *"
+@@ -66,7 +66,7 @@ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
+ 	fi
+ 
+ %_sh.o: libipt_NETFLOW.c
+-	$(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
+ 
+ %.so: %_sh.o
+ 	$(CC) -shared -o $@ $<
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
deleted file mode 100644
index 04f6abd77690..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_PN="${PN/_/-}"
-MY_P="${MY_PN}-${PV}"
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="
-	https://sourceforge.net/projects/ipt-netflow
-	https://github.com/aabc/ipt-netflow
-"
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-
-# set S before MODULE_NAMES
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	# bug #455984
-	"${FILESDIR}/${PN}-2.0-configure.patch"
-)
-
-pkg_setup() {
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-	local CONFIG_CHECK="~IP_NF_IPTABLES"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:make -C:$(MAKE) -C:g' \
-		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		Makefile.in || die
-
-	# Fix incorrect module version in sources
-	sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-	default
-}
-
-do_conf() {
-	echo ./configure $*
-	./configure $* ${EXTRA_ECONF} || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# this configure script is not based on autotools
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--disable-dkms \
-		--enable-aggregation \
-		--enable-direction \
-		--enable-macaddress \
-		--enable-vlan \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
index 88d6cef84f3f..8db277d79e5a 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 
@@ -31,12 +31,23 @@ PATCHES=(
 )
 
 pkg_setup() {
+	linux-info_pkg_setup
+
+	local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
+	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+	if use natevents; then
+		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
+		if kernel_is lt 5 2; then
+			CONFIG_CHECK+=" NF_NAT_NEEDED"
+		else
+			CONFIG_CHECK+=" NF_NAT"
+		fi
+	fi
+
 	BUILD_TARGETS="all"
 	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
 	IPT_LIB="/usr/$(get_libdir)/xtables"
-	local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+
 	linux-mod_pkg_setup
 }
 
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index 71ba1b74afbf..06411e1ae6d9 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -27,16 +27,27 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.3-flags.patch"
+	"${FILESDIR}/${PN}-9999-flags.patch"
 )
 
 pkg_setup() {
+	linux-info_pkg_setup
+
+	local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
+	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+	if use natevents; then
+		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
+		if kernel_is lt 5 2; then
+			CONFIG_CHECK+=" NF_NAT_NEEDED"
+		else
+			CONFIG_CHECK+=" NF_NAT"
+		fi
+	fi
+
 	BUILD_TARGETS="all"
 	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
 	IPT_LIB="/usr/$(get_libdir)/xtables"
-	local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
+
 	linux-mod_pkg_setup
 }
 
@@ -44,10 +55,14 @@ src_prepare() {
 	default
 
 	# Fix incorrect module version in sources
-	sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
+	sed -i \
+		-e '/IPT_NETFLOW_VERSION/s#"[0-9.]*"#"'${PV}'"#' \
+		ipt_NETFLOW.c || die
 
 	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
+	sed -i \
+		-e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' \
+		configure || die
 }
 
 do_conf() {
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index ea13edd1edeb..97db563591b3 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,6 +1,7 @@
 AUX ip6tables-1.4.13.confd 690 BLAKE2B 457beb9caaef166b8d98bddfd3e9f2799439bdfef4dd4acf4e5b7d619ac23b0d2c9f7ad62ab8fe70cb0970b378fbc4b179336c399a078babb2647cb127631b2e SHA512 8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e
 AUX ip6tables-r1.confd 899 BLAKE2B d8c72df359a35798d7a92958ba9a620ab580427a06765850928181d7b4cc25455c586daaad88bd20e61a9c9218dbc0895de38b006526bb04f4f2e998d8062fbe SHA512 553ddf83558edaccf891a366175e47aad950853be0de556581cfa08f614afa1f4139c94b8d8d2884ed69018513edeb966331d4d6a615829ada65fac2066840e5
 AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70
+AUX iptables-1.8.2-link.patch 785 BLAKE2B 2ef5ac495260eef324f341d5d807e8c59afee8ac4853b46ef8c88765ed786396888d0bcd15822765da5584c25c6cdbbbc6b8b85eb0b8dbdd9b300662b1d59479 SHA512 10f6fdc4e4a37a0becb87f99c49888df366248f02b17037faf83068ef00824ecb61022a40b5551f9c8d2db22262ad738d554296bd6b78765dd5f8baf524b2388
 AUX iptables-r1.confd 890 BLAKE2B 0aaca870e3c03f19a71cf1b210377dfda320faf118359e298bef419eaf280fd11c9726d200ae89602e863c9b48de0bb51ac05424b50c064afe948a980e300153 SHA512 10002da01ded6be0e9bca6041798ad0859fa2212fde077a048443e4f3012c95d86e4580ae426e87af5891368062af9af6f9fd35ed617d24cdd3c51702b816b13
 AUX iptables-r2.init 4384 BLAKE2B d11be1725e25d234e01af86c82d3745fd630b15b3ae2228845c5555db5c2ffdcd920fd565480f76ab91ef2d5b26f9ae96432efc288a1b9aa2abfb5b9bb01d7bf SHA512 8897ab985424c895e261e0fe521921f0da8e09e38394655b0f91c65c0e8f603731faf70489f7a6610c83d6c2fde75f92f309405d72277643165a847e62238df7
 AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db
@@ -17,7 +18,7 @@ DIST iptables-1.8.3.tar.bz2 716257 BLAKE2B 58c606a5753ae2cb8ada9039e4653d2abe03c
 DIST iptables-1.8.4.tar.bz2 704312 BLAKE2B f677bb9ed2c86e6a39953c0565766991e9647224effdc7db2b563f3f491f6ace2f9073ecc8e865d489101a9f80cf964d9775ab81536412dbd4ca85937432de94 SHA512 a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb
 EBUILD iptables-1.6.1-r3.ebuild 3264 BLAKE2B f63b279cc34c5bae77bf29173e20e959d769e9caa7487d7a5d9d2777d70a944a2af4d6a6ee0c4360ad018b625b3b9d2e849b8e6021b97eb1dd505646a6962253 SHA512 4d78e90b73f46fcbfa87bef6d6c5fc1ebed6d19a01b6aadaf55549d897c45e6763470cf1d5e02c381844072a6c7380d4f35ff9b8c33efda0711c7afdfe1c228e
 EBUILD iptables-1.6.2-r2.ebuild 3340 BLAKE2B aad99bac62ba2ec4754e93a211ef82672ad2639011009ade87ead6062221900ec32dcc5bd732fecf3017fd53e22e45d51343e8e6b656768d5d97403ee11daa59 SHA512 744bff7edd5b33d18d8cc28b7f8fba70f692975f2f8f36143524abcd7edec827bf5d7b21b2127ffcb155f542b9520787776968e158af71b1611b1cfad11d463a
-EBUILD iptables-1.8.2-r2.ebuild 3473 BLAKE2B c2132e008bfef0937fe15dc509cc2cc5fcd071229a78ad56b77739ed1350326e19e21057d3f12a2f21076633ae64335b772efd9ac6d29bb38be26caeb93a47b4 SHA512 8e8cc152121f0727cbccfc93abe8738c7ef58a3cb08326322680afe7554d0f4330a32ba03041ddafd08a0a096ea21a94cea2fb76b2efa4a4ebb3bc53e459a43b
-EBUILD iptables-1.8.3-r1.ebuild 3422 BLAKE2B f502fa3cae58d61d1adf102ad65e68c0debb7761070b2bf5a6d51a2dfd34f68736de74e48637e2ee142bd18b7835be4547fef3136bbdcbb949941a645971060f SHA512 95c4b0bafd83fabc8952d80e093a5e90ef65d9ed756f10a88a4b664f43875abc133ec66a95444e92c5cc8e1d9a86a8decefda29227498ef9d7b8b09d1870be39
-EBUILD iptables-1.8.4.ebuild 3322 BLAKE2B 9bd03747b5375f6c234b6ed22833060434fffcd604efc6eac72961a6b280f07d440edbdbb069361dc7de52da789353f874f359ff37503be1dd9a2c6bf5494af1 SHA512 423b929f018d686843851880464e90057a80cdb6b428a7644ef40d5011b776cf1cdaba337c31502ee68aa52438a57646d6cb9533aa65790cd46ae99df651e5f0
+EBUILD iptables-1.8.2-r2.ebuild 3446 BLAKE2B 9cbf96d3253ddf4bdbbdcdd7bd93b384503528c9ca021523236ebda045a0046c1287236ea473967782cc6eff43653ac573b8ca1425b70f85275697282d330fa9 SHA512 068bec8142df4c2cbe1c0019afb8011be2d22bb72820659e0c8a6079b6bdfb67c1671cb2a9a323cad67a6acff677988838fa387c80ac9e1d54b6891add893674
+EBUILD iptables-1.8.3-r1.ebuild 3402 BLAKE2B ff4b46d0c95ec9ae02b269b32234834553e48ca7884c9dd0b8bf719d84a176b79898d7f3aef6fefc8764774f95b2d3f380cb3a1d4dbde78de612181e685de0ec SHA512 a639d8de9b7884ed51e77fadb40885e2dd83011c609d78dc8c55b362ee1f81b066a854b495ca0adba09fbe5cedf572901e23256340a777b8384e6a0333390330
+EBUILD iptables-1.8.4.ebuild 3302 BLAKE2B 81aa119eca2308416f59b6a1ef8250ea623be4b55f95ccc35f23ec7f52769b57c35b34d2142f1259e644ea6a294a036c97aa2a1a1d50b896b44f707973fd35ff SHA512 e74682d90e770cafcdfc475d4951a26f0f6ebe03d950d3729dd86d00d8c9a4fe599741079023670c4db564f984a4c47d393116c3407680b5ef82706576b91077
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/files/iptables-1.8.2-link.patch b/net-firewall/iptables/files/iptables-1.8.2-link.patch
new file mode 100644
index 000000000000..c20f2e54b804
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.8.2-link.patch
@@ -0,0 +1,24 @@
+From ee4fc7c558d9eb9c37035250046d4eac9af3fa28 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 27 Dec 2018 23:47:33 +0100
+Subject: [PATCH] Fix link errors for USE="conntrack static-libs" (bug #586106)
+
+---
+ iptables/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/iptables/Makefile.am b/iptables/Makefile.am
+index 581dc32..2c3db86 100644
+--- a/iptables/Makefile.am
++++ b/iptables/Makefile.am
+@@ -26,6 +26,7 @@ xtables_legacy_multi_LDADD   += ../libiptc/libip6tc.la ../extensions/libext6.a
+ endif
+ xtables_legacy_multi_SOURCES += xshared.c
+ xtables_legacy_multi_LDADD   += ../libxtables/libxtables.la -lm
++xtables_legacy_multi_LDADD   += ${libnetfilter_conntrack_LIBS}
+ 
+ # iptables using nf_tables api
+ if ENABLE_NFTABLES
+-- 
+2.19.1
+
diff --git a/net-firewall/iptables/iptables-1.8.2-r2.ebuild b/net-firewall/iptables/iptables-1.8.2-r2.ebuild
index 65bb18d8aad2..6fdac74e6d4b 100644
--- a/net-firewall/iptables/iptables-1.8.2-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.8.2-r2.ebuild
@@ -45,8 +45,9 @@ src_prepare() {
 	# use the saner headers from the kernel
 	rm -f include/linux/{kernel,types}.h
 
-	# Only run autotools if user patched something
-	eapply_user && eautoreconf || elibtoolize
+	eapply "${FILESDIR}"/${P}-link.patch
+	eapply_user
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-firewall/iptables/iptables-1.8.3-r1.ebuild b/net-firewall/iptables/iptables-1.8.3-r1.ebuild
index 108426718102..52246a8ac413 100644
--- a/net-firewall/iptables/iptables-1.8.3-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.8.3-r1.ebuild
@@ -47,8 +47,9 @@ src_prepare() {
 	# use the saner headers from the kernel
 	rm include/linux/{kernel,types}.h || die
 
-	# Only run autotools if user patched something
-	eapply_user && eautoreconf || elibtoolize
+	eapply "${FILESDIR}"/${PN}-1.8.2-link.patch
+	eapply_user
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-firewall/iptables/iptables-1.8.4.ebuild b/net-firewall/iptables/iptables-1.8.4.ebuild
index 890475e4e57d..8cb78dfb30be 100644
--- a/net-firewall/iptables/iptables-1.8.4.ebuild
+++ b/net-firewall/iptables/iptables-1.8.4.ebuild
@@ -47,8 +47,9 @@ src_prepare() {
 	# use the saner headers from the kernel
 	rm include/linux/{kernel,types}.h || die
 
-	# Only run autotools if user patched something
-	eapply_user && eautoreconf || elibtoolize
+	eapply "${FILESDIR}"/${PN}-1.8.2-link.patch
+	eapply_user
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-firewall/itval/Manifest b/net-firewall/itval/Manifest
index 677e8d8b7809..0bfd23f4d3c4 100644
--- a/net-firewall/itval/Manifest
+++ b/net-firewall/itval/Manifest
@@ -1,3 +1,4 @@
 DIST ITVal-20121104.tar.bz2 71398 BLAKE2B 6d3b67d7089a7c940c54fb5b5f577624ef935ce785c2a81a03f76bf4d4ced5258d55db9d59894b75ed366681e08d390d1293247fe301c3b179af7e6eff5eb607 SHA512 145f464154d0c88e6c43a16a6ea59f3f6f525612c99032bd5acb934975d46568a40b25996a92d63d190afbe2f129010fb7cdb843dced9eae4ec925b97ee17eca
+EBUILD itval-1.2_p20121104-r1.ebuild 632 BLAKE2B 2782c989eaa1cbd2e7a5ac12f539970bd92cd9cf7c5ef464ce6f0563617fe211dbc67264a7dcd23a58e1860979d43435a3669f4f0032b7fc0b18657242965d0e SHA512 05675b7677c2ed3bb5d2bdbf2f9dd9301e864deebfd3306c5e1220c32ae9e6fdbc60a12806e4f24d17ef8a376b7be5d8afcc50f35a8e499a35b32ccd51f37ecb
 EBUILD itval-1.2_p20121104.ebuild 691 BLAKE2B 514e5a504582a5e532b3b345dc781b72e2c098c23772042b001c051c6738f530d6216e58200b78b9f86a82490e67f49e98379df76f3a542ca3676034b29dc8d6 SHA512 6bb6448aaba54292ea29ab788bb5b5da15b09f6b431c3933f98f574005e9ede3fc7bc939253692d42a3194b1a723e5813799ef837be673508bd5a84d8e163324
 MISC metadata.xml 355 BLAKE2B e335014fc880fc7dcddc6b2dd12ee3028a3f6d1743db5f5effaa4bd88ad6970eae01b381850d1baf8824525cf15bd277bbfd3b55ee9ed543064ed26221ca22ec SHA512 5d2237882022cc28ffcf8f5bf3fc1884d7b18bda49ffb6b3b7ae878e0e47e4b775e268601a031e0aecaeae5b1067a61efb3e061f966150bf20189e3a60eb2df5
diff --git a/net-firewall/itval/itval-1.2_p20121104-r1.ebuild b/net-firewall/itval/itval-1.2_p20121104-r1.ebuild
new file mode 100644
index 000000000000..9c18be099470
--- /dev/null
+++ b/net-firewall/itval/itval-1.2_p20121104-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake
+
+MY_PN="ITVal"
+MY_PV="$(ver_cut 4)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Iptables policy testing and validation tool"
+HOMEPAGE="http://itval.sourceforge.net"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/fddl
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+S=${WORKDIR}/${MY_P}
+DOCS=( AUTHORS ChangeLog README RELEASE )
+
+src_install() {
+	default
+	doman man/ITVal.n
+}
diff --git a/net-firewall/lutelwall/Manifest b/net-firewall/lutelwall/Manifest
index f62bcb7efcbe..565898685f00 100644
--- a/net-firewall/lutelwall/Manifest
+++ b/net-firewall/lutelwall/Manifest
@@ -1,4 +1,4 @@
 AUX lutelwall 354 BLAKE2B 27d2a5092f7c3bc9dcf505762378571e1a2c557790a05648a8c630f275381c764ce68e2e2bdf8594697e7058e8d9b41352f0cfd7df9af3b87298a9f9b55a9526 SHA512 43b9c9ba93d65767bfc1d6a36ee4acb98a3d671784d021a0cf501390b79d9d38c0913b63c693098941868fc65c17a1625f087e679a0fcbb9a3adf5f6009be4e1
 DIST lutelwall-0.99.tar.gz 29209 BLAKE2B 1f9e0c1516105e271ea3fc0ab51cdb4957a86ce725e305ef681951960f84029ecb8b911a1b49827dec67b00289385e8a62a5c90529463057859aa3d130897d39 SHA512 8812048c9e4ec3beff2214ed3ceb2d980d769ada686a934af22baec76a3670e51ddb171097adbfb78c63ce9bc25554b1da93ec8c86f59457277fd4651cf1068c
-EBUILD lutelwall-0.99.ebuild 674 BLAKE2B 36d98dbee79abdb11b6d83740d01505aa661f7c318b44b198f8391d7bce13667a11eae43fbb7524b1bbb08d9463a07e133ff1248b46b1076abf9442e96b6bd0c SHA512 2df911e9bd0bca04b6d0ea6dac3834b70fd556e41c2f25286f601bee2eb3408de700110710ba1e12e3b53001cdab381b3c3955e47abd59fc61e938c8030ff936
+EBUILD lutelwall-0.99-r1.ebuild 673 BLAKE2B a001d2687942b286ea3f268afd0a8db93ed6132f43e5907a06406fb5e6e82e0b2c256b6ea9a22f9aaca858bd75631b04a4b3590f072e87bc41c20a8cbf147b6a SHA512 afbc83a04b42793174e1c4d6318986592ee0394dbf9cc043d2af7523cbf53922dd3d0043c5e106cd6664233620f4e6678c2571f3bd2b1a9fce60f2e63ef93f3b
 MISC metadata.xml 869 BLAKE2B 8fae2c62b1e34e2f35ca01da9746a78b36c9fb2a0318717d7c5ae9e6d698ebbfe969b8f9945c10ff50db399c45539bb4f63bff1adc66a2efd4ed5a4efd724035 SHA512 a4326ec5c7720e296a1e74ae39eafe359a3d0d919112ac6f6f6522dfbfd89ffbb98764a952d110c93df6f84dcccbc942c7902e3ad06dfdc18788d45741862755
diff --git a/net-firewall/lutelwall/lutelwall-0.99.ebuild b/net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
index 05eb0624495b..e167c836d934 100644
--- a/net-firewall/lutelwall/lutelwall-0.99.ebuild
+++ b/net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="IPTables firewall setup script"
 LICENSE="GPL-2"
-HOMEPAGE="http://www.lutel.pl/lutelwall/"
-SRC_URI="http://www.lutel.pl/wp-content/uploads/${PV}/${P}.tar.gz"
+HOMEPAGE="https://www.lutel.pl/lutelwall/"
+SRC_URI="https://www.lutel.pl/wp-content/uploads/${PV}/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 54925b9d4067..66841225a5e4 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -13,7 +13,7 @@ DIST nftables-0.9.2.tar.bz2 779850 BLAKE2B 40bf9ed956a126048f27b343afc7aa4f6e34f
 DIST nftables-0.9.3.tar.bz2 786759 BLAKE2B 578276d861fdb2b843223aca1276bbc1dda9627d0058259a966e324e30ee64d8c102d1e2cceb82d29143caa9dcd1a4492df168f1c87b136fc7b3a1a7dc8568a8 SHA512 d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43
 EBUILD nftables-0.9.0-r5.ebuild 2886 BLAKE2B bea596aa70ac2317ad61e3ee2bd27e904c3004124e7a79fa91cd4177e0fc09fc82e9181e97766079c6005de2f0f5c04ccabdddd376865884b05f1660a049360f SHA512 44aa02207ec3db7ca91b9969847b82ed7d417b4ae7cdcd5a0fb54bb99d492be7ed3f56321d6d12757289912030016e0a1a2c6be8b4b93f40983d012c02f0e4f3
 EBUILD nftables-0.9.0-r6.ebuild 2869 BLAKE2B af739ee33b4666216d4bc049b3c5f274a90a3f906ef72a60ce433848cc4cf2801c5ccc9fe19945fd36f3da821ddbcfbccb7af510dbc4df2b0b35c38c39529ba7 SHA512 50bb9e432f6b4de5aaac7010799a915841b870ab49fe6b1636fe1e0ce8dc0bf60a1fb1bc412c24af9b66f886bc41d9a7f77ffa092db2b8d84d83213d79c896fd
-EBUILD nftables-0.9.1-r2.ebuild 3840 BLAKE2B b7b25df46be1b669c74f4d20fb66fb0d703c8961d4802c637b594e1480a2fe6acbeb54fbe6d0da762e969e80952b7b10f366997ea0e8e80947d6035ce82870d5 SHA512 adfaaf35014f398710fdfcb4c0f572a8f5a964d1d044d1b3f88d21de400d5789fde8bc7b7e0a51dd17fb8cd29d2b8852b7a1fd708f4187c1d236d44a874aa7bd
-EBUILD nftables-0.9.2-r2.ebuild 3743 BLAKE2B d8ec11d829b812dbd829b966d2578d207b0a9d21963bfc2764394abba6175157bf0980b51690731cbf0581558cd902aeb0797d5aa0bac60a9cdef6699f99ff6e SHA512 9751e9d562e677c3927ce3cc19d86b978b5dfd5502ee0a31e5d8d10031e994751f97bb53152ac1ccbc1fc030e57851edc14fa33e6bd0a0240fa540217e8b8840
-EBUILD nftables-0.9.3-r1.ebuild 3752 BLAKE2B f963feb1307a691b4735feefd0ea07f2beedb87663197e22c090918dab51c836760264cb5fc1df1244d362bc4c286a5c50b9eefa3e087a06c31b84a018f27ecf SHA512 5846aaa9cabde88d0b7bbacc3383c849eb666537796ba0a1dae1b0e42979c76d8a8050f55c351954d52815bdc93aaad58637213dccceb5d6bbe426f452907744
+EBUILD nftables-0.9.1-r2.ebuild 3838 BLAKE2B c2e56f1b280a899848a052ef5860fb50de0130c2896fc34271514ab2e9d6365a9df2f2adbcc8813eb84a69c802e6cd51240d21784dd7325e5493f0e56d90e334 SHA512 440efe48987ce9eec72b4ec47b7258b36adf3f666c4bee60f687eae9f0ae6b4977f8905648aa7b8b30375163bb0b69005f035b663762f58ec9ced3db642d3eb1
+EBUILD nftables-0.9.2-r2.ebuild 3741 BLAKE2B 1aefcc28925d397aa277214069c8f03f9974028f44d8a65742fc9fb4d85c553b8d2cca9f468d05fdcb21455bdbca62be5398dcd5aa868a8f3d72dfe2cd87d278 SHA512 3d3229de926b53f4ec6104ba791b00f8cd30e815a1463c75d282d4321952ced419fc227e8326a1d1e91e76fbfa5db23d09061ba7cd184665682e22de12928627
+EBUILD nftables-0.9.3-r1.ebuild 3755 BLAKE2B 10d85519f8b2954c8f7708e9b289d32d7237e2f4e315ba9d2517422126a4e40b2be3c3a9f3b386c71c1070ea54be4fb4393f9e18ba4d5bb45ed84f67d3b1b393 SHA512 9f305aee9146e9c0bc79d9e61fce26ecfbbe9f28fc308bb7fb29ed46dc8709d2e1d2009f1ffc34118e319f86926591a094bfd801604f7990b6a5cf2606b4fb82
 MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
diff --git a/net-firewall/nftables/nftables-0.9.1-r2.ebuild b/net-firewall/nftables/nftables-0.9.1-r2.ebuild
index fab18474325d..adebe58c63c3 100644
--- a/net-firewall/nftables/nftables-0.9.1-r2.ebuild
+++ b/net-firewall/nftables/nftables-0.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools linux-info python-r1 systemd
 
diff --git a/net-firewall/nftables/nftables-0.9.2-r2.ebuild b/net-firewall/nftables/nftables-0.9.2-r2.ebuild
index a6478ad1215c..99f33eaaa6c3 100644
--- a/net-firewall/nftables/nftables-0.9.2-r2.ebuild
+++ b/net-firewall/nftables/nftables-0.9.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools linux-info python-r1 systemd
 
diff --git a/net-firewall/nftables/nftables-0.9.3-r1.ebuild b/net-firewall/nftables/nftables-0.9.3-r1.ebuild
index 7f18d19e3468..93d6929a9423 100644
--- a/net-firewall/nftables/nftables-0.9.3-r1.ebuild
+++ b/net-firewall/nftables/nftables-0.9.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools linux-info python-r1 systemd
 
@@ -14,7 +14,7 @@ SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86"
 IUSE="debug +doc +gmp json +modern-kernel python +readline static-libs xtables"
 
 RDEPEND="
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index f393a766f369..e87575442bd4 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -14,6 +14,6 @@ AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0
 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7
 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.35-r1.ebuild 5633 BLAKE2B c341332bb14990b28cb2a00a67069ed4b9369ea69b6f3b655c5379e0ceea48560b475442e431e5a16c8b1c2811fb124bed52bcee1c254fd4a30cc03abf04e9cb SHA512 4ae8fe284f05e22f86bfefbdc048594f8eef2ba55b0a990b4d0f9796e92497aa3462f35dac78a49073ba71c7631fabc5b849c2616746ce477e18112efd533046
-EBUILD ufw-0.36.ebuild 5719 BLAKE2B a789b61f2ac8c99f81d57a7e9caaa7427b8c976f76c28c8f42b1840f5eae2f5a2db8bdd3d131f1cd69846263f1cf8c7763d377f9be2d3b3af864e8453d25f958 SHA512 9f0fa61626454d44b01eb9fecde3728ba3a243da74d9b1643e07fb6d19772d16baf3657ae99fc9db9e39cf8b71d0b36d9aa5b1fe046fb192607812aa4e1adde9
+EBUILD ufw-0.35-r1.ebuild 5629 BLAKE2B 94b1a98c73f0983e1661f58522c42d73c39c72e12523214ea10578945359f9dfe36a66726b359d64c442236efd274217c3a2b5a6e6ad620dde08e3059fdd1f16 SHA512 88336d6dc300202d8d25dcc1ef853b2b59353e97bf91947168543ef1b4709ec79f1d01d72c601b7549b2ca08ce45122d5d994d46a79450fde6d90f9d83cee625
+EBUILD ufw-0.36.ebuild 5715 BLAKE2B 75e8fe678dd451321d9007d2e5e3db754efd3f18748f5057263d83e510391e9a655372889a3a0540c4b333ce15c6ad49991224cb9d60ef12f64e544b4d6aaeb3 SHA512 87ee083edd1e07bedce5e8ec35aac7bff80ca4189bc88ed22b15646e9401c0291a4d41c6c1e85ba9f43eca4d33383c18e36722941e408f77cc7cdd122bd95cca
 MISC metadata.xml 867 BLAKE2B 803f1809161a81c013989270661d5e17bc74c9f02dd7c2cf9e7847b86072ea56fc5ad980a6f2d285ee1d806902621ff1100ac20bbc27465e828aec4537e846c6 SHA512 e11ddde14aa8fb8aa187537f3cfeb01b26b4421489d69223fc77ab4400b002105d2b8161ebf489748eb42b615899f87c1abc65d10d7ef40b2f107f0d85c17c77
diff --git a/net-firewall/ufw/ufw-0.35-r1.ebuild b/net-firewall/ufw/ufw-0.35-r1.ebuild
index 2265a2786702..abde803eb42f 100644
--- a/net-firewall/ufw/ufw-0.35-r1.ebuild
+++ b/net-firewall/ufw/ufw-0.35-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,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 cfddceb52bb1..01f7c4afdbd6 100644
--- a/net-firewall/ufw/ufw-0.36.ebuild
+++ b/net-firewall/ufw/ufw-0.36.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit bash-completion-r1 distutils-r1 eutils linux-info systemd
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 1cf0f9f494b8..360367bc8976 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,5 +1,5 @@
 DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497
-DIST xtables-addons-3.3.tar.xz 322676 BLAKE2B caea009b76e813d72a0490ac961be8e97340b6afda078062104ad8a320d7e6e673450232a0f670829b616e07596397e72c51c8d21f905c664749de6301dec12e SHA512 76e76f8cb385d1f471b01c60be1561910123a4a083374a3976fae98943197c3e77fad62363addba8d14d0aaf23713df9a10a22b1906bbdbb702a61c297d3cb3c
+DIST xtables-addons-3.7.tar.xz 325124 BLAKE2B e7f0bff03f0b77b55cd578c5a77ab4a306fa5a5cfd3b7e5b801b60d4ccc2c5a476fee2b04f4cb8db4b3ab34c7dab353ec13cba1fe98a714cfbb2e89e3110841d SHA512 336f19596251507a88d7c399f9a3e6f517e4b72787ff7e7108e20e42e68932bca0eed79c54ddfa92112daae73a94a7349a874bcf993bd4abea1d875d7f2b8565
 EBUILD xtables-addons-2.13.ebuild 5499 BLAKE2B 165def630f60562886928e7cc45a58c2446dc345745fcb0bc8245681042d88eef72001c3d8c2c86d085bb7dd9596567f64366319bf4e403146459355fef30c62 SHA512 fce73d0812ae0923585fd5d02878677a8364cb5c256e411ff579bd60ac446188981c72bf534dcc0168098d727c404d567e42855aa24474c874ca562ec1e017ac
-EBUILD xtables-addons-3.3.ebuild 5471 BLAKE2B d0d15134eaa4adf16cbfeb289dd3bfbbf3fce8635e0448a23298e3e275016a735fcbe08fb1427de7203344a5c24eb839d6eedae360ab4bb238378a03abac7057 SHA512 f885f314f54bf2b26218f7daf06c763e004f19d2e36f3f658cff75f428a2ce5891ebd555f7b5464db129d6d419a4aca9339dbb2e5b861a30077e13f678a4ee8e
+EBUILD xtables-addons-3.7.ebuild 5471 BLAKE2B c7728f379a0f445a6bfd93a9ef2ded1582cd27ba15ba72aa1a978df4af888d19e290b97b3c5a1ef67e19b54b54671770f873322b956e940a631209255dd87ed2 SHA512 54612f910f350f2bb8f14544b253a5132f3cb3515007d483968dac7cf560b4b68a33201a766d33c333d4f1d777bd16db5bb09cbcc46dd6836eca5047cf53aba0
 MISC metadata.xml 775 BLAKE2B 3462baf963682f15042f1fe9a985fdce50d46abb5fbe1080f6ce5285314a3e24581d780d84112a5bed0a4a132ce17f29678983711a38745d0fd7969091e76182 SHA512 85474ba552703d77bc7cc18ccef424f5eeb68e23eb41e14a8c360afcdcb2632a99420fda2dca57ea15dbda3f850d939c16b18cbdc96dbfcf31a6af3f40743f0c
diff --git a/net-firewall/xtables-addons/xtables-addons-3.3.ebuild b/net-firewall/xtables-addons/xtables-addons-3.7.ebuild
index a19790d7af14..b87050a6cf2a 100644
--- a/net-firewall/xtables-addons/xtables-addons-3.3.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-3.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 MODULES_OPTIONAL_USE=modules
 MODULES_OPTIONAL_USE_IUSE_DEFAULT=1