gentoo Easter resync : 12.04.2020

10 files changed, 149 insertions, 331 deletions

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 0725650ba22b..c318da90eaa6 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,19 +1,16 @@
 AUX libexec/nftables-mk.sh 1070 BLAKE2B 30d8109d74e7d8c4f51c753f676f91a1902ad42f6d68662f1191ff73d2a43a1bf49fb795f3763705f8aeb0a4f22cab0006a943e01adb188f1ef9eb05125dfdbd SHA512 a14e48f014f75c7e611bf2a653d9760804754febd1ae4543f78abbfbe60c79f5aa07c5fd53fe26bb74b48fcb8cb8aa78274771212e41c42db031e8c8ba7e81d2
 AUX libexec/nftables.sh 3665 BLAKE2B 74362a4425e974e74e7b895980002f0ded2ecbb4731bbf956edb56ffb9f1ad394802c4eeab3af3735eba4d8e71572a5663e564ce4e7fad76c9715043b90c1b43 SHA512 6cb1ac0928ae2da5c69764d45c52a661a6d72698bb9edd6a603580d2f9bd82b59f2a2661e7569ade3a3b729459d115004f251ad6a5eac8cdf1d38c65bfa9349e
-AUX nftables-0.9.1-avoid_dive_into_py_subdir.patch 1097 BLAKE2B dfb2b75226f54ec6af270de97edc10d065e5a9842654e8c6e5c13f3dbc7550e9a4bce90626418bf618d5111c4fbea4a361797e794150923286454c8fe4386b4f SHA512 cbcbd8897f3659771edf53df26f2741e0803d1e8d48180889d687122f986d39f412a88afd1c6d4cf0b7709d024d0c648065dd30714d1401718068291320b84e0
-AUX nftables-0.9.1-python_build.patch 1490 BLAKE2B 9cd50eaa93c315752f545827acc03629a349e46542ac884783b4494a8ec8d37d2270de9c13d67c49b91ba1ba510f32cd0fdde520a01957527633c1b860f3c3d3 SHA512 d3cd35b42203112b4423cb89eff51bccb63e18f2a325cf9b486cc8db367892d1afea941198a66c6a671df9324bd7cab39ed4cba7d0447f6bff10861a5cdcfda5
+AUX man-pages/gen-manpages.bash 1797 BLAKE2B c93cc311570abd674a12eb88711cf01664f437b8dc0fb4de36194f36671d92c35e04fcff6c56adcb0e642f089169f63ef063736398584e5e7ce799bf55acf2ff SHA512 ea3291412ce13d9dd463403fcc11c665c9de63edaabdecaf55e051b52b0ff845c9c7d63a6c4c08e4d2d94428815fe11daf9b7390081b4e9de4774e188b9ea677
+AUX nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch 1132 BLAKE2B 49d938450bd0e7b09266c2e49ac09aa2bde5f4ab945478a1c973cc05368a9338a5aee222c9638bd44a27f6e81233f3843e672ef3177e25f8e851a2c10edfda36 SHA512 31dce9d6508f36d8411ea834cbb35989067a93b0af2366f278d12aaf30b6fd9b70995e6ad21836e4b44ba009a77900057139d292053533330826ec496009de24
 AUX nftables-mk.confd 899 BLAKE2B f4c3d82fbae87fb0d755af786a98db591b6a667cf33660ba9275ada2e6417fad1899a7f29762f23c112fc5c9e178bc7590c3b2ba26617853c3577917bd7d3edf SHA512 505ed05674a04367f1a3d5cf6447596ad1c3b2e9c920697f12f58a20d94c2a39b0041bb4911678511c4548566a69d964661d4afc3e7e27997943b875f204c602
 AUX nftables-mk.init 2090 BLAKE2B 62f56586ca4ba0acbd3ac41f4904041d625388771bbafc32833055a5f3c00f251e1d9a04bb41dd672f33d13a0825f7e4470a30d7e874df1abd41508148ef42b0 SHA512 819b2d60b42207cb70d95b700557e873fe18c5f6e8437683240beb317f773cf8e18755086e24652a9bcff49c6f96af8cd9e3f3b62c9f433779eff4e3f3935197
 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.9.0.tar.gz 417981 BLAKE2B 4dfba4d71928f1694ffeb4871353fc373d88e23c5ba716e726e1e6aba0efb2703233528f7a408bfefe47bfe54aa3612cccab9742c2a2208ec8c7a4bcda0e1823 SHA512 78e383bad5440c9414202cf0e4b6749fc5c01071d2fa547208e61cea6e7e179933990e7e538a60696eb0a7cf510d2c4b273a91d50287bb51507d244cd2875aed
