1 |
commit: 559f842afc8e794b01bbd0a1861b5069fb219202 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 24 12:17:23 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 25 17:21:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=559f842a |
7 |
|
8 |
net-dns/avahi: Drop old, IUSE=gtk3->gtk, drop pygtk dependency |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
net-dns/avahi/avahi-0.6.28-r1.ebuild | 202 --------------------------------- |
13 |
net-dns/avahi/avahi-0.6.30-r1.ebuild | 210 ----------------------------------- |
14 |
net-dns/avahi/avahi-0.6.31-r2.ebuild | 209 ---------------------------------- |
15 |
net-dns/avahi/avahi-0.6.31-r6.ebuild | 33 ++---- |
16 |
net-dns/avahi/metadata.xml | 5 +- |
17 |
5 files changed, 12 insertions(+), 647 deletions(-) |
18 |
|
19 |
diff --git a/net-dns/avahi/avahi-0.6.28-r1.ebuild b/net-dns/avahi/avahi-0.6.28-r1.ebuild |
20 |
deleted file mode 100644 |
21 |
index f9120d68..00000000 |
22 |
--- a/net-dns/avahi/avahi-0.6.28-r1.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,202 +0,0 @@ |
25 |
-# Copyright 1999-2013 Gentoo Foundation |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28-r1.ebuild,v 1.7 2011/03/05 13:42:05 armin76 Exp $ |
28 |
- |
29 |
-EAPI="3" |
30 |
- |
31 |
-PYTHON_DEPEND="python? 2" |
32 |
-PYTHON_USE_WITH="gdbm" |
33 |
-PYTHON_USE_WITH_OPT="python" |
34 |
- |
35 |
-inherit eutils mono python multilib flag-o-matic |
36 |
- |
37 |
-DESCRIPTION="System which facilitates service discovery on a local network" |
38 |
-HOMEPAGE="http://avahi.org/" |
39 |
-SRC_URI="http://avahi.org/download/${P}.tar.gz" |
40 |
- |
41 |
-LICENSE="LGPL-2.1" |
42 |
-SLOT="0" |
43 |
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86" |
44 |
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test " |
45 |
- |
46 |
-DBUS_DEPEND=">=sys-apps/dbus-0.30" |
47 |
-RDEPEND=">=dev-libs/libdaemon-0.14 |
48 |
- dev-libs/expat |
49 |
- >=dev-libs/glib-2 |
50 |
- gdbm? ( sys-libs/gdbm ) |
51 |
- qt3? ( dev-qt/qt-meta:3 ) |
52 |
- qt4? ( dev-qt/qtcore:4 ) |
53 |
- gtk? ( |
54 |
- >=x11-libs/gtk+-2.14.0:2 |
55 |
- ) |
56 |
- dbus? ( |
57 |
- ${DBUS_DEPEND} |
58 |
- python? ( dev-python/dbus-python ) |
59 |
- ) |
60 |
- mono? ( |
61 |
- >=dev-lang/mono-1.1.10 |
62 |
- gtk? ( >=dev-dotnet/gtk-sharp-2 ) |
63 |
- ) |
64 |
- howl-compat? ( |
65 |
- !net-misc/howl |
66 |
- ${DBUS_DEPEND} |
67 |
- ) |
68 |
- mdnsresponder-compat? ( |
69 |
- !net-misc/mDNSResponder |
70 |
- ${DBUS_DEPEND} |
71 |
- ) |
72 |
- python? ( |
73 |
- gtk? ( >=dev-python/pygtk-2 ) |
74 |
- ) |
75 |
- bookmarks? ( |
76 |
- dev-python/twisted |
77 |
- dev-python/twisted-web |
78 |
- ) |
79 |
- kernel_linux? ( sys-libs/libcap )" |
80 |
-DEPEND="${RDEPEND} |
81 |
- >=dev-util/intltool-0.40.5 |
82 |
- virtual/pkgconfig |
83 |
- doc? ( |
84 |
- app-doc/doxygen |
85 |
- mono? ( >=virtual/monodoc-1.1.8 ) |
86 |
- )" |
87 |
- |
88 |
-pkg_setup() { |
89 |
- if use python; then |
90 |
- python_set_active_version 2 |
91 |
- python_pkg_setup |
92 |
- fi |
93 |
- |
94 |
- if use python && ! use dbus && ! use gtk; then |
95 |
- ewarn "For proper python support you should also enable the dbus and gtk USE flags!" |
96 |
- fi |
97 |
-} |
98 |
- |
99 |
-pkg_preinst() { |
100 |
- enewgroup netdev |
101 |
- enewgroup avahi |
102 |
- enewuser avahi -1 -1 -1 avahi |
103 |
- |
104 |
- if use autoipd; then |
105 |
- enewgroup avahi-autoipd |
106 |
- enewuser avahi-autoipd -1 -1 -1 avahi-autoipd |
107 |
- fi |
108 |
-} |
109 |
- |
110 |
-src_prepare() { |
111 |
- if use ipv6; then |
112 |
- sed -i \ |
113 |
- -e s/use-ipv6=no/use-ipv6=yes/ \ |
114 |
- avahi-daemon/avahi-daemon.conf || die |
115 |
- fi |
116 |
- |
117 |
- sed -i\ |
118 |
- -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ |
119 |
- doxygen_to_devhelp.xsl || die |
120 |
- |
121 |
- epatch "${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch |
122 |
- epatch "${FILESDIR}"/${P}-CVE-2011-1002.patch |
123 |
-} |
124 |
- |
125 |
-src_configure() { |
126 |
- use sh && replace-flags -O? -O0 |
127 |
- |
128 |
- local myconf="" |
129 |
- |
130 |
- if use python; then |
131 |
- myconf+=" |
132 |
- $(use_enable dbus python-dbus) |
133 |
- $(use_enable gtk pygtk) |
134 |
- " |
135 |
- fi |
136 |
- |
137 |
- if use mono; then |
138 |
- myconf+=" $(use_enable doc monodoc)" |
139 |
- fi |
140 |
- |
141 |
- # these require dbus enabled |
142 |
- if use mdnsresponder-compat || use howl-compat || use mono; then |
143 |
- myconf+=" --enable-dbus" |
144 |
- fi |
145 |
- |
146 |
- # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module |
147 |
- unset DISPLAY |
148 |
- |
149 |
- # Upstream ships a gir file (AvahiCore.gir) which does not work with |
150 |
- # >=gobject-introspection-0.9, so we disable introspection for now. |
151 |
- # http://avahi.org/ticket/318 |
152 |
- econf \ |
153 |
- --localstatedir=/var \ |
154 |
- --with-distro=gentoo \ |
155 |
- --disable-python-dbus \ |
156 |
- --disable-pygtk \ |
157 |
- --disable-xmltoman \ |
158 |
- --disable-monodoc \ |
159 |
- --disable-introspection \ |
160 |
- --enable-glib \ |
161 |
- $(use_enable test tests) \ |
162 |
- $(use_enable autoipd) \ |
163 |
- $(use_enable mdnsresponder-compat compat-libdns_sd) \ |
164 |
- $(use_enable howl-compat compat-howl) \ |
165 |
- $(use_enable doc doxygen-doc) \ |
166 |
- $(use_enable mono) \ |
167 |
- $(use_enable dbus) \ |
168 |
- $(use_enable python) \ |
169 |
- --disable-gtk3 \ |
170 |
- $(use_enable gtk) \ |
171 |
- $(use_enable qt3) \ |
172 |
- $(use_enable qt4) \ |
173 |
- $(use_enable gdbm) \ |
174 |
- ${myconf} |
175 |
-} |
176 |
- |
177 |
-src_compile() { |
178 |
- emake || die "emake failed" |
179 |
- |
180 |
- use doc && { emake avahi.devhelp || die ; } |
181 |
-} |
182 |
- |
183 |
-src_install() { |
184 |
- emake install py_compile=true DESTDIR="${D}" || die "make install failed" |
185 |
- use bookmarks && use python && use dbus && use gtk || \ |
186 |
- rm -f "${D}"/usr/bin/avahi-bookmarks |
187 |
- |
188 |
- use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc |
189 |
- use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h |
190 |
- |
191 |
- if use autoipd; then |
192 |
- insinto /$(get_libdir)/rcscripts/net |
193 |
- doins "${FILESDIR}"/autoipd.sh || die |
194 |
- |
195 |
- insinto /$(get_libdir)/rc/net |
196 |
- newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die |
197 |
- fi |
198 |
- |
199 |
- dodoc docs/{AUTHORS,NEWS,README,TODO} || die |
200 |
- |
201 |
- if use doc; then |
202 |
- dohtml -r doxygen/html/. || die |
203 |
- insinto /usr/share/devhelp/books/avahi |
204 |
- doins avahi.devhelp || die |
205 |
- fi |
206 |
-} |
207 |
- |
208 |
-pkg_postrm() { |
209 |
- use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover) |
210 |
-} |
211 |
- |
212 |
-pkg_postinst() { |
213 |
- use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover) |
214 |
- |
215 |
- if use autoipd; then |
216 |
- echo |
217 |
- elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" |
218 |
- elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" |
219 |
- fi |
220 |
- |
221 |
- if use dbus; then |
222 |
- echo |
223 |
- elog "If this is your first install of avahi please reload your dbus config" |
224 |
- elog "with /etc/init.d/dbus reload before starting avahi-daemon!" |
225 |
- fi |
226 |
-} |
227 |
|
228 |
diff --git a/net-dns/avahi/avahi-0.6.30-r1.ebuild b/net-dns/avahi/avahi-0.6.30-r1.ebuild |
229 |
deleted file mode 100644 |
230 |
index f6b8998e..00000000 |
231 |
--- a/net-dns/avahi/avahi-0.6.30-r1.ebuild |
232 |
+++ /dev/null |
233 |
@@ -1,210 +0,0 @@ |
234 |
-# Copyright 1999-2013 Gentoo Foundation |
235 |
-# Distributed under the terms of the GNU General Public License v2 |
236 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.1 2011/08/14 12:52:06 nirbheek Exp $ |
237 |
- |
238 |
-EAPI="3" |
239 |
- |
240 |
-PYTHON_DEPEND="python? 2" |
241 |
-PYTHON_USE_WITH="gdbm" |
242 |
-PYTHON_USE_WITH_OPT="python" |
243 |
- |
244 |
-inherit autotools eutils mono python multilib flag-o-matic |
245 |
- |
246 |
-DESCRIPTION="System which facilitates service discovery on a local network" |
247 |
-HOMEPAGE="http://avahi.org/" |
248 |
-SRC_URI="http://avahi.org/download/${P}.tar.gz" |
249 |
- |
250 |
-LICENSE="LGPL-2.1" |
251 |
-SLOT="0" |
252 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 |
253 |
-~x86-linux" |
254 |
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 |
255 |
-kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils" |
256 |
- |
257 |
-DBUS_DEPEND=">=sys-apps/dbus-0.30" |
258 |
-COMMON_DEPEND=">=dev-libs/libdaemon-0.14 |
259 |
- dev-libs/expat |
260 |
- dev-libs/glib:2 |
261 |
- gdbm? ( sys-libs/gdbm ) |
262 |
- qt3? ( dev-qt/qt-meta:3 ) |
263 |
- qt4? ( dev-qt/qtcore:4 ) |
264 |
- gtk? ( >=x11-libs/gtk+-2.14.0:2 ) |
265 |
- gtk3? ( x11-libs/gtk+:3 ) |
266 |
- dbus? ( |
267 |
- ${DBUS_DEPEND} |
268 |
- python? ( dev-python/dbus-python ) |
269 |
- ) |
270 |
- mono? ( |
271 |
- >=dev-lang/mono-1.1.10 |
272 |
- gtk? ( >=dev-dotnet/gtk-sharp-2 ) |
273 |
- ) |
274 |
- howl-compat? ( ${DBUS_DEPEND} ) |
275 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
276 |
- mdnsresponder-compat? ( ${DBUS_DEPEND} ) |
277 |
- python? ( |
278 |
- gtk? ( >=dev-python/pygtk-2 ) |
279 |
- ) |
280 |
- bookmarks? ( |
281 |
- dev-python/twisted |
282 |
- dev-python/twisted-web |
283 |
- ) |
284 |
- kernel_linux? ( sys-libs/libcap )" |
285 |
-DEPEND="${COMMON_DEPEND} |
286 |
- >=dev-util/intltool-0.40.5 |
287 |
- virtual/pkgconfig |
288 |
- doc? ( |
289 |
- app-doc/doxygen |
290 |
- mono? ( >=virtual/monodoc-1.1.8 ) |
291 |
- )" |
292 |
-RDEPEND="${COMMON_DEPEND} |
293 |
- howl-compat? ( !net-misc/howl ) |
294 |
- mdnsresponder-compat? ( !net-misc/mDNSResponder )" |
295 |
- |
296 |
-pkg_setup() { |
297 |
- if use python; then |
298 |
- python_set_active_version 2 |
299 |
- python_pkg_setup |
300 |
- fi |
301 |
- |
302 |
- if use python && ! use dbus && ! use gtk; then |
303 |
- ewarn "For proper python support you should also enable the dbus and gtk USE flags!" |
304 |
- fi |
305 |
- |
306 |
- # FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255 |
307 |
- if use utils && ! { use gtk || use gtk3; }; then |
308 |
- ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''" |
309 |
- fi |
310 |
-} |
311 |
- |
312 |
-pkg_preinst() { |
313 |
- enewgroup netdev |
314 |
- enewgroup avahi |
315 |
- enewuser avahi -1 -1 -1 avahi |
316 |
- |
317 |
- if use autoipd; then |
318 |
- enewgroup avahi-autoipd |
319 |
- enewuser avahi-autoipd -1 -1 -1 avahi-autoipd |
320 |
- fi |
321 |
-} |
322 |
- |
323 |
-src_prepare() { |
324 |
- if use ipv6; then |
325 |
- sed -i \ |
326 |
- -e s/use-ipv6=no/use-ipv6=yes/ \ |
327 |
- avahi-daemon/avahi-daemon.conf || die |
328 |
- fi |
329 |
- |
330 |
- sed -i\ |
331 |
- -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ |
332 |
- doxygen_to_devhelp.xsl || die |
333 |
- |
334 |
- # Make gtk utils optional |
335 |
- epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch" |
336 |
- |
337 |
- eautoreconf |
338 |
-} |
339 |
- |
340 |
-src_configure() { |
341 |
- use sh && replace-flags -O? -O0 |
342 |
- |
343 |
- local myconf="--disable-static" |
344 |
- |
345 |
- if use python; then |
346 |
- myconf+=" |
347 |
- $(use_enable dbus python-dbus) |
348 |
- $(use_enable gtk pygtk) |
349 |
- " |
350 |
- fi |
351 |
- |
352 |
- if use mono; then |
353 |
- myconf+=" $(use_enable doc monodoc)" |
354 |
- fi |
355 |
- |
356 |
- # these require dbus enabled |
357 |
- if use mdnsresponder-compat || use howl-compat || use mono; then |
358 |
- myconf+=" --enable-dbus" |
359 |
- fi |
360 |
- |
361 |
- # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module |
362 |
- unset DISPLAY |
363 |
- |
364 |
- econf \ |
365 |
- --localstatedir="${EPREFIX}/var" \ |
366 |
- --with-distro=gentoo \ |
367 |
- --disable-python-dbus \ |
368 |
- --disable-pygtk \ |
369 |
- --disable-xmltoman \ |
370 |
- --disable-monodoc \ |
371 |
- --enable-glib \ |
372 |
- --enable-gobject \ |
373 |
- $(use_enable test tests) \ |
374 |
- $(use_enable autoipd) \ |
375 |
- $(use_enable mdnsresponder-compat compat-libdns_sd) \ |
376 |
- $(use_enable howl-compat compat-howl) \ |
377 |
- $(use_enable doc doxygen-doc) \ |
378 |
- $(use_enable mono) \ |
379 |
- $(use_enable dbus) \ |
380 |
- $(use_enable python) \ |
381 |
- $(use_enable gtk) \ |
382 |
- $(use_enable gtk3) \ |
383 |
- $(use_enable introspection) \ |
384 |
- $(use_enable utils gtk-utils) \ |
385 |
- $(use_enable qt3) \ |
386 |
- $(use_enable qt4) \ |
387 |
- $(use_enable gdbm) \ |
388 |
- ${myconf} |
389 |
-} |
390 |
- |
391 |
-src_compile() { |
392 |
- emake || die "emake failed" |
393 |
- |
394 |
- use doc && { emake avahi.devhelp || die ; } |
395 |
-} |
396 |
- |
397 |
-src_install() { |
398 |
- emake install py_compile=true DESTDIR="${D}" || die "make install failed" |
399 |
- use bookmarks && use python && use dbus && use gtk || \ |
400 |
- rm -f "${ED}"/usr/bin/avahi-bookmarks |
401 |
- |
402 |
- use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc |
403 |
- use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h |
404 |
- |
405 |
- if use autoipd; then |
406 |
- insinto /$(get_libdir)/rcscripts/net |
407 |
- doins "${FILESDIR}"/autoipd.sh || die |
408 |
- |
409 |
- insinto /$(get_libdir)/rc/net |
410 |
- newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die |
411 |
- fi |
412 |
- |
413 |
- dodoc docs/{AUTHORS,NEWS,README,TODO} || die |
414 |
- |
415 |
- if use doc; then |
416 |
- dohtml -r doxygen/html/. || die |
417 |
- insinto /usr/share/devhelp/books/avahi |
418 |
- doins avahi.devhelp || die |
419 |
- fi |
420 |
- |
421 |
- # Remove .la files |
422 |
- find "${D}" -name '*.la' -exec rm -f {} + || die |
423 |
-} |
424 |
- |
425 |
-pkg_postrm() { |
426 |
- use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover) |
427 |
-} |
428 |
- |
429 |
-pkg_postinst() { |
430 |
- use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover) |
431 |
- |
432 |
- if use autoipd; then |
433 |
- echo |
434 |
- elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" |
435 |
- elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" |
436 |
- fi |
437 |
- |
438 |
- if use dbus; then |
439 |
- echo |
440 |
- elog "If this is your first install of avahi please reload your dbus config" |
441 |
- elog "with /etc/init.d/dbus reload before starting avahi-daemon!" |
442 |
- fi |
443 |
-} |
444 |
|
445 |
diff --git a/net-dns/avahi/avahi-0.6.31-r2.ebuild b/net-dns/avahi/avahi-0.6.31-r2.ebuild |
446 |
deleted file mode 100644 |
447 |
index 11d20fc1..00000000 |
448 |
--- a/net-dns/avahi/avahi-0.6.31-r2.ebuild |
449 |
+++ /dev/null |
450 |
@@ -1,209 +0,0 @@ |
451 |
-# Copyright 1999-2013 Gentoo Foundation |
452 |
-# Distributed under the terms of the GNU General Public License v2 |
453 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r2.ebuild,v 1.14 2013/10/12 12:14:46 pacho Exp $ |
454 |
- |
455 |
-EAPI="5" |
456 |
- |
457 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
458 |
-PYTHON_REQ_USE="gdbm" |
459 |
- |
460 |
-WANT_AUTOMAKE=1.11 |
461 |
- |
462 |
-inherit autotools eutils mono python-r1 multilib flag-o-matic user systemd |
463 |
- |
464 |
-DESCRIPTION="System which facilitates service discovery on a local network" |
465 |
-HOMEPAGE="http://avahi.org/" |
466 |
-SRC_URI="http://avahi.org/download/${P}.tar.gz" |
467 |
- |
468 |
-LICENSE="LGPL-2.1" |
469 |
-SLOT="0" |
470 |
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux" |
471 |
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils" |
472 |
- |
473 |
-REQUIRED_USE=" |
474 |
- utils? ( || ( gtk gtk3 ) ) |
475 |
- python? ( dbus gdbm ) |
476 |
- mono? ( dbus ) |
477 |
- howl-compat? ( dbus ) |
478 |
- mdnsresponder-compat? ( dbus ) |
479 |
-" |
480 |
- |
481 |
-COMMON_DEPEND=" |
482 |
- dev-libs/libdaemon |
483 |
- dev-libs/expat |
484 |
- dev-libs/glib:2 |
485 |
- gdbm? ( sys-libs/gdbm ) |
486 |
- qt3? ( dev-qt/qt-meta:3 ) |
487 |
- qt4? ( dev-qt/qtcore:4 ) |
488 |
- gtk? ( x11-libs/gtk+:2 ) |
489 |
- gtk3? ( x11-libs/gtk+:3 ) |
490 |
- dbus? ( sys-apps/dbus ) |
491 |
- kernel_linux? ( sys-libs/libcap ) |
492 |
- introspection? ( dev-libs/gobject-introspection ) |
493 |
- mono? ( |
494 |
- dev-lang/mono |
495 |
- gtk? ( dev-dotnet/gtk-sharp ) |
496 |
- ) |
497 |
- python? ( |
498 |
- gtk? ( dev-python/pygtk ) |
499 |
- dbus? ( dev-python/dbus-python ) |
500 |
- ) |
501 |
- bookmarks? ( |
502 |
- dev-python/twisted-core |
503 |
- dev-python/twisted-web |
504 |
- ) |
505 |
-" |
506 |
- |
507 |
-DEPEND=" |
508 |
- ${COMMON_DEPEND} |
509 |
- dev-util/intltool |
510 |
- virtual/pkgconfig |
511 |
- doc? ( |
512 |
- app-doc/doxygen |
513 |
- ) |
514 |
-" |
515 |
- |
516 |
-RDEPEND=" |
517 |
- ${COMMON_DEPEND} |
518 |
- howl-compat? ( !net-misc/howl ) |
519 |
- mdnsresponder-compat? ( !net-misc/mDNSResponder ) |
520 |
-" |
521 |
- |
522 |
-pkg_preinst() { |
523 |
- enewgroup netdev |
524 |
- enewgroup avahi |
525 |
- enewuser avahi -1 -1 -1 avahi |
526 |
- |
527 |
- if use autoipd; then |
528 |
- enewgroup avahi-autoipd |
529 |
- enewuser avahi-autoipd -1 -1 -1 avahi-autoipd |
530 |
- fi |
531 |
-} |
532 |
- |
533 |
-src_prepare() { |
534 |
- if use ipv6; then |
535 |
- sed -i \ |
536 |
- -e s/use-ipv6=no/use-ipv6=yes/ \ |
537 |
- avahi-daemon/avahi-daemon.conf || die |
538 |
- fi |
539 |
- |
540 |
- sed -i\ |
541 |
- -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ |
542 |
- doxygen_to_devhelp.xsl || die |
543 |
- |
544 |
- # Make gtk utils optional |
545 |
- epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch |
546 |
- |
547 |
- # Fix init scripts for >=openrc-0.9.0, bug #383641 |
548 |
- epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch |
549 |
- |
550 |
- # install-exec-local -> install-exec-hook |
551 |
- epatch "${FILESDIR}"/${P}-install-exec-hook.patch |
552 |
- |
553 |
- # Backport host-name-from-machine-id patch, bug #466134 |
554 |
- epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch |
555 |
- |
556 |
- # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575 |
557 |
- epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch |
558 |
- |
559 |
- # Drop DEPRECATED flags, bug #384743 |
560 |
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die |
561 |
- |
562 |
- # Fix references to Lennart's home directory, bug #466210 |
563 |
- sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die |
564 |
- |
565 |
- # Prevent .pyc files in DESTDIR |
566 |
- >py-compile |
567 |
- |
568 |
- eautoreconf |
569 |
-} |
570 |
- |
571 |
-src_configure() { |
572 |
- use sh && replace-flags -O? -O0 |
573 |
- |
574 |
- local myconf="--disable-static" |
575 |
- |
576 |
- if use python; then |
577 |
- python_export_best |
578 |
- myconf+=" |
579 |
- $(use_enable dbus python-dbus) |
580 |
- $(use_enable gtk pygtk) |
581 |
- " |
582 |
- fi |
583 |
- |
584 |
- if use mono; then |
585 |
- myconf+=" $(use_enable doc monodoc)" |
586 |
- fi |
587 |
- |
588 |
- # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module |
589 |
- unset DISPLAY |
590 |
- |
591 |
- econf \ |
592 |
- --localstatedir="${EPREFIX}/var" \ |
593 |
- --with-distro=gentoo \ |
594 |
- --disable-python-dbus \ |
595 |
- --disable-pygtk \ |
596 |
- --disable-xmltoman \ |
597 |
- --disable-monodoc \ |
598 |
- --enable-glib \ |
599 |
- --enable-gobject \ |
600 |
- $(use_enable test tests) \ |
601 |
- $(use_enable autoipd) \ |
602 |
- $(use_enable mdnsresponder-compat compat-libdns_sd) \ |
603 |
- $(use_enable howl-compat compat-howl) \ |
604 |
- $(use_enable doc doxygen-doc) \ |
605 |
- $(use_enable mono) \ |
606 |
- $(use_enable dbus) \ |
607 |
- $(use_enable python) \ |
608 |
- $(use_enable gtk) \ |
609 |
- $(use_enable gtk3) \ |
610 |
- $(use_enable introspection) \ |
611 |
- $(use_enable utils gtk-utils) \ |
612 |
- $(use_enable qt3) \ |
613 |
- $(use_enable qt4) \ |
614 |
- $(use_enable gdbm) \ |
615 |
- $(systemd_with_unitdir) \ |
616 |
- ${myconf} |
617 |
-} |
618 |
- |
619 |
-src_compile() { |
620 |
- emake || die "emake failed" |
621 |
- |
622 |
- use doc && { emake avahi.devhelp || die ; } |
623 |
-} |
624 |
- |
625 |
-src_install() { |
626 |
- emake install DESTDIR="${D}" || die "make install failed" |
627 |
- use bookmarks && use python && use dbus && use gtk || \ |
628 |
- rm -f "${ED}"/usr/bin/avahi-bookmarks |
629 |
- |
630 |
- use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc |
631 |
- use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h |
632 |
- |
633 |
- if use autoipd; then |
634 |
- insinto /$(get_libdir)/rcscripts/net |
635 |
- doins "${FILESDIR}"/autoipd.sh || die |
636 |
- |
637 |
- insinto /$(get_libdir)/rc/net |
638 |
- newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die |
639 |
- fi |
640 |
- |
641 |
- dodoc docs/{AUTHORS,NEWS,README,TODO} || die |
642 |
- |
643 |
- if use doc; then |
644 |
- dohtml -r doxygen/html/. || die |
645 |
- insinto /usr/share/devhelp/books/avahi |
646 |
- doins avahi.devhelp || die |
647 |
- fi |
648 |
- |
649 |
- find "${ED}" -name '*.la' -exec rm -f {} + |
650 |
-} |
651 |
- |
652 |
-pkg_postinst() { |
653 |
- if use autoipd; then |
654 |
- elog |
655 |
- elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" |
656 |
- elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" |
657 |
- elog |
658 |
- fi |
659 |
-} |
660 |
|
661 |
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild |
662 |
index e4b38704..b140ed6d 100644 |
663 |
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild |
664 |
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild |
665 |
@@ -1,6 +1,5 @@ |
666 |
-# Copyright 1999-2015 Gentoo Foundation |
667 |
+# Copyright 1999-2020 Gentoo Authors |
668 |
# Distributed under the terms of the GNU General Public License v2 |
669 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r6.ebuild,v 1.11 2015/04/08 18:16:54 mgorny Exp $ |
670 |
|
671 |
EAPI="5" |
672 |
|
673 |
@@ -19,10 +18,10 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz" |
674 |
LICENSE="LGPL-2.1" |
675 |
SLOT="0" |
676 |
KEYWORDS="~alpha amd64 ~arm ~hppa m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux" |
677 |
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils" |
678 |
+IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils" |
679 |
|
680 |
REQUIRED_USE=" |
681 |
- utils? ( || ( gtk gtk3 ) ) |
682 |
+ utils? ( gtk ) |
683 |
python? ( dbus gdbm ) |
684 |
mono? ( dbus ) |
685 |
howl-compat? ( dbus ) |
686 |
@@ -36,33 +35,23 @@ COMMON_DEPEND=" |
687 |
gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) |
688 |
qt3? ( dev-qt/qt-meta:3 ) |
689 |
qt4? ( dev-qt/qtcore:4 ) |
690 |
- gtk? ( x11-libs/gtk+:2 ) |
691 |
- gtk3? ( x11-libs/gtk+:3 ) |
692 |
+ gtk? ( x11-libs/gtk+:3 ) |
693 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
694 |
kernel_linux? ( sys-libs/libcap ) |
695 |
introspection? ( dev-libs/gobject-introspection ) |
696 |
- mono? ( |
697 |
- dev-lang/mono |
698 |
- gtk? ( dev-dotnet/gtk-sharp ) |
699 |
- ) |
700 |
+ mono? ( dev-lang/mono ) |
701 |
python? ( |
702 |
${PYTHON_DEPS} |
703 |
- gtk? ( dev-python/pygtk ) |
704 |
dbus? ( dev-python/dbus-python ) |
705 |
) |
706 |
- bookmarks? ( |
707 |
- dev-python/twisted-core |
708 |
- dev-python/twisted-web |
709 |
- ) |
710 |
+ bookmarks? ( dev-python/twisted ) |
711 |
" |
712 |
|
713 |
DEPEND=" |
714 |
${COMMON_DEPEND} |
715 |
dev-util/intltool |
716 |
>=virtual/pkgconfig-0-r1 |
717 |
- doc? ( |
718 |
- app-doc/doxygen |
719 |
- ) |
720 |
+ doc? ( app-doc/doxygen ) |
721 |
" |
722 |
|
723 |
RDEPEND=" |
724 |
@@ -159,7 +148,7 @@ multilib_src_configure() { |
725 |
if use python; then |
726 |
myconf+=( |
727 |
$(multilib_native_use_enable dbus python-dbus) |
728 |
- $(multilib_native_use_enable gtk pygtk) |
729 |
+ --disable-pygtk |
730 |
) |
731 |
fi |
732 |
|
733 |
@@ -192,8 +181,8 @@ multilib_src_configure() { |
734 |
$(multilib_native_use_enable mono) \ |
735 |
$(use_enable dbus) \ |
736 |
$(multilib_native_use_enable python) \ |
737 |
- $(multilib_native_use_enable gtk) \ |
738 |
- $(multilib_native_use_enable gtk3) \ |
739 |
+ --disable-gtk \ |
740 |
+ $(multilib_native_use_enable gtk gtk3) \ |
741 |
$(use_enable nls) \ |
742 |
$(multilib_native_use_enable introspection) \ |
743 |
$(multilib_native_use_enable utils gtk-utils) \ |
744 |
@@ -212,7 +201,7 @@ multilib_src_compile() { |
745 |
|
746 |
multilib_src_install() { |
747 |
emake install DESTDIR="${D}" |
748 |
- use bookmarks && use python && use dbus && use gtk || \ |
749 |
+ use bookmarks && use python && use dbus || \ |
750 |
rm -f "${ED}"/usr/bin/avahi-bookmarks |
751 |
|
752 |
use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc |
753 |
|
754 |
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml |
755 |
index d7665549..626558ea 100644 |
756 |
--- a/net-dns/avahi/metadata.xml |
757 |
+++ b/net-dns/avahi/metadata.xml |
758 |
@@ -2,16 +2,13 @@ |
759 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
760 |
<pkgmetadata> |
761 |
<!-- maintainer-needed --> |
762 |
-<maintainer> |
763 |
- <email>swegener@g.o</email> |
764 |
-</maintainer> |
765 |
<use> |
766 |
<flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address |
767 |
configuration daemon</flag> |
768 |
<flag name='bookmarks'>Install the avahi-bookmarks application (requires |
769 |
<pkg>dev-python/twisted</pkg>)</flag> |
770 |
<flag name='howl-compat'>Enable compat libraries for howl</flag> |
771 |
- <flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the |
772 |
+ <flag name="gtk">Build the avahi-ui-gtk3 library, and use gtk3 for the |
773 |
avahi utilities under USE=utils</flag> |
774 |
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> |
775 |
for introspection</flag> |