Cleanup.

Package-Manager: portage-2.1.5.2

13 files changed, 18 insertions, 814 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 2eb9b11eed81..0d6915180c8f 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.143 2008/05/29 17:36:48 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.144 2008/05/30 21:05:55 swegener Exp $
+
+  30 May 2008; Sven Wegener <swegener@gentoo.org>
+  -files/avahi-0.6.20-cleanup-dns-compression-table.patch,
+  -files/avahi-0.6.20-make-known-answers-not-conflict.patch,
+  -files/avahi-0.6.20-ui-sharp-gtk.patch,
+  -files/avahi-0.6.21-browse-help.patch,
+  -files/avahi-0.6.21-dbus-compat.patch,
+  -files/avahi-0.6.21-no-browse-domains-segfault.patch,
+  -files/avahi-0.6.21-no-ipv6.patch,
+  -files/avahi-0.6.21-service_name_chosen.patch, -avahi-0.6.20-r2.ebuild,
+  -avahi-0.6.21.ebuild, -avahi-0.6.22.ebuild:
+  Cleanup.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> avahi-0.6.19-r2.ebuild,
   avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild, avahi-0.6.22.ebuild,
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 712356ad05e9..9d8611a25bf9 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -8,33 +8,20 @@ AUX avahi-0.6.19-assert-security.patch 794 RMD160 7c9218345b9ce84291b679748ccd24
 AUX avahi-0.6.19-ui-sharp-automake.patch 654 RMD160 a55092fc273e7d01a92609219a3ba30dcd2770e9 SHA1 9c0a7a1fc7691181d73375e4380d0aa19830ca72 SHA256 4c1ef7b47639072151af0d745eedd34a6396ad2cb904ad4ad4f4cde482457b92
 AUX avahi-0.6.19-ui-sharp-gtk.patch 427 RMD160 967c446b0204baa4ddf5a0568164352caa90cfaa SHA1 6261c6ed45f5a5651ed5464c60777f21e4a482de SHA256 ae4ae6a21ebfcf39f3f1f9bf67cc5f47881d4e28cfb6f488517819806909ee9c
 AUX avahi-0.6.20-autoipd.patch 584 RMD160 5117179edd7af3237edad97c5c141b271470f58a SHA1 aa15b45e31cf97721d597fc030d56f66365d2f88 SHA256 7a8fa3ce860730d5a63641fe4e7e9f85d0fc45b7d4a0aa4d84a2b58e2c4112cd
