Version bump.

Package-Manager: portage-2.1.1

5 files changed, 210 insertions, 5 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 53a98461d313..34509eca5203 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.54 2006/08/18 22:57:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.55 2006/09/10 17:22:20 swegener Exp $
+
+*avahi-0.6.13 (10 Sep 2006)
+
+  10 Sep 2006; Sven Wegener <swegener@gentoo.org>
+  +files/0.6.13-svn-fixes.patch, +avahi-0.6.13.ebuild:
+  Version bump.
 
   19 Aug 2006; Bryan Østergaard <kloeri@gentoo.org> avahi-0.6.12.ebuild:
   Add ~ia64 keyword.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 2acd4f9a1bfa..6760108a66a5 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.6.13-svn-fixes.patch 1064 RMD160 e80a515a1918e7c5f46c34a52223e69c34ba91d8 SHA1 1e5aad45e402732058cc836a5c14890d492d0b29 SHA256 758355433bbcd074e210868e8c96d236e15ce50c47854513517b92144b0d7ac5
+MD5 09ab402d6a8024a70c344c95c9e70f8d files/0.6.13-svn-fixes.patch 1064
+RMD160 e80a515a1918e7c5f46c34a52223e69c34ba91d8 files/0.6.13-svn-fixes.patch 1064
+SHA256 758355433bbcd074e210868e8c96d236e15ce50c47854513517b92144b0d7ac5 files/0.6.13-svn-fixes.patch 1064
 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
@@ -5,6 +12,7 @@ SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 files/av
 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
 DIST avahi-0.6.12.tar.gz 886104 RMD160 4de072df6d6330909e0587dc2ba696c4f232f8e2 SHA1 678d9878d560dc3a1b3d641828af3c5f6cdc76a9 SHA256 3083d2aa0313e66f3b13eea39aee15578505fa98c2c8515dccfe46f8dd11bb2f
+DIST avahi-0.6.13.tar.gz 895380 RMD160 35e8c0e026ab32cddd345b7afdc7f9ab3f0ab098 SHA1 c902bb556810a753a9b46400526af1b7e8f606de SHA256 5e10afd1d3e98eac31ac0a4bdab63e6672b66a4bfd192eb700e6d3903be7b4b9
 EBUILD avahi-0.6.10.ebuild 3197 RMD160 20c62f409d9a6f51a925d8d030aae2a2e778937a SHA1 868c3425cbde3b34fa460cc568987d9ed01ccff3 SHA256 02822eef91e2d8c012b9d456836e1e45ac0bc78be0cf11321ea01b96e21862f0
 MD5 6a94ea924fd350d53336c2be63109890 avahi-0.6.10.ebuild 3197
 RMD160 20c62f409d9a6f51a925d8d030aae2a2e778937a avahi-0.6.10.ebuild 3197
@@ -17,10 +25,14 @@ EBUILD avahi-0.6.12.ebuild 3439 RMD160 54fab9bfab20b141ac947f62eb322f4d3757c238
 MD5 4f8802e168571dc2a6a012845fdd0de7 avahi-0.6.12.ebuild 3439
 RMD160 54fab9bfab20b141ac947f62eb322f4d3757c238 avahi-0.6.12.ebuild 3439
 SHA256 3ce8b05a3c0632e57c289c56e3e2b8019a7d664fb1bff2cb325fb4c93f8960c8 avahi-0.6.12.ebuild 3439
