Cleanup.

(Portage version: 2.1_rc2)
 (Signed Manifest commit)

3 files changed, 11 insertions, 164 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f91a09fb662e..fc38f79c36ca 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,38 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 size 362
+AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4
 MD5 317c28eba6516a18140aa8e2cb26d618 files/avahi-0.6.1-no-ipv6.patch 362
 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 files/avahi-0.6.1-no-ipv6.patch 362
 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4 files/avahi-0.6.1-no-ipv6.patch 362
-DIST avahi-0.6.10.tar.gz 879819 RMD160 59274b5314476830614fe9cb2d90e59eec3aba0f SHA256 780d9d171681bb37c3067b50ddb85a8f741f2b3f0e435cfedf60bb32635243ac size 879819
-DIST avahi-0.6.9.tar.gz 873201 RMD160 aa24acf73020aea2162430a1486b010faf6f3a89 SHA256 06ff5a190963abd2aed92b7b8f5deb4a5beb709e5c3d61876aab3c20fa593ed7 size 873201
-EBUILD avahi-0.6.10.ebuild 3077 RMD160 d7aee41e391cff3dec56d09ac35a12d55174bae6 SHA1 8cdc9cbb07a261d497d0b7d78d95ead1c2030c05 SHA256 9d40245ef98d78605c99870f4e33bedea22fceea425bb56ed7138bfe198ae517 size 3077
+DIST avahi-0.6.10.tar.gz 879819 RMD160 59274b5314476830614fe9cb2d90e59eec3aba0f SHA256 780d9d171681bb37c3067b50ddb85a8f741f2b3f0e435cfedf60bb32635243ac
+EBUILD avahi-0.6.10.ebuild 3077 RMD160 d7aee41e391cff3dec56d09ac35a12d55174bae6 SHA1 8cdc9cbb07a261d497d0b7d78d95ead1c2030c05 SHA256 9d40245ef98d78605c99870f4e33bedea22fceea425bb56ed7138bfe198ae517
 MD5 1aa935675e18792adbbb4f720b53310c avahi-0.6.10.ebuild 3077
 RMD160 d7aee41e391cff3dec56d09ac35a12d55174bae6 avahi-0.6.10.ebuild 3077
 SHA256 9d40245ef98d78605c99870f4e33bedea22fceea425bb56ed7138bfe198ae517 avahi-0.6.10.ebuild 3077
-EBUILD avahi-0.6.9.ebuild 3072 RMD160 d83be2b6e9dbf934908a2efd294ad01092adeae8 SHA1 6f2e4e27509d8046bcfacaba5b147e7292ba1cea SHA256 02dc2e6c02bdfd15c2a770ffd3145cc07ec04654faed0f27599543d0a692b61d size 3072
-MD5 fdc312b5a2095880052678d33e9ebb53 avahi-0.6.9.ebuild 3072
-RMD160 d83be2b6e9dbf934908a2efd294ad01092adeae8 avahi-0.6.9.ebuild 3072
-SHA256 02dc2e6c02bdfd15c2a770ffd3145cc07ec04654faed0f27599543d0a692b61d avahi-0.6.9.ebuild 3072
-MISC ChangeLog 6145 RMD160 27d2ea407a27776a2428b664d1e12cd31f260b1a SHA1 a56b3ed41b42a3daa018467f025f0812df0abfe6 SHA256 326a8c904c458a7bbc212e506d832d7cb4decb56fead3c1fa5d128a255cac76a size 6145
-MD5 932c6c14c1974c7aa7cc0cc98a2cf382 ChangeLog 6145
-RMD160 27d2ea407a27776a2428b664d1e12cd31f260b1a ChangeLog 6145
-SHA256 326a8c904c458a7bbc212e506d832d7cb4decb56fead3c1fa5d128a255cac76a ChangeLog 6145
-MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d size 223
+MISC ChangeLog 6230 RMD160 698f09a0b6bfb9a82bb1341a5ef80413ee77b898 SHA1 a5fc0851dec2bc0ac088743d6840b2bbfb32670f SHA256 19c9381a510f51e61f495e5b6a060095b6b2cdcf3dd56dc224a102b6cbf0778c
+MD5 fc86642eb944144eb10d506cdc631577 ChangeLog 6230
+RMD160 698f09a0b6bfb9a82bb1341a5ef80413ee77b898 ChangeLog 6230
+SHA256 19c9381a510f51e61f495e5b6a060095b6b2cdcf3dd56dc224a102b6cbf0778c ChangeLog 6230
+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 93c7e0a877e52d9e2bfb829b708bd258 files/digest-avahi-0.6.10 238
 RMD160 016c6edc45d51d40f7c45c5f015df2f336e97a68 files/digest-avahi-0.6.10 238
 SHA256 389bb608ff57eedf32409a5979eda80b0987f2fa25e13994abf20b63b39233e4 files/digest-avahi-0.6.10 238
