Adding metadata

7 files changed, 9 insertions, 702 deletions

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 3a739c1ad419..79f9d0518843 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,2 @@
-DIST firewalld-2.3.0.tar.bz2 1307839 BLAKE2B f986af940841d7982c44ef5d7df9758f8b8f0e2bd511c61dc358d21e2d272ddc510571bcbdd6c7e47d0bd1ee6250240445094b30945c8de695007c1eb24ed642 SHA512 9a0fe1098c8bbb63bc4af04f56b7810d3d4e94be4247574daba64fb7a344488053f80426b7422c3a4620a54fee69a4264e1b0d66580757aac29aa65d723007c5
-DIST firewalld-2.3.1.tar.bz2 1309031 BLAKE2B 08893b400ec8ed5bc5148f8480fdadc6cd5019563fbac778257048a721fe34ef40e911b836a60492b51080da1d9ca5c83cdd0eb2a617e376008c6af46fe09156 SHA512 cf9e41c5a04705a70159e91f301a14526c2a9915dccd053e439ef10c7cbcec8b56f5adc250361041b9fd7d94fe5d314f32be0d1d816ebf520242c09513dc3e42
-DIST firewalld-2.3.2.tar.bz2 1328360 BLAKE2B 97bd5d580c13b2b61ffcc03b1763270659995934745fb308e2dadf0853c2bca138081a0b6f656e905ea7e4ed4a1c4a32706d3e9382d92c30fc0f1e28437751c4 SHA512 d3166e116614cee8b9d640000db8bab1b60f2e19102fd0b3c6609d557a77c0cefc0e2bea25194d889ac211e58a9384ae7fd2e590af9f7f2fc674a86fa3f0e681
 DIST firewalld-2.4.0.tar.bz2 1342244 BLAKE2B 8e878eefe9b458e2c9b742b55268839e746cfa5c8f4460df17fff74c4f6b03bad64981ec530565d6746fca05a797dcd82f3af99a3cb64dfbe98be6f7d6c38f41 SHA512 24071b2f0a2d5acf41430e41238480d78b1f758bceb493b44dba89dbc02a73f6adfc47359d108d502c41ac2b1ac8302bbda426d7f89095b44240c98739f58ae8
+DIST firewalld-2.4.2.tar.bz2 1366993 BLAKE2B add319d100c01e6431e3a416ba802827c762f0882869f1a3a6e5fd49016c193050f73c5c520ebc82e967516d782cc802738048b30e2a0592e2e8849dcc18b96b SHA512 725fb01c5982e1e824fddb18ccb5ffe95a74c3b1d04a406e08f7aa93d1d6b7b8e8f3eabd7bd3b7e15112c876a9b07cf4fce0effeb091a1ccf00c481706faac02
diff --git a/net-firewall/firewalld/files/firewalld-2.3.1-systemd-service.patch b/net-firewall/firewalld/files/firewalld-2.3.1-systemd-service.patch
deleted file mode 100644
index ba74d302535a..000000000000
--- a/net-firewall/firewalld/files/firewalld-2.3.1-systemd-service.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
-Removes EnvironmentFile and FIREWALLD_ARGS variable
---- a/config/firewalld.service.in
-+++ b/config/firewalld.service.in
-@@ -4,12 +4,10 @@ Before=network-pre.target
- Wants=network-pre.target
- After=dbus.service
- After=polkit.service
--Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
- Documentation=man:firewalld(1)
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/firewalld
--ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
-+ExecStart=@sbindir@/firewalld --nofork --nopid
- ExecStartPost=@bindir@/firewall-cmd --state
- # don't fail ExecStartPost on RUNNING_BUT_FAILED
- SuccessExitStatus=251
diff --git a/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch b/net-firewall/firewalld/files/firewalld-2.4.2-systemd-service.patch
index 461dec825c94..cc90b9d797d7 100644
--- a/net-firewall/firewalld/files/firewalld-2.2.1-systemd-service.patch
+++ b/net-firewall/firewalld/files/firewalld-2.4.2-systemd-service.patch
@@ -1,19 +1,18 @@
 Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
 Removes EnvironmentFile and FIREWALLD_ARGS variable
-===================================================================
 --- a/config/firewalld.service.in
 +++ b/config/firewalld.service.in
