Cleanup.

Package-Manager: portage-2.1.3.9

13 files changed, 17 insertions, 931 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 61f2ff0ce979..fd0a8c1b0d81 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,14 @@
 # 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.124 2007/08/22 03:00:48 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.125 2007/09/09 13:46:55 swegener Exp $
+
+  09 Sep 2007; Sven Wegener <swegener@gentoo.org>
+  -files/avahi-0.6.16-svn-1353.patch, -files/avahi-0.6.16-svn-1361.patch,
+  -files/avahi-0.6.16-svn-1363.patch, -files/avahi-0.6.16-svn-1365.patch,
+  -files/avahi-0.6.16-svn-1366.patch, -files/avahi-0.6.16-svn-1370.patch,
+  -files/avahi-0.6.16-svn-1371.patch, -files/avahi-0.6.16-svn-1372.patch,
+  -files/avahi-0.6.16-svn-1374.patch, -avahi-0.6.16-r1.ebuild:
+  Cleanup.
 
   20 Aug 2007; Stuart Longland <redhatter@gentoo.org> avahi-0.6.21.ebuild:
   Tested and working on MIPS... keyworded ~mips.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 65073c305e3e..0c2f0e634ece 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -9,42 +9,6 @@ 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
 AUX avahi-0.6.19-assert-security.patch 794 RMD160 7c9218345b9ce84291b679748ccd24ed9cc1c81d SHA1 9a3d9a8a726cecb45b07cd4411b4521acc1b7fd8 SHA256 b52d7ffda641a58f446112fb6413cdfee670e666c943751389dc6ef2b3b3c4e4
 MD5 556e77f8b9ecb88caed982f6ae2d36c4 files/avahi-0.6.19-assert-security.patch 794
 RMD160 7c9218345b9ce84291b679748ccd24ed9cc1c81d files/avahi-0.6.19-assert-security.patch 794
@@ -81,14 +45,9 @@ AUX avahi-0.6.21-dbus-compat.patch 762 RMD160 d11f99a0e8dff26bfc1a16399401f68d16
 MD5 c5d1fc486c87375b6f4428259fad8372 files/avahi-0.6.21-dbus-compat.patch 762
 RMD160 d11f99a0e8dff26bfc1a16399401f68d161c634d files/avahi-0.6.21-dbus-compat.patch 762
 SHA256 7d9525d8b6d9b2e357be10ef0d6c291e9895a24ea4249f27cee9a619971a5068 files/avahi-0.6.21-dbus-compat.patch 762
-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
-SHA256 e3fc0c488a5a6eb368dffc6a680f58f2a825835a7314c3716cf4cdc4d105fd7b avahi-0.6.16-r1.ebuild 4530
 EBUILD avahi-0.6.19-r2.ebuild 4500 RMD160 f42b614d2c722e1633525465277fb8f65e58bf23 SHA1 741f5ab650b1bbc0a7c9c7773d234add633056b4 SHA256 04d0469dbaf3570f4ae96a0744df6d17c5de47e3f5eb2625880a7d89393771e6
 MD5 bb05599b7ffa6eb6b6dd848263e54252 avahi-0.6.19-r2.ebuild 4500
 RMD160 f42b614d2c722e1633525465277fb8f65e58bf23 avahi-0.6.19-r2.ebuild 4500
@@ -101,17 +60,14 @@ EBUILD avahi-0.6.21.ebuild 4450 RMD160 f04a0290c2ca7e2471e3990e0e6e043c228e0912
 MD5 5f2aef94c81543f7ec72712a3a68d16f avahi-0.6.21.ebuild 4450
 RMD160 f04a0290c2ca7e2471e3990e0e6e043c228e0912 avahi-0.6.21.ebuild 4450
 SHA256 84b7fc8c1908cc4f3a59b3b6a18da10af5f7ff9e556d0d11228bfe7ac57e5371 avahi-0.6.21.ebuild 4450
-MISC ChangeLog 17491 RMD160 63413d769d9028eee79f2d30f0f18f4ba47993a3 SHA1 687a0b8f9eef0889a8520aea6ebd6decb5db1a7a SHA256 7b54416c9fbee0720d4ccef73f896bd47f8171ff95236855aa203c1939a44c12
-MD5 41abd08bb55ffa0908803ec0ee8583c1 ChangeLog 17491
-RMD160 63413d769d9028eee79f2d30f0f18f4ba47993a3 ChangeLog 17491
-SHA256 7b54416c9fbee0720d4ccef73f896bd47f8171ff95236855aa203c1939a44c12 ChangeLog 17491
+MISC ChangeLog 17911 RMD160 29cde2ad7254a9c04871d5376b365a70456efc5d SHA1 804b32feaa78df2be1dc4417b6e557390bd0a80a SHA256 203c00d129cf7ac1741d0f0e23b39f66dcbe8282961ca285b7020fca6856f247
+MD5 bfec239110210ce97b3ebd65271704f8 ChangeLog 17911
+RMD160 29cde2ad7254a9c04871d5376b365a70456efc5d ChangeLog 17911
+SHA256 203c00d129cf7ac1741d0f0e23b39f66dcbe8282961ca285b7020fca6856f247 ChangeLog 17911
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata.xml 223
-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
 MD5 8426d4046873ff10e6d7facf145b3b89 files/digest-avahi-0.6.19-r2 238
 RMD160 a5c23988afd3e8cdf90e4647155bd86e9d2dee92 files/digest-avahi-0.6.19-r2 238
 SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/digest-avahi-0.6.19-r2 238