-DIST nftables-0.9.1.tar.bz2 764066 BLAKE2B 26b194d6b3b970c05348c32a3ab21e8c25fcdb0d09d3d6b467198ba23a5bb44e7b6450d3efb86c39a488df4a837885c4a1ab96c197d5449f7de49b7b18ff5f90 SHA512 e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242
-DIST nftables-0.9.2.tar.bz2 779850 BLAKE2B 40bf9ed956a126048f27b343afc7aa4f6e34f35dc91127402cb127903f8150d212c80491fef2b54c18a63ca065608521062b3f6a2dd78969bdbf4d7d8a5a751d SHA512 2d83b104af0d70f99a16c2e40afdb9bf89bd984323810e2895976c5e2e346bf09dd88850a391f295e335279adfdd39d34c13610cf8e6b801499dc0df2a5cecf6
 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 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 fc44ae9636c1754eb5a9e9a7446f123d692bf44f3f2a079598caf4fa17bd1cbfe5fd8b97216a557130c78b0e76343fee9e25c38c2fa766381c090652ef5535be SHA512 095c8901aedc4ee1bb0da83a1f4186c1eba9f47fe749cd8edba9e46a43ba32bab53373a339df85656d3034c44a8a820dd907ec02841b3125df9aa2ca456eefae
+DIST nftables-0.9.4-manpages.tar.xz 38580 BLAKE2B bb561c7824d032ecfff5c98af10c95af6f5188377f43de8398be7e503adff0441d49fa3e2cefcb646927cc1a4222957f0cc75d5ad4c770ef3a3f8cb8a677c5ce SHA512 1b94ff06ceccf75bbefbf64496d5fa0b492907d7ec5fe41f7808c6e239b2a0a42e88d61e35e22485abee7e4bd382178e962a7c5b113433247ca329cbfa408bca
+DIST nftables-0.9.4.tar.bz2 792788 BLAKE2B 3f2d8ff3bcfe3ab815ee369c4937adef5e5730edee8ea59b32031732802e608bcb47ddd3e55303ad6c295158aff51b2f2c069d98600db83d732ff78836c7abb5 SHA512 cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0
+EBUILD nftables-0.9.3-r1.ebuild 3756 BLAKE2B 79cbed1a1065288d7736bb3687e7142a9bc55e788bdf88cdbb7fb48f6adfd93af2e0deb6964d3522f09fbeeed4f6c4700988f7db27a6e52ccf10bd0a9c469026 SHA512 5f508726b8e1543590379b60c589f97f722bb458ac12530833992d76094e5c70df830af223363a3c95fb142309843df6b30320b666062b48f2659e4c014973b6
+EBUILD nftables-0.9.4-r1.ebuild 3781 BLAKE2B c25fd6174c133d80178976e4b1e624061de4876459640384c555476e267b98ebeb601d2e2c475179e7732e5b4f5f9c25aab21ed4ef6d4dc024b42f8c5b8f9ffb SHA512 dac803385ecc52e77c4531c13a9b8b3cd8e694cf0a6adc4559fd095833b6b9a9284a7a7bed41848a44b1efd0943a6fb8c639d6daef9b73f562878c6b946b23b0
+EBUILD nftables-0.9.4-r2.ebuild 4130 BLAKE2B 88a9ebe9a5228d11a9e9cb9c1e9b7493e8d7b0cb9a4300c7cbed6cbe0b7f2c2f5e20d3d7b2eb1eeab3ba3d6e71413570af63c295d5d5ba082c70b1b9e4ffdcfe SHA512 21bfce23115c386124a56563856287ec270dd39f9d69d4fe6d8e4ffd007e926ef833c4660109aea6d5965fc615409173d48b9d7267172308c08b8ff5668cc3af
 MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
