10 files changed, 21 insertions, 330 deletions
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 9dd7d8fd6ef4..091eaa5a3c40 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 69a9e2ea2f5a..3909583ea2d1 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,8 +1,8 @@
 AUX firewalld-0.5.1-errorcodes1.patch 1491 BLAKE2B 63e10fa5628fdb766b03f544ec16f095a0c1ff0de92af0d2f959f209e842af0cd53a24165e4fc06e15dea35f933387c25a3289049e828409d2aede00d1dfa3cf SHA512 3f293d48455f9ecfd454eb2cb950b853b0bc43fd709de291a963e9a62cddb1685c7a8bffb735178f79966fc2a8031fdb382c61fdadf8dd0134741741461e7ba6
 AUX firewalld-0.5.1-errorcodes2.patch 1465 BLAKE2B 67da2f57a445113ac0334af5f58cd8425e11153d7b6be6183614d31897527afa5d24dec72a6102805ec14f1fe18ab72684e545d352672c950077e26d842f279b SHA512 92c34604f4e22e4e647255ffa51528c7daed9fc738c3fe118e51a2263732c24c416ab0604dbacb86601d9e9b247cef56c74024fc0eb2550c42b9b57b999fcd39
 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 2839 BLAKE2B 5560e10a2c297e5f0c1f51ee28a2ecbdcfb14b5f38235b19719b1c33bc12f763c7138e50cdf2795157ab09f4e4cad4d49f05e0a6036ae22fb60b74f03b14386d SHA512 2d26fbf9c9d2fb507d8da8c036ddb3ea81a4d95c5dc64fec2baf2bdce76271a69d40fc6ba8979da0e8d17d6f989cc036ce7eb3fbc81630365cbcafdc926e23f9
-EBUILD firewalld-0.6.3.ebuild 2514 BLAKE2B 0a3982fb6a2bdbf30968867247563a2760432aeef24d014d0dcd122876515f5bc9472708eca28ec99a9e3c93b54b6534541c7c4b12e75770902f07ebd37af8f3 SHA512 06827644dad6f6d64b0461d3b53c9550285689e7eb0aac6d2df852fc7fe4e141c3e866c71610f124f97d145b415d77e6caf9a786a9b35eed832172da382a4219
+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
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
index 6b6f2a4cd0b3..cd1dbb2e527e 100644
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.6.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-firewall/ebtables
+	|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
 	net-firewall/iptables[ipv6]
 	net-firewall/ipset
 	net-firewall/nftables
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1.ebuild
index 7f2c39160ee6..275e832e3802 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit autotools gnome2-utils python-r1 systemd bash-completion-r1
+inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -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 ~x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -22,9 +22,10 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-firewall/ebtables
 	net-firewall/iptables[ipv6]
+	|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
 	net-firewall/ipset
