[net-dns/avahi] Update from main portage tree

3 files changed, 59 insertions, 59 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index b1fab83c..9233b0ba 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.187 2010/10/06 22:47:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.188 2010/11/03 13:02:49 scarabeus Exp $
+
+  03 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> avahi-0.6.28.ebuild:
+  QA: add missing dies, remove dies from pkg_setup, cleanup conditions in
+  configure phase.
 
   06 Oct 2010; Sven Wegener <swegener@gentoo.org> avahi-0.6.28.ebuild:
   Bump libdaemon dependency to 0.14, bug #339885.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index a9e76f91..d6317377 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -13,6 +13,6 @@ EBUILD avahi-0.6.25-r1.ebuild 5001 RMD160 a3630d681a75bbb9bb12c2ef86d213750eec6a
 EBUILD avahi-0.6.25.ebuild 5352 RMD160 0fb9fe844fba482fbfc95caf8744b71539c55324 SHA1 353f53cbbf73ed27c5b85629fd2e09374f08a251 SHA256 854cb5b236f3109a227970a9aa99904c1f947680a8bef1345c3e98bdc89d0efa
 EBUILD avahi-0.6.27-r1.ebuild 4936 RMD160 3003c3df83b4454863f0cb15259fd4e38c2a79d7 SHA1 7d17c3bf220c9c8a9f445fb17d73e4a9afdb8864 SHA256 a5260698cfca38d54d53f1bd93be28316bc189cf6f18c38e9a6798cee762b966
 EBUILD avahi-0.6.27.ebuild 4679 RMD160 8ea7c8f93c28455161164f508b6ee46532fb1e23 SHA1 b74b902c640695c5cb73e2f75a23b6c07bef08bb SHA256 75995b26ecbcbb4d6d4a42882034acebd44f932bd8d0d9db3e149989aac07d21
-EBUILD avahi-0.6.28.ebuild 4874 RMD160 953d797788dacbb51b3c2dea72524df9cb044d69 SHA1 217c39dcb1f186858e47562d475301ed1f975e02 SHA256 cac4f27a1f009e77e621355f70aae77c0fcf61971f2b28cf929e137383c4142e
-MISC ChangeLog 27873 RMD160 c4606c707e052fed1a0eeebd9188e74c20d3cc4c SHA1 def40b05e96e9c2e717a99e379f051f235320dd5 SHA256 883c32387b0fe1659e8d6b4273ef4f31428f087930adac411141b7d13efa2ee8
+EBUILD avahi-0.6.28.ebuild 4813 RMD160 cc5249e798c5bf1191c7697eb70d156bff2c8564 SHA1 8ce02969ad6e645a42cafc12dc1dd3361aea1208 SHA256 8eac4b4b455386ff64a303a4563ec09fb7c5e9fb79bd15a8c9315bb421ae069f
+MISC ChangeLog 28044 RMD160 e766a9a811ca77b545062f06ebc9dcd0e04fc013 SHA1 1b1a521b8fcecb1712e7cd8b9f8739df6da5a11e SHA256 80d1d817122bd6ddff737353afaec9d1c335648f5d73cd405f63a94b314eefa7
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.28.ebuild b/net-dns/avahi/avahi-0.6.28.ebuild
index 5ce877e4..8a8e1f54 100644
--- a/net-dns/avahi/avahi-0.6.28.ebuild
+++ b/net-dns/avahi/avahi-0.6.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.2 2010/10/06 22:47:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.3 2010/11/03 13:02:49 scarabeus Exp $
 
 EAPI="3"
 
@@ -17,8 +17,9 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
+IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test "
 
+DBUS_DEPEND=">=sys-apps/dbus-0.30"
 RDEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
 	>=dev-libs/glib-2
@@ -30,15 +31,21 @@ RDEPEND=">=dev-libs/libdaemon-0.14
 		>=gnome-base/libglade-2.4.0
 	)
 	dbus? (
-		>=sys-apps/dbus-0.30
+		${DBUS_DEPEND}
 		python? ( dev-python/dbus-python )
 	)
 	mono? (
 		>=dev-lang/mono-1.1.10
 		gtk? ( >=dev-dotnet/gtk-sharp-2 )
 	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	howl-compat? (
+		!net-misc/howl
+		${DBUS_DEPEND}
+	)
+	mdnsresponder-compat? (
+		!net-misc/mDNSResponder
+		${DBUS_DEPEND}
+	)
 	python? (
 		gtk? ( >=dev-python/pygtk-2 )
 	)
@@ -56,25 +63,13 @@ DEPEND="${RDEPEND}
 	)"
 
 pkg_setup() {
-	if use python
-	then
+	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
 	fi
 
-	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
-	then
-		die "For *-compat or mono support you also need to enable the dbus USE flag!"
-	fi
-
-	if use bookmarks && ! ( use python && use dbus && use gtk )
-	then
-		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
-	fi
-
-	if use python && ! use dbus && ! use gtk
-	then
-		die "For proper python support you also need the dbus and gtk USE flags!"
+	if use python && ! use dbus && ! use gtk; then
+		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
 	fi
 }
 
@@ -83,17 +78,22 @@ pkg_preinst() {
 	enewgroup avahi
 	enewuser avahi -1 -1 -1 avahi
 
-	if use autoipd
-	then
+	if use autoipd; then
 		enewgroup avahi-autoipd
 		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
 	fi
 }
 
 src_prepare() {
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
+	if use ipv6; then
+		sed -i \
+			-e s/use-ipv6=no/use-ipv6=yes/ \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
 
-	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
+	sed -i\
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
 }
 
 src_configure() {
@@ -101,15 +101,20 @@ src_configure() {
 
 	local myconf=""
 
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
+	if use python; then
+		myconf+="
+			$(use_enable dbus python-dbus)
+			$(use_enable gtk pygtk)
+		"
+	fi
+
+	if use mono; then
+		myconf+=" $(use_enable doc monodoc)"
 	fi
 
-	if use mono && use doc
-	then
-		myconf="${myconf} --enable-monodoc"
+	# these require dbus enabled
+	if use mdnsresponder-compat || use howl-compat || use mono; then
+		myconf+=" --enable-dbus"
 	fi
 
 	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
@@ -146,59 +151,50 @@ src_configure() {
 src_compile() {
 	emake || die "emake failed"
 
-	use doc && emake avahi.devhelp
+	use doc && { emake avahi.devhelp || die ; }
 }
 
 src_install() {
 	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
+	use bookmargs && use python && use dbus && use gtk || \
+		rm -f "${D}"/usr/bin/avahi-bookmarks
 
 	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
 	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
 
-	if use autoipd
-	then
+	if use autoipd; then
 		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
+		doins "${FILESDIR}"/autoipd.sh || die
 
 		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
 	fi
 
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
+	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
 
-	if use doc
-	then
-		dohtml -r doxygen/html/.
+	if use doc; then
+		dohtml -r doxygen/html/. || die
 		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
+		doins avahi.devhelp || die
 	fi
 }
 
 pkg_postrm() {
-	if use python; then
-		python_mod_cleanup avahi avahi_discover
-	fi
+	use python && python_mod_cleanup avahi avahi_discover
 }
 
 pkg_postinst() {
-	if use python; then
-		python_mod_optimize avahi avahi_discover
-	fi
+	use python && python_mod_optimize avahi avahi_discover
 
-	if use autoipd
-	then
-		elog
+	if use autoipd; then
+		echo
 		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
 		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
 	fi
 
-	if use dbus
-	then
-		elog
+	if use dbus; then
+		echo
 		elog "If this is your first install of avahi please reload your dbus config"
 		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-		elog
 	fi
 }