app-emulation/libvirt: Fix IP_NF_TARGET_MASQUERADE check

As of kernel commit v5.2-rc1~133^2~174^2~6 the
IP_NF_TARGET_MASQUERADE is just an alias for
NETFILTER_XT_TARGET_MASQUERADE:

  config IP_NF_TARGET_MASQUERADE
    tristate "MASQUERADE target support"
    select NETFILTER_XT_TARGET_MASQUERADE
    help
    This is a backwards-compat option for the user's convenience
    (e.g. when running oldconfig). It selects NETFILTER_XT_TARGET_MASQUERADE.

Fine tune our kernel config checks, though this can be changed
once kernels older than 5.2.0 leave the tree.

Closes: https://bugs.gentoo.org/907728
Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31292
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 84 insertions, 7 deletions

diff --git a/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
index b8eebb09cafb..c8769138db8b 100644
--- a/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
@@ -191,10 +191,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
diff --git a/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
index 4d8236b3465c..e0f5cde83128 100644
--- a/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
@@ -191,10 +191,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
diff --git a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild b/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild
index c921af5c0afb..e531e9999331 100644
--- a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild
@@ -198,10 +198,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
diff --git a/app-emulation/libvirt/libvirt-8.9.0.ebuild b/app-emulation/libvirt/libvirt-8.9.0.ebuild
index 7ff7a49b8728..5436a91bf68e 100644
--- a/app-emulation/libvirt/libvirt-8.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.9.0.ebuild
@@ -194,10 +194,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
diff --git a/app-emulation/libvirt/libvirt-9.2.0.ebuild b/app-emulation/libvirt/libvirt-9.2.0.ebuild
index 33dbf42a43ca..0713f78055c0 100644
--- a/app-emulation/libvirt/libvirt-9.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.2.0.ebuild
@@ -197,10 +197,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
diff --git a/app-emulation/libvirt/libvirt-9.3.0.ebuild b/app-emulation/libvirt/libvirt-9.3.0.ebuild
index 38c62b32f793..6c4af2c50848 100644
--- a/app-emulation/libvirt/libvirt-9.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.3.0.ebuild
@@ -198,10 +198,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 3d66a605794d..b2849810143e 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -198,10 +198,21 @@ pkg_setup() {
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
+
+	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
+	if use virt-network ; then
+		if kernel_is -lt 5 2 ; then
+			CONFIG_CHECK+="
+			~IP_NF_TARGET_MASQUERADE"
+		else
+			CONFIG_CHECK+="
+			~NETFILTER_XT_TARGET_MASQUERADE"
+		fi
+	fi
+
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT