Cleanup.

Package-Manager: portage-7278-svn

11 files changed, 13 insertions, 776 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index bc3a1df4bbfd..f8a4f1619938 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.118 2007/07/13 19:56:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.119 2007/07/21 21:17:59 swegener Exp $
+
+  21 Jul 2007; Sven Wegener <swegener@gentoo.org>
+  -files/avahi-0.6.18-inotify-ifdef-fix.patch, -avahi-0.6.17.ebuild,
+  -avahi-0.6.18.ebuild, -avahi-0.6.19.ebuild, -avahi-0.6.20.ebuild:
+  Cleanup.
 
   13 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> avahi-0.6.20.ebuild,
   avahi-0.6.20-r1.ebuild:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f233b3ff730e..b1594057ba37 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -45,10 +45,6 @@ AUX avahi-0.6.16-svn-1374.patch 2259 RMD160 eeff239f51bf0bbd4c384f62dc3ca801c77e
 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.18-inotify-ifdef-fix.patch 455 RMD160 abc10c1cd74192f545e43fd6a0cfcc8002515a0d SHA1 33436385957fe27a8446c850b77cbdb9e37661d7 SHA256 165a156b28e0c7b4784138ebdc0ebffd7c47a675320f74323345545633e04710
-MD5 5e626d1ed9e0f9ec6d1fe4b586cf0eca files/avahi-0.6.18-inotify-ifdef-fix.patch 455
-RMD160 abc10c1cd74192f545e43fd6a0cfcc8002515a0d files/avahi-0.6.18-inotify-ifdef-fix.patch 455
-SHA256 165a156b28e0c7b4784138ebdc0ebffd7c47a675320f74323345545633e04710 files/avahi-0.6.18-inotify-ifdef-fix.patch 455
 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
@@ -74,42 +70,24 @@ MD5 02bb9381563447d6382b6a140e2ec463 files/avahi-0.6.20-ui-sharp-gtk.patch 427
 RMD160 d2459f3b30740bb6a97f47bfc1f709a1439e36d6 files/avahi-0.6.20-ui-sharp-gtk.patch 427
 SHA256 cd3601df622a8445d50779fb73bb3deab3880fd66cd765d932155f51ac99491b files/avahi-0.6.20-ui-sharp-gtk.patch 427
 DIST avahi-0.6.16.tar.gz 891970 RMD160 0106c3082867715052b416e3c761d8f052de00a0 SHA1 8e684d29a16f6fda3c6a0458299134124d64b5ae SHA256 794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce
-DIST avahi-0.6.17.tar.gz 927202 RMD160 cac51c09730e1faf10bf0e11f091be3fd5f138d8 SHA1 3f7d293b72ca1c5269fa4b1e68b453d8ec3ff8f9 SHA256 2cb6a15a9fff56c0d24f3a95b7f67c52436a88716e640c7f7afd48c9a5cbd740
-DIST avahi-0.6.18.tar.gz 961748 RMD160 687dd4d84e175916ec3555314721068d75ad8943 SHA1 cec71de1b8cd939e847972dfea33217999bf7cd0 SHA256 11a0270cdf1220943ce8f3a79b705c6de6e57d94a058ee2efa9592037b4a4274
 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
 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.17.ebuild 4207 RMD160 f14d1e3abac746b624b65abff8fb8034973d1e89 SHA1 b3a7577b55b5008b835cb5202fec418ca58fb465 SHA256 e3821850bb5a2b93120b069a9e3cb1850cd86432369aff4d41dd09e67be965ec
