1 |
commit: 38f8fa95b10b471388121559841eddfa09415a9f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 28 21:40:17 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 28 22:20:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f8fa95 |
7 |
|
8 |
net-firewall/firewalld: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
net-firewall/firewalld/Manifest | 1 - |
13 |
net-firewall/firewalld/firewalld-0.4.3.3.ebuild | 108 ----------------------- |
14 |
net-firewall/firewalld/firewalld-0.5.1-r1.ebuild | 103 --------------------- |
15 |
3 files changed, 212 deletions(-) |
16 |
|
17 |
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest |
18 |
index f07683c2650..867d62e1570 100644 |
19 |
--- a/net-firewall/firewalld/Manifest |
20 |
+++ b/net-firewall/firewalld/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a |
23 |
DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be |
24 |
|
25 |
diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild |
26 |
deleted file mode 100644 |
27 |
index e270b3f02b3..00000000000 |
28 |
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,108 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=5 |
35 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
36 |
-#BACKPORTS= |
37 |
- |
38 |
-inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1 |
39 |
- |
40 |
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall" |
41 |
-HOMEPAGE="http://www.firewalld.org/" |
42 |
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2 |
43 |
- ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}" |
44 |
- |
45 |
-LICENSE="GPL-2+" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="amd64 ~arm64 x86" |
48 |
-IUSE="gui" |
49 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
50 |
- |
51 |
-RDEPEND="${PYTHON_DEPS} |
52 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
53 |
- dev-python/decorator[${PYTHON_USEDEP}] |
54 |
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}] |
55 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
56 |
- net-firewall/ebtables |
57 |
- net-firewall/iptables[ipv6] |
58 |
- net-firewall/ipset |
59 |
- || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) |
60 |
- gui? ( |
61 |
- x11-libs/gtk+:3 |
62 |
- dev-python/PyQt4[${PYTHON_USEDEP}] |
63 |
- )" |
64 |
-DEPEND="${RDEPEND} |
65 |
- dev-libs/glib:2 |
66 |
- >=dev-util/intltool-0.35 |
67 |
- sys-devel/gettext" |
68 |
- |
69 |
-src_prepare() { |
70 |
- [[ -n ${BACKPORTS} ]] && \ |
71 |
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
72 |
- epatch |
73 |
- |
74 |
- epatch_user |
75 |
- eautoreconf |
76 |
-} |
77 |
- |
78 |
-src_configure() { |
79 |
- python_setup |
80 |
- |
81 |
- econf \ |
82 |
- --enable-systemd \ |
83 |
- --with-iptables="${EPREFIX}/sbin/iptables" \ |
84 |
- --with-ip6tables="${EPREFIX}/sbin/ip6tables" \ |
85 |
- --with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \ |
86 |
- --with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \ |
87 |
- --with-ebtables="${EPREFIX}/sbin/ebtables" \ |
88 |
- --with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \ |
89 |
- "$(systemd_with_unitdir 'systemd-unitdir')" \ |
90 |
- --with-bashcompletiondir="$(get_bashcompdir)" |
91 |
-} |
92 |
- |
93 |
-src_install() { |
94 |
- # manually split up the installation to avoid "file already exists" errors |
95 |
- emake -C config DESTDIR="${D}" install |
96 |
- emake -C po DESTDIR="${D}" install |
97 |
- emake -C shell-completion DESTDIR="${D}" install |
98 |
- emake -C doc DESTDIR="${D}" install |
99 |
- |
100 |
- install_python() { |
101 |
- emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install |
102 |
- python_optimize |
103 |
- } |
104 |
- python_foreach_impl install_python |
105 |
- |
106 |
- python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config} |
107 |
- python_replicate_script "${D}/usr/sbin/firewalld" |
108 |
- |
109 |
- # Get rid of junk |
110 |
- rm -rf "${D}/etc/rc.d/" |
111 |
- rm -rf "${D}/etc/sysconfig/" |
112 |
- |
113 |
- # For non-gui installs we need to remove GUI bits |
114 |
- if ! use gui; then |
115 |
- rm -rf "${D}/etc/xdg/autostart" |
116 |
- rm -f "${D}/usr/bin/firewall-applet" |
117 |
- rm -f "${D}/usr/bin/firewall-config" |
118 |
- rm -rf "${D}/usr/share/applications" |
119 |
- rm -rf "${D}/usr/share/icons" |
120 |
- fi |
121 |
- |
122 |
- newinitd "${FILESDIR}"/firewalld.init firewalld |
123 |
-} |
124 |
- |
125 |
-pkg_preinst() { |
126 |
- gnome2_icon_savelist |
127 |
- gnome2_schemas_savelist |
128 |
-} |
129 |
- |
130 |
-pkg_postinst() { |
131 |
- gnome2_icon_cache_update |
132 |
- gnome2_schemas_update |
133 |
-} |
134 |
- |
135 |
-pkg_postrm() { |
136 |
- gnome2_icon_cache_update |
137 |
- gnome2_schemas_update |
138 |
-} |
139 |
|
140 |
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild |
141 |
deleted file mode 100644 |
142 |
index 516a0ba3d63..00000000000 |
143 |
--- a/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,103 +0,0 @@ |
146 |
-# Copyright 1999-2018 Gentoo Foundation |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=6 |
150 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
151 |
- |
152 |
-inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1 |
153 |
- |
154 |
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall" |
155 |
-HOMEPAGE="http://www.firewalld.org/" |
156 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
157 |
- |
158 |
-LICENSE="GPL-2+" |
159 |
-SLOT="0" |
160 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
161 |
-IUSE="gui" |
162 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
163 |
- |
164 |
-RDEPEND="${PYTHON_DEPS} |
165 |
- !!net-firewall/gshield |
166 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
167 |
- dev-python/decorator[${PYTHON_USEDEP}] |
168 |
- >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}] |
169 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
170 |
- net-firewall/ebtables |
171 |
- net-firewall/iptables[ipv6] |
172 |
- net-firewall/ipset |
173 |
- || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) |
174 |
- gui? ( |
175 |
- x11-libs/gtk+:3 |
176 |
- dev-python/PyQt4[${PYTHON_USEDEP}] |
177 |
- )" |
178 |
-DEPEND="${RDEPEND} |
179 |
- dev-libs/glib:2 |
180 |
- >=dev-util/intltool-0.35 |
181 |
- sys-devel/gettext" |
182 |
- |
183 |
-src_prepare() { |
184 |
- default |
185 |
- eautoreconf |
186 |
-} |
187 |
- |
188 |
-src_configure() { |
189 |
- python_setup |
190 |
- |
191 |
- econf \ |
192 |
- --enable-systemd \ |
193 |
- --with-iptables="${EPREFIX}/sbin/iptables" \ |
194 |
- --with-ip6tables="${EPREFIX}/sbin/ip6tables" \ |
195 |
- --with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \ |
196 |
- --with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \ |
197 |
- --with-ebtables="${EPREFIX}/sbin/ebtables" \ |
198 |
- --with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \ |
199 |
- --with-systemd-unitdir="$(systemd_get_systemunitdir)" \ |
200 |
- --with-bashcompletiondir="$(get_bashcompdir)" |
201 |
-} |
202 |
- |
203 |
-src_install() { |
204 |
- # manually split up the installation to avoid "file already exists" errors |
205 |
- emake -C config DESTDIR="${D}" install |
206 |
- emake -C po DESTDIR="${D}" install |
207 |
- emake -C shell-completion DESTDIR="${D}" install |
208 |
- emake -C doc DESTDIR="${D}" install |
209 |
- |
210 |
- install_python() { |
211 |
- emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install |
212 |
- python_optimize |
213 |
- } |
214 |
- python_foreach_impl install_python |
215 |
- |
216 |
- python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config} |
217 |
- python_replicate_script "${D}/usr/sbin/firewalld" |
218 |
- |
219 |
- # Get rid of junk |
220 |
- rm -rf "${D}/etc/rc.d/" |
221 |
- rm -rf "${D}/etc/sysconfig/" |
222 |
- |
223 |
- # For non-gui installs we need to remove GUI bits |
224 |
- if ! use gui; then |
225 |
- rm -rf "${D}/etc/xdg/autostart" |
226 |
- rm -f "${D}/usr/bin/firewall-applet" |
227 |
- rm -f "${D}/usr/bin/firewall-config" |
228 |
- rm -rf "${D}/usr/share/applications" |
229 |
- rm -rf "${D}/usr/share/icons" |
230 |
- fi |
231 |
- |
232 |
- newinitd "${FILESDIR}"/firewalld.init firewalld |
233 |
-} |
234 |
- |
235 |
-pkg_preinst() { |
236 |
- gnome2_icon_savelist |
237 |
- gnome2_schemas_savelist |
238 |
-} |
239 |
- |
240 |
-pkg_postinst() { |
241 |
- gnome2_icon_cache_update |
242 |
- gnome2_schemas_update |
243 |
-} |
244 |
- |
245 |
-pkg_postrm() { |
246 |
- gnome2_icon_cache_update |
247 |
- gnome2_schemas_update |
248 |
-} |