+	net-firewall/nftables
 	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
 	gui? (
 		x11-libs/gtk+:3
@@ -37,7 +38,10 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test" # bug 650760
 
-PATCHES=( "${FILESDIR}"/${P}-errorcodes{1,2}.patch )
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
 
 src_prepare() {
 	default
@@ -55,25 +59,14 @@ src_configure() {
 		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
 		--with-ebtables="${EPREFIX}/sbin/ebtables" \
 		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-nft="${EPREFIX}/sbin/nft" \
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
 		--with-bashcompletiondir="$(get_bashcompdir)"
 }
 
 src_install() {
-	# manually split up the installation to avoid "file already exists" errors
-	emake -C config DESTDIR="${D}" install
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
+	default
+	python_optimize
 
 	# Get rid of junk
 	rm -rf "${D}/etc/rc.d/" || die
@@ -92,16 +85,15 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
 	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 6834a240df2f..917e3dcdcd98 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,6 +1,5 @@
 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-r1.init 2766 BLAKE2B 1941ba5383055bfedd57b8eb6a390cab5fc3438bcf9f2b03a31f7a417ac7c2abaa590d23a8ae4500595c9bbb83da852e27d71f672a2758fe0be45691a461105c SHA512 9b74344043f48ce2a4691f09199cfa752bd7ee360d912d412fe1cf51de54821b0d082c9585a11b84020454f9759af78ff097d7dfc8f5148ef9e987e6d990edde
 AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70
 AUX iptables-r1.confd 890 BLAKE2B 0aaca870e3c03f19a71cf1b210377dfda320faf118359e298bef419eaf280fd11c9726d200ae89602e863c9b48de0bb51ac05424b50c064afe948a980e300153 SHA512 10002da01ded6be0e9bca6041798ad0859fa2212fde077a048443e4f3012c95d86e4580ae426e87af5891368062af9af6f9fd35ed617d24cdd3c51702b816b13
 AUX iptables-r2.init 4384 BLAKE2B d11be1725e25d234e01af86c82d3745fd630b15b3ae2228845c5555db5c2ffdcd920fd565480f76ab91ef2d5b26f9ae96432efc288a1b9aa2abfb5b9bb01d7bf SHA512 8897ab985424c895e261e0fe521921f0da8e09e38394655b0f91c65c0e8f603731faf70489f7a6610c83d6c2fde75f92f309405d72277643165a847e62238df7
diff --git a/net-firewall/iptables/files/iptables-1.4.13-r1.init b/net-firewall/iptables/files/iptables-1.4.13-r1.init
deleted file mode 100644
index b410b4ff52bf..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.13-r1.init
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="check save panic"
-extra_started_commands="reload"
-
-iptables_name=${SVCNAME}
-case ${iptables_name} in
-iptables|ip6tables) ;;
-*) iptables_name="iptables" ;;
-esac
-
-iptables_bin="/sbin/${iptables_name}"
-case ${iptables_name} in
-	iptables)  iptables_proc="/proc/net/ip_tables_names"
-	           iptables_save=${IPTABLES_SAVE};;
-	ip6tables) iptables_proc="/proc/net/ip6_tables_names"
-	           iptables_save=${IP6TABLES_SAVE};;
-esac
-
-depend() {
-	need localmount #434774
-	before net
-}
-
-set_table_policy() {
-	local chains table=$1 policy=$2
-	case ${table} in
-		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
-		mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
-		filter) chains="INPUT FORWARD OUTPUT";;
-		*)      chains="";;
-	esac
-	local chain
-	for chain in ${chains} ; do
-		${iptables_bin} -t ${table} -P ${chain} ${policy}
-	done
-}
-
-checkkernel() {
-	if [ ! -e ${iptables_proc} ] ; then
-		eerror "Your kernel lacks ${iptables_name} support, please load"
-		eerror "appropriate modules and try again."
-		return 1
-	fi
-	return 0
-}
-checkconfig() {
-	if [ ! -f ${iptables_save} ] ; then
-		eerror "Not starting ${iptables_name}.  First create some rules then run:"
-		eerror "/etc/init.d/${iptables_name} save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ${iptables_name} state and starting firewall"
-	${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	checkkernel || return 1
-	ebegin "Stopping firewall"
-	local a
-	for a in $(cat ${iptables_proc}) ; do
-		set_table_policy $a ACCEPT
-
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-	done
-	eend $?
-}
-
-reload() {
-	checkkernel || return 1
-	checkrules || return 1
-	ebegin "Flushing firewall"
-	local a
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-	done
-	eend $?
-
-	start
-}
-
-checkrules() {
-	ebegin "Checking rules"
-	${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
-	eend $?
-}
-
-check() {
-	# Short name for users of init.d script.
-	checkrules
-}
-
-save() {
-	ebegin "Saving ${iptables_name} state"
-	checkpath -q -d "$(dirname "${iptables_save}")"
-	checkpath -q -m 0600 -f "${iptables_save}"
-	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
-	eend $?
-}
-
-panic() {
-	checkkernel || return 1
-	if service_started ${iptables_name}; then
-		rc-service ${iptables_name} stop
-	fi
-
-	local a
-	ebegin "Dropping all packets"
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 8cdc0e98e75d..f80131a2fde7 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -7,12 +7,8 @@ AUX nftables-mk.init 2090 BLAKE2B 62f56586ca4ba0acbd3ac41f4904041d625388771bbafc
 AUX nftables.confd 655 BLAKE2B 5512be1edd43e270941de3d9b66fda69e4afd7c7e6e970b232a044c2fd64f8e50b9b55a4fe670174c3eabf3d176ee0158c1043baec4b76b0802e7e97bc862fcf SHA512 8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144
 AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c89b59fc7e3ea0dff0e98d767cee2c00a5462023fdf6f59e813dec7063768a34187f2404377e498f7 SHA512 ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
-DIST nftables-0.8.5.tar.gz 355403 BLAKE2B 124bc5c35f050cc591f57b39cddcd595f97d14f83aed464b42efed272a03150623667dd0ca2862833c6b86d825d264c79dd1a211b9a6913b5734c0eaa4029b13 SHA512 311ec77646e2bc7da1b46ef2aba7492a5c0fdf23d33633649a6304771c5ce5ad839353b0702e942a82508c01d1c35705b602d91e54913944e03e176dc3f855f8
-DIST nftables-0.8.tar.gz 327629 BLAKE2B a484c22ac010f68fc7458c12cabd0c35e474a0bf81fa4edbefba12d75b424898d38adb11a7fbb4542efbbb2d14be823701b3d9ced7b9fd669338366733fa169b SHA512 90ffebc338c121334ca42822793b6fdeff48390e755c690308919de47064b53f9af735a2c2914e5255f1bddec90484599337d4cdd67f7a01a3956deefcef9fcb
 DIST nftables-0.9.0.tar.gz 417981 BLAKE2B 4dfba4d71928f1694ffeb4871353fc373d88e23c5ba716e726e1e6aba0efb2703233528f7a408bfefe47bfe54aa3612cccab9742c2a2208ec8c7a4bcda0e1823 SHA512 78e383bad5440c9414202cf0e4b6749fc5c01071d2fa547208e61cea6e7e179933990e7e538a60696eb0a7cf510d2c4b273a91d50287bb51507d244cd2875aed
 DIST nftables-0.9.1.tar.bz2 764066 BLAKE2B 26b194d6b3b970c05348c32a3ab21e8c25fcdb0d09d3d6b467198ba23a5bb44e7b6450d3efb86c39a488df4a837885c4a1ab96c197d5449f7de49b7b18ff5f90 SHA512 e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242
-EBUILD nftables-0.8-r3.ebuild 1959 BLAKE2B a029fd4444f5aeddedfbdcb3659f879c4a8f6246c25042449cb5ffa7809401a7ef512275dc1f45c50b51bc2807b3679d1c386bcb2470522ba1a338dc728bdb15 SHA512 6bd510183e9d1cec3fa05970adccf28ac21c7ad839f3a6236ee584d1308c48988ee2b006630ecd558954cb80a7a8faf6e78ab9b06b29df4b2a69161a9e848c71
-EBUILD nftables-0.8.5.ebuild 1937 BLAKE2B b24ea2b8978dc0294c2d27a90aa205916ddeb04c2b66f0adc7e870705a6ffac8ac0e3bf5a95e3c79c27965f780c0ca94ba21bcb5abad49ce49b50ff00c2046fd SHA512 f5f461225c68ed17450380d467f79d87302f0d1c1d69ddb15f90b6a938ea79906e165e6564db8135f07eafc35fb89acfab7659a97d62c7c71ac0376953ff6954
-EBUILD nftables-0.9.0-r4.ebuild 2498 BLAKE2B 46c0e388ed499ae4bcae60c8dd0d44d59c7dad3b2f6bac02c111487c9e3f7e298b92dc6d5f91cebbb682debe531879f20a7b784fd39282433792b2ccb05306a9 SHA512 445045a2f3afd1d020c5e42e9737ff6adf230cdba4e9e398a2388cfff2c1f04a5c005398c235ba2ac877cb4244ff69f4c2383b096d90688b5118649e15cb618f
+EBUILD nftables-0.9.0-r4.ebuild 2497 BLAKE2B 17916257a8fd7934348d4ceddcbead2c50a24954bff6b50e9f13ec5da2351935c3310be2c6749bfb94141523ca2157e6fe84d89bb7b56914f4f3a0553b7e58b8 SHA512 bf2036978cc0412b677c9117512db14c7344747e19f3fe1b2ef6a7d2b750cf64b33c41bdfaae55f8cfdda19c7f376faadd16a626816672a05b70b11d77231ffc
 EBUILD nftables-0.9.1.ebuild 3439 BLAKE2B cc4cc8af10d494b52a1b1c1cb826983fbe04bf62d7c11aa25bb7c8b11189feeb6e69b2437276574ff0dd9f41d680fcf3e5b19f4d62e17324a3129eeb4c521594 SHA512 dc05bd17223ad8106259170681b2ca55af02842ea1f1eb9f809b93f829c0930a9cfdd06df8922faf6c5d8e54b2d59ebc5516da1ba7eaa8b264e04aa6466fc4ad
 MISC metadata.xml 918 BLAKE2B 16404ad621319f8a8e93e39d8586aaadb0f6fc6989ee928605a8e5e00f581c5f84b11b9718958667a2f76722950a893e5d6097ff2f242961998ac7b092901489 SHA512 27413ba6b81e930b13ae55292d1c308b54b173cf120430d5462313cd8052834bd01e272978b3ba1d4b9f1be99215a90446b2e93bd0a502d328182706be40f02d
diff --git a/net-firewall/nftables/nftables-0.8-r3.ebuild b/net-firewall/nftables/nftables-0.8-r3.ebuild
deleted file mode 100644
index 2c67f3c09eda..000000000000
--- a/net-firewall/nftables/nftables-0.8-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ia64 x86"
-IUSE="debug doc +gmp +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3:0=
-	gmp? ( dev-libs/gmp:0= )
-	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.0.8:0="
-
-DEPEND="${RDEPEND}
-	>=app-text/docbook2X-0.8.8-r4
-	doc? ( >=app-text/dblatex-0.3.7 )
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-S="${WORKDIR}/v${PV}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable doc pdf-doc)
-		$(use_enable debug)
-		$(use_with readline cli)
-		$(use_with !gmp mini_gmp)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	dodir /usr/libexec/${PN}
-	exeinto /usr/libexec/${PN}
-	doexe "${FILESDIR}"/libexec/${PN}.sh
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-	systemd_enable_service basic.target ${PN}-restore.service
-}
-
-pkg_postinst() {
-	local save_file
-	save_file="${EROOT%/}/var/lib/nftables/rules-save"
-
-	# In order for the nftables-restore systemd service to start
-	# the save_file must exist.
-	if [[ ! -f ${save_file} ]]; then
-		touch ${save_file}
-	fi
-
-	elog "If you are creating firewall rules before the next system restart "
-	elog "the nftables-restore service must be manually started in order to "
-	elog "save those rules on shutdown."
-}
diff --git a/net-firewall/nftables/nftables-0.8.5.ebuild b/net-firewall/nftables/nftables-0.8.5.ebuild
deleted file mode 100644
index cc5cb45fc15d..000000000000
--- a/net-firewall/nftables/nftables-0.8.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-IUSE="debug doc +gmp +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3:0=
-	gmp? ( dev-libs/gmp:0= )
-	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.1.0:0="
-
-DEPEND="${RDEPEND}
-	>=app-text/docbook2X-0.8.8-r4
-	doc? ( >=app-text/dblatex-0.3.7 )
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-S="${WORKDIR}/v${PV}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable doc pdf-doc)
-		$(use_enable debug)
-		$(use_with readline cli)
-		$(use_with !gmp mini_gmp)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	exeinto /usr/libexec/${PN}
-	doexe "${FILESDIR}"/libexec/${PN}.sh
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-	systemd_enable_service basic.target ${PN}-restore.service
-}
-
-pkg_postinst() {
-	local save_file
-	save_file="${EROOT%/}/var/lib/nftables/rules-save"
-
-	# In order for the nftables-restore systemd service to start
-	# the save_file must exist.
-	if [[ ! -f ${save_file} ]]; then
-		touch ${save_file}
-	fi
-
-	elog "If you are creating firewall rules before the next system restart "
-	elog "the nftables-restore service must be manually started in order to "
-	elog "save those rules on shutdown."
-}
diff --git a/net-firewall/nftables/nftables-0.9.0-r4.ebuild b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
index edd756eca79c..e56ff112a6b7 100644
--- a/net-firewall/nftables/nftables-0.9.0-r4.ebuild
+++ b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
@@ -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 ~arm64 ia64 x86"
+KEYWORDS="amd64 arm ~arm64 ia64 x86"
 IUSE="debug doc +gmp json +modern_kernel +readline"
 
 RDEPEND=">=net-libs/libmnl-1.0.3:0=