-AUX avahi-0.6.20-cleanup-dns-compression-table.patch 1895 RMD160 31c8d84fb7fff3fb1a226c66e089c295131d30ae SHA1 1fcf7d6587e30a3534831b380760d87ed52c7211 SHA256 80c18ca1f12a7d67e55b41973ef2606bb46539945019e155ae88cb262b6c33fb
-AUX avahi-0.6.20-make-known-answers-not-conflict.patch 785 RMD160 0af844fdd3bf968942ad939371ddecce8acd91c2 SHA1 8c56fbee4eb1fdae33a46bd303796581fd13a5d1 SHA256 797c2a390ce867d8e98bb346e483b650489140f2a48489fc0dac7a0ded5b2c63
-AUX avahi-0.6.20-ui-sharp-gtk.patch 427 RMD160 d2459f3b30740bb6a97f47bfc1f709a1439e36d6 SHA1 8eeb7d17cfcb251840cb953cb61e0d107fa55c9d SHA256 cd3601df622a8445d50779fb73bb3deab3880fd66cd765d932155f51ac99491b
-AUX avahi-0.6.21-browse-help.patch 628 RMD160 c81d420ea3a41dcf8f98f55e15b891ed15b72d16 SHA1 cc5de8301febaf1cd38c47079b996c97d8f0cae1 SHA256 bda1cf309b500347c0a35304184cdec1d993582858d352613984098400e502af
-AUX avahi-0.6.21-dbus-compat.patch 814 RMD160 c4701d197c1158a3955b221d2fa20ab8e784ab1f SHA1 5e3af0e8f6c63df6faea2fb26fab9502f1b4548f SHA256 8d75c4045a5fe5f51d1164918cbb1bd17369efffd67c2c4ddae87509595ae058
-AUX avahi-0.6.21-no-browse-domains-segfault.patch 627 RMD160 fd1d23a23a992d0a6754795135c750033a2cadee SHA1 f1b74c53f60dac90bd3b7ef3b3681f1bb719ed78 SHA256 6a54f155d8e51ddf790bd10ab365cf7ef301fceb5d030491365cb317831e1fcb
-AUX avahi-0.6.21-no-ipv6.patch 603 RMD160 ca38329bfe8f8f2e287ca50e520cb22b7850ba03 SHA1 cb6f1f9c81e187d4855e15c0638eba730d4c8156 SHA256 812c8e8ed89c1b52b591f19011131f9bf8ca166cc5b77fd84ac829120231bd68
-AUX avahi-0.6.21-service_name_chosen.patch 862 RMD160 aac77d26037346e25a021f262d05a6083553266d SHA1 403817d36ba34bd77558cd46807f9b8a7d88374d SHA256 4d71cd2534a3cda8990e4b5a8e859daab026112089f419924e8f1b5ce4c24091
 AUX avahi-0.6.22-gobject.patch 1113 RMD160 d4551aecefa470a6fe1f0998cc382192942ef647 SHA1 7e005c7d773aece3171f24061769c02b55693c35 SHA256 440df6f17e9e619622a326547313a9cb9df696ef1cfa0339385a225b69c8001a
 AUX avahi-0.6.22-vncviewer.patch 462 RMD160 a79540e16aecb781f0701ceb57db456f33296666 SHA1 de77191d8f2fe499be77c9f54adaefeea9919fc3 SHA256 daf1eaf78883b07669536b46b081c0b66f5a4a375a833a071ab91b6e12656da5
 AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 SHA1 a5b084504f70ceaf99bcfd75ddad846bda294166 SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb
 AUX avahi-vncviewer.patch 474 RMD160 ca19092b5a410cefb67480f0de7f4baf8ceff1fc SHA1 1838114e7c0ed4ff15c4adaf791fb6cbfab1bb48 SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b
 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
 DIST avahi-0.6.22.tar.gz 1199901 RMD160 fad35f473a9109c8648e43b0f6f547c32b18e32f SHA1 2863bae55a991facc93138ca4660d5b55c846bd1 SHA256 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
 EBUILD avahi-0.6.19-r2.ebuild 4716 RMD160 75f369b613e5aaf68eb68249a2e2776365a10313 SHA1 0249ee22a402782ba226028a6eb1c95911460c79 SHA256 1df38998b5013e1b8e91870f2f9ae9ecd2103a02b4b05b2f942148df1105f14f
-EBUILD avahi-0.6.20-r2.ebuild 4822 RMD160 834aacb3ae2c98a13eb595071af4ae209b251adc SHA1 4e0c6929e41768a443fbb4be27c53d460112a1b2 SHA256 f8596d623427802701a3795f9662d3cfdb1b5aaa4a1774416e6e30c9bfb2ba3d
-EBUILD avahi-0.6.21.ebuild 4888 RMD160 1698629dfa07969d64cadf3e879d718a0270e3c1 SHA1 8b297ec7d2969e5761461b13971deddeea54d7d5 SHA256 19087eb6d601fc545f7c66d2b782f08ebf1a6d6510e3d462c3ee798ef483134b
 EBUILD avahi-0.6.22-r1.ebuild 5172 RMD160 47524eed8456081bb1284a5065d7c8d06f130111 SHA1 39596ce06a1e3f90e312fd696cda52e6447b9a72 SHA256 d8b98e0cd49866b50ead45da32844c7f08ff5eb1f0bcf9b14b81e65539b807aa