-MD5 4cd5a6b656c3f15bbdbc02210c5dd0b8 avahi-0.6.17.ebuild 4207
-RMD160 f14d1e3abac746b624b65abff8fb8034973d1e89 avahi-0.6.17.ebuild 4207
-SHA256 e3821850bb5a2b93120b069a9e3cb1850cd86432369aff4d41dd09e67be965ec avahi-0.6.17.ebuild 4207
-EBUILD avahi-0.6.18.ebuild 4379 RMD160 bc5a4e4ad67210aa5d839fa93c35824cc1c8b4b7 SHA1 2f48f16da35da3d9ad9ae0a620a3899cde9a5cd8 SHA256 ddc54c7b174bec78fa035e5dc3741ebb62b1d3ace2209ab56e90b655fed1c1fa
-MD5 f963b9747fe0787a4a54c8df3aa1468d avahi-0.6.18.ebuild 4379
-RMD160 bc5a4e4ad67210aa5d839fa93c35824cc1c8b4b7 avahi-0.6.18.ebuild 4379
-SHA256 ddc54c7b174bec78fa035e5dc3741ebb62b1d3ace2209ab56e90b655fed1c1fa avahi-0.6.18.ebuild 4379
 EBUILD avahi-0.6.19-r1.ebuild 4451 RMD160 3b47663e8f6ccc695ad195ceabe7c5926ca7b72d SHA1 2babb7768070a27cb7eee464e1d5d0f2fdffb59a SHA256 78386c1809e6e25ac756b2f95ea0dfcd9a68ad405cb268d4c4ae211daf571632
 MD5 4f37238db83d7fb8d89951391f3a2b15 avahi-0.6.19-r1.ebuild 4451
 RMD160 3b47663e8f6ccc695ad195ceabe7c5926ca7b72d avahi-0.6.19-r1.ebuild 4451
 SHA256 78386c1809e6e25ac756b2f95ea0dfcd9a68ad405cb268d4c4ae211daf571632 avahi-0.6.19-r1.ebuild 4451
-EBUILD avahi-0.6.19.ebuild 4363 RMD160 88de205107a99409b9d7adbce96e7b9466659bf4 SHA1 95b4a8329e42d5adbec462646f782465b9735d9c SHA256 91e45ab233248eb38a4e77da7edfd419455c1196448a7fb045c607744a5a55cd
-MD5 f83dd71b9abca7300f83aee874ddecfd avahi-0.6.19.ebuild 4363
-RMD160 88de205107a99409b9d7adbce96e7b9466659bf4 avahi-0.6.19.ebuild 4363
-SHA256 91e45ab233248eb38a4e77da7edfd419455c1196448a7fb045c607744a5a55cd avahi-0.6.19.ebuild 4363
 EBUILD avahi-0.6.20-r1.ebuild 4573 RMD160 c4312f393264aeff8a0e817a955bb67db29210bf SHA1 0f1cdbe2883e048fdf4baa017c4217d543b7b1bf SHA256 419db6c9d05dd3527958e33b603e534711808417858366a25119a4238a10ed3e
 MD5 b49f039d53d50ce4c5a848e9545edaef avahi-0.6.20-r1.ebuild 4573
 RMD160 c4312f393264aeff8a0e817a955bb67db29210bf avahi-0.6.20-r1.ebuild 4573
 SHA256 419db6c9d05dd3527958e33b603e534711808417858366a25119a4238a10ed3e avahi-0.6.20-r1.ebuild 4573
