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

Gentoo Archives: gentoo-commits

From: "Sven Wegener (swegener)" <swegener@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dns/avahi: ChangeLog avahi-0.6.31.ebuild
Date: Sun, 25 Nov 2012 10:49:12
Message-Id: 20121125104857.47FEB20C65@flycatcher.gentoo.org
1 swegener 12/11/25 10:48:57
2
3 Modified: ChangeLog
4 Added: avahi-0.6.31.ebuild
5 Log:
6 Version bump, bug #404209.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)
9
10 Revision Changes Path
11 1.235 net-dns/avahi/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.235&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.235&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.234&r2=1.235
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v
20 retrieving revision 1.234
21 retrieving revision 1.235
22 diff -u -r1.234 -r1.235
23 --- ChangeLog 7 Oct 2012 14:33:51 -0000 1.234
24 +++ ChangeLog 25 Nov 2012 10:48:57 -0000 1.235
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-dns/avahi
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.234 2012/10/07 14:33:51 armin76 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.235 2012/11/25 10:48:57 swegener Exp $
30 +
31 +*avahi-0.6.31 (25 Nov 2012)
32 +
33 + 25 Nov 2012; Sven Wegener <swegener@g.o> +avahi-0.6.31.ebuild,
34 + +files/avahi-0.6.31-install-exec-hook.patch:
35 + Version bump, bug #404209.
36
37 07 Oct 2012; Raúl Porcel <armin76@g.o> avahi-0.6.30-r3.ebuild:
38 alpha/ia64/s390/sh/sparc stable wrt #431830
39
40
41
42 1.1 net-dns/avahi/avahi-0.6.31.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.31.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.31.ebuild?rev=1.1&content-type=text/plain
46
47 Index: avahi-0.6.31.ebuild
48 ===================================================================
49 # Copyright 1999-2012 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31.ebuild,v 1.1 2012/11/25 10:48:57 swegener Exp $
52
53 EAPI="3"
54
55 PYTHON_DEPEND="python? 2"
56 PYTHON_USE_WITH="gdbm"
57 PYTHON_USE_WITH_OPT="python"
58
59 WANT_AUTOMAKE=1.11
60
61 inherit autotools eutils mono python multilib flag-o-matic user
62
63 DESCRIPTION="System which facilitates service discovery on a local network"
64 HOMEPAGE="http://avahi.org/"
65 SRC_URI="http://avahi.org/download/${P}.tar.gz"
66
67 LICENSE="LGPL-2.1"
68 SLOT="0"
69 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
70 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
71 kernel_linux mdnsresponder-compat mono python qt4 test utils"
72
73 DBUS_DEPEND=">=sys-apps/dbus-0.30"
74 COMMON_DEPEND=">=dev-libs/libdaemon-0.14
75 dev-libs/expat
76 dev-libs/glib:2
77 gdbm? ( sys-libs/gdbm )
78 qt4? ( x11-libs/qt-core:4 )
79 gtk? ( >=x11-libs/gtk+-2.14.0:2 )
80 gtk3? ( x11-libs/gtk+:3 )
81 dbus? (
82 ${DBUS_DEPEND}
83 python? ( dev-python/dbus-python )
84 )
85 mono? (
86 >=dev-lang/mono-1.1.10
87 gtk? ( >=dev-dotnet/gtk-sharp-2 )
88 )
89 howl-compat? ( ${DBUS_DEPEND} )
90 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
91 mdnsresponder-compat? ( ${DBUS_DEPEND} )
92 python? (
93 gtk? ( >=dev-python/pygtk-2 )
94 )
95 bookmarks? (
96 dev-python/twisted
97 dev-python/twisted-web
98 )
99 kernel_linux? ( sys-libs/libcap )"
100 DEPEND="${COMMON_DEPEND}
101 >=dev-util/intltool-0.40.5
102 virtual/pkgconfig
103 doc? (
104 app-doc/doxygen
105 mono? ( >=virtual/monodoc-1.1.8 )
106 )"
107 RDEPEND="${COMMON_DEPEND}
108 howl-compat? ( !net-misc/howl )
109 mdnsresponder-compat? ( !net-misc/mDNSResponder )"
110
111 pkg_setup() {
112 if use python; then
113 python_set_active_version 2
114 python_pkg_setup
115 fi
116
117 if use python && ! use dbus && ! use gtk; then
118 ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
119 fi
120
121 # FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
122 if use utils && ! { use gtk || use gtk3; }; then
123 ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
124 fi
125 }
126
127 pkg_preinst() {
128 enewgroup netdev
129 enewgroup avahi
130 enewuser avahi -1 -1 -1 avahi
131
132 if use autoipd; then
133 enewgroup avahi-autoipd
134 enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
135 fi
136 }
137
138 src_prepare() {
139 if use ipv6; then
140 sed -i \
141 -e s/use-ipv6=no/use-ipv6=yes/ \
142 avahi-daemon/avahi-daemon.conf || die
143 fi
144
145 sed -i\
146 -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
147 doxygen_to_devhelp.xsl || die
148
149 # Make gtk utils optional
150 epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
151
152 # Fix init scripts for >=openrc-0.9.0 (bug #383641)
153 epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
154
155 # install-exec-local -> install-exec-hook
156 epatch "${FILESDIR}"/${P}-install-exec-hook.patch
157
158 # Drop DEPRECATED flags, bug #384743
159 sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
160
161 # Prevent .pyc files in DESTDIR
162 >py-compile
163
164 eautoreconf
165 }
166
167 src_configure() {
168 use sh && replace-flags -O? -O0
169
170 local myconf="--disable-static"
171
172 if use python; then
173 myconf+="
174 $(use_enable dbus python-dbus)
175 $(use_enable gtk pygtk)
176 "
177 fi
178
179 if use mono; then
180 myconf+=" $(use_enable doc monodoc)"
181 fi
182
183 # these require dbus enabled
184 if use mdnsresponder-compat || use howl-compat || use mono; then
185 myconf+=" --enable-dbus"
186 fi
187
188 # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
189 unset DISPLAY
190
191 econf \
192 --localstatedir="${EPREFIX}/var" \
193 --with-distro=gentoo \
194 --disable-python-dbus \
195 --disable-pygtk \
196 --disable-xmltoman \
197 --disable-monodoc \
198 --enable-glib \
199 --enable-gobject \
200 $(use_enable test tests) \
201 $(use_enable autoipd) \
202 $(use_enable mdnsresponder-compat compat-libdns_sd) \
203 $(use_enable howl-compat compat-howl) \
204 $(use_enable doc doxygen-doc) \
205 $(use_enable mono) \
206 $(use_enable dbus) \
207 $(use_enable python) \
208 $(use_enable gtk) \
209 $(use_enable gtk3) \
210 $(use_enable introspection) \
211 $(use_enable utils gtk-utils) \
212 --disable-qt3 \
213 $(use_enable qt4) \
214 $(use_enable gdbm) \
215 ${myconf}
216 }
217
218 src_compile() {
219 emake || die "emake failed"
220
221 use doc && { emake avahi.devhelp || die ; }
222 }
223
224 src_install() {
225 emake install DESTDIR="${D}" || die "make install failed"
226 use bookmarks && use python && use dbus && use gtk || \
227 rm -f "${ED}"/usr/bin/avahi-bookmarks
228
229 use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
230 use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
231
232 if use autoipd; then
233 insinto /$(get_libdir)/rcscripts/net
234 doins "${FILESDIR}"/autoipd.sh || die
235
236 insinto /$(get_libdir)/rc/net
237 newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
238 fi
239
240 dodoc docs/{AUTHORS,NEWS,README,TODO} || die
241
242 if use doc; then
243 dohtml -r doxygen/html/. || die
244 insinto /usr/share/devhelp/books/avahi
245 doins avahi.devhelp || die
246 fi
247
248 # /usr/bin/avahi-bookmarks is installed only with USE="bookmarks dbus gtk python".
249 # /usr/bin/avahi-discover is installed only with USE="dbus gtk python".
250 use dbus && use gtk && use python && python_convert_shebangs -r 2 "${ED}usr/bin"
251
252 find "${ED}" -name '*.la' -exec rm -f {} +
253 }
254
255 pkg_postrm() {
256 use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
257 }
258
259 pkg_postinst() {
260 use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
261
262 if use autoipd; then
263 echo
264 elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
265 elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
266 fi
267
268 if use dbus; then
269 echo
270 elog "If this is your first install of avahi please reload your dbus config"
271 elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
272 fi
273 }
Report Message
Find on MARC Find on Google Groups