-EBUILD avahi-0.6.22.ebuild 4840 RMD160 0f4892954d1d3a6ef3f1da01ceb62d8017a9b434 SHA1 17543b0bc819caf8c42bba09cd6e82b76c98ec89 SHA256 84afb0094869193a9c3805bc4c180f490618159474ac5d42d90556f493a19314
-MISC ChangeLog 21079 RMD160 f61794bdb01e6e48e9887c887155068e97baecfc SHA1 386d86140f177024c440d00d612c1f69fdaee512 SHA256 41c9f77a8745d9c2fc3052c54fdd88004a1ae2b13d9d0bfa8f23a2c44194f950
+MISC ChangeLog 21599 RMD160 f369d586af15d9d03484472703baeddb7b8375f4 SHA1 08ef65ab1a5dcb60085479738082b30859f22f87 SHA256 a6442ad94f48a334ee4c1eebc70ad2a673a27e2dca57f72edee7277d31578836
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkg+6bUACgkQQU4yORhF8iCQOQCgsMeNgej9GQM+XlgAbUFFtwfW
-lkkAniugbHCvyE4wduduULSNtVUfbY1c
-=XFkN
+iD8DBQFIQGw4I1lqEGTUzyQRAl9pAKCDWpWZEKWrt6Ih5FRutK4VNAhVUgCgh42n
+xLRnotMVzfYJuXN/VkoaDXs=
+=NbBB
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.20-r2.ebuild b/net-dns/avahi/avahi-0.6.20-r2.ebuild
deleted file mode 100644
index 1880ab1ec4c2..000000000000
--- a/net-dns/avahi/avahi-0.6.20-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2000-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.9 2008/05/29 17:36:48 hawking Exp $
-
-WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="none"
-
-inherit eutils mono python qt3 qt4 autotools multilib
-
-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.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	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-2 )
-	)
-	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/intltool-0.35
-	>=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}-ui-sharp-gtk.patch
-	epatch "${FILESDIR}"/${P}-make-known-answers-not-conflict.patch
-	epatch "${FILESDIR}"/${P}-cleanup-dns-compression-table.patch
-	epatch "${FILESDIR}"/${P}-autoipd.patch
-	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
-	epatch "${FILESDIR}"/avahi-vncviewer.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 /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/avahi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
-	fi
-
-	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/avahi-0.6.21.ebuild b/net-dns/avahi/avahi-0.6.21.ebuild
deleted file mode 100644
index 075ffa37b9b6..000000000000
--- a/net-dns/avahi/avahi-0.6.21.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2000-2008 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.12 2008/05/29 17:36:48 hawking Exp $
-
-inherit eutils mono python qt3 qt4 multilib
-
-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 ~mips ~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.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	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-2 )
-	)
-	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/intltool-0.35
-	>=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}"/${P}-no-ipv6.patch
-	epatch "${FILESDIR}"/${P}-dbus-compat.patch
-	epatch "${FILESDIR}"/${P}-browse-help.patch
-	epatch "${FILESDIR}"/${P}-service_name_chosen.patch
-	epatch "${FILESDIR}"/${P}-no-browse-domains-segfault.patch
-	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
-	epatch "${FILESDIR}"/avahi-vncviewer.patch
-
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-}
-
-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() {
-	emake 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 /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup
-}
-
-pkg_postinst() {
-	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
-	fi
-
-	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
-
-	if use dbus
-	then
-		elog
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.22.ebuild b/net-dns/avahi/avahi-0.6.22.ebuild
deleted file mode 100644
index 7fbb0da6ad44..000000000000
--- a/net-dns/avahi/avahi-0.6.22.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 2000-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v 1.4 2008/05/29 17:36:48 hawking Exp $
-
-inherit eutils mono python qt3 qt4 multilib
-
-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 ~mips ~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.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	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-2 )
-	)
-	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/intltool-0.35
-	>=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}"/${P}-vncviewer.patch
-
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
-	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-}
-
-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"
-
-	use doc && emake avahi.devhelp
-}
-
-src_install() {
-	emake 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 /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,README,TODO}
-
-	if use doc
-	then
-		dohtml -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup
-}
-
-pkg_postinst() {
-	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
-	fi
-
-	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
-
-	if use dbus
-	then
-		elog
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/files/avahi-0.6.20-cleanup-dns-compression-table.patch b/net-dns/avahi/files/avahi-0.6.20-cleanup-dns-compression-table.patch
deleted file mode 100644
index 67c9cb66ed72..000000000000
--- a/net-dns/avahi/files/avahi-0.6.20-cleanup-dns-compression-table.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: avahi-core/dns.c
-===================================================================
---- avahi-core/dns.c	(revision 1492)
-+++ avahi-core/dns.c	(revision 1497)
-@@ -153,6 +153,19 @@
-     avahi_dns_packet_set_field(p, idx, avahi_dns_packet_get_field(p, idx) + 1);
- }   
- 
-+
-+static void name_table_cleanup(void *key, void *value, void *user_data) {
-+    AvahiDnsPacket *p = user_data;
-+    
-+    if ((uint8_t*) value >= AVAHI_DNS_PACKET_DATA(p) + p->size)
-+        avahi_hashmap_remove(p->name_table, key);
-+}
-+
-+void avahi_dns_packet_cleanup_name_table(AvahiDnsPacket *p) {
-+    if (p->name_table)
-+        avahi_hashmap_foreach(p->name_table, name_table_cleanup, p);
-+}
-+
- uint8_t* avahi_dns_packet_append_name(AvahiDnsPacket *p, const char *name) {
-     uint8_t *d, *saved_ptr = NULL;
-     size_t saved_size;
-@@ -216,6 +229,8 @@
- 
- fail:
-     p->size = saved_size;
-+    avahi_dns_packet_cleanup_name_table(p);
-+
-     return NULL;
- }
- 
-@@ -685,6 +700,8 @@
-         !avahi_dns_packet_append_uint16(p, k->type) ||
-         !avahi_dns_packet_append_uint16(p, k->clazz | (unicast_response ? AVAHI_DNS_UNICAST_RESPONSE : 0))) {
-         p->size = size;
-+        avahi_dns_packet_cleanup_name_table(p);
-+
-         return NULL;
-     }
- 
-@@ -799,6 +816,8 @@
- 
- fail:
-     p->size = size;
-+    avahi_dns_packet_cleanup_name_table(p);
-+
-     return NULL;
- }
- 
-Index: avahi-core/dns.h
-===================================================================
---- avahi-core/dns.h	(revision 1492)
-+++ avahi-core/dns.h	(revision 1497)
-@@ -52,6 +52,8 @@
- 
- uint8_t *avahi_dns_packet_extend(AvahiDnsPacket *p, size_t l);
- 
-+void avahi_dns_packet_cleanup_name_table(AvahiDnsPacket *p);
-+
- uint8_t *avahi_dns_packet_append_uint16(AvahiDnsPacket *p, uint16_t v);
- uint8_t *avahi_dns_packet_append_uint32(AvahiDnsPacket *p, uint32_t v);
- uint8_t *avahi_dns_packet_append_name(AvahiDnsPacket *p, const char *name);
diff --git a/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch b/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch
deleted file mode 100644
index 314a5791dd1c..000000000000
--- a/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: /trunk/avahi-core/server.c
-===================================================================
---- /trunk/avahi-core/server.c (revision 1463)
-+++ /trunk/avahi-core/server.c (revision 1496)
-@@ -611,9 +611,7 @@
-             }
-             
--            if (handle_conflict(s, i, record, unique)) {
--                avahi_response_scheduler_suppress(i->response_scheduler, record, a);
--                avahi_record_list_drop(s->record_list, record);
--                avahi_cache_stop_poof(i->cache, record, a);
--            }
-+            avahi_response_scheduler_suppress(i->response_scheduler, record, a);
-+            avahi_record_list_drop(s->record_list, record);
-+            avahi_cache_stop_poof(i->cache, record, a);
-             
-             avahi_record_unref(record);
diff --git a/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch b/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch
deleted file mode 100644
index 9d6def5b8c80..000000000000
--- a/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur avahi-0.6.20.orig/avahi-ui-sharp/Makefile.am avahi-0.6.20/avahi-ui-sharp/Makefile.am
---- avahi-0.6.20.orig/avahi-ui-sharp/Makefile.am	2007-05-10 20:10:30.000000000 +0000
-+++ avahi-0.6.20/avahi-ui-sharp/Makefile.am	2007-06-29 18:12:38.686167585 +0000
-@@ -44,6 +44,7 @@
- 
- if HAVE_MONO
- if HAVE_DBUS
-+if HAVE_GTK
- all: $(ASSEMBLY) $(ASSEMBLY).config bssh.exe
- 
- if HAVE_MONODOC
-@@ -68,3 +69,4 @@
- 
- endif
- endif
-+endif
diff --git a/net-dns/avahi/files/avahi-0.6.21-browse-help.patch b/net-dns/avahi/files/avahi-0.6.21-browse-help.patch
deleted file mode 100644
index 238f3cc67c36..000000000000
--- a/net-dns/avahi/files/avahi-0.6.21-browse-help.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix avahi-browse --help
-
-Index: trunk/avahi-utils/avahi-browse.c
-===================================================================
---- trunk/avahi-utils/avahi-browse.c	(revision 1518)
-+++ trunk/avahi-utils/avahi-browse.c	(revision 1519)
-@@ -586,9 +586,12 @@
-                 "%s [options] -a\n"
-                 "%s [options] -D\n"
- #if defined(HAVE_GDBM) || defined(HAVE_DBM)
--                "%s [options] -b\n",
-+                "%s [options] -b\n"
- #endif
-                 "\n",
-+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
-+                argv0,
-+#endif
-                 argv0, argv0, argv0);
- 
-             fprintf(f, 
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
deleted file mode 100644
index fc0d7983f0b4..000000000000
--- a/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-use dbus_watch_get_unix_fd() only in dbus >= 1.1.1
-
-Index: trunk/avahi-common/dbus-watch-glue.c
-===================================================================
---- trunk/avahi-common/dbus-watch-glue.c	(revision 1517)
-+++ trunk/avahi-common/dbus-watch-glue.c	(revision 1518)
-@@ -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_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 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/avahi-0.6.21-no-browse-domains-segfault.patch b/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch
deleted file mode 100644
index 0eca3329672f..000000000000
--- a/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Don't segfault when no browse domains are configured in resolv.conf. Original patch from zml. Closes #162
-
-Index: avahi-daemon/main.c
-===================================================================
---- avahi-daemon/main.c	(revision 1524)
-+++ avahi-daemon/main.c	(revision 1525)
-@@ -317,6 +317,11 @@
-     int n;
-     char **p;
- 
-+    if (!resolv_conf_search_domains) {
-+        avahi_server_set_browse_domains(avahi_server, NULL);
-+        return;
-+    }
-+
-     l = avahi_string_list_copy(config.server_config.browse_domains);
-     
-     for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {
diff --git a/net-dns/avahi/files/avahi-0.6.21-no-ipv6.patch b/net-dns/avahi/files/avahi-0.6.21-no-ipv6.patch
deleted file mode 100644
index ef7c33caa5f6..000000000000
--- a/net-dns/avahi/files/avahi-0.6.21-no-ipv6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-uClibc systems dont define IPV6_V6ONLY when USE=-ipv6
-
---- avahi-core/socket.c
-+++ avahi-core/socket.c
-@@ -372,6 +372,7 @@
- }
- 
- int avahi_open_socket_ipv6(int no_reuse) {
-+#ifdef IPV6_V6ONLY
-     struct sockaddr_in6 sa, local;
-     int fd = -1, yes, r;
-     int ttl;
-@@ -437,6 +438,7 @@
- fail:
-     if (fd >= 0)
-         close(fd);
-+#endif
- 
-     return -1;
- }
-@@ -936,6 +938,7 @@
- }
- 
- int avahi_open_unicast_socket_ipv6(void) {
-+#ifdef IPV6_V6ONLY
-     struct sockaddr_in6 local;
-     int fd = -1, yes;
-         
-@@ -977,5 +980,6 @@
-     if (fd >= 0)
-         close(fd);
- 
-+#endif
-     return -1;
- }
diff --git a/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch b/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch
deleted file mode 100644
index 67dfdb8b25d7..000000000000
--- a/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix a segfault when registering services with libdns_sd before the avahi daemon finished starting up; Closes rhbz 251700; Original patch from Tim Waugh
-
-Index: trunk/avahi-compat-libdns_sd/compat.c
-===================================================================
---- trunk/avahi-compat-libdns_sd/compat.c	(revision 1535)
-+++ trunk/avahi-compat-libdns_sd/compat.c	(revision 1536)
-@@ -990,6 +990,16 @@
-                     return;
-                 }
-             }
-+
-+            if (!sdref->service_name_chosen) {
-+
-+                assert(sdref->service_name);
-+                
-+                if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) {
-+                    reg_report_error(sdref, kDNSServiceErr_NoMemory);
-+                    return;
-+                }
-+            }
-             
-             /* Register the service */
-