diff --git a/net-firewall/nftables/files/man-pages/gen-manpages.bash b/net-firewall/nftables/files/man-pages/gen-manpages.bash
new file mode 100644
index 000000000000..a2223d3dd5be
--- /dev/null
+++ b/net-firewall/nftables/files/man-pages/gen-manpages.bash
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# create manpages for nftables
+
+declare -A MAN_PAGES
+
+MAN_PAGES=(
+	[nft.8]="nft.txt"
+	[libnftables-json.5]="libnftables-json.adoc"
+	[libnftables.3]="libnftables.adoc"
+)
+
+build_manpages() {
+	tar axf "${distfile}" -C "${srcdir}" || return
+
+	pushd "${srcdir}/${version}/doc" > /dev/null || return
+	local manpage
+	for manpage in "${!MAN_PAGES[@]}"; do
+		a2x -L --doctype manpage --format manpage -D . "${MAN_PAGES[${manpage}]}" || return
+	done
+	popd > /dev/null || return
+
+	local -a tarfiles
+	readarray -t tarfiles < <(printf -- "${version}/doc/%s\\n" "${!MAN_PAGES[@]}")
+
+	tar -Jc --owner='root:0' --group='root:0' \
+		--transform="s:^${version}/doc:${version}-manpages:" \
+		-f "${version}-manpages.tar.xz" \
+		-C "${srcdir}" \
+		"${tarfiles[@]}" || return
+
+	rm -rf "${srcdir:?}/${version}" || return
+}
+
+main() {
+	shopt -s failglob
+	local version="${1}" srcdir="${0%/*}"
+
+	if [[ -z ${version} ]]; then
+		# shellcheck disable=SC2016
+		version=$(
+			find . -maxdepth 1 -type d -a -name 'nftables-*' -printf '%P\0' 2>/dev/null \
+			| LC_COLLATE=C sort -z \
+			| sed -z -n '${p;Q}' \
+			| tr -d '\000'
+		)
+		if [[ -z ${version} ]]; then
+			# shellcheck disable=SC2016
+			version=$(
+				find . -maxdepth 3 -mindepth 3 -type f -a -name 'nftables-*.ebuild' -printf '%P\0' 2>/dev/null \
+				| LC_COLLATE=C sort -z \
+				| sed -r -z -n '${s:.*/::;s:-r[0-9]+::;s:[.]ebuild::;p;Q}' \
+				| tr -d '\000'
+			)
+			if [[ -z ${version} ]]; then
+				printf 'Usage %s <version>\n' "${0}" >&2
+				return 1
+			fi
+		fi
+	elif [[ ${version} =~ [0-9.]+ ]]; then
+		version="nftables-${version}"
+	fi
+
+	local distdir distfile
+	local -a distfiles
+	distdir="$(portageq distdir)" || return
+	distfiles=( "${distdir}/${version}.tar."* ) || return
+	distfile="${distfiles[-1]}"
+	build_manpages || return
+}
+
+main "${@}"
diff --git a/net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch b/net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch
deleted file mode 100644
index 8ff4b85d88a8..000000000000
--- a/net-firewall/nftables/files/nftables-0.9.1-avoid_dive_into_py_subdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c5ca85848c2fe28366d286a5b000f99d927516d3 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Tue, 25 Jun 2019 08:58:34 +0200
-Subject: build: avoid recursion into py/ if not selected
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- Makefile.am    | 6 ++++--
- py/Makefile.am | 3 ---
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e567d32d..4a17424d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,8 +3,10 @@ ACLOCAL_AMFLAGS	= -I m4
- SUBDIRS = 	src	\
- 		include	\
- 		files	\
--		doc		\
--		py
-+		doc
-+if HAVE_PYTHON
-+SUBDIRS += py
-+endif
- 
- EXTRA_DIST =	tests	\
- 		files
-diff --git a/py/Makefile.am b/py/Makefile.am
-index 9fce7c9e..5f4e1f6f 100644
---- a/py/Makefile.am
-+++ b/py/Makefile.am
-@@ -1,7 +1,5 @@
- EXTRA_DIST = setup.py __init__.py nftables.py schema.json
- 
--if HAVE_PYTHON
--
- all-local:
- 	cd $(srcdir) && \
- 		$(PYTHON_BIN) setup.py build --build-base $(abs_builddir)
-@@ -28,4 +26,3 @@ clean-local:
- 
- distclean-local:
- 	rm -f version
--endif
--- 
-cgit v1.2.1
-
diff --git a/net-firewall/nftables/files/nftables-0.9.1-python_build.patch b/net-firewall/nftables/files/nftables-0.9.1-python_build.patch
deleted file mode 100644
index 81f65524ce7d..000000000000
--- a/net-firewall/nftables/files/nftables-0.9.1-python_build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1f7e4deb527db32c55646e6e5baedb2ff2aa205e Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Tue, 25 Jun 2019 08:58:33 +0200
-Subject: build: unbreak non-functionality of --disable-python
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 75cf9199..b71268e8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -103,11 +103,14 @@ AC_ARG_WITH([python_bin],
- 	   )
- 
- AS_IF([test "x$PYTHON_BIN" = "x"], [
--	AS_IF([test "x$enable_python" = "xyes"], [AC_MSG_ERROR([Python asked but not found])])
--	AS_IF([test "x$enable_python" = "xcheck"], [AC_MSG_WARN([Python not found, continuing anyway])])
-+	AS_IF([test "x$enable_python" = "xyes"], [AC_MSG_ERROR([Python asked but not found])],
-+	[test "x$enable_python" = "xcheck"], [
-+		AC_MSG_WARN([Python not found, continuing anyway])
-+		enable_python=no
- 	])
-+])
- 
--AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON_BIN" != "x"])
-+AM_CONDITIONAL([HAVE_PYTHON], [test "$enable_python" != "no"])
- 
- AC_CONFIG_FILES([					\
- 		Makefile				\
-@@ -138,7 +141,7 @@ nft configuration:
-   libxtables support:		${with_xtables}
-   json output support:          ${with_json}"
- 
--AS_IF([test "x$PYTHON_BIN" != "x"], [
-+AS_IF([test "$enable_python" != "no"], [
- 	echo "  enable Python:		yes (with $PYTHON_BIN)"
- 	], [
- 	echo "  enable Python:		no"
--- 
-cgit v1.2.1
-
diff --git a/net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch b/net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch
new file mode 100644
index 000000000000..6eb708596255
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch
@@ -0,0 +1,37 @@
+From 3c83e2bca90b697e7c98f849319f1ad015dcdb86 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 7 Apr 2020 13:16:59 -0700
+Subject: [PATCH nftables 2/2] build: Allow building from tarballs without
+ yacc/lex
+
+The generated files are included in the tarballs already, but
+configure.ac was coded to fail if yacc/lex were not found regardless.
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a04d94bc..3496e410 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,13 +29,13 @@ AC_PROG_SED
+ AM_PROG_LEX
+ AC_PROG_YACC
+ 
+-if test -z "$ac_cv_prog_YACC"
++if test -z "$ac_cv_prog_YACC" -a ! -f "${srcdir}/src/parser_bison.c"
+ then
+         echo "*** Error: No suitable bison/yacc found. ***"
+         echo "    Please install the 'bison' package."
+         exit 1
+ fi
+-if test -z "$ac_cv_prog_LEX"
++if test -z "$ac_cv_prog_LEX" -a ! -f "${srcdir}/src/scanner.c"
+ then
+         echo "*** Error: No suitable flex/lex found. ***"
+         echo "    Please install the 'flex' package."
+-- 
+2.24.1
+
diff --git a/net-firewall/nftables/nftables-0.9.0-r5.ebuild b/net-firewall/nftables/nftables-0.9.0-r5.ebuild
deleted file mode 100644
index dc29d33b649e..000000000000
--- a/net-firewall/nftables/nftables-0.9.0-r5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~arm64 ia64 x86"
-IUSE="debug doc +gmp json +modern-kernel +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3:0=
-	gmp? ( dev-libs/gmp:0= )
-	json? ( dev-libs/jansson )
-	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.1.1: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
-		if use modern-kernel && kernel_is lt 3 18; then
-			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
-		fi
-		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 debug)
-		$(use_enable doc pdf-doc)
-		$(use_with !gmp mini_gmp)
-		$(use_with json)
-		$(use_with readline cli)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local mksuffix=""
-	use modern-kernel && mksuffix="-mk"
-
-	exeinto /usr/libexec/${PN}
-	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
-	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}${mksuffix}.init ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-
-	docinto /usr/share/doc/${PF}/skels
-	dodoc "${D}"/etc/nftables/*
-	rm -R "${D}"/etc/nftables
-}
-
-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
-		( umask 177; touch "${save_file}" )
-	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
-		ewarn "Your system has dangerous permissions for ${save_file}"
-		ewarn "It is probably affected by bug #691326."
-		ewarn "You may need to fix the permissions of the file. To do so,"
-		ewarn "you can run the command in the line below as root."
-		ewarn "    'chmod 600 \"${save_file}\"'"
-	fi
-
-	elog "If you wish to enable the firewall rules on boot (on systemd) you"
-	elog "will need to enable the nftables-restore service."
-	elog "    'systemd_enable_service basic.target ${PN}-restore.service'"
-	elog
-	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-r6.ebuild b/net-firewall/nftables/nftables-0.9.0-r6.ebuild
deleted file mode 100644
index 90884e99c1c3..000000000000
--- a/net-firewall/nftables/nftables-0.9.0-r6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~arm64 ~ia64 ~x86"
-IUSE="debug doc +gmp json +modern-kernel +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3:0=
-	gmp? ( dev-libs/gmp:0= )
-	json? ( dev-libs/jansson )
-	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.1.1: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
-		if use modern-kernel && kernel_is lt 3 18; then
-			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
-		fi
-		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 debug)
-		$(use_enable doc pdf-doc)
-		$(use_with !gmp mini_gmp)
-		$(use_with json)
-		$(use_with readline cli)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local mksuffix=""
-	use modern-kernel && mksuffix="-mk"
-
-	exeinto /usr/libexec/${PN}
-	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
-	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}${mksuffix}.init ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-
-	docinto skels
-	dodoc "${D}"/etc/nftables/*
-	rm -R "${D}"/etc/nftables
-}
-
-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
-		( umask 177; touch "${save_file}" )
-	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
-		ewarn "Your system has dangerous permissions for ${save_file}"
-		ewarn "It is probably affected by bug #691326."
-		ewarn "You may need to fix the permissions of the file. To do so,"
-		ewarn "you can run the command in the line below as root."
-		ewarn "    'chmod 600 \"${save_file}\"'"
-	fi
-
-	elog "If you wish to enable the firewall rules on boot (on systemd) you"
-	elog "will need to enable the nftables-restore service."
-	elog "    'systemd_enable_service basic.target ${PN}-restore.service'"
-	elog
-	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.3-r1.ebuild b/net-firewall/nftables/nftables-0.9.3-r1.ebuild
index eb102f26b556..5b91d72210c5 100644
--- a/net-firewall/nftables/nftables-0.9.3-r1.ebuild
+++ b/net-firewall/nftables/nftables-0.9.3-r1.ebuild
@@ -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 ~ppc64 ~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/nftables/nftables-0.9.2-r2.ebuild b/net-firewall/nftables/nftables-0.9.4-r1.ebuild
index 99f33eaaa6c3..c6c7496044cf 100644
--- a/net-firewall/nftables/nftables-0.9.2-r2.ebuild
+++ b/net-firewall/nftables/nftables-0.9.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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="
@@ -23,15 +23,17 @@ RDEPEND="
 	json? ( dev-libs/jansson )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.1.4:0=
+	>=net-libs/libnftnl-1.1.6:0=
 	xtables? ( >=net-firewall/iptables-1.6.1 )
 "
 
 DEPEND="${RDEPEND}"
 
 BDEPEND="
-	doc? ( app-text/asciidoc )
-	>=app-text/docbook2X-0.8.8-r4
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -83,7 +85,7 @@ src_configure() {
 		$(use_enable doc man-doc)
 		$(use_with !gmp mini_gmp)
 		$(use_with json)
-		$(use_with readline cli)
+		$(use_with readline cli readline)
 		$(use_enable static-libs static)
 		$(use_with xtables)
 	)
@@ -115,6 +117,7 @@ src_install() {
 		python_foreach_impl python_make install
 	fi
 
+	python_foreach_impl python_optimize
 	find "${ED}" -type f -name "*.la" -delete || die
 }
 
@@ -136,7 +139,7 @@ pkg_postinst() {
 
 	elog "If you wish to enable the firewall rules on boot (on systemd) you"
 	elog "will need to enable the nftables-restore service."
-	elog "    'systemd_enable_service basic.target ${PN}-restore.service'"
+	elog "    'systemctl enable ${PN}-restore.service'"
 	elog
 	elog "If you are creating firewall rules before the next system restart "
 	elog "the nftables-restore service must be manually started in order to "
diff --git a/net-firewall/nftables/nftables-0.9.1-r2.ebuild b/net-firewall/nftables/nftables-0.9.4-r2.ebuild
index adebe58c63c3..f9a434586f77 100644
--- a/net-firewall/nftables/nftables-0.9.1-r2.ebuild
+++ b/net-firewall/nftables/nftables-0.9.4-r2.ebuild
@@ -3,19 +3,20 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools linux-info python-r1 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"
-SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+	!doc? ( https://dev.gentoo.org/~chutzpah/dist/nftables/${P}-manpages.tar.xz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="debug +doc +gmp json +modern-kernel python +readline static-libs xtables"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.3:0=
@@ -23,17 +24,17 @@ RDEPEND="
 	json? ( dev-libs/jansson )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.1.3:0=
+	>=net-libs/libnftnl-1.1.6:0=
 	xtables? ( >=net-firewall/iptables-1.6.1 )
 "
 
 DEPEND="${RDEPEND}"
 
 BDEPEND="
-	doc? ( app-text/asciidoc )
-	>=app-text/docbook2X-0.8.8-r4
-	sys-devel/bison
-	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
 	virtual/pkgconfig
 "
 
@@ -42,8 +43,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 #S="${WORKDIR}/v${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-python_build.patch
-	"${FILESDIR}"/${P}-avoid_dive_into_py_subdir.patch
+	# this has been sent upstream, see
+	# https://marc.info/?l=netfilter-devel&m=158629102300853
+	"${FILESDIR}/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch"
 )
 
 python_make() {
@@ -88,7 +90,7 @@ src_configure() {
 		$(use_enable doc man-doc)
 		$(use_with !gmp mini_gmp)
 		$(use_with json)
-		$(use_with readline cli)
+		$(use_with readline cli readline)
 		$(use_enable static-libs static)
 		$(use_with xtables)
 	)
@@ -106,6 +108,12 @@ src_compile() {
 src_install() {
 	default
 
+	if ! use doc; then
+		pushd "${WORKDIR}/${P}-manpages" >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
 	local mksuffix="$(usex modern-kernel '-mk' '')"
 
 	exeinto /usr/libexec/${PN}
@@ -120,6 +128,7 @@ src_install() {
 		python_foreach_impl python_make install
 	fi
 
+	python_foreach_impl python_optimize
 	find "${ED}" -type f -name "*.la" -delete || die
 }
 
@@ -141,7 +150,7 @@ pkg_postinst() {
 
 	elog "If you wish to enable the firewall rules on boot (on systemd) you"
 	elog "will need to enable the nftables-restore service."
-	elog "    'systemd_enable_service basic.target ${PN}-restore.service'"
+	elog "    'systemctl enable ${PN}-restore.service'"
 	elog
 	elog "If you are creating firewall rules before the next system restart "
 	elog "the nftables-restore service must be manually started in order to "