Revision bump to pull in some changes from Gentopia. The init script needs dbus, if we've compiled avahi with dbus support. This is a work-a-round, a clean solution will be available in upstream's sources.

(Portage version: 2.0.53)

6 files changed, 182 insertions, 13 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index fac5ebbcbc7b..66b0fdc8423f 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/avahi
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.22 2005/12/04 10:41:08 swegener Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.23 2006/01/01 12:07:10 swegener Exp $
+
+*avahi-0.6.1-r1 (01 Jan 2006)
+
+  01 Jan 2006; Sven Wegener <swegener@gentoo.org>
+  +files/0.6.1-need-dbus-initscript.patch,
+  +files/0.6.1-dbus-0.60-support.patch, +avahi-0.6.1-r1.ebuild:
+  Revision bump to pull in some changes from Gentopia. The init script needs
+  dbus, if we've compiled avahi with dbus support. This is a work-a-round,
+  a clean solution will be available in upstream's sources.
 
   04 Dec 2005; Sven Wegener <swegener@gentoo.org> avahi-0.6.1.ebuild:
   Add support for the gdbm USE flag.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index a3af96eb2901..c2b51b3a8c6e 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a95b45072975e2694253f22c87777d0b ChangeLog 3066
 MD5 5da4a9160b981e4d0f2e64e12a39de37 avahi-0.5.2-r1.ebuild 2085
-MD5 10acd5db4e98791ddd421b34c404c7f3 avahi-0.6.1.ebuild 2402
+MD5 822580ce24e6857ebfae9a873c6054ba avahi-0.6.1-r1.ebuild 2957
+MD5 e644659c416e5e27c9e3f16dd647e908 avahi-0.6.1.ebuild 2501
+MD5 5c2f9592d893c11179467bcf84e0bf33 files/0.6.1-dbus-0.60-support.patch 1035
 MD5 b06b1183ea48e210c1943f0913f63714 files/digest-avahi-0.5.2-r1 63
 MD5 82793ef545794b3d74b3094017ed5572 files/digest-avahi-0.6.1 63
+MD5 82793ef545794b3d74b3094017ed5572 files/digest-avahi-0.6.1-r1 63
+MD5 b6927bd36d03685344b213dadfc70154 foo 3517
 MD5 e522a390cede4510e8dbd0446e695912 metadata.xml 297
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDksfNI1lqEGTUzyQRAs5CAKCMVKfb8vcC2DNZ1KF1jVWwsirAJgCgyhVx
-sHqPGqy5f0acuKTHDNGmSII=
-=PBdw
------END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.1-r1.ebuild b/net-dns/avahi/avahi-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..91ae9301295d
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.1-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.1-r1.ebuild,v 1.1 2006/01/01 12:07:11 swegener Exp $
+
+inherit eutils qt3 mono python
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://www.freedesktop.org/Software/Avahi"
+SRC_URI="http://www.freedesktop.org/~lennart/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt"
+
+RDEPEND=">=dev-libs/libdaemon-0.5
+	dev-libs/expat
+	gdbm? ( sys-libs/gdbm )
+	qt? ( $(qt_min_version 3.3) )
+	gtk? (
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-2
+		>=dev-libs/glib-2
+	)
+	mono? ( >=dev-lang/mono-1.1.3 )
+	dbus? ( >=sys-apps/dbus-0.30 )
+	python? (
+		>=virtual/python-2.4
+		dbus? (
+			bookmarks? (
+				dev-python/twisted
+				dev-python/twisted-web
+			)
+		)
+		gtk? ( >=dev-python/pygtk-2 )
+	)
+	dbus? (
+		howl-compat? ( !net-misc/howl )
+		mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	)"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		mono? ( >=dev-util/monodoc-1.1.8 )
+	)"
+
+export PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
+
+pkg_setup() {
+	if use python && ! built_with_use dev-lang/python gdbm
+	then
+		die "Need dev-lang/python compiled with gdbm support!"
+	fi
+}
+
+pkg_preinst() {
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PV}-dbus-0.60-support.patch
+	use dbus && epatch "${FILESDIR}"/${PV}-need-dbus-initscript.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	if use python
+	then
+		use dbus && myconf="${myconf} --enable-python-dbus"
+		use gtk && myconf="${myconf} --enable-pygtk"
+	fi
+
+	if use mono && use doc
+	then
+		myconf="${myconf} --enable-monodoc"
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--disable-qt4 \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable mono) \
+		$(use_enable dbus) \
+		$(use_enable python) \
+		$(use_enable gtk) \
+		$(use_enable qt qt3) \
+		$(use_enable gtk glib) \
+		$(use_enable gdbm) \
+		${myconf} \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+
+	dodoc docs/{AUTHORS,README,TODO}
+
+	# Let's do some cleanup
+	rmdir "${D}"/Disabled &>/dev/null
+	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
diff --git a/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch b/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch
new file mode 100644
index 000000000000..b026c847755f
--- /dev/null
+++ b/net-dns/avahi/files/0.6.1-dbus-0.60-support.patch
@@ -0,0 +1,29 @@
+Index: avahi-daemon/dbus-protocol.c
+===================================================================
+--- avahi-daemon/dbus-protocol.c	(revision 1027)
++++ avahi-daemon/dbus-protocol.c	(revision 1040)
+@@ -156,7 +156,6 @@
+     return client;
+ }
+ 
+-
+ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata) {
+     DBusError error;
+ 
+@@ -1029,7 +1028,15 @@
+         goto fail;
+     }
+ 
+-    if (dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
++    if (dbus_bus_request_name(
++            server->bus,
++            AVAHI_DBUS_NAME,
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++            DBUS_NAME_FLAG_DO_NOT_QUEUE,
++#else
++            DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++#endif
++            &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+         if (dbus_error_is_set(&error)) {
+             avahi_log_error("dbus_bus_request_name(): %s", error.message);
+             goto fail;
diff --git a/net-dns/avahi/files/0.6.1-need-dbus-initscript.patch b/net-dns/avahi/files/0.6.1-need-dbus-initscript.patch
new file mode 100644
index 000000000000..10b20215ebd1
--- /dev/null
+++ b/net-dns/avahi/files/0.6.1-need-dbus-initscript.patch
@@ -0,0 +1,14 @@
+Index: initscript/gentoo/avahi-daemon.in
+===================================================================
+--- initscript/gentoo/avahi-daemon.in	(revision 1048)
++++ initscript/gentoo/avahi-daemon.in	(working copy)
+@@ -6,7 +6,8 @@
+ opts="${opts} reload"
+ 
+ depend() {
+-	use net dbus
++	use net
++	need dbus
+ }
+ 
+ start() {
diff --git a/net-dns/avahi/files/digest-avahi-0.6.1-r1 b/net-dns/avahi/files/digest-avahi-0.6.1-r1
new file mode 100644
index 000000000000..f997656dd88a
--- /dev/null
+++ b/net-dns/avahi/files/digest-avahi-0.6.1-r1
@@ -0,0 +1 @@
+MD5 330613902c59bd597f140a8254e9f4ec avahi-0.6.1.tar.gz 850021