-EBUILD avahi-0.6.20.ebuild 4354 RMD160 95ea998922c860cd89c9fb4f735e6a97c19b3ca2 SHA1 eb6e9d07e6ca8577def6ab1ab2be88a30e517a22 SHA256 c5d08e5c0a3be0ba6508374c645722eb0e4d83b21b188f2a46d6067280275cb6
-MD5 7ba8b6c6db02e36d88807e99bf41c880 avahi-0.6.20.ebuild 4354
-RMD160 95ea998922c860cd89c9fb4f735e6a97c19b3ca2 avahi-0.6.20.ebuild 4354
-SHA256 c5d08e5c0a3be0ba6508374c645722eb0e4d83b21b188f2a46d6067280275cb6 avahi-0.6.20.ebuild 4354
-MISC ChangeLog 16465 RMD160 aa0b5249b3e566f160051b1710afceb325f3682f SHA1 7e42d09227dc758685e2da5f1358f8a99e6b9927 SHA256 abad0f916c8866749f42f0f9747e2a8886b5b3b151f14cb5cee0b3532b435f31
-MD5 40d041c919da0c0550fb4d8ef195f60a ChangeLog 16465
-RMD160 aa0b5249b3e566f160051b1710afceb325f3682f ChangeLog 16465
-SHA256 abad0f916c8866749f42f0f9747e2a8886b5b3b151f14cb5cee0b3532b435f31 ChangeLog 16465
+MISC ChangeLog 16663 RMD160 3048560b7f12bffb8810d59010d9deb06fb62737 SHA1 c313948c0c82d60930507e8b5cd6ec9d2bce243f SHA256 b749cb2f759fa7485f2b580cdd47df1c4226725dfe86922d440d21003a98fcf1
+MD5 90c6e834ccb0d7cab66cecade2af9be7 ChangeLog 16663
+RMD160 3048560b7f12bffb8810d59010d9deb06fb62737 ChangeLog 16663
+SHA256 b749cb2f759fa7485f2b580cdd47df1c4226725dfe86922d440d21003a98fcf1 ChangeLog 16663
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -117,28 +95,16 @@ SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata
 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 2ee14b7d4b58f4e286fa2df74900f08a files/digest-avahi-0.6.17 238
-RMD160 5e0b2508e838f749f18a3d0acb529633a0180056 files/digest-avahi-0.6.17 238
-SHA256 c9184b9bd5b1d7318517095be0096d4cc2dc6e71361b16fba22ff288c986053c files/digest-avahi-0.6.17 238
-MD5 799fc91b1e5a781e5538b9ee127ea8b1 files/digest-avahi-0.6.18 238
-RMD160 1ace061c86b5b39e749495f208cee4c0d7d40e67 files/digest-avahi-0.6.18 238
-SHA256 11372c91a1b12a5b2930aa3fc3ff38c756c108f7a4a42bbef1e02636ef434e7a files/digest-avahi-0.6.18 238
-MD5 8426d4046873ff10e6d7facf145b3b89 files/digest-avahi-0.6.19 238
-RMD160 a5c23988afd3e8cdf90e4647155bd86e9d2dee92 files/digest-avahi-0.6.19 238
-SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/digest-avahi-0.6.19 238
 MD5 8426d4046873ff10e6d7facf145b3b89 files/digest-avahi-0.6.19-r1 238
 RMD160 a5c23988afd3e8cdf90e4647155bd86e9d2dee92 files/digest-avahi-0.6.19-r1 238
 SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/digest-avahi-0.6.19-r1 238
-MD5 abad0d13524e320d577cc47c71fbc9da files/digest-avahi-0.6.20 238
-RMD160 189115dd402bfa26b8bf8aa16ffd0879d8d147a5 files/digest-avahi-0.6.20 238
-SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/digest-avahi-0.6.20 238
 MD5 abad0d13524e320d577cc47c71fbc9da files/digest-avahi-0.6.20-r1 238
 RMD160 189115dd402bfa26b8bf8aa16ffd0879d8d147a5 files/digest-avahi-0.6.20-r1 238
 SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/digest-avahi-0.6.20-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGl9kBAiZjviIA2XgRAs53AJ9skdxgffihsjNlkhQyzLYOl+/ANQCfXURE