-@@ -4,12 +4,10 @@
- Wants=network-pre.target
- After=dbus.service
- After=polkit.service
+@@ -5,12 +5,10 @@ Wants=network-pre.target
+ # Use PartOf so firewalld is restarted when dbus is restarted. But it doesn't
+ # have to wait on it initially.
+ PartOf=dbus.service
 -Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
  Documentation=man:firewalld(1)
-
+ 
  [Service]
 -EnvironmentFile=-/etc/sysconfig/firewalld
 -ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
 +ExecStart=@sbindir@/firewalld --nofork --nopid
  ExecReload=/bin/kill -HUP $MAINPID
- # supress to log debug and error output also to /var/log/messages
  StandardOutput=null
+ StandardError=null
diff --git a/net-firewall/firewalld/firewalld-2.3.0-r2.ebuild b/net-firewall/firewalld/firewalld-2.3.0-r2.ebuild
deleted file mode 100644
index c912198a69b1..000000000000
--- a/net-firewall/firewalld/firewalld-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature
-inherit plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui selinux test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		>=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}]
-		gui? (
-			dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3
-			x11-libs/libnotify[introspection]
-		)
-	')
-	net-firewall/nftables[xtables(+)]
-	selinux? ( sec-policy/selinux-firewalld )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/glib:2
-"
-BDEPEND="
-	app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-systemd-service.patch
-)
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="
-		~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER
-		~NETFILTER_ADVANCED
-		~NETFILTER_INGRESS
-		~NF_NAT_MASQUERADE
-		~NF_NAT_REDIRECT
-		~NF_TABLES_INET
-		~NF_TABLES_IPV4
-		~NF_TABLES_IPV6
-		~NF_CONNTRACK
-		~NF_CONNTRACK_BROADCAST
-		~NF_CONNTRACK_NETBIOS_NS
-		~NF_CONNTRACK_TFTP
-		~NF_CT_NETLINK
-		~NF_CT_NETLINK_HELPER
-		~NF_DEFRAG_IPV4
-		~NF_DEFRAG_IPV6
-		~NF_NAT
-		~NF_NAT_TFTP
-		~NF_REJECT_IPV4
-		~NF_REJECT_IPV6
-		~NF_SOCKET_IPV4
-		~NF_SOCKET_IPV6
-		~NF_TABLES
-		~NF_TPROXY_IPV4
-		~NF_TPROXY_IPV6
-		~IP_NF_FILTER
-		~IP_NF_IPTABLES
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_RAW
-		~IP_NF_SECURITY
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REJECT
-		~IP6_NF_FILTER
-		~IP6_NF_IPTABLES
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT
-		~IP6_NF_RAW
-		~IP6_NF_SECURITY
-		~IP6_NF_TARGET_MASQUERADE
-		~IP6_NF_TARGET_REJECT
-		~IP_SET
-		~NETFILTER_CONNCOUNT
-		~NETFILTER_NETLINK
-		~NETFILTER_NETLINK_OSF
-		~NETFILTER_NETLINK_QUEUE
-		~NETFILTER_SYNPROXY
-		~NETFILTER_XTABLES
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_MULTIPORT
-		~NETFILTER_XT_MATCH_STATE
-		~NETFILTER_XT_NAT
-		~NETFILTER_XT_TARGET_MASQUERADE
-		~NFT_COMPAT
-		~NFT_CT
-		~NFT_FIB
-		~NFT_FIB_INET
-		~NFT_FIB_IPV4
-		~NFT_FIB_IPV6
-		~NFT_HASH
-		~NFT_LIMIT
-		~NFT_LOG
-		~NFT_MASQ
-		~NFT_NAT
-		~NFT_QUEUE
-		~NFT_QUOTA
-		~NFT_REDIR
-		~NFT_REJECT
-		~NFT_REJECT_INET
-		~NFT_REJECT_IPV4
-		~NFT_REJECT_IPV6
-		~NFT_SOCKET
-		~NFT_SYNPROXY
-		~NFT_TPROXY
-		~NFT_TUNNEL
-		~NFT_XFRM
-	"
-
-	# kernel >= 4.19 has a unified NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${ED}"/etc/sysconfig/ || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${ED}"/etc/xdg/autostart || die
-		rm -f "${ED}"/usr/bin/firewall-applet || die
-		rm -f "${ED}"/usr/bin/firewall-config || die
-		rm -rf "${ED}"/usr/share/applications || die
-		rm -rf "${ED}"/usr/share/icons || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-2.3.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.3.1-r1.ebuild
deleted file mode 100644
index 26342f0a5118..000000000000
--- a/net-firewall/firewalld/firewalld-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature
-inherit plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui selinux test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		>=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}]
-		gui? (
-			dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3
-			x11-libs/libnotify[introspection]
-		)
-	')
-	net-firewall/ipset
-	net-firewall/nftables[xtables(+)]
-	selinux? ( sec-policy/selinux-firewalld )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/glib:2
-"
-BDEPEND="
-	app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.1-systemd-service.patch
-)
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="
-		~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER
-		~NETFILTER_ADVANCED
-		~NETFILTER_INGRESS
-		~NF_NAT_MASQUERADE
-		~NF_NAT_REDIRECT
-		~NF_TABLES_INET
-		~NF_TABLES_IPV4
-		~NF_TABLES_IPV6
-		~NF_CONNTRACK
-		~NF_CONNTRACK_BROADCAST
-		~NF_CONNTRACK_NETBIOS_NS
-		~NF_CONNTRACK_TFTP
-		~NF_CT_NETLINK
-		~NF_CT_NETLINK_HELPER
-		~NF_DEFRAG_IPV4
-		~NF_DEFRAG_IPV6
-		~NF_NAT
-		~NF_NAT_TFTP
-		~NF_REJECT_IPV4
-		~NF_REJECT_IPV6
-		~NF_SOCKET_IPV4
-		~NF_SOCKET_IPV6
-		~NF_TABLES
-		~NF_TPROXY_IPV4
-		~NF_TPROXY_IPV6
-		~IP_NF_FILTER
-		~IP_NF_IPTABLES
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_RAW
-		~IP_NF_SECURITY
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REJECT
-		~IP6_NF_FILTER
-		~IP6_NF_IPTABLES
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT
-		~IP6_NF_RAW
-		~IP6_NF_SECURITY
-		~IP6_NF_TARGET_MASQUERADE
-		~IP6_NF_TARGET_REJECT
-		~IP_SET
-		~NETFILTER_CONNCOUNT
-		~NETFILTER_NETLINK
-		~NETFILTER_NETLINK_OSF
-		~NETFILTER_NETLINK_QUEUE
-		~NETFILTER_SYNPROXY
-		~NETFILTER_XTABLES
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_MULTIPORT
-		~NETFILTER_XT_MATCH_STATE
-		~NETFILTER_XT_NAT
-		~NETFILTER_XT_TARGET_MASQUERADE
-		~NFT_COMPAT
-		~NFT_CT
-		~NFT_FIB
-		~NFT_FIB_INET
-		~NFT_FIB_IPV4
-		~NFT_FIB_IPV6
-		~NFT_HASH
-		~NFT_LIMIT
-		~NFT_LOG
-		~NFT_MASQ
-		~NFT_NAT
-		~NFT_QUEUE
-		~NFT_QUOTA
-		~NFT_REDIR
-		~NFT_REJECT
-		~NFT_REJECT_INET
-		~NFT_REJECT_IPV4
-		~NFT_REJECT_IPV6
-		~NFT_SOCKET
-		~NFT_SYNPROXY
-		~NFT_TPROXY
-		~NFT_TUNNEL
-		~NFT_XFRM
-	"
-
-	# kernel >= 4.19 has a unified NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Skip XML schema verification for tests
-	cat <<-EOF > config/xmlschema/check.sh || die
-	#!/bin/sh
-	exit 0
-	EOF
-	chmod +x config/xmlschema/check.sh || die
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${ED}"/etc/sysconfig/ || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${ED}"/etc/xdg/autostart || die
-		rm -f "${ED}"/usr/bin/firewall-applet || die
-		rm -f "${ED}"/usr/bin/firewall-config || die
-		rm -rf "${ED}"/usr/share/applications || die
-		rm -rf "${ED}"/usr/share/icons || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-2.3.1.ebuild b/net-firewall/firewalld/firewalld-2.3.1.ebuild
deleted file mode 100644
index e9b8823cd46e..000000000000
--- a/net-firewall/firewalld/firewalld-2.3.1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature
-inherit plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui selinux test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		>=net-firewall/nftables-0.9.4[python,json,${PYTHON_USEDEP}]
-		gui? (
-			dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3
-			x11-libs/libnotify[introspection]
-		)
-	')
-	net-firewall/nftables[xtables(+)]
-	selinux? ( sec-policy/selinux-firewalld )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/glib:2
-"
-BDEPEND="
-	app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.1-systemd-service.patch
-)
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="
-		~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER
-		~NETFILTER_ADVANCED
-		~NETFILTER_INGRESS
-		~NF_NAT_MASQUERADE
-		~NF_NAT_REDIRECT
-		~NF_TABLES_INET
-		~NF_TABLES_IPV4
-		~NF_TABLES_IPV6
-		~NF_CONNTRACK
-		~NF_CONNTRACK_BROADCAST
-		~NF_CONNTRACK_NETBIOS_NS
-		~NF_CONNTRACK_TFTP
-		~NF_CT_NETLINK
-		~NF_CT_NETLINK_HELPER
-		~NF_DEFRAG_IPV4
-		~NF_DEFRAG_IPV6
-		~NF_NAT
-		~NF_NAT_TFTP
-		~NF_REJECT_IPV4
-		~NF_REJECT_IPV6
-		~NF_SOCKET_IPV4
-		~NF_SOCKET_IPV6
-		~NF_TABLES
-		~NF_TPROXY_IPV4
-		~NF_TPROXY_IPV6
-		~IP_NF_FILTER
-		~IP_NF_IPTABLES
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_RAW
-		~IP_NF_SECURITY
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REJECT
-		~IP6_NF_FILTER
-		~IP6_NF_IPTABLES
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT
-		~IP6_NF_RAW
-		~IP6_NF_SECURITY
-		~IP6_NF_TARGET_MASQUERADE
-		~IP6_NF_TARGET_REJECT
-		~IP_SET
-		~NETFILTER_CONNCOUNT
-		~NETFILTER_NETLINK
-		~NETFILTER_NETLINK_OSF
-		~NETFILTER_NETLINK_QUEUE
-		~NETFILTER_SYNPROXY
-		~NETFILTER_XTABLES
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_MULTIPORT
-		~NETFILTER_XT_MATCH_STATE
-		~NETFILTER_XT_NAT
-		~NETFILTER_XT_TARGET_MASQUERADE
-		~NFT_COMPAT
-		~NFT_CT
-		~NFT_FIB
-		~NFT_FIB_INET
-		~NFT_FIB_IPV4
-		~NFT_FIB_IPV6
-		~NFT_HASH
-		~NFT_LIMIT
-		~NFT_LOG
-		~NFT_MASQ
-		~NFT_NAT
-		~NFT_QUEUE
-		~NFT_QUOTA
-		~NFT_REDIR
-		~NFT_REJECT
-		~NFT_REJECT_INET
-		~NFT_REJECT_IPV4
-		~NFT_REJECT_IPV6
-		~NFT_SOCKET
-		~NFT_SYNPROXY
-		~NFT_TPROXY
-		~NFT_TUNNEL
-		~NFT_XFRM
-	"
-
-	# kernel >= 4.19 has a unified NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	# bug #853055
-	if kernel_is -lt 5 18 ; then
-		CONFIG_CHECK+=" ~NFT_COUNTER"
-	fi
-
-	# bug #926685
-	if kernel_is -le 6 1 ; then
-		CONFIG_CHECK+=" ~NFT_OBJREF"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Skip XML schema verification for tests
-	cat <<-EOF > config/xmlschema/check.sh || die
-	#!/bin/sh
-	exit 0
-	EOF
-	chmod +x config/xmlschema/check.sh || die
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${ED}"/etc/sysconfig/ || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${ED}"/etc/xdg/autostart || die
-		rm -f "${ED}"/usr/bin/firewall-applet || die
-		rm -f "${ED}"/usr/bin/firewall-config || die
-		rm -rf "${ED}"/usr/share/applications || die
-		rm -rf "${ED}"/usr/share/icons || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-2.3.2.ebuild b/net-firewall/firewalld/firewalld-2.4.2.ebuild
index 0530c3174104..d0c881dfd479 100644
--- a/net-firewall/firewalld/firewalld-2.3.2.ebuild
+++ b/net-firewall/firewalld/firewalld-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,7 +54,7 @@ QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
 PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.2-systemd-service.patch
+	"${FILESDIR}"/${PN}-2.4.2-systemd-service.patch
 )
 
 pkg_setup() {