Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Maxim Koltsov (maksbotan)" <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dns/avahi: avahi-0.6.30-r2.ebuild ChangeLog avahi-0.6.29-r1.ebuild avahi-0.6.29.ebuild avahi-0.6.30.ebuild
Date: Sat, 24 Dec 2011 17:03:37
Message-Id: 20111224170327.B161E2004B@flycatcher.gentoo.org
1 maksbotan 11/12/24 17:03:27
2
3 Modified: ChangeLog
4 Added: avahi-0.6.30-r2.ebuild avahi-0.6.29-r1.ebuild
5 Removed: avahi-0.6.29.ebuild avahi-0.6.30.ebuild
6 Log:
7 Fix shebangs, bug 383773. Clean old versions
8
9 (Portage version: 2.1.10.41/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.212 net-dns/avahi/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.212&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.212&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.211&r2=1.212
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v
21 retrieving revision 1.211
22 retrieving revision 1.212
23 diff -u -r1.211 -r1.212
24 --- ChangeLog 18 Dec 2011 22:19:29 -0000 1.211
25 +++ ChangeLog 24 Dec 2011 17:03:27 -0000 1.212
26 @@ -1,6 +1,6 @@
27 # ChangeLog for net-dns/avahi
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.211 2011/12/18 22:19:29 maekke Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.212 2011/12/24 17:03:27 maksbotan Exp $
31
32 18 Dec 2011; Markus Meier <maekke@g.o> avahi-0.6.30-r1.ebuild:
33 arm stable, bug #393009
34 @@ -11,6 +11,13 @@
35 16 Dec 2011; Jeroen Roovers <jer@g.o> avahi-0.6.30-r1.ebuild:
36 Stable for HPPA (bug #393009).
37
38 +*avahi-0.6.30-r2 (24 Dec 2011)
39 +*avahi-0.6.29-r1 (24 Dec 2011)
40 +
41 + 24 Dec 2011; Maxim Koltsov <maksbotan@g.o> -avahi-0.6.29.ebuild,
42 + +avahi-0.6.29-r1.ebuild, -avahi-0.6.30.ebuild, +avahi-0.6.30-r2.ebuild:
43 + Fix shebangs, bug 383773. Clean old versions
44 +
45 15 Dec 2011; Agostino Sarubbo <ago@g.o> avahi-0.6.30-r1.ebuild:
46 Stable for AMD64, wrt bug #393009
47
48
49
50
51 1.1 net-dns/avahi/avahi-0.6.30-r2.ebuild
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild?rev=1.1&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild?rev=1.1&content-type=text/plain
55
56 Index: avahi-0.6.30-r2.ebuild
57 ===================================================================
58 # Copyright 1999-2011 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 # $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild,v 1.1 2011/12/24 17:03:27 maksbotan Exp $
61
62 EAPI="3"
63
64 PYTHON_DEPEND="python? 2"
65 PYTHON_USE_WITH="gdbm"
66 PYTHON_USE_WITH_OPT="python"
67
68 inherit autotools eutils mono python multilib flag-o-matic
69
70 DESCRIPTION="System which facilitates service discovery on a local network"
71 HOMEPAGE="http://avahi.org/"
72 SRC_URI="http://avahi.org/download/${P}.tar.gz"
73
74 LICENSE="LGPL-2.1"
75 SLOT="0"
76 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
77 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
78 kernel_linux mdnsresponder-compat mono python qt4 test utils"
79
80 DBUS_DEPEND=">=sys-apps/dbus-0.30"
81 COMMON_DEPEND=">=dev-libs/libdaemon-0.14
82 dev-libs/expat
83 dev-libs/glib:2
84 gdbm? ( sys-libs/gdbm )
85 qt4? ( x11-libs/qt-core:4 )
86 gtk? ( >=x11-libs/gtk+-2.14.0:2 )
87 gtk3? ( x11-libs/gtk+:3 )
88 dbus? (
89 ${DBUS_DEPEND}
90 python? ( dev-python/dbus-python )
91 )
92 mono? (
93 >=dev-lang/mono-1.1.10
94 gtk? ( >=dev-dotnet/gtk-sharp-2 )
95 )
96 howl-compat? ( ${DBUS_DEPEND} )
97 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
98 mdnsresponder-compat? ( ${DBUS_DEPEND} )
99 python? (
100 gtk? ( >=dev-python/pygtk-2 )
101 )
102 bookmarks? (
103 dev-python/twisted
104 dev-python/twisted-web
105 )
106 kernel_linux? ( sys-libs/libcap )"
107 DEPEND="${COMMON_DEPEND}
108 >=dev-util/intltool-0.40.5
109 >=dev-util/pkgconfig-0.9.0
110 doc? (
111 app-doc/doxygen
112 mono? ( >=virtual/monodoc-1.1.8 )
113 )"
114 RDEPEND="${COMMON_DEPEND}
115 howl-compat? ( !net-misc/howl )
116 mdnsresponder-compat? ( !net-misc/mDNSResponder )"
117
118 pkg_setup() {
119 if use python; then
120 python_set_active_version 2
121 python_pkg_setup
122 fi
123
124 if use python && ! use dbus && ! use gtk; then
125 ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
126 fi
127
128 # FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
129 if use utils && ! { use gtk || use gtk3; }; then
130 ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
131 fi
132 }
133
134 pkg_preinst() {
135 enewgroup netdev
136 enewgroup avahi
137 enewuser avahi -1 -1 -1 avahi
138
139 if use autoipd; then
140 enewgroup avahi-autoipd
141 enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
142 fi
143 }
144
145 src_prepare() {
146 if use ipv6; then
147 sed -i \
148 -e s/use-ipv6=no/use-ipv6=yes/ \
149 avahi-daemon/avahi-daemon.conf || die
150 fi
151
152 sed -i\
153 -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
154 doxygen_to_devhelp.xsl || die
155
156 # Make gtk utils optional
157 epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch"
158
159 # Fix init scripts for >=openrc-0.9.0 (bug #383641)
160 epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
161
162 # Drop DEPRECATED flags, bug #384743
163 sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
164
165 eautoreconf
166 }
167
168 src_configure() {
169 use sh && replace-flags -O? -O0
170
171 local myconf="--disable-static"
172
173 if use python; then
174 myconf+="
175 $(use_enable dbus python-dbus)
176 $(use_enable gtk pygtk)
177 "
178 fi
179
180 if use mono; then
181 myconf+=" $(use_enable doc monodoc)"
182 fi
183
184 # these require dbus enabled
185 if use mdnsresponder-compat || use howl-compat || use mono; then
186 myconf+=" --enable-dbus"
187 fi
188
189 # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
190 unset DISPLAY
191
192 econf \
193 --localstatedir="${EPREFIX}/var" \
194 --with-distro=gentoo \
195 --disable-python-dbus \
196 --disable-pygtk \
197 --disable-xmltoman \
198 --disable-monodoc \
199 --enable-glib \
200 --enable-gobject \
201 $(use_enable test tests) \
202 $(use_enable autoipd) \
203 $(use_enable mdnsresponder-compat compat-libdns_sd) \
204 $(use_enable howl-compat compat-howl) \
205 $(use_enable doc doxygen-doc) \
206 $(use_enable mono) \
207 $(use_enable dbus) \
208 $(use_enable python) \
209 $(use_enable gtk) \
210 $(use_enable gtk3) \
211 $(use_enable introspection) \
212 $(use_enable utils gtk-utils) \
213 --disable-qt3 \
214 $(use_enable qt4) \
215 $(use_enable gdbm) \
216 ${myconf}
217 }
218
219 src_compile() {
220 emake || die "emake failed"
221
222 use doc && { emake avahi.devhelp || die ; }
223 }
224
225 src_install() {
226 emake install py_compile=true DESTDIR="${D}" || die "make install failed"
227 use bookmarks && use python && use dbus && use gtk || \
228 rm -f "${ED}"/usr/bin/avahi-bookmarks
229
230 use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
231 use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
232
233 if use autoipd; then
234 insinto /$(get_libdir)/rcscripts/net
235 doins "${FILESDIR}"/autoipd.sh || die
236
237 insinto /$(get_libdir)/rc/net
238 newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
239 fi
240
241 dodoc docs/{AUTHORS,NEWS,README,TODO} || die
242
243 if use doc; then
244 dohtml -r doxygen/html/. || die
245 insinto /usr/share/devhelp/books/avahi
246 doins avahi.devhelp || die
247 fi
248 python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die
249
250 # Remove .la files
251 find "${D}" -name '*.la' -exec rm -f {} + || die
252 }
253
254 pkg_postrm() {
255 use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
256 }
257
258 pkg_postinst() {
259 use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
260
261 if use autoipd; then
262 echo
263 elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
264 elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
265 fi
266
267 if use dbus; then
268 echo
269 elog "If this is your first install of avahi please reload your dbus config"
270 elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
271 fi
272 }
273
274
275
276 1.1 net-dns/avahi/avahi-0.6.29-r1.ebuild
277
278 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.29-r1.ebuild?rev=1.1&view=markup
279 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.29-r1.ebuild?rev=1.1&content-type=text/plain
280
281 Index: avahi-0.6.29-r1.ebuild
282 ===================================================================
283 # Copyright 1999-2011 Gentoo Foundation
284 # Distributed under the terms of the GNU General Public License v2
285 # $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29-r1.ebuild,v 1.1 2011/12/24 17:03:27 maksbotan Exp $
286
287 EAPI="3"
288
289 PYTHON_DEPEND="python? 2"
290 PYTHON_USE_WITH="gdbm"
291 PYTHON_USE_WITH_OPT="python"
292
293 inherit eutils mono python multilib flag-o-matic
294
295 DESCRIPTION="System which facilitates service discovery on a local network"
296 HOMEPAGE="http://avahi.org/"
297 SRC_URI="http://avahi.org/download/${P}.tar.gz"
298
299 LICENSE="LGPL-2.1"
300 SLOT="0"
301 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
302 IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt4 test "
303
304 DBUS_DEPEND=">=sys-apps/dbus-0.30"
305 RDEPEND=">=dev-libs/libdaemon-0.14
306 dev-libs/expat
307 >=dev-libs/glib-2
308 gdbm? ( sys-libs/gdbm )
309 qt4? ( x11-libs/qt-core:4 )
310 gtk? (
311 >=x11-libs/gtk+-2.14.0:2
312 )
313 dbus? (
314 ${DBUS_DEPEND}
315 python? ( dev-python/dbus-python )
316 )
317 mono? (
318 >=dev-lang/mono-1.1.10
319 gtk? ( >=dev-dotnet/gtk-sharp-2 )
320 )
321 howl-compat? (
322 !net-misc/howl
323 ${DBUS_DEPEND}
324 )
325 mdnsresponder-compat? (
326 !net-misc/mDNSResponder
327 ${DBUS_DEPEND}
328 )
329 python? (
330 gtk? ( >=dev-python/pygtk-2 )
331 )
332 bookmarks? (
333 dev-python/twisted
334 dev-python/twisted-web
335 )
336 kernel_linux? ( sys-libs/libcap )"
337 DEPEND="${RDEPEND}
338 >=dev-util/intltool-0.40.5
339 >=dev-util/pkgconfig-0.9.0
340 doc? (
341 app-doc/doxygen
342 mono? ( >=virtual/monodoc-1.1.8 )
343 )"
344
345 pkg_setup() {
346 if use python; then
347 python_set_active_version 2
348 python_pkg_setup
349 fi
350
351 if use python && ! use dbus && ! use gtk; then
352 ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
353 fi
354 }
355
356 pkg_preinst() {
357 enewgroup netdev
358 enewgroup avahi
359 enewuser avahi -1 -1 -1 avahi
360
361 if use autoipd; then
362 enewgroup avahi-autoipd
363 enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
364 fi
365 }
366
367 src_prepare() {
368 if use ipv6; then
369 sed -i \
370 -e s/use-ipv6=no/use-ipv6=yes/ \
371 avahi-daemon/avahi-daemon.conf || die
372 fi
373
374 sed -i\
375 -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
376 doxygen_to_devhelp.xsl || die
377
378 # Fix init scripts for >=openrc-0.9.0 (bug #383641)
379 epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
380 }
381
382 src_configure() {
383 use sh && replace-flags -O? -O0
384
385 local myconf=""
386
387 if use python; then
388 myconf+="
389 $(use_enable dbus python-dbus)
390 $(use_enable gtk pygtk)
391 "
392 fi
393
394 if use mono; then
395 myconf+=" $(use_enable doc monodoc)"
396 fi
397
398 # these require dbus enabled
399 if use mdnsresponder-compat || use howl-compat || use mono; then
400 myconf+=" --enable-dbus"
401 fi
402
403 # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
404 unset DISPLAY
405
406 # Upstream ships a gir file (AvahiCore.gir) which does not work with
407 # >=gobject-introspection-0.9, so we disable introspection for now.
408 # http://avahi.org/ticket/318
409 econf \
410 --localstatedir=/var \
411 --with-distro=gentoo \
412 --disable-python-dbus \
413 --disable-pygtk \
414 --disable-xmltoman \
415 --disable-monodoc \
416 --disable-introspection \
417 --enable-glib \
418 $(use_enable test tests) \
419 $(use_enable autoipd) \
420 $(use_enable mdnsresponder-compat compat-libdns_sd) \
421 $(use_enable howl-compat compat-howl) \
422 $(use_enable doc doxygen-doc) \
423 $(use_enable mono) \
424 $(use_enable dbus) \
425 $(use_enable python) \
426 --disable-gtk3 \
427 $(use_enable gtk) \
428 --disable-qt3 \
429 $(use_enable qt4) \
430 $(use_enable gdbm) \
431 ${myconf}
432 }
433
434 src_compile() {
435 emake || die "emake failed"
436
437 use doc && { emake avahi.devhelp || die ; }
438 }
439
440 src_install() {
441 emake install py_compile=true DESTDIR="${D}" || die "make install failed"
442 use bookmarks && use python && use dbus && use gtk || \
443 rm -f "${D}"/usr/bin/avahi-bookmarks
444
445 use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
446 use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
447
448 if use autoipd; then
449 insinto /$(get_libdir)/rcscripts/net
450 doins "${FILESDIR}"/autoipd.sh || die
451
452 insinto /$(get_libdir)/rc/net
453 newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
454 fi
455
456 dodoc docs/{AUTHORS,NEWS,README,TODO} || die
457
458 if use doc; then
459 dohtml -r doxygen/html/. || die
460 insinto /usr/share/devhelp/books/avahi
461 doins avahi.devhelp || die
462 fi
463 python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die
464 }
465
466 pkg_postrm() {
467 use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
468 }
469
470 pkg_postinst() {
471 use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
472
473 if use autoipd; then
474 echo
475 elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
476 elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
477 fi
478
479 if use dbus; then
480 echo
481 elog "If this is your first install of avahi please reload your dbus config"
482 elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
483 fi
484 }
Report Message
Find on MARC Find on Google Groups