Revision bump, pull in a couple of fixes until 0.6.17 is released.

(Portage version: 2.1.2_rc4-r6)
 (Signed Manifest commit)

3 files changed, 57 insertions, 183 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index b1f9ddbd8721..dfda4ef85719 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.6.15-dbus-fixes.patch 1647 RMD160 5d120cb23fae7d4603456593ef1b07eb842d5e0d SHA1 29ca0c669f1e03b729cd053aba560a775f2685c5 SHA256 733f4a3d5d6e9f10c7e1bec045e566c09fa128ca6043f90190f9235cc4fbcbb4
 MD5 d3d5b3538c1d66c747b02296b957d9fa files/0.6.15-dbus-fixes.patch 1647
 RMD160 5d120cb23fae7d4603456593ef1b07eb842d5e0d files/0.6.15-dbus-fixes.patch 1647
@@ -10,20 +13,56 @@ AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d
 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
+AUX avahi-0.6.16-svn-1353.patch 338 RMD160 285dbaba10fda5f8e81b4de968acdbe4b0033654 SHA1 02ebacd162b1cad949d820858ace85488d05c77c SHA256 d7135566ec8c48b2d2ffcffe0c64ab92638faad47d451853f1e187187c144629
+MD5 8639f4641da48421e515658f984e1393 files/avahi-0.6.16-svn-1353.patch 338
+RMD160 285dbaba10fda5f8e81b4de968acdbe4b0033654 files/avahi-0.6.16-svn-1353.patch 338
+SHA256 d7135566ec8c48b2d2ffcffe0c64ab92638faad47d451853f1e187187c144629 files/avahi-0.6.16-svn-1353.patch 338
+AUX avahi-0.6.16-svn-1361.patch 1635 RMD160 c23a11f9faf5a0e1508a7f97557bb911b9f4a1d1 SHA1 6b46b710a69521ab2f45e372b6059ba1353c5168 SHA256 4e9927e19b641a3b5beac292701d05f33683acafa9d50033f38a9e5d28271be1
+MD5 3f6e01521a57f064a35d7a2939a43f91 files/avahi-0.6.16-svn-1361.patch 1635
+RMD160 c23a11f9faf5a0e1508a7f97557bb911b9f4a1d1 files/avahi-0.6.16-svn-1361.patch 1635
+SHA256 4e9927e19b641a3b5beac292701d05f33683acafa9d50033f38a9e5d28271be1 files/avahi-0.6.16-svn-1361.patch 1635
+AUX avahi-0.6.16-svn-1363.patch 928 RMD160 f0565b2927496de04a79a7c9636dee53bd26b9f3 SHA1 348e9fad2bf1a1cb4c7927fbeb06e5aca8c06c48 SHA256 05f08d7a8771c199f744c69154e5c216b63308b79d0778a7609b7947259358ad
+MD5 74fe158a1bae94f53a50a2f850b4741b files/avahi-0.6.16-svn-1363.patch 928
+RMD160 f0565b2927496de04a79a7c9636dee53bd26b9f3 files/avahi-0.6.16-svn-1363.patch 928
+SHA256 05f08d7a8771c199f744c69154e5c216b63308b79d0778a7609b7947259358ad files/avahi-0.6.16-svn-1363.patch 928
+AUX avahi-0.6.16-svn-1365.patch 9083 RMD160 c009ffdff833011eb5269cd380535a36501a6f14 SHA1 46782ef54375fd41ff3300b764a0eadea9949311 SHA256 52671d0b1b7d3c6caf8e2dfbf8a6e33f614ca9a056821527c15587fcba122e25
+MD5 291c9d4b58fa4bf0a73c3fa65ae211cd files/avahi-0.6.16-svn-1365.patch 9083
+RMD160 c009ffdff833011eb5269cd380535a36501a6f14 files/avahi-0.6.16-svn-1365.patch 9083
+SHA256 52671d0b1b7d3c6caf8e2dfbf8a6e33f614ca9a056821527c15587fcba122e25 files/avahi-0.6.16-svn-1365.patch 9083
+AUX avahi-0.6.16-svn-1366.patch 4014 RMD160 e718d8c19223723cb460de6d883df5a3d86325cd SHA1 3bd5d16795d0d0a80614cc5b6991f90a698334ae SHA256 46f7cae433505f0e2b39279cfa017423800c508d48a5c6284f0b9a8c5bc207dc
+MD5 6513249f0015a7d701765634f2f814c9 files/avahi-0.6.16-svn-1366.patch 4014
+RMD160 e718d8c19223723cb460de6d883df5a3d86325cd files/avahi-0.6.16-svn-1366.patch 4014
+SHA256 46f7cae433505f0e2b39279cfa017423800c508d48a5c6284f0b9a8c5bc207dc files/avahi-0.6.16-svn-1366.patch 4014
+AUX avahi-0.6.16-svn-1370.patch 3050 RMD160 e87bd6fac168bd2ab6074f33b68625d624a1a429 SHA1 f7415fa6bd56796f6e7a9ead3c42a57eddd1e237 SHA256 8c47c58e0c1cccccadf0263a2a458673b55768502411e6cfe2bc4fef0d9d7464
+MD5 f5bc7d211998d0ea9a58e43479166958 files/avahi-0.6.16-svn-1370.patch 3050
+RMD160 e87bd6fac168bd2ab6074f33b68625d624a1a429 files/avahi-0.6.16-svn-1370.patch 3050
+SHA256 8c47c58e0c1cccccadf0263a2a458673b55768502411e6cfe2bc4fef0d9d7464 files/avahi-0.6.16-svn-1370.patch 3050
+AUX avahi-0.6.16-svn-1371.patch 660 RMD160 7b41f99bb931f9047b01429f9ebfd0b7f2bc77a1 SHA1 9724f80da8296bed6940acdb5ccd7351e874e5c3 SHA256 7d4fd241092a4916c7ac3e0372f7b58ef8d8522759df35ebb0aef2294327dbed
+MD5 c8f93e6386bb3405b4982b4a53b7145e files/avahi-0.6.16-svn-1371.patch 660
+RMD160 7b41f99bb931f9047b01429f9ebfd0b7f2bc77a1 files/avahi-0.6.16-svn-1371.patch 660
+SHA256 7d4fd241092a4916c7ac3e0372f7b58ef8d8522759df35ebb0aef2294327dbed files/avahi-0.6.16-svn-1371.patch 660
+AUX avahi-0.6.16-svn-1372.patch 1137 RMD160 0740dbed8bf2cf6f0d2e928fa73ff7b61796b503 SHA1 216a1646025e9bd582f87de619afbd341bb2df21 SHA256 0a51caf95a4466f69a7a07c77b6f28e9252db71f0b3dd290fca42393caea295e
+MD5 f8171fae686708b73f8215844387fe6b files/avahi-0.6.16-svn-1372.patch 1137
+RMD160 0740dbed8bf2cf6f0d2e928fa73ff7b61796b503 files/avahi-0.6.16-svn-1372.patch 1137
+SHA256 0a51caf95a4466f69a7a07c77b6f28e9252db71f0b3dd290fca42393caea295e files/avahi-0.6.16-svn-1372.patch 1137
+AUX avahi-0.6.16-svn-1374.patch 2259 RMD160 eeff239f51bf0bbd4c384f62dc3ca801c77e0687 SHA1 22b7b45a464c63ef170e263e29cd81a74e0a833c SHA256 227b4efcdc2120fd2637c4987198907b47f17d3db816760159ce506a62a4a74f
+MD5 7f7e9a595cd772291c60860cacf05775 files/avahi-0.6.16-svn-1374.patch 2259
+RMD160 eeff239f51bf0bbd4c384f62dc3ca801c77e0687 files/avahi-0.6.16-svn-1374.patch 2259
+SHA256 227b4efcdc2120fd2637c4987198907b47f17d3db816760159ce506a62a4a74f files/avahi-0.6.16-svn-1374.patch 2259
 DIST avahi-0.6.15.tar.gz 892455 RMD160 c288d193f96751283065c4002d50ee139586e8b0 SHA1 b6ad5c4be1b868b1d8ccb14370c82bb8f01f8236 SHA256 21dc28f464dbf158ad15dc5ee9d0bad78215ef5633086e55b7201294d5841da0
 DIST avahi-0.6.16.tar.gz 891970 RMD160 0106c3082867715052b416e3c761d8f052de00a0 SHA1 8e684d29a16f6fda3c6a0458299134124d64b5ae SHA256 794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce
 EBUILD avahi-0.6.15.ebuild 4176 RMD160 98028ffb701ba1fd9d02c87e6b6d14801d4b78a5 SHA1 6c2df25cd19d76cac38616768231313509eed024 SHA256 690b89245901299100cc438ee7858a48ec5e8d7b461b3ea7d4c8c2f3f732ff68
 MD5 633de2ca94b87b711056addcc0270f09 avahi-0.6.15.ebuild 4176
 RMD160 98028ffb701ba1fd9d02c87e6b6d14801d4b78a5 avahi-0.6.15.ebuild 4176
 SHA256 690b89245901299100cc438ee7858a48ec5e8d7b461b3ea7d4c8c2f3f732ff68 avahi-0.6.15.ebuild 4176
