Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/
Date: Sun, 29 Aug 2021 23:24:28
Message-Id: 1630279448.b9cab9d21eaba6ae665b6a07081dec3acb470824.sam@gentoo
1 commit: b9cab9d21eaba6ae665b6a07081dec3acb470824
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 29 23:24:08 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 29 23:24:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cab9d2
7
8 net-firewall/firewalld: drop 0.7.1-r3, 0.7.3-r1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 net-firewall/firewalld/Manifest | 2 -
13 net-firewall/firewalld/firewalld-0.7.1-r3.ebuild | 118 -----------------------
14 net-firewall/firewalld/firewalld-0.7.3-r1.ebuild | 118 -----------------------
15 3 files changed, 238 deletions(-)
16
17 diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
18 index ede989b0123..4e27cc4b4e8 100644
19 --- a/net-firewall/firewalld/Manifest
20 +++ b/net-firewall/firewalld/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
23 -DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
24 DIST firewalld-0.9.1.tar.gz 1335885 BLAKE2B 0952039f1f50d6395921bea5ad031c5d21d9be04c5d0b09074f9fce76c29a1ab5acf23f0ee8442ae0c2a4e12e28a42edae40f9b536b007cf747c4eab60e43a04 SHA512 aa29fb8926285d6cc7aff318921cf84cacd7c3e4cecacd9b48bf8b5e16502ceedd8ec6cd78546d2373d084230277e0f43c1e655441eda76fe898960d6f2d46b6
25 DIST firewalld-0.9.3.tar.gz 1309371 BLAKE2B 78a86f9c14ed8cc2497f3b79e4be627a28dcdcd4e8117438cb24142643bd16dc624196a80ce2c9f81c63f745c1b1430b2e8c2f3f1061f98fd4fa58f6227def81 SHA512 6ae45652225a3b983c0f67307208df171cf4794da5873a84b4a827753b8d93736f0538e06d31cd8177446827691886a58a493b6be1dcf6efd1a550f8886522f4
26 DIST firewalld-1.0.1.tar.gz 1306854 BLAKE2B 6dd68ed4219eb7d266e6bfa4d626dec51dcf28aae84609c9b87afa8e397179b0565bc8144c106c8ae8770293b371552b930679ec8a1204b2c9cb1f75e39c7013 SHA512 875af09caface324f7b5cfb0a87df5d309ff2e9e51d6d3a797f46f951ba95f4e1bc9f9f046f5191fafdef878dc65baf1b77a25a17f5aaf2f32bb1e1f782f1f8c
27
28 diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
29 deleted file mode 100644
30 index 05546297f4b..00000000000
31 --- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
32 +++ /dev/null
33 @@ -1,118 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{8,9} )
40 -inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
41 -
42 -DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
43 -HOMEPAGE="http://www.firewalld.org/"
44 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 -
46 -LICENSE="GPL-2+"
47 -SLOT="0"
48 -KEYWORDS="amd64 arm64 ~ppc64 x86"
49 -IUSE="gui +nftables +iptables"
50 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
51 -
52 -RDEPEND="${PYTHON_DEPS}
53 - !!net-firewall/gshield
54 - nftables? ( net-firewall/nftables )
55 - iptables? (
56 - net-firewall/iptables[ipv6]
57 - net-firewall/ebtables
58 - net-firewall/ipset
59 - nftables? ( net-firewall/nftables[xtables(+)] )
60 - )
61 - || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
62 - $(python_gen_cond_dep '
63 - dev-python/dbus-python[${PYTHON_USEDEP}]
64 - dev-python/decorator[${PYTHON_USEDEP}]
65 - >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
66 - dev-python/pygobject:3[${PYTHON_USEDEP}]
67 - gui? (
68 - x11-libs/gtk+:3
69 - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
70 - )
71 - ')"
72 -DEPEND="${RDEPEND}
73 - dev-libs/glib:2
74 - >=dev-util/intltool-0.35
75 - sys-devel/gettext"
76 -
77 -RESTRICT="test" # bug 650760
78 -
79 -PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
80 -
81 -pkg_setup() {
82 - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
83 -
84 - # kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
85 - if kernel_is -lt 4 19; then
86 - CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
87 - fi
88 -
89 - linux-info_pkg_setup
90 -}
91 -
92 -src_prepare() {
93 - default
94 - eautoreconf
95 -
96 - plocale_find_changes "po" "" ".po"
97 - plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
98 -}
99 -
100 -src_configure() {
101 - python_setup
102 -
103 - local econf_args=(
104 - --enable-systemd
105 - $(use_with nftables nft "${EPREFIX}/sbin/nft")
106 - $(use_with iptables iptables "${EPREFIX}/sbin/iptables")
107 - $(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
108 - $(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
109 - $(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
110 - $(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
111 - $(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
112 - $(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
113 - --with-systemd-unitdir="$(systemd_get_systemunitdir)"
114 - --with-bashcompletiondir="$(get_bashcompdir)"
115 - )
116 - econf "${econf_args[@]}"
117 -}
118 -
119 -src_install() {
120 - default
121 - python_optimize
122 -
123 - # Get rid of junk
124 - rm -rf "${D}/etc/rc.d/" || die
125 - rm -rf "${D}/etc/sysconfig/" || die
126 -
127 - # For non-gui installs we need to remove GUI bits
128 - if ! use gui; then
129 - rm -rf "${D}/etc/xdg/autostart" || die
130 - rm -f "${D}/usr/bin/firewall-applet" || die
131 - rm -f "${D}/usr/bin/firewall-config" || die
132 - rm -rf "${D}/usr/share/applications" || die
133 - rm -rf "${D}/usr/share/icons" || die
134 - fi
135 -
136 - newinitd "${FILESDIR}"/firewalld.init firewalld
137 -}
138 -
139 -pkg_preinst() {
140 - gnome2_schemas_savelist
141 -}
142 -
143 -pkg_postinst() {
144 - xdg_icon_cache_update
145 - gnome2_schemas_update
146 -}
147 -
148 -pkg_postrm() {
149 - xdg_icon_cache_update
150 - gnome2_schemas_update
151 -}
152
153 diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
154 deleted file mode 100644
155 index d926073fdf7..00000000000
156 --- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
157 +++ /dev/null
158 @@ -1,118 +0,0 @@
159 -# Copyright 1999-2021 Gentoo Authors
160 -# Distributed under the terms of the GNU General Public License v2
161 -
162 -EAPI=7
163 -
164 -PYTHON_COMPAT=( python3_{8,9} )
165 -inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
166 -
167 -DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
168 -HOMEPAGE="http://www.firewalld.org/"
169 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
170 -
171 -LICENSE="GPL-2+"
172 -SLOT="0"
173 -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
174 -IUSE="gui +nftables +iptables"
175 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
176 -
177 -RDEPEND="${PYTHON_DEPS}
178 - !!net-firewall/gshield
179 - nftables? ( net-firewall/nftables )
180 - iptables? (
181 - net-firewall/iptables[ipv6]
182 - net-firewall/ebtables
183 - net-firewall/ipset
184 - nftables? ( net-firewall/nftables[xtables(+)] )
185 - )
186 - || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
187 - $(python_gen_cond_dep '
188 - dev-python/dbus-python[${PYTHON_USEDEP}]
189 - dev-python/decorator[${PYTHON_USEDEP}]
190 - >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
191 - dev-python/pygobject:3[${PYTHON_USEDEP}]
192 - gui? (
193 - x11-libs/gtk+:3
194 - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
195 - )
196 - ')"
197 -DEPEND="${RDEPEND}
198 - dev-libs/glib:2
199 - >=dev-util/intltool-0.35
200 - sys-devel/gettext"
201 -
202 -RESTRICT="test" # bug 650760
203 -
204 -PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
205 -
206 -pkg_setup() {
207 - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK"
208 -
209 - # kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
210 - if kernel_is -lt 4 19; then
211 - CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
212 - fi
213 -
214 - linux-info_pkg_setup
215 -}
216 -
217 -src_prepare() {
218 - default
219 - eautoreconf
220 -
221 - plocale_find_changes "po" "" ".po"
222 - plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
223 -}
224 -
225 -src_configure() {
226 - python_setup
227 -
228 - local econf_args=(
229 - --enable-systemd
230 - $(use_with nftables nft "${EPREFIX}/sbin/nft")
231 - $(use_with iptables iptables "${EPREFIX}/sbin/iptables")
232 - $(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
233 - $(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
234 - $(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
235 - $(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
236 - $(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
237 - $(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
238 - --with-systemd-unitdir="$(systemd_get_systemunitdir)"
239 - --with-bashcompletiondir="$(get_bashcompdir)"
240 - )
241 - econf "${econf_args[@]}"
242 -}
243 -
244 -src_install() {
245 - default
246 - python_optimize
247 -
248 - # Get rid of junk
249 - rm -rf "${D}/etc/rc.d/" || die
250 - rm -rf "${D}/etc/sysconfig/" || die
251 -
252 - # For non-gui installs we need to remove GUI bits
253 - if ! use gui; then
254 - rm -rf "${D}/etc/xdg/autostart" || die
255 - rm -f "${D}/usr/bin/firewall-applet" || die
256 - rm -f "${D}/usr/bin/firewall-config" || die
257 - rm -rf "${D}/usr/share/applications" || die
258 - rm -rf "${D}/usr/share/icons" || die
259 - fi
260 -
261 - newinitd "${FILESDIR}"/firewalld.init firewalld
262 -}
263 -
264 -pkg_preinst() {
265 - gnome2_schemas_savelist
266 -}
267 -
268 -pkg_postinst() {
269 - xdg_icon_cache_update
270 - gnome2_schemas_update
271 -}
272 -
273 -pkg_postrm() {
274 - xdg_icon_cache_update
275 - gnome2_schemas_update
276 -}