Version bump.

Package-Manager: portage-2.1.3.4

5 files changed, 226 insertions, 8 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 476034b6b113..1c67ea8fe369 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.120 2007/08/08 20:28:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.121 2007/08/12 17:16:57 swegener Exp $
+
+*avahi-0.6.21 (12 Aug 2007)
+
+  12 Aug 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.21-dbus-compat.patch, +avahi-0.6.21.ebuild:
+  Version bump.
 
 *avahi-0.6.20-r2 (08 Aug 2007)
 *avahi-0.6.19-r2 (08 Aug 2007)
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index d785e15c87b4..33c45da2bb15 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -73,9 +73,14 @@ AUX avahi-0.6.20-ui-sharp-gtk.patch 427 RMD160 d2459f3b30740bb6a97f47bfc1f709a14
 MD5 02bb9381563447d6382b6a140e2ec463 files/avahi-0.6.20-ui-sharp-gtk.patch 427
 RMD160 d2459f3b30740bb6a97f47bfc1f709a1439e36d6 files/avahi-0.6.20-ui-sharp-gtk.patch 427
 SHA256 cd3601df622a8445d50779fb73bb3deab3880fd66cd765d932155f51ac99491b files/avahi-0.6.20-ui-sharp-gtk.patch 427
+AUX avahi-0.6.21-dbus-compat.patch 676 RMD160 71d8494ea2b9458902d63520ec07c058eab45f76 SHA1 98503e0654bbe6ff696c4cdbf54ec92b1b5d4846 SHA256 03e624fc48addefe5f9c1bef2c14799f4f763834426c5bcc7e7bfc5416ac3498
+MD5 76313352c0d91cef9e211540e286e376 files/avahi-0.6.21-dbus-compat.patch 676
+RMD160 71d8494ea2b9458902d63520ec07c058eab45f76 files/avahi-0.6.21-dbus-compat.patch 676
+SHA256 03e624fc48addefe5f9c1bef2c14799f4f763834426c5bcc7e7bfc5416ac3498 files/avahi-0.6.21-dbus-compat.patch 676
 DIST avahi-0.6.16.tar.gz 891970 RMD160 0106c3082867715052b416e3c761d8f052de00a0 SHA1 8e684d29a16f6fda3c6a0458299134124d64b5ae SHA256 794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce
 DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 SHA1 367322064a5dd66a0e69c75df9407ab3518aebdc SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
 DIST avahi-0.6.20.tar.gz 974209 RMD160 da413b25675184d1514953bfd308d544ca5f0556 SHA1 451a095440fba9bec2effa0730bb4ec29593d1b1 SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
+DIST avahi-0.6.21.tar.gz 976841 RMD160 0f33afed44112a57c5353bf373a307c9c551abdb SHA1 3675f83b294b87a5cfa947d2f68518f0da8ed7b9 SHA256 d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
 EBUILD avahi-0.6.16-r1.ebuild 4530 RMD160 6d22029258b16750b3875e84c4d41d012316193b SHA1 b8fc4b06c084471d80f9890411c2be9120765f42 SHA256 e3fc0c488a5a6eb368dffc6a680f58f2a825835a7314c3716cf4cdc4d105fd7b
 MD5 c75a6081e5a0745fbc2b46aa43e7dfe1 avahi-0.6.16-r1.ebuild 4530
 RMD160 6d22029258b16750b3875e84c4d41d012316193b avahi-0.6.16-r1.ebuild 4530
@@ -96,10 +101,14 @@ EBUILD avahi-0.6.20-r2.ebuild 4613 RMD160 ea3dc6653c636420f9768f2283296bbec89a8a
 MD5 e469c409fede1f996f3b7c057c952434 avahi-0.6.20-r2.ebuild 4613
 RMD160 ea3dc6653c636420f9768f2283296bbec89a8ab9 avahi-0.6.20-r2.ebuild 4613
 SHA256 e260241b0379113a8fa86d46fc817701d1ee7709a4915050441f1386ac8908a9 avahi-0.6.20-r2.ebuild 4613
-MISC ChangeLog 16926 RMD160 ecf8c8123500604d7f126987c3d963dbe4310a2b SHA1 fe3ad063cc350c19afad2c4e95b7a324c3aa8ee8 SHA256 ab86d4f9c5a3359d720d1eb410badca740336e9d4fcfcf8c152000c2e33fc2b7
-MD5 ee56a6f1bfa4fb32d62970b5171ccf32 ChangeLog 16926
-RMD160 ecf8c8123500604d7f126987c3d963dbe4310a2b ChangeLog 16926
-SHA256 ab86d4f9c5a3359d720d1eb410badca740336e9d4fcfcf8c152000c2e33fc2b7 ChangeLog 16926
+EBUILD avahi-0.6.21.ebuild 4441 RMD160 cda3891157e97a13e86510d49e2826044a1ca542 SHA1 8300d35e5db470197125b0e833e054a9edc092fa SHA256 916dc9ec07e34cf0eb8b6887d89f65a707687b58195d6f47cb8d0c19848cc000
+MD5 7ce0a879ea15c32f59cdb09e0fd8e929 avahi-0.6.21.ebuild 4441
+RMD160 cda3891157e97a13e86510d49e2826044a1ca542 avahi-0.6.21.ebuild 4441
+SHA256 916dc9ec07e34cf0eb8b6887d89f65a707687b58195d6f47cb8d0c19848cc000 avahi-0.6.21.ebuild 4441
+MISC ChangeLog 17085 RMD160 dcfba4394281598b13985e342c79026e9b0d9132 SHA1 568893e1de7761e079633b6e07cb5f68396ae607 SHA256 f943135308baf0cf35768f0f6f6b11d097a0e17e8b3eb50a8792d04f10c503f7
+MD5 cbc951d69b2faeafc0e948db6ac09368 ChangeLog 17085
+RMD160 dcfba4394281598b13985e342c79026e9b0d9132 ChangeLog 17085
+SHA256 f943135308baf0cf35768f0f6f6b11d097a0e17e8b3eb50a8792d04f10c503f7 ChangeLog 17085
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -119,10 +128,13 @@ SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/di
 MD5 abad0d13524e320d577cc47c71fbc9da files/digest-avahi-0.6.20-r2 238
 RMD160 189115dd402bfa26b8bf8aa16ffd0879d8d147a5 files/digest-avahi-0.6.20-r2 238
 SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/digest-avahi-0.6.20-r2 238