@@ -122,9 +78,9 @@ 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)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0D2+p/wUKkr7RBoRArdKAJ9NlYZRFDJT1Xg2r4K0Qur88CgPMACfbDYB
-qodgsI/2YLkUnOfc0do3F9Y=
-=72rW
+iD8DBQFG4/lXI1lqEGTUzyQRAhsTAKDeocfibInRHyGEk//oSyGvNZ3fBwCgjkmL
+ydgS2/YPw8g4F7p2zu0R/pw=
+=rbry
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.16-r1.ebuild b/net-dns/avahi/avahi-0.6.16-r1.ebuild
deleted file mode 100644
index 8b46a6815ca6..000000000000
--- a/net-dns/avahi/avahi-0.6.16-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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.16-r1.ebuild,v 1.13 2007/06/24 22:13:11 vapier 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 s390 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
-	epatch "${FILESDIR}"/${P}-svn-1353.patch
-	epatch "${FILESDIR}"/${P}-svn-1361.patch
-	epatch "${FILESDIR}"/${P}-svn-1363.patch
-	epatch "${FILESDIR}"/${P}-svn-1365.patch
-	epatch "${FILESDIR}"/${P}-svn-1366.patch
-	epatch "${FILESDIR}"/${P}-svn-1370.patch
-	epatch "${FILESDIR}"/${P}-svn-1371.patch
-	epatch "${FILESDIR}"/${P}-svn-1372.patch
-	epatch "${FILESDIR}"/${P}-svn-1374.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 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.16-svn-1353.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1353.patch
deleted file mode 100644
index 4dc5563be417..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1353.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: avahi-core/dns.c
-===================================================================
---- avahi-core/dns.c	(revision 1352)
-+++ avahi-core/dns.c	(revision 1353)
-@@ -400,6 +400,8 @@
-         } else
-             return -1;
-     }
-+
-+    return -1;
- }
- 
- int avahi_dns_packet_consume_name(AvahiDnsPacket *p, char *ret_name, size_t l) {
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1361.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1361.patch
deleted file mode 100644
index 5b56b3b714f0..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1361.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c	(revision 1360)
-+++ avahi-core/socket.c	(revision 1361)
-@@ -635,6 +635,9 @@
-         goto fail;
-     }
- 
-+    if (ms <= 0)
-+        goto fail;
-+
-     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
- 
-     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
-@@ -650,7 +653,14 @@
-     msg.msg_flags = 0;
-     
-     if ((l = recvmsg(fd, &msg, 0)) < 0) {
--        avahi_log_warn("recvmsg(): %s", strerror(errno));
-+        /* Linux returns EAGAIN when an invalid IP packet has been
-+        recieved. We suppress warnings in this case because this might
-+        create quite a bit of log traffic on machines with unstable
-+        links. (See #60) */
-+
-+        if (errno != EAGAIN)
-+            avahi_log_warn("recvmsg(): %s", strerror(errno));
-+
-         goto fail;
-     }
- 
-@@ -768,6 +778,9 @@
-         avahi_log_warn("ioctl(): %s", strerror(errno));
-         goto fail;
-     }
-+
-+    if (ms <= 0)
-+        goto fail;
-     
-     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
- 
-@@ -785,7 +798,14 @@
-     msg.msg_flags = 0;
-     
-     if ((l = recvmsg(fd, &msg, 0)) < 0) {
--        avahi_log_warn("recvmsg(): %s", strerror(errno));
-+        /* Linux returns EAGAIN when an invalid IP packet has been
-+        recieved. We suppress warnings in this case because this might
-+        create quite a bit of log traffic on machines with unstable
-+        links. (See #60) */
-+
-+        if (errno != EAGAIN)
-+            avahi_log_warn("recvmsg(): %s", strerror(errno));
-+        
-         goto fail;
-     }
- 
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1363.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1363.patch
deleted file mode 100644
index bb97b40a86ff..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1363.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c	(revision 1362)
-+++ avahi-core/socket.c	(revision 1363)
-@@ -475,10 +475,10 @@
-     struct iovec io;
- #ifdef IP_PKTINFO
-     struct cmsghdr *cmsg;
--    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
-+    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
- #elif defined(IP_SENDSRCADDR)
-     struct cmsghdr *cmsg;
--    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
-+    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
- #endif
- 
-     assert(fd >= 0);
-@@ -565,7 +565,7 @@
-     struct msghdr msg;
-     struct iovec io;
-     struct cmsghdr *cmsg;
--    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-+    size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
- 
-     assert(fd >= 0);
-     assert(p);
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1365.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1365.patch
deleted file mode 100644
index c3aa8c47f3a2..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1365.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Index: avahi-core/iface.c
-===================================================================
---- avahi-core/iface.c	(revision 1364)
-+++ avahi-core/iface.c	(revision 1365)
-@@ -50,9 +50,9 @@
-     assert(a);
-     m = a->monitor;
- 
--    if (a->interface->announcing &&
--        m->list_complete &&
-+    if (m->list_complete &&
-         avahi_interface_address_is_relevant(a) &&
-+        avahi_interface_is_relevant(a->interface) &&
-         !remove_rrs &&
-         m->server->config.publish_addresses &&
-         (m->server->state == AVAHI_SERVER_RUNNING ||
-@@ -67,11 +67,15 @@
-         
-         if (avahi_s_entry_group_is_empty(a->entry_group)) {
-             char t[AVAHI_ADDRESS_STR_MAX];
-+            AvahiProtocol p;
-+
-+            p = (a->interface->protocol == AVAHI_PROTO_INET && m->server->config.publish_a_on_ipv6) ||
-+                (a->interface->protocol == AVAHI_PROTO_INET6 && m->server->config.publish_aaaa_on_ipv4) ? AVAHI_PROTO_UNSPEC : a->interface->protocol;
-+            
-             avahi_address_snprint(t, sizeof(t), &a->address);
-+            avahi_log_info("Registering new address record for %s on %s.%s.", t, a->interface->hardware->name, p == AVAHI_PROTO_UNSPEC ? "*" : avahi_proto_to_string(p));
- 
--            avahi_log_info("Registering new address record for %s on %s.", t, a->interface->hardware->name);
--
--            if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address) < 0) {
-+            if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, p, 0, NULL, &a->address) < 0) {
-                 avahi_log_warn(__FILE__": avahi_server_add_address() failed: %s", avahi_strerror(m->server->error));
-                 avahi_s_entry_group_free(a->entry_group);
-                 a->entry_group = NULL;
-@@ -171,6 +175,10 @@
- 
-     if (!!join  == !!i->mcast_joined)
-         return 0;
-+
-+    if ((i->protocol == AVAHI_PROTO_INET6 && i->monitor->server->fd_ipv6 < 0) ||
-+        (i->protocol == AVAHI_PROTO_INET && i->monitor->server->fd_ipv4 < 0))
-+        return -1;
-     
-     if (join) {
-         AvahiInterfaceAddress *a;
-@@ -186,10 +194,8 @@
-             a = i->addresses;
- 
-         /* Hmm, there is no address available. */
--        if (!a) {
--            avahi_log_warn(__FILE__": interface_mdns_mcast_join() called but no local address available."); 
-+        if (!a)
-             return -1;
--        }
- 
-         i->local_mcast_address = a->address;
-     }
-@@ -387,9 +393,9 @@
-             
-     avahi_hashmap_insert(m->hashmap, &hw->index, hw);
- 
--    if (m->server->fd_ipv4 >= 0)
-+    if (m->server->fd_ipv4 >= 0 || m->server->config.publish_a_on_ipv6)
-         avahi_interface_new(m, hw, AVAHI_PROTO_INET);
--    if (m->server->fd_ipv6 >= 0)
-+    if (m->server->fd_ipv6 >= 0 || m->server->config.publish_aaaa_on_ipv4)
-         avahi_interface_new(m, hw, AVAHI_PROTO_INET6);
- 
-     return hw;
-@@ -426,13 +432,16 @@
-     b = avahi_interface_is_relevant(i);
- 
-     if (m->list_complete && b && !i->announcing) {
--        avahi_log_info("New relevant interface %s.%s for mDNS.", i->hardware->name, avahi_proto_to_string(i->protocol));
--
-         interface_mdns_mcast_join(i, 1);
- 
--        i->announcing = 1;
--        avahi_announce_interface(m->server, i);
--        avahi_multicast_lookup_engine_new_interface(m->server->multicast_lookup_engine, i);
-+        if (i->mcast_joined) {
-+            avahi_log_info("New relevant interface %s.%s for mDNS.", i->hardware->name, avahi_proto_to_string(i->protocol));
-+
-+            i->announcing = 1;
-+            avahi_announce_interface(m->server, i);
-+            avahi_multicast_lookup_engine_new_interface(m->server->multicast_lookup_engine, i);
-+        }
-+        
-     } else if (!b && i->announcing) {
-         avahi_log_info("Interface %s.%s no longer relevant for mDNS.", i->hardware->name, avahi_proto_to_string(i->protocol));
- 
-@@ -553,7 +562,7 @@
-     assert(i);
-     assert(p);
- 
--    if (!avahi_interface_is_relevant(i))
-+    if (!i->announcing)
-         return;
-     
-     assert(!a || a->proto == i->protocol);
-@@ -575,10 +584,10 @@
-     assert(i);
-     assert(key);
- 
--    if (avahi_interface_is_relevant(i))
--        return avahi_query_scheduler_post(i->query_scheduler, key, immediately, ret_id);
--
--    return 0;
-+    if (!i->announcing)
-+        return 0;
-+    
-+    return avahi_query_scheduler_post(i->query_scheduler, key, immediately, ret_id);
- }
- 
- int avahi_interface_withraw_query(AvahiInterface *i, unsigned id) {
-@@ -590,20 +599,20 @@
-     assert(i);
-     assert(record);
- 
--    if (avahi_interface_is_relevant(i))
--        return avahi_response_scheduler_post(i->response_scheduler, record, flush_cache, querier, immediately);
--
--    return 0;
-+    if (!i->announcing)
-+        return 0;
-+    
-+    return avahi_response_scheduler_post(i->response_scheduler, record, flush_cache, querier, immediately);
- }
- 
- int avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *record, int immediately) {
-     assert(i);
-     assert(record);
-     
--    if (avahi_interface_is_relevant(i))
--        return avahi_probe_scheduler_post(i->probe_scheduler, record, immediately);
-+    if (!i->announcing)
-+        return 0;
- 
--    return 0;
-+    return avahi_probe_scheduler_post(i->probe_scheduler, record, immediately);
- }
- 
- int avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, void* userdata) {
-@@ -625,21 +634,19 @@
- 
- int avahi_interface_is_relevant(AvahiInterface *i) {
-     AvahiInterfaceAddress *a;
--    int relevant_address;
-     
-     assert(i);
- 
--    relevant_address = 0;
-+    if (!i->hardware->flags_ok)
-+        return 0;
-     
-     for (a = i->addresses; a; a = a->address_next)
--        if (avahi_interface_address_is_relevant(a)) {
--            relevant_address = 1;
--            break;
--        }
-+        if (avahi_interface_address_is_relevant(a))
-+            return 1;
- 
--    return i->hardware->flags_ok && relevant_address;
-+    return 0;
- }
--
-+    
- int avahi_interface_address_is_relevant(AvahiInterfaceAddress *a) {
-     AvahiInterfaceAddress *b;
-     assert(a);
-Index: avahi-core/announce.c
-===================================================================
---- avahi-core/announce.c	(revision 1364)
-+++ avahi-core/announce.c	(revision 1365)
-@@ -498,7 +498,7 @@
-     assert(i);
- 
-     if (send_goodbye)
--        if (avahi_interface_is_relevant(i)) {
-+        if (i->announcing) {
-             AvahiEntry *e;
-             
-             for (e = s->entries; e; e = e->entries_next)
-Index: avahi-core/core.h
-===================================================================
---- avahi-core/core.h	(revision 1364)
-+++ avahi-core/core.h	(revision 1365)
-@@ -63,6 +63,8 @@
-     AvahiStringList *browse_domains;  /**< Additional browsing domains */
-     int disable_publishing;           /**< Disable publishing of any record */
-     int allow_point_to_point;         /**< Enable publishing on POINTOPOINT interfaces */
-+    int publish_a_on_ipv6;            /**< Publish an IPv4 A RR on IPv6 sockets */
-+    int publish_aaaa_on_ipv4;         /**< Publish an IPv4 A RR on IPv6 sockets */
- } AvahiServerConfig;
- 
- /** Allocate a new mDNS responder object. */
-@@ -148,6 +150,9 @@
- /** Set the wide area DNS servers */
- int avahi_server_set_wide_area_servers(AvahiServer *s, const AvahiAddress *a, unsigned n);
- 
-+/** Return the current configuration of the server \since 0.6.17 */
-+const AvahiServerConfig* avahi_server_get_config(AvahiServer *s);
-+
- AVAHI_C_DECL_END
- 
- #endif
-Index: avahi-core/server.c
-===================================================================
---- avahi-core/server.c	(revision 1364)
-+++ avahi-core/server.c	(revision 1365)
-@@ -803,7 +803,7 @@
-     avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->id);
-     
-     for (j = s->monitor->interfaces; j; j = j->interface_next)
--        if (avahi_interface_is_relevant(j) &&
-+        if (j->announcing &&
-             j != i &&
-             (s->config.reflect_ipv || j->protocol == i->protocol)) {
- 
-@@ -884,7 +884,7 @@
-     assert(src_address->proto == dst_address->proto);
- 
-     if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, src_address->proto)) ||
--        !avahi_interface_is_relevant(i)) {
-+        !i->announcing) {
-         avahi_log_warn("Recieved packet from invalid interface.");
-         return;
-     }
-@@ -977,7 +977,7 @@
-     }
- 
-     if (!(j = avahi_interface_monitor_get_interface(s->monitor, slot->interface, slot->address.proto)) ||
--        !avahi_interface_is_relevant(j))
-+        !j->announcing)
-         return;
- 
-     /* Patch the original ID into this response */
-@@ -1560,6 +1560,8 @@
-     c->browse_domains = NULL;
-     c->disable_publishing = 0;
-     c->allow_point_to_point = 0;
-+    c->publish_aaaa_on_ipv4 = 1;
-+    c->publish_a_on_ipv6 = 0;
-     
-     return c;
- }
-@@ -1721,3 +1723,9 @@
-     avahi_wide_area_set_servers(s->wide_area_lookup_engine, a, n);
-     return AVAHI_OK;
- }
-+
-+const AvahiServerConfig* avahi_server_get_config(AvahiServer *s) {
-+    assert(s);
-+
-+    return &s->config;
-+}
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1366.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1366.patch
deleted file mode 100644
index 8f13aaf50289..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1366.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: avahi-daemon/static-hosts.c
-===================================================================
---- avahi-daemon/static-hosts.c	(revision 1365)
-+++ avahi-daemon/static-hosts.c	(revision 1366)
-@@ -110,7 +110,9 @@
- static void add_static_host_to_server(StaticHost *h)
- {
-     AvahiAddress a;
-+    AvahiProtocol p;
-     int err;
-+    const AvahiServerConfig *config;
- 
-     if (!h->group)
-         if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {
-@@ -123,7 +125,12 @@
-         return;
-     }
- 
--    if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, h->host, &a))) {
-+    config = avahi_server_get_config(avahi_server);
-+    
-+    p = (a.proto == AVAHI_PROTO_INET && config->publish_a_on_ipv6) ||
-+        (a.proto == AVAHI_PROTO_INET6 && config->publish_aaaa_on_ipv4) ? AVAHI_PROTO_UNSPEC : a.proto;
-+    
-+    if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, p, 0, h->host, &a))) {
-         avahi_log_error ("Static host name %s: avahi_server_add_address failure: %s", h->host, avahi_strerror(err));
-         return;
-     }
-Index: avahi-daemon/main.c
-===================================================================
---- avahi-daemon/main.c	(revision 1365)
-+++ avahi-daemon/main.c	(revision 1366)
-@@ -442,7 +442,7 @@
- static int is_yes(const char *s) {
-     assert(s);
-     
--    return *s == 'y' || *s == 'Y';
-+    return *s == 'y' || *s == 'Y' || *s == '1' || *s == 't' || *s == 'T';
- }
- 
- static int load_config_file(DaemonConfig *c) {
-@@ -541,8 +541,12 @@
-                     c->server_config.add_service_cookie = is_yes(p->value);
-                 else if (strcasecmp(p->key, "publish-dns-servers") == 0) {
-                     avahi_strfreev(c->publish_dns_servers);
--                    c->publish_dns_servers = avahi_split_csv(p->value); 
--                } else {
-+                    c->publish_dns_servers = avahi_split_csv(p->value);
-+                } else if (strcasecmp(p->key, "publish-a-on-ipv6") == 0)
-+                    c->server_config.publish_a_on_ipv6 = is_yes(p->value);
-+                else if (strcasecmp(p->key, "publish-aaaa-on-ipv4") == 0)
-+                    c->server_config.publish_aaaa_on_ipv4 = is_yes(p->value);
-+                else {
-                     avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
-                     goto finish;
-                 }
-Index: avahi-daemon/avahi-daemon.conf
-===================================================================
---- avahi-daemon/avahi-daemon.conf	(revision 1365)
-+++ avahi-daemon/avahi-daemon.conf	(revision 1366)
-@@ -45,6 +45,8 @@
- #publish-domain=yes
- #publish-dns-servers=192.168.50.1, 192.168.50.2
- #publish-resolv-conf-dns-servers=yes
-+#publish-aaaa-on-ipv4=yes
-+#publish-a-on-ipv6=no
- 
- [reflector]
- #enable-reflector=no
-Index: man/avahi-daemon.conf.5.xml.in
-===================================================================
---- man/avahi-daemon.conf.5.xml.in	(revision 1365)
-+++ man/avahi-daemon.conf.5.xml.in	(revision 1366)
-@@ -223,6 +223,22 @@
-         SIGHUP to have it reload this file. Defaults to "no".</p>
-       </option>
- 
-+      <option>
-+        <p><opt>publish-aaaa-on-ipv4=</opt> Takes a boolean value
-+        ("yes" or "no"). If set to "yes" avahi-daemon will publish an
-+        IPv6 AAAA record via IPv4, i.e. the local IPv6 addresses can be
-+        resolved using an IPv4 transport. Only useful when IPv4 is
-+        enabled with <opt>use-ipv4=true</opt>. Defaults to "yes".</p>
-+      </option>
-+
-+      <option>
-+        <p><opt>publish-a-on-ipv6=</opt> Takes a boolean value
-+        ("yes" or "no"). If set to "yes" avahi-daemon will publish an
-+        IPv4 A record via IPv6, i.e. the local IPv4 addresses can be
-+        resolved using an IPv6 transport. Only useful when IPv6 is
-+        enabled with <opt>use-ipv6=true</opt>. Defaults to "no".</p>
-+      </option>
-+
-     </section>
- 
- 	<section name="Section [reflector]">
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1370.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1370.patch
deleted file mode 100644
index 13f6bcdbfc7e..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1370.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c	(revision 1369)
-+++ avahi-core/socket.c	(revision 1370)
-@@ -560,7 +560,14 @@
-     return sendmsg_loop(fd, &msg, 0);
- }
- 
--int avahi_send_dns_packet_ipv6(int fd, AvahiIfIndex interface, AvahiDnsPacket *p, const AvahiIPv6Address *src_address, const AvahiIPv6Address *dst_address, uint16_t dst_port) {
-+int avahi_send_dns_packet_ipv6(
-+        int fd,
-+        AvahiIfIndex interface,
-+        AvahiDnsPacket *p,
-+        const AvahiIPv6Address *src_address,
-+        const AvahiIPv6Address *dst_address,
-+        uint16_t dst_port) {
-+    
-     struct sockaddr_in6 sa;
-     struct msghdr msg;
-     struct iovec io;
-@@ -617,7 +624,14 @@
-     return sendmsg_loop(fd, &msg, 0);
- }
- 
--AvahiDnsPacket *avahi_recv_dns_packet_ipv4(int fd, AvahiIPv4Address *ret_src_address, uint16_t *ret_src_port, AvahiIPv4Address *ret_dst_address, AvahiIfIndex *ret_iface, uint8_t *ret_ttl) {
-+AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
-+        int fd,
-+        AvahiIPv4Address *ret_src_address,
-+        uint16_t *ret_src_port,
-+        AvahiIPv4Address *ret_dst_address,
-+        AvahiIfIndex *ret_iface,
-+        uint8_t *ret_ttl) {
-+    
-     AvahiDnsPacket *p= NULL;
-     struct msghdr msg;
-     struct iovec io;
-@@ -635,8 +649,10 @@
-         goto fail;
-     }
- 
--    if (ms <= 0)
-+    if (ms < 0) {
-+        avahi_log_warn("FIONREAD returned negative value.");
-         goto fail;
-+    }
- 
-     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
- 
-@@ -761,7 +777,14 @@
-     return NULL;
- }
- 
--AvahiDnsPacket *avahi_recv_dns_packet_ipv6(int fd, AvahiIPv6Address *ret_src_address, uint16_t *ret_src_port, AvahiIPv6Address *ret_dst_address, AvahiIfIndex *ret_iface, uint8_t *ret_ttl) {
-+AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
-+        int fd,
-+        AvahiIPv6Address *ret_src_address,
-+        uint16_t *ret_src_port,
-+        AvahiIPv6Address *ret_dst_address,
-+        AvahiIfIndex *ret_iface,
-+        uint8_t *ret_ttl) {
-+    
-     AvahiDnsPacket *p = NULL;
-     struct msghdr msg;
-     struct iovec io;
-@@ -779,8 +802,10 @@
-         goto fail;
-     }
- 
--    if (ms <= 0)
-+    if (ms < 0) {
-+        avahi_log_warn("FIONREAD returned negative value.");
-         goto fail;
-+    }
-     
-     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
- 
-@@ -860,7 +885,7 @@
- 
-     assert(found_iface);
-     assert(found_ttl);
--
-+    
-     return p;
- 
- fail:
-@@ -912,13 +937,19 @@
- 
- int avahi_open_unicast_socket_ipv6(void) {
-     struct sockaddr_in6 local;
--    int fd = -1;
-+    int fd = -1, yes;
-         
-     if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-         avahi_log_warn("socket() failed: %s", strerror(errno));
-         goto fail;
-     }
-     
-+    yes = 1;
-+    if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
-+        avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno));
-+        goto fail;
-+    }
-+
-     memset(&local, 0, sizeof(local));
-     local.sin6_family = AF_INET6;
-     
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1371.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1371.patch
deleted file mode 100644
index e17900fc0183..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1371.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: avahi-core/wide-area.c
-===================================================================
---- avahi-core/wide-area.c	(revision 1370)
-+++ avahi-core/wide-area.c	(revision 1371)
-@@ -579,8 +579,8 @@
-     e->cleanup_dead = 0;
- 
-     /* Create sockets */
--    e->fd_ipv4 = avahi_open_unicast_socket_ipv4();
--    e->fd_ipv6 = avahi_open_unicast_socket_ipv6();
-+    e->fd_ipv4 = s->config.use_ipv4 ? avahi_open_unicast_socket_ipv4() : -1;
-+    e->fd_ipv6 = s->config.use_ipv6 ? avahi_open_unicast_socket_ipv6() : -1;
- 
-     if (e->fd_ipv4 < 0 && e->fd_ipv6 < 0) {
-         avahi_log_error(__FILE__": Failed to create wide area sockets: %s", strerror(errno));
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1372.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1372.patch
deleted file mode 100644
index ff4b7ad0d004..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1372.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: avahi-daemon/static-hosts.c
-===================================================================
---- avahi-daemon/static-hosts.c	(revision 1371)
-+++ avahi-daemon/static-hosts.c	(revision 1372)
-@@ -116,7 +116,7 @@
- 
-     if (!h->group)
-         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));
-+            avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(avahi_server_errno(avahi_server)));
-             return;
-         }
- 
-@@ -130,7 +130,7 @@
-     p = (a.proto == AVAHI_PROTO_INET && config->publish_a_on_ipv6) ||
-         (a.proto == AVAHI_PROTO_INET6 && config->publish_aaaa_on_ipv4) ? AVAHI_PROTO_UNSPEC : a.proto;
-     
--    if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, p, 0, h->host, &a))) {
-+    if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, p, 0, h->host, &a)) < 0) {
-         avahi_log_error ("Static host name %s: avahi_server_add_address failure: %s", h->host, avahi_strerror(err));
-         return;
-     }
diff --git a/net-dns/avahi/files/avahi-0.6.16-svn-1374.patch b/net-dns/avahi/files/avahi-0.6.16-svn-1374.patch
deleted file mode 100644
index 89397fe4279d..000000000000
--- a/net-dns/avahi/files/avahi-0.6.16-svn-1374.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: avahi-compat-libdns_sd/compat.c
-===================================================================
---- avahi-compat-libdns_sd/compat.c	(revision 1373)
-+++ avahi-compat-libdns_sd/compat.c	(revision 1374)
-@@ -469,25 +469,26 @@
- }
- 
- int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdref) {
-+
-+    AVAHI_WARN_LINKAGE;
-+    
-     if (!sdref || sdref->n_ref <= 0)
-         return -1;
- 
--    AVAHI_WARN_LINKAGE;
--    
-     return sdref->main_fd;
- }
- 
- DNSServiceErrorType DNSSD_API DNSServiceProcessResult(DNSServiceRef sdref) {
-     DNSServiceErrorType ret = kDNSServiceErr_Unknown;
- 
--    assert(sdref);
--    assert(sdref->n_ref >= 1);
--    
-     AVAHI_WARN_LINKAGE;
- 
-+    if (!sdref || sdref->n_ref <= 0)
-+        return kDNSServiceErr_BadParam;
-+    
-+    sdref_ref(sdref);
-+
-     ASSERT_SUCCESS(pthread_mutex_lock(&sdref->mutex));
--
--    sdref_ref(sdref);
-     
-     /* Cleanup notification socket */
-     if (read_command(sdref->main_fd) != COMMAND_POLL_DONE)
-@@ -512,10 +513,10 @@
-     
- finish:
- 
-+    ASSERT_SUCCESS(pthread_mutex_unlock(&sdref->mutex));
-+    
-     sdref_unref(sdref);
- 
--    ASSERT_SUCCESS(pthread_mutex_unlock(&sdref->mutex));
--    
-     return ret;
- }
- 
-@@ -613,7 +614,6 @@
- 
-     if (!ret_sdref)
-         return kDNSServiceErr_BadParam;
--
-     *ret_sdref = NULL;
- 
-     assert(regtype);
-@@ -739,7 +739,10 @@
- 
-     AVAHI_WARN_LINKAGE;
- 
--    assert(ret_sdref);
-+    if (!ret_sdref)
-+        return kDNSServiceErr_BadParam;
-+    *ret_sdref = NULL;
-+
-     assert(name);
-     assert(regtype);
-     assert(domain);
-@@ -853,7 +856,10 @@
- 
-     AVAHI_WARN_LINKAGE;
- 
--    assert(ret_sdref);
-+    if (!ret_sdref)
-+        return kDNSServiceErr_BadParam;
-+    *ret_sdref = NULL;
-+
-     assert(callback);
- 
-     if (interface == kDNSServiceInterfaceIndexLocalOnly ||
-@@ -1096,7 +1102,6 @@
- 
-     if (!ret_sdref)
-         return kDNSServiceErr_BadParam;
--
-     *ret_sdref = NULL;
-     
-     if (!regtype)
-@@ -1210,10 +1215,12 @@
- 
-     int ret = kDNSServiceErr_Unknown;
-     AvahiStringList *txt = NULL;
--    assert(sdref);
- 
-     AVAHI_WARN_LINKAGE;
- 
-+    if (!sdref || sdref->n_ref <= 0)
-+        return kDNSServiceErr_BadParam;
-+
-     if (flags || rref) {
-         AVAHI_WARN_UNSUPPORTED;
-         return kDNSServiceErr_Unsupported;
diff --git a/net-dns/avahi/files/digest-avahi-0.6.16-r1 b/net-dns/avahi/files/digest-avahi-0.6.16-r1
deleted file mode 100644
index 5917dd6b84d0..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.16-r1
+++ /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