-EBUILD avahi-0.6.16.ebuild 4142 RMD160 9b9554af473e9fcb1fbf8f777950ce3abdcac948 SHA1 45c4372e9a4553274622bb4dc18407ead4e27a76 SHA256 a0ad38df6b3e1649222fe713a9d2e409f47697249d9160f3a055aaf0f5485fc9
-MD5 3f20da4541d6398f8d53d6fa57d4bd8d avahi-0.6.16.ebuild 4142
-RMD160 9b9554af473e9fcb1fbf8f777950ce3abdcac948 avahi-0.6.16.ebuild 4142
-SHA256 a0ad38df6b3e1649222fe713a9d2e409f47697249d9160f3a055aaf0f5485fc9 avahi-0.6.16.ebuild 4142
-MISC ChangeLog 11016 RMD160 b2f53cb8737ae6c82fc512bea57d72c6d2eb9a28 SHA1 4d62906d12ca2af22148230697246c17a16551ec SHA256 328bfcc54ff4bcfeed12d6100ce881427b72c1c41c667ee8972491989046c90e
-MD5 599f303d491ac4b0c32688ecd8b9db20 ChangeLog 11016
-RMD160 b2f53cb8737ae6c82fc512bea57d72c6d2eb9a28 ChangeLog 11016
-SHA256 328bfcc54ff4bcfeed12d6100ce881427b72c1c41c667ee8972491989046c90e ChangeLog 11016
+EBUILD avahi-0.6.16-r1.ebuild 4548 RMD160 84ba95647853fe33cf02b0db89ec981e8b093390 SHA1 2c475da1679ddc754451617667ff1f9fef3e4526 SHA256 959d75f4038d98e02461fdaba988d39910a1c1d8418a3602f27cf3deea5fbef7
+MD5 9d3508a3ac608288b8dd83897e4f859f avahi-0.6.16-r1.ebuild 4548
+RMD160 84ba95647853fe33cf02b0db89ec981e8b093390 avahi-0.6.16-r1.ebuild 4548
+SHA256 959d75f4038d98e02461fdaba988d39910a1c1d8418a3602f27cf3deea5fbef7 avahi-0.6.16-r1.ebuild 4548
+MISC ChangeLog 11549 RMD160 4aa7eadce4eb68139612c96a8e2f2b8cab365bf1 SHA1 366aa00a9a0ab4098dcd4f77f01e3bf6e22585fc SHA256 8a6f4ddae37111b4afe2c01a67c69f4df640487a0f011b249ee340459c53f00f
+MD5 90b2b2cd35b35e54c5bc438421861cc8 ChangeLog 11549
+RMD160 4aa7eadce4eb68139612c96a8e2f2b8cab365bf1 ChangeLog 11549
+SHA256 8a6f4ddae37111b4afe2c01a67c69f4df640487a0f011b249ee340459c53f00f ChangeLog 11549
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -31,6 +70,13 @@ SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata
 MD5 23815a4887561501c51eb7b6a63646b8 files/digest-avahi-0.6.15 238
 RMD160 a8269968c6333ac231f868cf577f6899be16300b files/digest-avahi-0.6.15 238
 SHA256 0d0868d27f53d49fc385a54124696193f69ae5b8a7de3c8496df5af227594bce files/digest-avahi-0.6.15 238
