1 |
scarabeus 10/11/03 13:02:49 |
2 |
|
3 |
Modified: ChangeLog avahi-0.6.28.ebuild |
4 |
Log: |
5 |
QA: add missing dies, remove dies from pkg_setup, cleanup conditions in configure phase. |
6 |
|
7 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.188 net-dns/avahi/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.188&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.188&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.187&r2=1.188 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v |
19 |
retrieving revision 1.187 |
20 |
retrieving revision 1.188 |
21 |
diff -u -r1.187 -r1.188 |
22 |
--- ChangeLog 6 Oct 2010 22:47:20 -0000 1.187 |
23 |
+++ ChangeLog 3 Nov 2010 13:02:49 -0000 1.188 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for net-dns/avahi |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.187 2010/10/06 22:47:20 swegener Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.188 2010/11/03 13:02:49 scarabeus Exp $ |
29 |
+ |
30 |
+ 03 Nov 2010; Tomáš Chvátal <scarabeus@g.o> avahi-0.6.28.ebuild: |
31 |
+ QA: add missing dies, remove dies from pkg_setup, cleanup conditions in |
32 |
+ configure phase. |
33 |
|
34 |
06 Oct 2010; Sven Wegener <swegener@g.o> avahi-0.6.28.ebuild: |
35 |
Bump libdaemon dependency to 0.14, bug #339885. |
36 |
|
37 |
|
38 |
|
39 |
1.3 net-dns/avahi/avahi-0.6.28.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild?rev=1.3&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild?rev=1.3&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild?r1=1.2&r2=1.3 |
44 |
|
45 |
Index: avahi-0.6.28.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v |
48 |
retrieving revision 1.2 |
49 |
retrieving revision 1.3 |
50 |
diff -u -r1.2 -r1.3 |
51 |
--- avahi-0.6.28.ebuild 6 Oct 2010 22:47:20 -0000 1.2 |
52 |
+++ avahi-0.6.28.ebuild 3 Nov 2010 13:02:49 -0000 1.3 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.2 2010/10/06 22:47:20 swegener Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.3 2010/11/03 13:02:49 scarabeus Exp $ |
58 |
|
59 |
EAPI="3" |
60 |
|
61 |
@@ -17,8 +17,9 @@ |
62 |
LICENSE="LGPL-2.1" |
63 |
SLOT="0" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
65 |
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt4 autoipd kernel_linux test ipv6" |
66 |
+IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt4 test " |
67 |
|
68 |
+DBUS_DEPEND=">=sys-apps/dbus-0.30" |
69 |
RDEPEND=">=dev-libs/libdaemon-0.14 |
70 |
dev-libs/expat |
71 |
>=dev-libs/glib-2 |
72 |
@@ -29,15 +30,21 @@ |
73 |
>=gnome-base/libglade-2.4.0 |
74 |
) |
75 |
dbus? ( |
76 |
- >=sys-apps/dbus-0.30 |
77 |
+ ${DBUS_DEPEND} |
78 |
python? ( dev-python/dbus-python ) |
79 |
) |
80 |
mono? ( |
81 |
>=dev-lang/mono-1.1.10 |
82 |
gtk? ( >=dev-dotnet/gtk-sharp-2 ) |
83 |
) |
84 |
- howl-compat? ( !net-misc/howl ) |
85 |
- mdnsresponder-compat? ( !net-misc/mDNSResponder ) |
86 |
+ howl-compat? ( |
87 |
+ !net-misc/howl |
88 |
+ ${DBUS_DEPEND} |
89 |
+ ) |
90 |
+ mdnsresponder-compat? ( |
91 |
+ !net-misc/mDNSResponder |
92 |
+ ${DBUS_DEPEND} |
93 |
+ ) |
94 |
python? ( |
95 |
gtk? ( >=dev-python/pygtk-2 ) |
96 |
) |
97 |
@@ -55,25 +62,13 @@ |
98 |
)" |
99 |
|
100 |
pkg_setup() { |
101 |
- if use python |
102 |
- then |
103 |
+ if use python; then |
104 |
python_set_active_version 2 |
105 |
python_pkg_setup |
106 |
fi |
107 |
|
108 |
- if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus |
109 |
- then |
110 |
- die "For *-compat or mono support you also need to enable the dbus USE flag!" |
111 |
- fi |
112 |
- |
113 |
- if use bookmarks && ! ( use python && use dbus && use gtk ) |
114 |
- then |
115 |
- die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!" |
116 |
- fi |
117 |
- |
118 |
- if use python && ! use dbus && ! use gtk |
119 |
- then |
120 |
- die "For proper python support you also need the dbus and gtk USE flags!" |
121 |
+ if use python && ! use dbus && ! use gtk; then |
122 |
+ ewarn "For proper python support you should also enable the dbus and gtk USE flags!" |
123 |
fi |
124 |
} |
125 |
|
126 |
@@ -82,17 +77,22 @@ |
127 |
enewgroup avahi |
128 |
enewuser avahi -1 -1 -1 avahi |
129 |
|
130 |
- if use autoipd |
131 |
- then |
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 |
- use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf |
140 |
+ if use ipv6; then |
141 |
+ sed -i \ |
142 |
+ -e s/use-ipv6=no/use-ipv6=yes/ \ |
143 |
+ avahi-daemon/avahi-daemon.conf || die |
144 |
+ fi |
145 |
|
146 |
- sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl |
147 |
+ sed -i\ |
148 |
+ -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ |
149 |
+ doxygen_to_devhelp.xsl || die |
150 |
} |
151 |
|
152 |
src_configure() { |
153 |
@@ -100,15 +100,20 @@ |
154 |
|
155 |
local myconf="" |
156 |
|
157 |
- if use python |
158 |
- then |
159 |
- use dbus && myconf="${myconf} --enable-python-dbus" |
160 |
- use gtk && myconf="${myconf} --enable-pygtk" |
161 |
+ if use python; then |
162 |
+ myconf+=" |
163 |
+ $(use_enable dbus python-dbus) |
164 |
+ $(use_enable gtk pygtk) |
165 |
+ " |
166 |
+ fi |
167 |
+ |
168 |
+ if use mono; then |
169 |
+ myconf+=" $(use_enable doc monodoc)" |
170 |
fi |
171 |
|
172 |
- if use mono && use doc |
173 |
- then |
174 |
- myconf="${myconf} --enable-monodoc" |
175 |
+ # these require dbus enabled |
176 |
+ if use mdnsresponder-compat || use howl-compat || use mono; then |
177 |
+ myconf+=" --enable-dbus" |
178 |
fi |
179 |
|
180 |
# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module |
181 |
@@ -145,59 +150,50 @@ |
182 |
src_compile() { |
183 |
emake || die "emake failed" |
184 |
|
185 |
- use doc && emake avahi.devhelp |
186 |
+ use doc && { emake avahi.devhelp || die ; } |
187 |
} |
188 |
|
189 |
src_install() { |
190 |
emake install py_compile=true DESTDIR="${D}" || die "make install failed" |
191 |
- use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks |
192 |
+ use bookmargs && use python && use dbus && use gtk || \ |
193 |
+ rm -f "${D}"/usr/bin/avahi-bookmarks |
194 |
|
195 |
use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc |
196 |
use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h |
197 |
|
198 |
- if use autoipd |
199 |
- then |
200 |
+ if use autoipd; then |
201 |
insinto /$(get_libdir)/rcscripts/net |
202 |
- doins "${FILESDIR}"/autoipd.sh |
203 |
+ doins "${FILESDIR}"/autoipd.sh || die |
204 |
|
205 |
insinto /$(get_libdir)/rc/net |
206 |
- newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh |
207 |
+ newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die |
208 |
fi |
209 |
|
210 |
- dodoc docs/{AUTHORS,NEWS,README,TODO} |
211 |
+ dodoc docs/{AUTHORS,NEWS,README,TODO} || die |
212 |
|
213 |
- if use doc |
214 |
- then |
215 |
- dohtml -r doxygen/html/. |
216 |
+ if use doc; then |
217 |
+ dohtml -r doxygen/html/. || die |
218 |
insinto /usr/share/devhelp/books/avahi |
219 |
- doins avahi.devhelp |
220 |
+ doins avahi.devhelp || die |
221 |
fi |
222 |
} |
223 |
|
224 |
pkg_postrm() { |
225 |
- if use python; then |
226 |
- python_mod_cleanup avahi avahi_discover |
227 |
- fi |
228 |
+ use python && python_mod_cleanup avahi avahi_discover |
229 |
} |
230 |
|
231 |
pkg_postinst() { |
232 |
- if use python; then |
233 |
- python_mod_optimize avahi avahi_discover |
234 |
- fi |
235 |
+ use python && python_mod_optimize avahi avahi_discover |
236 |
|
237 |
- if use autoipd |
238 |
- then |
239 |
- elog |
240 |
+ if use autoipd; then |
241 |
+ echo |
242 |
elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" |
243 |
elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" |
244 |
- elog |
245 |
fi |
246 |
|
247 |
- if use dbus |
248 |
- then |
249 |
- elog |
250 |
+ if use dbus; then |
251 |
+ echo |
252 |
elog "If this is your first install of avahi please reload your dbus config" |
253 |
elog "with /etc/init.d/dbus reload before starting avahi-daemon!" |
254 |
- elog |
255 |
fi |
256 |
} |