commit:     d0e5ee08fefb505f06199c77dc8ed65be0f94a32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 19:30:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:50:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e5ee08

net-firewall/firewalld: drop 1.1.2, 1.2.0

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

 net-firewall/firewalld/Manifest               |   2 -
 net-firewall/firewalld/firewalld-1.1.2.ebuild | 212 --------------------------
 net-firewall/firewalld/firewalld-1.2.0.ebuild | 212 --------------------------
 3 files changed, 426 deletions(-)

diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index c92bd3fd4b47..148b643488f6 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,5 +1,3 @@
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 
0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a
 SHA512 
ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
-DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B 
ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150
 SHA512 
a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0
 DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 
178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38
 SHA512 
5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
-DIST firewalld-1.2.0.tar.gz 2120379 BLAKE2B 
8c09e9a5e08e9f4dc2b3bfeda35d9078bd464956a30d7fdb5700329755fc307f0664f6a20ff5e941026785f28940b1eeebe747e2b2b3eed150725e014d05f870
 SHA512 
739ef7e4b85f2f00656434f6b37fb8116b9a93595390667d212820bc30a3e3cfaf5a60be7b18ec1f72be720d35a76224f3ce28856a9ff72557b8a8ae8e83f0a8
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 
4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef
 SHA512 
a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a

diff --git a/net-firewall/firewalld/firewalld-1.1.2.ebuild 
b/net-firewall/firewalld/firewalld-1.1.2.ebuild
deleted file mode 100644
index a1e5b3069d0d..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-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_COUNTER
-       ~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
-
-       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.2.0.ebuild 
b/net-firewall/firewalld/firewalld-1.2.0.ebuild
deleted file mode 100644
index a1e5b3069d0d..000000000000
--- a/net-firewall/firewalld/firewalld-1.2.0.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-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_COUNTER
-       ~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
-
-       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