+MD5 87d3e0560a399c32aeabd184957fc10d files/digest-avahi-0.6.21 238
+RMD160 55763a7d1642a46b05622141a93b327a5cca4e77 files/digest-avahi-0.6.21 238
+SHA256 959d8a48b6cc82ee56ba4c373c11569935ae21adb9ee13d0fe6bcbfb18669d35 files/digest-avahi-0.6.21 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGuieOI1lqEGTUzyQRAj37AKDO/oYyr9AR44fJIBw2qmE1V4/N9gCgkb7A
-2Ty0WUqFTNZWk2scC5Q4Asw=
-=jE5Q
+iD8DBQFGv0DZI1lqEGTUzyQRApTIAJ96Wctu09A5r3bU56tBabfJ5CfzggCeNLC6
+vK+MaO0giv8h63MQz/nfNxY=
+=L5fA
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.21.ebuild b/net-dns/avahi/avahi-0.6.21.ebuild
new file mode 100644
index 000000000000..652a8051da11
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.21.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2000-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.1 2007/08/12 17:16:57 swegener Exp $
+
+WANT_AUTOMAKE="1.9"
+
+inherit eutils mono python qt3 qt4 autotools
+
+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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
+
+RDEPEND=">=dev-libs/libdaemon-0.11-r1
+	dev-libs/expat
+	>=dev-libs/glib-2
+	gdbm? ( sys-libs/gdbm )
+	qt3? ( $(qt_min_version 3.3.6-r2) )
+	qt4? ( $(qt4_min_version 4) )
+	gtk? (
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-2
+	)
+	dbus? (
+		>=sys-apps/dbus-0.30
+		python? (
+			|| (
+				dev-python/dbus-python
+				(
+					<sys-apps/dbus-0.90
+					>=sys-apps/dbus-0.30
+				)
+			)
+		)
+	)
+	mono? (
+		>=dev-lang/mono-1.1.10
+		gtk? ( dev-dotnet/gtk-sharp )
+	)
+	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
+	)
+	kernel_linux? ( sys-libs/libcap )
+	!net-misc/mDNSResponder"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	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 && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
+	then
+		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
+	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 netdev
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+
+	if use autoipd
+	then
+		enewgroup avahi-autoipd
+		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
+	epatch "${FILESDIR}"/${P}-dbus-compat.patch
+
+	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
+
+	eautomake
+}
+
+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
+
+	econf \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		$(use_enable test tests) \
+		$(use_enable autoipd) \
+		$(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 py_compile=true 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
+
+	if use autoipd
+	then
+		insinto /lib/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,README,TODO}
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+
+	if use autoipd
+	then
+		elog
+		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
+}
diff --git a/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch b/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch
new file mode 100644
index 000000000000..37fc4eb058c4
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch
@@ -0,0 +1,16 @@
+Index: trunk/avahi-common/dbus-watch-glue.c
+===================================================================
+--- trunk/avahi-common/dbus-watch-glue.c	(revision 1517)
++++ trunk/avahi-common/dbus-watch-glue.c	(working copy)
+@@ -134,7 +134,11 @@
+ 
+         if (!(avahi_watch = poll_api->watch_new(
+                   poll_api,
++#if DBUS_VERSION_MAJOR >= 1 && DBUS_VERSION_MINOR >= 1 && DBUS_VERSION_MICRO >= 1
+                   dbus_watch_get_unix_fd(dbus_watch),
++#else
++                  dbus_watch_get_fd(dbus_watch),
++#endif
+                   translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
+                   watch_callback,
+                   dbus_watch)))
diff --git a/net-dns/avahi/files/digest-avahi-0.6.21 b/net-dns/avahi/files/digest-avahi-0.6.21
new file mode 100644
index 000000000000..b6579d78d7dd
--- /dev/null
+++ b/net-dns/avahi/files/digest-avahi-0.6.21
@@ -0,0 +1,3 @@
+MD5 9cc68f79c50c9dd9e419990c3c9b05b9 avahi-0.6.21.tar.gz 976841
+RMD160 0f33afed44112a57c5353bf373a307c9c551abdb avahi-0.6.21.tar.gz 976841
+SHA256 d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561 avahi-0.6.21.tar.gz 976841