Version bump. Add support for the qt4 USE flag and tweak configure logic.

Package-Manager: portage-2.1-r1

4 files changed, 164 insertions, 15 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index f5019bc4e6e6..3b0436c9e549 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.49 2006/06/30 23:26:24 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.50 2006/07/09 20:16:31 swegener Exp $
+
+*avahi-0.6.11 (09 Jul 2006)
+
+  09 Jul 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.11.ebuild:
+  Version bump. Add support for the qt4 USE flag and tweak configure logic.
 
   30 Jun 2006; Thomas Cort <tcort@gentoo.org> avahi-0.6.10.ebuild:
   Stable on alpha.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index d4344dd26048..f9ac02a0a54e 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,19 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4
 MD5 317c28eba6516a18140aa8e2cb26d618 files/avahi-0.6.1-no-ipv6.patch 362
 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 files/avahi-0.6.1-no-ipv6.patch 362
 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 files/avahi-0.6.1-no-ipv6.patch 362
 DIST avahi-0.6.10.tar.gz 879819 RMD160 59274b5314476830614fe9cb2d90e59eec3aba0f SHA1 26ad1f9845126f2ca2e2a46a00bd201619a1a682 SHA256 780d9d171681bb37c3067b50ddb85a8f741f2b3f0e435cfedf60bb32635243ac
+DIST avahi-0.6.11.tar.gz 885546 RMD160 fb2ac512169c519183afd6ad5f21537ce8c51c3e SHA1 126abbc5fb83a482188094b89883268b97b9876a SHA256 3eadfe63e64b3ab56b72f1a7e21106a680b9fd6f699e59ea02187a9d567df975
 EBUILD avahi-0.6.10.ebuild 3195 RMD160 9eb3a473c7580a4251f688e7487d0810f86e6520 SHA1 77e918ca4f14d0d5eec59203bb8ae7b104a37449 SHA256 c4412208f0b728287a356a0e08ecdd171b12a216840ad99c3a020a47c0e35e04
 MD5 afa686bc3da393ab0fe561e72101779b avahi-0.6.10.ebuild 3195
 RMD160 9eb3a473c7580a4251f688e7487d0810f86e6520 avahi-0.6.10.ebuild 3195
 SHA256 c4412208f0b728287a356a0e08ecdd171b12a216840ad99c3a020a47c0e35e04 avahi-0.6.10.ebuild 3195
-MISC ChangeLog 6718 RMD160 2f76dd491f170d91bfb14788e75a62d64220187a SHA1 643d2fb57270c6caaeda3363ab75a405691eb577 SHA256 969083bb25c780518c9aa182aefc51e2007b39b4a25527f64a485a866291db3a
-MD5 b51460009103282d906ad1bd36b535e3 ChangeLog 6718
-RMD160 2f76dd491f170d91bfb14788e75a62d64220187a ChangeLog 6718
-SHA256 969083bb25c780518c9aa182aefc51e2007b39b4a25527f64a485a866291db3a ChangeLog 6718
+EBUILD avahi-0.6.11.ebuild 3435 RMD160 02136f2e7a00d363c5d29ffb9d2e4e6e234c2b15 SHA1 f6565b86a82ff6dcd21f36c9889ab6bf44fc6e20 SHA256 3b895156810403b6f2a4ad5bfbc3bf9e0cd04dc82a1023a18da61fc524ceab37
+MD5 30f9ce817c563090b4b0b4756f958cba avahi-0.6.11.ebuild 3435
+RMD160 02136f2e7a00d363c5d29ffb9d2e4e6e234c2b15 avahi-0.6.11.ebuild 3435
+SHA256 3b895156810403b6f2a4ad5bfbc3bf9e0cd04dc82a1023a18da61fc524ceab37 avahi-0.6.11.ebuild 3435
+MISC ChangeLog 6899 RMD160 a194d4193bb5fe671a4f4ebf4e42e6055324d5d4 SHA1 fea9972b2e8f8885a11e367ed1c469bed289d366 SHA256 105e4d2ece75c7d7d7849440291fb40a3431548a6c12cd4dcbe3ec3cb47416ff
+MD5 dede4d7c9ddf9fe0f64f1a391753fda0 ChangeLog 6899
+RMD160 a194d4193bb5fe671a4f4ebf4e42e6055324d5d4 ChangeLog 6899
+SHA256 105e4d2ece75c7d7d7849440291fb40a3431548a6c12cd4dcbe3ec3cb47416ff ChangeLog 6899
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -21,10 +23,6 @@ SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata
 MD5 93c7e0a877e52d9e2bfb829b708bd258 files/digest-avahi-0.6.10 238
 RMD160 016c6edc45d51d40f7c45c5f015df2f336e97a68 files/digest-avahi-0.6.10 238
 SHA256 389bb608ff57eedf32409a5979eda80b0987f2fa25e13994abf20b63b39233e4 files/digest-avahi-0.6.10 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEqCzaamhnQswr0vIRAjtSAJ9/sf+/Lplx4ViPtkvxcAreNQfw8gCfVchk
