gentoo resync : 08.07.2021

12 files changed, 82 insertions, 228 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 30d5fec1621e..ba69cf28326a 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 86eac7af4539..79ed2e3c50cf 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -3,8 +3,8 @@ DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
-EBUILD firewalld-0.7.1-r3.ebuild 3252 BLAKE2B 558ba5030545c7734b0e81e5e95ff9f46c9859fa5e8a1689d7b70b6eff01dc5a92a8cfc8c566a5221249561d545f0cd820d40493b434995cf0dc118b3a5fbea5 SHA512 df317fcb7112457e9712a738a3c623c2e906882f276290b3f7b391b0bc1ddeb7333edeb2849e51432d2a6c39014e2d84e88a96402779bd26184ca67ba912e3f7
-EBUILD firewalld-0.7.3-r1.ebuild 3255 BLAKE2B 859a4f21726b5c56a32c862bdc34b12ca2e3686ee174bf867a662c5dbd89a47a096de66747a1adffcf60e55064f3389d0b6b79f9b36b8cee6095c08e9a6ef9fc SHA512 71cc1c50d5e6842248f94558199babf0c6b3a947bd396018c20e3c40cd3f864d6812898ca78d93a7ce102b90563566be500a935da03f7374e15776727d1e0d38
-EBUILD firewalld-0.9.1-r1.ebuild 3197 BLAKE2B 1f18cd3fd67145e232a8c4b4f0bc68a46eebcf5862675094d5a7ba6a902134ad3c61d1ed8a4be167cbd27dddd95442472822600325f86db59d45eb76ff0f01c9 SHA512 54f7300b5024a0263c012e72bd3013df9d1c9377e52eebeb9a8ddc6ef2b49513d3726ffd25192e64ac0e3a584981cfa8f69325dd14a8c79c416d204e8da4dc16
-EBUILD firewalld-0.9.3-r1.ebuild 3200 BLAKE2B 09019b98a50382a7e89e57eb42099cc9f0975efa03f95b9ecc7fe45cd29fa7e434fb0ec1df02d6ab0222e33f3cf450ca38c588aa48ca3f50971752e021288c5d SHA512 d7b0815b7d60505dcccb9ced314ce6e20c5f5ce7d53e39972aa6fa3e13381bf7e190ae3411e46882a9ed5be6200dd0f695b7ff736a17a2ba9312dd4f1bc80c70
+EBUILD firewalld-0.7.1-r3.ebuild 3252 BLAKE2B 359feb9be1d3e07b487f88461260b440c4fecd77b1c3a4e53bfe57d9d3a8948af3f893c1bc74d8c247f97eda67f462af178a1c746722358832774a725e97ac8a SHA512 8a1e5724736aaa5135e529230e2636fe0ee24bb5eb711d325cb3e6ef5572d4848da986798ab3abdcfa35ee3ff784efd78a2b559c195998580d7162797bc49338
+EBUILD firewalld-0.7.3-r1.ebuild 3255 BLAKE2B e1ee150f40a9cb4462a63acc6e200e3e03681f7616b26f3b8d9c4944f8bcfc963c1579a745253f65bbd43b3f7b4d95248d4c0af19f63b2f65264c37e777af1ce SHA512 b517268487e4286017dd86f25ebb3a0267d10c7202b919286e3f05117b1434025c69a6bf257b70629d1d897315326d7297936379d31f92205893db5fe6e6e90a
+EBUILD firewalld-0.9.1-r1.ebuild 3197 BLAKE2B b4cfefba08d239d0dffc64f43173bfdc2d25fb642cb328546c1a884aab0d5ed628724aec1ba6ef9599501ab65569e3d64035e05db7bab7e0d756002cb23e91fd SHA512 a3ed188cb1b6537c184248900440fa34bd8bde1e55c0e55e20503bbf3daae128c25a215c650ac0b958f789e3d6f4f02650d379038399ea1539b0ef94203c4bc7
+EBUILD firewalld-0.9.3-r1.ebuild 3200 BLAKE2B 96bfc05546f0520a593bffe78c745d7c2da291e47e3df6fa041b0c4e220e0bb71446e6a255bb32de031f162dd656f9f8e6451d5f7bc7ad4f1756fef9da4fec55 SHA512 07402b18d95625be24ec4a8b3e11d96b8d86ddf041d20b181e82e3e84bf07a769b9d1fc65d436d04e188d1aaf038151f6649878b9ae08bf278257fe8322c1ad4
 MISC metadata.xml 486 BLAKE2B 0d1b9c530a7b7ac43414cda002e07cbc9b897164be53d9183dc50ba78bc8d29a40bfc364444f4253f903ac1698a459e6f7ca68431a22905a6f5aed02ca41bb61 SHA512 d4b20ffb819399bfc60760ec90bfaf60ffbe666a1c0b2117a8eae42db2f85c1f5274c8dee28fbfa7b66bea1d9720ad1dd8acb425c43eb71cf0c9b2557a1471a0
diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index ef390e5c45b2..0803ec72a634 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -60,8 +60,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {
diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index 994dfa68b67e..4c32e1152ae2 100644
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -60,8 +60,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {
diff --git a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
index 2d6922f4a9ef..571c2e6a669a 100644
--- a/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -61,8 +61,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {
diff --git a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
index f9fdccdb8a10..10845818f9b9 100644
--- a/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.9.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
 HOMEPAGE="http://www.firewalld.org/"
@@ -61,8 +61,8 @@ src_prepare() {
 	default
 	eautoreconf
 
-	l10n_find_plocales_changes "po" "" ".po"
-	l10n_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
 }
 
 src_configure() {
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index b9689b8c73b9..4dc864d9796e 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,11 +1,8 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
-AUX ipt_netflow-2.5-gentoo.patch 1944 BLAKE2B 0acb66305cd7f337a271b356f65c2984b445fc245d4de5668ccdff54ef7bb5095fc27148be978f13bc84dfc92be58abda897dacf053a31b10b44caffb5cbabb7 SHA512 781c4286889b2e39f2276de02970306b76f859c87565dff5235cfb1fedd0e7f6cc2a5f1263899f7505317ce22fd73c724a4a1273114adcc6ad2c3cc84069d47d
-AUX ipt_netflow-2.5.1-vlan_dev_priv.patch 1182 BLAKE2B f5522a888133b5411cb6b3e43e2cc2d0457b521a46e26b3f3d6826a84dc016dd8b58195317601ebf49de81031faf9100f95dd547adbda81a9b4814a75c3e147b SHA512 d1d23794871237338102ed148b94a6d0f92997675f6e059fc0f1e94b54aed894dd4325721d8427edcaf6747bd063338b7f94b4ab51904bf76bd98c8380d4e5e2
 AUX ipt_netflow-2.6-gentoo.patch 1998 BLAKE2B b4da947e83bc7c80f91a489858a9a7fdf461f29c331822c1c417bc233af18d7b89517aa443d7ac0bd0212ace6fa8707528254930ca78fceef24e8e1c90109bac SHA512 71a39f75860e1112d900ab8f86c36cbd6bf7908f0caca9d7e3cf257accdd6d08c51d3584129cdf4b145123e67510bf3792fc8c330036e26af441f115241623d9
+AUX ipt_netflow-2.6-ref_module_fix.patch 1908 BLAKE2B 2f59dbf1e5986549a67319c478ba831eb4c835d52aa16cdc216d4cb893f99560ea3a15936489cdf809b9e886aab888095fb66dca9acb467a44da6bbb5acec6ae SHA512 5e76e4f2982fe3f4ca961f93bdb4b20865d5e2fbd600001798457eafb561057a6beb3da75fffa91265429ed145220b9f25a1facb4447405ba9990c90289f4ae4
 AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
-DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5
-EBUILD ipt_netflow-2.5.1-r1.ebuild 2462 BLAKE2B 27dd6837a8be04ddb8d4cc95895630360d2d4e791698ec509477a7c591ac28c853e3b8985dd2178fade70d7477a448f6f8b0f288fe363bbfe636ae94ddbb18f3 SHA512 81f9fd7612a9584c7790f8309450af3e3b6ae9bf07c40042be7cdf6f7414f0fcadb2bf0aa608d92cefd555071d473883ccae090f1024d7c7115ceb14731d7f3b
-EBUILD ipt_netflow-2.6.ebuild 2424 BLAKE2B 8ab74f15f2a3f7824eb0e76ea94c52acd022bc0e80861890a402e3ea6b3e1e7db534b645b4ec6a49a36006f24a0a4ba98036607225c56041b0bf3b4b7ff432fc SHA512 a0642f0ad24c4e981705dc53c08652658d967ec597a89b4db2f7002ffa2673c8a03572a00344d1b5159e94a5894e0140ce4ae7584157cb39d6280f8fc155e1eb
+EBUILD ipt_netflow-2.6.ebuild 2477 BLAKE2B a1d0c5a23e524abba0e5decab56f4735d8da61e5b14f3a64f6d183573ea602135cd4b7f2d01aaa79ccf26076a3104cb1edb5f6f6d48646299d8bea2b434061d4 SHA512 4b227d79da53e5afe7645d2e3568dad1bb00f90809cff724b06154db3d1a25568d98b48bca70d9ea6e348ff3be83e5d9b850131d571aabfc9e5f34794c825ca8
 EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5b6f3fa7387d690d361f6cc26b83507944f0cefc560db6894efebf9e399b1a97eab5884fb62cddccadb984272e0fd630b19af224f1b26dc335a732eb3ce3dfa8 SHA512 2b2ce7e03db3d3168876c8c83ebf271f75aa3d85e05436234fd4c36738da096243fd7f5f3ba648efdf65d62ec986c956c8014cd69afa73e40e67be717bf3b295
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
deleted file mode 100644
index 508be107795e..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.5-gentoo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- 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 @@
- 
- 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,10 +66,10 @@
- 	fi
- 
- %_sh.o: libipt_NETFLOW.c
--	$(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
-+	$(CC) $(CFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
- 
- %.so: %_sh.o
--	$(CC) -shared -o $@ $<
-+	$(CC) $(LDFLAGS) -shared -o $@ $<
- 
- version.h: ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
- 	@./version.sh --define > version.h
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
deleted file mode 100644
index 49721e547fd7..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.5.1-vlan_dev_priv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 1153f73f038205dc17303e6e6c455bbbb56191f7
-Author: ABC <abc@openwall.com>
-Date:   Wed Oct 14 15:35:57 2020 +0300
-
-    gen_compat_def: Check for vlan_dev_priv instead of version if
-
-diff --git a/gen_compat_def b/gen_compat_def
-index c0f20f6..3965e94 100755
---- a/gen_compat_def
-+++ b/gen_compat_def
-@@ -85,6 +85,8 @@ kbuild_test_struct proc_ops linux/proc_fs.h
- kbuild_test_struct proc_ops linux/proc_fs.h
- # No since v5.1, but present in CentOS-8's 4.18.0-227
- kbuild_test_symbol synchronize_sched linux/rcupdate.h
-+# Stumbled on 5.9
-+kbuild_test_struct vlan_dev_priv linux/if_vlan.h
- 
- echo "// End of compat_def.h"
- 
-diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
-index 01055df..6f95166 100644
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -4874,7 +4874,7 @@ static void parse_l2_header(const struct sk_buff *skb, struct ipt_netflow_tuple
- 		tuple->tag[tag_num++] = htons(vlan_tx_tag_get(skb));
- 	else if (skb->dev && is_vlan_dev(skb->dev)) {
- 		struct net_device *vlan_dev = skb->dev;
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
-+# ifdef HAVE_VLAN_DEV_PRIV
- 		struct vlan_dev_priv *vlan = vlan_dev_priv(vlan_dev);
- 
- 		/* `if` condition is `#if`ed intentionally, and this is
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch
new file mode 100644
index 000000000000..21d647190709
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.6-ref_module_fix.patch
@@ -0,0 +1,60 @@
+commit 352cdb28eecbb57de3509b18dfc37dcce0455c01
+Author: ABC <abc@openwall.com>
+Date:   Tue Jun 22 19:07:02 2021 +0300
+
+    Fix compile for stable kernels by not using 'ref_module'
+    
+    `ref_module' unexport in 7ef5264de7732 ("modules: mark ref_module
+    static") is back-ported into stable kernels making old `#if
+    LINUX_VERSION_CODE' checks irrelevant or too complicated to update.
+    
+    Do not use `ref_module' API at all since `try_module_get' is ancient
+    enough to use always.
+    
+    Reported-by: https://github.com/xtaran
+    Fixes: https://github.com/aabc/ipt-netflow/issues/177
+
+diff --git a/compat.h b/compat.h
+index 99edf91..30f1d8f 100644
+--- a/compat.h
++++ b/compat.h
+@@ -170,10 +170,6 @@ static int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cm
+ # define CHECK_OK	0
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+-# define use_module	ref_module
+-#endif
+-
+ #ifndef NF_IP_LOCAL_IN /* 2.6.25 */
+ # define NF_IP_PRE_ROUTING	NF_INET_PRE_ROUTING
+ # define NF_IP_LOCAL_IN		NF_INET_LOCAL_IN
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index d3d3901..c4c049d 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -5494,12 +5494,8 @@ static void register_ct_events(void)
+ 	}
+ 	/* Reference netlink module to prevent it's unsafe unload before us. */
+ 	if (!netlink_m && (netlink_m = find_module(NETLINK_M))) {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0)
+-		use_module(THIS_MODULE, netlink_m);
+-#else
+ 		if (!try_module_get(netlink_m))
+ 			netlink_m = NULL;
+-#endif
+ 	}
+ 
+ 	/* Register ct events callback. */
+@@ -5527,10 +5523,9 @@ static void unregister_ct_events(void)
+ #else /* < v3.2 */
+ 	unset_notifier_cb();
+ #endif /* v3.2 */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
+ 	module_put(netlink_m);
+ 	netlink_m = NULL;
+-#endif
++
+ 	rcu_assign_pointer(saved_event_cb, NULL);
+ #else /* < v2.6.31 */
+ 	nf_conntrack_unregister_notifier(&ctnl_notifier);
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
deleted file mode 100644
index bf18a5d00831..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-BDEPEND="
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.5-gentoo.patch"
-	"${FILESDIR}/${P}-vlan_dev_priv.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~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"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-}
-
-do_conf() {
-	tc-export CC
-	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)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-
-	exeinto "${IPT_LIB}"
-	doexe libip{,6}t_NETFLOW.so
-
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
index 97fce443ce9b..35009fb8ac17 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
@@ -14,7 +14,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,6 +31,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
 	"${FILESDIR}/${PN}-2.6-gentoo.patch"
+	"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
 )
 
 pkg_setup() {