commit:     ade5a04bab4e8d37ebed596dfb5377e1378ecb7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 13:32:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 13:32:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade5a04b

net-firewall/firewalld: drop 1.3.0, 1.3.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/firewalld/Manifest               |   2 -
 net-firewall/firewalld/firewalld-1.3.0.ebuild | 216 --------------------------
 net-firewall/firewalld/firewalld-1.3.1.ebuild | 216 --------------------------
 3 files changed, 434 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index d61b351f728c..5243b7f7c53f 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,3 +1 @@
-DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B 
ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c
 SHA512 
e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68
-DIST firewalld-1.3.1.tar.bz2 1229285 BLAKE2B 
cd3c42f90700ab9076b2bcf51f4a863adf6909072bd3c6a0439e1a37af4cfca7b4bcf323e0609ec22bb98f5669145636d70b394e37bf8e4641590f431d0167eb
 SHA512 
98fb8a3fed2fa02aef2fe4940e044839693daa7a040d38e6ad5ff636e6cb60647917b80340858b28a9f3e3a4a736d7e4e6fdfe00356c072308d0c22277015574
 DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 
108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a
 SHA512 
06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695

diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild 
b/net-firewall/firewalld/firewalld-1.3.0.ebuild
deleted file mode 100644
index 79d062f3b4ae..000000000000
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature plocale 
python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A 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.gz";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-       iptables? (
-               net-firewall/iptables[ipv6(+)]
-               net-firewall/ebtables
-               net-firewall/ipset
-               nftables? ( net-firewall/nftables[xtables(+)] )
-       )
-       || ( >=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}]
-               gui? (
-                       x11-libs/gtk+:3
-                       dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-               )
-               nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-       ')"
-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 ru si sk sq sr 
sr@latin sv ta te tr uk zh_CN zh_TW"
-
-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_OBJREF
-       ~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 unified a 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
-
-       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
-               $(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-               $(use_with iptables iptables_restore 
"${EPREFIX}/sbin/iptables-restore")
-               $(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-               $(use_with iptables ip6tables_restore 
"${EPREFIX}/sbin/ip6tables-restore")
-               $(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-               $(use_with iptables ebtables_restore 
"${EPREFIX}/sbin/ebtables-restore")
-               $(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-               --with-systemd-unitdir="$(systemd_get_systemunitdir)"
-               --with-bashcompletiondir="$(get_bashcompdir)"
-       )
-
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       python_optimize
-
-       # Get rid of junk
-       rm -rf "${D}/etc/sysconfig/" || die
-
-       # For non-gui installs we need to remove GUI bits
-       if ! use gui; then
-               rm -rf "${D}/etc/xdg/autostart" || die
-               rm -f "${D}/usr/bin/firewall-applet" || die
-               rm -f "${D}/usr/bin/firewall-config" || die
-               rm -rf "${D}/usr/share/applications" || die
-               rm -rf "${D}/usr/share/icons" || die
-       fi
-
-       newinitd "${FILESDIR}"/firewalld.init firewalld
-
-       # Our version drops the/an obsolete 'conflicts' line with old iptables 
services
-       # bug #833506
-       systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-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-1.3.1.ebuild 
b/net-firewall/firewalld/firewalld-1.3.1.ebuild
deleted file mode 100644
index 779a8dfedba5..000000000000
--- a/net-firewall/firewalld/firewalld-1.3.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature plocale 
python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A 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 +nftables +iptables test"
-# Tests are too unreliable in sandbox environment
-RESTRICT="!test? ( test ) test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-       iptables? (
-               net-firewall/iptables[ipv6(+)]
-               net-firewall/ebtables
-               net-firewall/ipset
-               nftables? ( net-firewall/nftables[xtables(+)] )
-       )
-       || ( >=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}]
-               gui? (
-                       x11-libs/gtk+:3
-                       dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-               )
-               nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-       ')"
-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 ru si sk sq sr 
sr@latin sv ta te tr uk zh_CN zh_TW"
-
-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_OBJREF
-       ~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 unified a 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
-
-       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
-               $(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-               $(use_with iptables iptables_restore 
"${EPREFIX}/sbin/iptables-restore")
-               $(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-               $(use_with iptables ip6tables_restore 
"${EPREFIX}/sbin/ip6tables-restore")
-               $(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-               $(use_with iptables ebtables_restore 
"${EPREFIX}/sbin/ebtables-restore")
-               $(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-               --with-systemd-unitdir="$(systemd_get_systemunitdir)"
-               --with-bashcompletiondir="$(get_bashcompdir)"
-       )
-
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       python_optimize
-
-       # Get rid of junk
-       rm -rf "${D}/etc/sysconfig/" || die
-
-       # For non-gui installs we need to remove GUI bits
-       if ! use gui; then
-               rm -rf "${D}/etc/xdg/autostart" || die
-               rm -f "${D}/usr/bin/firewall-applet" || die
-               rm -f "${D}/usr/bin/firewall-config" || die
-               rm -rf "${D}/usr/share/applications" || die
-               rm -rf "${D}/usr/share/icons" || die
-       fi
-
-       newinitd "${FILESDIR}"/firewalld.init firewalld
-
-       # Our version drops the/an obsolete 'conflicts' line with old iptables 
services
-       # bug #833506
-       systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-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
-}

Reply via email to