-8V3YzFKoMmA9RzuxNnQC9MY=
-=tyAp
------END PGP SIGNATURE-----
+MD5 5a9c4ff516fb0a645fb869863b99ab54 files/digest-avahi-0.6.11 238
+RMD160 3571994bf59f3c8b958c12aa60dadd8c5077ad89 files/digest-avahi-0.6.11 238
+SHA256 ea16aa89dd82c587276ceb8c2581019cd1ec5e66ead7a2fb1925106b34754480 files/digest-avahi-0.6.11 238
diff --git a/net-dns/avahi/avahi-0.6.11.ebuild b/net-dns/avahi/avahi-0.6.11.ebuild
new file mode 100644
index 000000000000..a2f962c10406
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.11.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2000-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.11.ebuild,v 1.1 2006/07/09 20:16:31 swegener Exp $
+
+inherit eutils mono python
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4"
+
+RDEPEND=">=dev-libs/libdaemon-0.5
+	dev-libs/expat
+	>=dev-libs/glib-2
+	gdbm? ( sys-libs/gdbm )
+	qt3? ( =x11-libs/qt-3* )
+	qt4? ( =x11-libs/qt-4* )
+	gtk? (
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-2
+	)
+	dbus? (
+		>=sys-apps/dbus-0.30
+	)
+	mono? (
+		>=dev-lang/mono-1.1.10
+	)
+	howl-compat? (
+		!net-misc/howl
+	)
+	mdnsresponder-compat? (
+		!net-misc/mDNSResponder
+	)
+	python? (
+		>=virtual/python-2.4
+		gtk? ( >=dev-python/pygtk-2 )
+	)
+	bookmarks? (
+		dev-python/twisted
+		dev-python/twisted-web
+	)"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		mono? ( >=dev-util/monodoc-1.1.8 )
+	)"
+
+pkg_setup() {
+	if use python && ! built_with_use dev-lang/python gdbm
+	then
+		die "For python support you need dev-lang/python compiled with gdbm support!"
+	fi
+
+	if use python && use dbus && ! built_with_use sys-apps/dbus python
+	then
+		die "For python and dbus support you need sys-apps/dbus compiled with python support!"
+	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
+}
+
+pkg_preinst() {
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.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
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig" \
+	econf \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		$(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 qt3) \
+		$(use_enable qt4) \
+		$(use_enable gdbm) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	use bookmarks || 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
+
+	dodoc docs/{AUTHORS,README,TODO}
+}
+
+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/digest-avahi-0.6.11 b/net-dns/avahi/files/digest-avahi-0.6.11
new file mode 100644
index 000000000000..2b2ef0d3a10f
--- /dev/null
+++ b/net-dns/avahi/files/digest-avahi-0.6.11
@@ -0,0 +1,3 @@
+MD5 91fd8cc0c2bae638848faad36cf1c032 avahi-0.6.11.tar.gz 885546
+RMD160 fb2ac512169c519183afd6ad5f21537ce8c51c3e avahi-0.6.11.tar.gz 885546
+SHA256 3eadfe63e64b3ab56b72f1a7e21106a680b9fd6f699e59ea02187a9d567df975 avahi-0.6.11.tar.gz 885546