-MD5 8aa4fe4af3aa3c0f161ad400add7fbf6 files/digest-avahi-0.6.16 238
-RMD160 bd1113ac391bce31d10cc8acb8e5720b3b56d8d7 files/digest-avahi-0.6.16 238
-SHA256 fc63dba6c511d1588e7866f900ebbb3defb54ed3cc455f871c35b473549c0371 files/digest-avahi-0.6.16 238
+MD5 8aa4fe4af3aa3c0f161ad400add7fbf6 files/digest-avahi-0.6.16-r1 238
+RMD160 bd1113ac391bce31d10cc8acb8e5720b3b56d8d7 files/digest-avahi-0.6.16-r1 238
+SHA256 fc63dba6c511d1588e7866f900ebbb3defb54ed3cc455f871c35b473549c0371 files/digest-avahi-0.6.16-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFoQCEI1lqEGTUzyQRAo+uAJ4kI7nl8eNwA7YyL4L5OrpgL4ucOwCeMW6v
+KjkGgdxJO6TOV9CmdF9H+VU=
+=mVrT
+-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.16.ebuild b/net-dns/avahi/avahi-0.6.16.ebuild
deleted file mode 100644
index 7078abc583c4..000000000000
--- a/net-dns/avahi/avahi-0.6.16.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.16.ebuild,v 1.1 2006/12/29 13:13:43 dertobi123 Exp $
-
-inherit eutils mono python qt3 qt4
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz
-	http://lathiat.net/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd"
-
-RDEPEND=">=dev-libs/libdaemon-0.5
-	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 )
-	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}
-	>=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
-}
-
-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 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 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
-		einfo
-		einfo "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		einfo "addresses, just set config_<interface>=( autoipd ) in /etc/conf.net!"
-		einfo
-	fi
-}
diff --git a/net-dns/avahi/files/digest-avahi-0.6.16 b/net-dns/avahi/files/digest-avahi-0.6.16
deleted file mode 100644
index 5917dd6b84d0..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3cbc460bbd55bae35f7b57443c063640 avahi-0.6.16.tar.gz 891970
-RMD160 0106c3082867715052b416e3c761d8f052de00a0 avahi-0.6.16.tar.gz 891970
-SHA256 794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce avahi-0.6.16.tar.gz 891970