-QpgLvxtZEWDtu8zkku5yByo=
-=6DgP
+iD8DBQFGongJI1lqEGTUzyQRAvreAJwPRRAL0LlHLfoGX1/2//ozDzoIAQCeJTpA
+Nn5UvVfVYReP88NS5899J8k=
+=7zHp
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.17.ebuild b/net-dns/avahi/avahi-0.6.17.ebuild
deleted file mode 100644
index 2580319657c7..000000000000
--- a/net-dns/avahi/avahi-0.6.17.ebuild
+++ /dev/null
@@ -1,170 +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.17.ebuild,v 1.8 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 kernel_linux"
-
-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
-	)
-	kernel_linux? ( sys-libs/libcap )"
-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 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/avahi-0.6.18.ebuild b/net-dns/avahi/avahi-0.6.18.ebuild
deleted file mode 100644
index c65906076c94..000000000000
--- a/net-dns/avahi/avahi-0.6.18.ebuild
+++ /dev/null
@@ -1,176 +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.18.ebuild,v 1.11 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"
-
-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 kernel_linux test"
-
-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
-	)
-	kernel_linux? ( sys-libs/libcap )
-	!net-misc/mDNSResponder"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=dev-util/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python && ! built_with_use dev-lang/python gdbm
-	then
-		die "For python support you need dev-lang/python compiled with gdbm support!"
-	fi
-
-	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
-	then
-		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
-	fi
-
-	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
-	then
-		die "For *-compat or mono support you also need to enable the dbus USE flag!"
-	fi
-
-	if use bookmarks && ! ( use python && use dbus && use gtk )
-	then
-		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd
-	then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
-	epatch "${FILESDIR}"/${P}-inotify-ifdef-fix.patch
-
-	rm -f \
-		avahi-python/avahi/ServiceTypeDatabase.py \
-		avahi-autoipd/avahi-autoipd.action
-}
-
-src_compile() {
-	local myconf=""
-
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
-	fi
-
-	if use mono && use doc
-	then
-		myconf="${myconf} --enable-monodoc"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
-
-	if use autoipd
-	then
-		insinto /lib/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
-
-	if use autoipd
-	then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.19.ebuild b/net-dns/avahi/avahi-0.6.19.ebuild
deleted file mode 100644
index cff503f97859..000000000000
--- a/net-dns/avahi/avahi-0.6.19.ebuild
+++ /dev/null
@@ -1,179 +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.19.ebuild,v 1.5 2007/06/24 22:13:11 vapier Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit eutils mono python qt3 qt4 autotools
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test"
-
-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
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	python? (
-		>=virtual/python-2.4
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )
-	!net-misc/mDNSResponder"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=dev-util/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python && ! built_with_use dev-lang/python gdbm
-	then
-		die "For python support you need dev-lang/python compiled with gdbm support!"
-	fi
-
-	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
-	then
-		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
-	fi
-
-	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
-	then
-		die "For *-compat or mono support you also need to enable the dbus USE flag!"
-	fi
-
-	if use bookmarks && ! ( use python && use dbus && use gtk )
-	then
-		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd
-	then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
-	epatch "${FILESDIR}"/${P}-ui-sharp-automake.patch
-
-	eautomake
-}
-
-src_compile() {
-	local myconf=""
-
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
-	fi
-
-	if use mono && use doc
-	then
-		myconf="${myconf} --enable-monodoc"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
-
-	if use autoipd
-	then
-		insinto /lib/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
-
-	if use autoipd
-	then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.20.ebuild b/net-dns/avahi/avahi-0.6.20.ebuild
deleted file mode 100644
index 31e9d0eb75ba..000000000000
--- a/net-dns/avahi/avahi-0.6.20.ebuild
+++ /dev/null
@@ -1,179 +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.20.ebuild,v 1.6 2007/07/13 19:56:01 flameeyes Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit eutils mono python qt3 qt4 autotools
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( $(qt_min_version 3.3.6-r2) )
-	qt4? ( $(qt4_min_version 4) )
-	gtk? (
-		>=x11-libs/gtk+-2
-		>=gnome-base/libglade-2
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			|| (
-				dev-python/dbus-python
-				(
-					<sys-apps/dbus-0.90
-					>=sys-apps/dbus-0.30
-				)
-			)
-		)
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	python? (
-		>=virtual/python-2.4
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )
-	!net-misc/mDNSResponder"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=dev-util/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python && ! built_with_use dev-lang/python gdbm
-	then
-		die "For python support you need dev-lang/python compiled with gdbm support!"
-	fi
-
-	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
-	then
-		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
-	fi
-
-	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
-	then
-		die "For *-compat or mono support you also need to enable the dbus USE flag!"
-	fi
-
-	if use bookmarks && ! ( use python && use dbus && use gtk )
-	then
-		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd
-	then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
-	epatch "${FILESDIR}"/${P}-ui-sharp-gtk.patch
-
-	eautomake
-}
-
-src_compile() {
-	local myconf=""
-
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
-	fi
-
-	if use mono && use doc
-	then
-		myconf="${myconf} --enable-monodoc"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
-
-	if use autoipd
-	then
-		insinto /lib/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
-
-	if use autoipd
-	then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/files/avahi-0.6.18-inotify-ifdef-fix.patch b/net-dns/avahi/files/avahi-0.6.18-inotify-ifdef-fix.patch
deleted file mode 100644
index 78654551b519..000000000000
--- a/net-dns/avahi/files/avahi-0.6.18-inotify-ifdef-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: trunk/avahi-daemon/main.c
-===================================================================
---- trunk/avahi-daemon/main.c	(revision 1450)
-+++ trunk/avahi-daemon/main.c	(working copy)
-@@ -42,11 +42,13 @@
- #include <sys/resource.h>
- #include <sys/socket.h>
- 
-+#ifdef HAVE_INOTIFY
- #ifdef HAVE_SYS_INOTIFY_H
- #include <sys/inotify.h>
- #else
- #include "inotify-nosys.h"
- #endif
-+#endif
- 
- #include <libdaemon/dfork.h>
- #include <libdaemon/dsignal.h>
diff --git a/net-dns/avahi/files/digest-avahi-0.6.17 b/net-dns/avahi/files/digest-avahi-0.6.17
deleted file mode 100644
index fecabe42a61b..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29ebb2181958d5721ee5fc45f035a77c avahi-0.6.17.tar.gz 927202
-RMD160 cac51c09730e1faf10bf0e11f091be3fd5f138d8 avahi-0.6.17.tar.gz 927202
-SHA256 2cb6a15a9fff56c0d24f3a95b7f67c52436a88716e640c7f7afd48c9a5cbd740 avahi-0.6.17.tar.gz 927202
diff --git a/net-dns/avahi/files/digest-avahi-0.6.18 b/net-dns/avahi/files/digest-avahi-0.6.18
deleted file mode 100644
index bc55f50f7998..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ab3d67cb743d16cf38ad69b4b76ca989 avahi-0.6.18.tar.gz 961748
-RMD160 687dd4d84e175916ec3555314721068d75ad8943 avahi-0.6.18.tar.gz 961748
-SHA256 11a0270cdf1220943ce8f3a79b705c6de6e57d94a058ee2efa9592037b4a4274 avahi-0.6.18.tar.gz 961748
diff --git a/net-dns/avahi/files/digest-avahi-0.6.19 b/net-dns/avahi/files/digest-avahi-0.6.19
deleted file mode 100644
index 166fb945297b..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a06782435d1c994ecd00a66e95a5d9d4 avahi-0.6.19.tar.gz 973381
-RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 avahi-0.6.19.tar.gz 973381
-SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a avahi-0.6.19.tar.gz 973381
diff --git a/net-dns/avahi/files/digest-avahi-0.6.20 b/net-dns/avahi/files/digest-avahi-0.6.20
deleted file mode 100644
index b44d491d525d..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6acdff79afa2631f765f3bbbc3e25a74 avahi-0.6.20.tar.gz 974209
-RMD160 da413b25675184d1514953bfd308d544ca5f0556 avahi-0.6.20.tar.gz 974209
-SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9 avahi-0.6.20.tar.gz 974209