-MD5 2290f3ed38ccc8b5f1b88b3da0020a3d files/digest-avahi-0.6.9 235
-RMD160 6620fe5917030d7de8d3a86b9f8fa36bb3bf0941 files/digest-avahi-0.6.9 235
-SHA256 fc5b5847c423142c20ab4c76cbab55db1c1acc0456b6b8794ead358f96575766 files/digest-avahi-0.6.9 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEaquoSENan+PfizARAgf0AKCEoOElFBTGkUk8/wWucnE/LqmqRwCglGuK
-FzaQs9XLovrpFJmgzPkZ65Q=
-=0JIC
+iD8DBQFEc17eI1lqEGTUzyQRAiWwAKCFlAplR+CU0JRzrUjs1HyoWmCFYQCfQA6Q
+sgZrNaqRGn605yOH5iJtlDY=
+=vSIN
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.9.ebuild b/net-dns/avahi/avahi-0.6.9.ebuild
deleted file mode 100644
index f8ceb9921df3..000000000000
--- a/net-dns/avahi/avahi-0.6.9.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2000-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.9.ebuild,v 1.8 2006/05/14 09:46:36 swegener Exp $
-
-inherit eutils qt3 mono python
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sh sparc x86"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt"
-
-# We have USE flags depending on each other, which leads to this logic. We
-# prefer an activated USE flag and override the dependent USE flags.
-
-RDEPEND=">=dev-libs/libdaemon-0.5
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt? ( $(qt_min_version 3.3) )
-	gtk? (
-		>=x11-libs/gtk+-2
-		>=gnome-base/libglade-2
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		>=sys-apps/dbus-0.30
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-	)
-	howl-compat? (
-		!net-misc/howl
-		>=sys-apps/dbus-0.30
-	)
-	mdnsresponder-compat? (
-		!net-misc/mDNSResponder
-		>=sys-apps/dbus-0.30
-	)
-	python? (
-		>=virtual/python-2.4
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		>=virtual/python-2.4
-		>=sys-apps/dbus-0.30
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		mono? ( >=dev-util/monodoc-1.1.8 )
-	)"
-
-export PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
-
-pkg_setup() {
-	if use python && ! built_with_use dev-lang/python gdbm ; then
-		die "Need dev-lang/python compiled with gdbm support!"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
-}
-
-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
-	then
-		myconf="${myconf} --enable-dbus"
-
-		use doc && myconf="${myconf} --enable-monodoc"
-	fi
-
-	if use howl-compat || use mdnsresponder-compat?
-	then
-		myconf="${myconf} --enable-dbus"
-	fi
-
-	if use bookmarks
-	then
-		myconf="${myconf} --enable-python --enable-dbus --enable-python-dbus"
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-qt4 \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable qt qt3) \
-		$(use_enable gdbm) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
-
-	dodoc docs/{AUTHORS,README,TODO}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
-}
diff --git a/net-dns/avahi/files/digest-avahi-0.6.9 b/net-dns/avahi/files/digest-avahi-0.6.9
deleted file mode 100644
index 254fdc59f546..000000000000
--- a/net-dns/avahi/files/digest-avahi-0.6.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2652910f0e52c373d7a15b6851750517 avahi-0.6.9.tar.gz 873201
-RMD160 aa24acf73020aea2162430a1486b010faf6f3a89 avahi-0.6.9.tar.gz 873201
-SHA256 06ff5a190963abd2aed92b7b8f5deb4a5beb709e5c3d61876aab3c20fa593ed7 avahi-0.6.9.tar.gz 873201