-MISC ChangeLog 7320 RMD160 2b6d990e8e42a01b94598adc52f746397f9aa35b SHA1 c2c0f6bf62eafc1decfa8382c9addafb6a3535fc SHA256 193b78848480cdc36550bb6c57ce91b78358c5e1d5813596366f19c2232f557d
-MD5 756f3f50643867c01409b3a55a517a64 ChangeLog 7320
-RMD160 2b6d990e8e42a01b94598adc52f746397f9aa35b ChangeLog 7320
-SHA256 193b78848480cdc36550bb6c57ce91b78358c5e1d5813596366f19c2232f557d ChangeLog 7320
+EBUILD avahi-0.6.13.ebuild 3485 RMD160 f74f1ecd1e3e9a951651ccb2487f2eb019f7a9c2 SHA1 c4ad93ca61f151dca9f99efc847b39b5a86941c3 SHA256 9e39d6deae6de237dddcc8dd1c76b9da25937b690513828cd5202ccab728c87e
+MD5 75204d2ae35bdddf49e3a9c127051564 avahi-0.6.13.ebuild 3485
+RMD160 f74f1ecd1e3e9a951651ccb2487f2eb019f7a9c2 avahi-0.6.13.ebuild 3485
+SHA256 9e39d6deae6de237dddcc8dd1c76b9da25937b690513828cd5202ccab728c87e avahi-0.6.13.ebuild 3485
+MISC ChangeLog 7473 RMD160 3492cd275e5e22b0b08762b01c18e92ddc8c9697 SHA1 060281e2ea7f288533272d8e60d24962cd286205 SHA256 1c595ab502d25a906d5dfd4829a1c87dda6ad5944594280adca35f942aa12b24
+MD5 d75ab7b2ba39f2fbaff79e68431e9a34 ChangeLog 7473
+RMD160 3492cd275e5e22b0b08762b01c18e92ddc8c9697 ChangeLog 7473
+SHA256 1c595ab502d25a906d5dfd4829a1c87dda6ad5944594280adca35f942aa12b24 ChangeLog 7473
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -34,3 +46,13 @@ SHA256 ea16aa89dd82c587276ceb8c2581019cd1ec5e66ead7a2fb1925106b34754480 files/di
 MD5 d62d9b9dce7e0dd9a737d84cd8b1fce6 files/digest-avahi-0.6.12 238
 RMD160 9a12933b6bc86a036fbed7b92bc98c8fd696cd7c files/digest-avahi-0.6.12 238
 SHA256 d3f684b2e6e2b38f1b9cfd6eb9c1c981b0ebd9696b55e54613841fcc7eb9b31a files/digest-avahi-0.6.12 238
+MD5 ed4234a87677542a893dfd9c83983088 files/digest-avahi-0.6.13 238
+RMD160 a9e556050811bfa2b3d4378cc420044c48a7eedc files/digest-avahi-0.6.13 238
+SHA256 87b11bd274b1cf12c3fbea98889f1611f65477fb495442b04b8fc02727219eb8 files/digest-avahi-0.6.13 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFBEnVI1lqEGTUzyQRAv+lAKCukZuQovfdikND7fVUYWRe1JC3/gCfaoSx
+ve5urL/OG2hqxE/xUhoV9c8=
+=GG+v
+-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.13.ebuild b/net-dns/avahi/avahi-0.6.13.ebuild
new file mode 100644
index 000000000000..0bf28c2e8f2b
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.13.ebuild
@@ -0,0 +1,144 @@
+# 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.13.ebuild,v 1.1 2006/09/10 17:22:20 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 ~ia64 ~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
+	epatch "${FILESDIR}"/${PV}-svn-fixes.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/0.6.13-svn-fixes.patch b/net-dns/avahi/files/0.6.13-svn-fixes.patch
new file mode 100644
index 000000000000..ffc7260197c1
--- /dev/null
+++ b/net-dns/avahi/files/0.6.13-svn-fixes.patch
@@ -0,0 +1,30 @@
+Index: trunk/avahi-daemon/static-hosts.c

+===================================================================

+--- trunk/avahi-daemon/static-hosts.c (revision 1167)

++++ trunk/avahi-daemon/static-hosts.c (revision 1285)

+@@ -99,5 +99,6 @@

+     AVAHI_LLIST_REMOVE(StaticHost, hosts, hosts, s);

+ 

+-    avahi_s_entry_group_free (s->group);

++    if (s->group)

++        avahi_s_entry_group_free (s->group);

+ 

+     avahi_free(s->host);

+@@ -113,5 +114,8 @@

+ 

+     if (!h->group)

+-        h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h);

++        if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {

++            avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(err));

++            return;

++        }

+ 

+     if (!avahi_address_parse (h->ip, AVAHI_PROTO_UNSPEC, &a)) {

+@@ -130,5 +134,6 @@

+ static void remove_static_host_from_server(StaticHost *h)

+ {

+-    avahi_s_entry_group_reset (h->group);

++    if (h->group)

++        avahi_s_entry_group_reset (h->group);

+ }

+  

diff --git a/net-dns/avahi/files/digest-avahi-0.6.13 b/net-dns/avahi/files/digest-avahi-0.6.13
new file mode 100644
index 000000000000..8b4f5123ee98
--- /dev/null
+++ b/net-dns/avahi/files/digest-avahi-0.6.13
@@ -0,0 +1,3 @@
+MD5 d1000689979105cc95b9ca102284aae4 avahi-0.6.13.tar.gz 895380
+RMD160 35e8c0e026ab32cddd345b7afdc7f9ab3f0ab098 avahi-0.6.13.tar.gz 895380
+SHA256 5e10afd1d3e98eac31ac0a4bdab63e6672b66a4bfd192eb700e6d3903be7b4b9 avahi-0.6.13.tar.gz 895380