Remove older versions

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 20 insertions, 660 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c0397181b86a..377e67dcf9a5 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.255 2013/10/12 12:14:46 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.256 2014/01/12 15:32:51 blueness Exp $
+
+  12 Jan 2014; Anthony G. Basile <blueness@gentoo.org> -avahi-0.6.30-r1.ebuild,
+  -avahi-0.6.31-r1.ebuild, -avahi-0.6.31.ebuild:
+  Remove older versions
 
   12 Oct 2013; Pacho Ramos <pacho@gentoo.org> avahi-0.6.31-r2.ebuild:
   Drop unneeded dep
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 303ed877716a..cc5d81f5865c 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -12,17 +12,24 @@ AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10f
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f SHA512 1b0ad0d509fd5e18c651ebe432d4cc85a62cb96e0b240a769ea2f600944eb90d143e4e5abb9057f7bc1a421b4aa743cf483fe8a888b4f63cab61577eda08d7f4 WHIRLPOOL 0c503606adb07741c5ef30b0f8af858cac97e5bf6e36549ed41bb1c76884e27fe234dffe1f8320e7c5570a3cf0032351d6b4c3d2c8905a1be832cb1bdce562e9
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
-EBUILD avahi-0.6.30-r1.ebuild 5375 SHA256 18728c3cb28e7921b6a64568316058434281707e31a415ffa35a8a4047e060bf SHA512 91e168f05c4875150bf276672876d4d8726b98d08f0f9795a6235b5b63d533dd41cd93b26e2b1a05f7df962e5c7773dcc0951b2b47393f826b5df0f852fbdba5 WHIRLPOOL 27623465374d2f3a7c8df6c87f4db1befd58ae5b457e7bb405dfa3efc542bae5ad7f8b2dc1a17d771bd63d7ca9bb1ed4c828bbf45938c8373012fc8f4a8de0db
 EBUILD avahi-0.6.30-r3.ebuild 5760 SHA256 eb775e04bc4851f7136c0124e35515b7c95ff7204658da028f64b07657ba8895 SHA512 1042db6edacba870a1f2d9e4923b9719773d4ca5a5be75f441609ff8ba9a8bfd7a8f0ab14ab8f405db415f41f45ef010a149aa22ec2052410e2864ba5302c8c1 WHIRLPOOL 6b420137bdf3c2610e56b6c07ad71c33e120bfc6766f8f0a781f0d8c164d9f57f4b9f9950e0cb687fe7bd6bd8cbdd057252efe0c01a4138ab9e9d4e541930073
-EBUILD avahi-0.6.31-r1.ebuild 5909 SHA256 deda53e55e66ae1621e0ab6dcff96dff28d60d22b6e7abc72e0d10392cc5d986 SHA512 23139543e1a17ea0e1fe5e1324114f9b5632242f839e6a5586ce8b4e007697c51ac7c600894bfd87f6c9bfc5d77a48e61f7d2117667416e4f72801b5ea5f9551 WHIRLPOOL 89aa10965b53c160dc8b79010886fe9d65c8b6da5a4e01e3e5884972916e3cd1626704bbf74e44a380be7583b5a2edcfcbcecf5a43ec53f0b649bc9e3fbe2b50
 EBUILD avahi-0.6.31-r2.ebuild 5103 SHA256 d1cc521df9d58b2892d5d5ae45e3341f341a6f6f83edc4891015257b1d9bd2fd SHA512 446f2a275d6c308326f122cd367598da61ba684192bc3c3e693920384194812387fb692974fdca94493d5105df94e8a3ef2be32cb0ba9ec56a15b3bc4958329a WHIRLPOOL f36e953f1c2ea4e436735a534b73a4ac81da4ab36ff6b782eb0ffd0ff9b4e0870f4aef2aa17f4f7edbd0a39d58e00f81abee68c200dabb7641ff8a67441bec26
-EBUILD avahi-0.6.31.ebuild 5790 SHA256 93971e7191ba25ee7b2e788d09afe07624e068dc1b147c508b728d3c8a3dee57 SHA512 f1d47d684161f541d06e0b897f80c1d4bd5fb3ce554370b81b6a6f6028d8980b83c6280194f18ab8c8d7cb1ba2ebb3bdacd5382da174769f6de7b9a7dd3bc939 WHIRLPOOL 73f96f0d29a0ec54d40d96be8d21a53d47da34359fa8aa4ebd339d88a4b01a24176d0b3fb7d1e73e513ac1265d7e01274a016ef98057fdbbcfd08baa41f3e605
-MISC ChangeLog 38092 SHA256 b29e9afb297c46f3a064b69c903547c1079073588965983de53b42059347894d SHA512 198aa0b1388762a8fcead2d591a61810fd845c14d7e5971ff6b3de2c3a3dc1c63aef9b67a15083ba1a408d4646a68f717faa310cc5216d55ed47f6d61f5254e0 WHIRLPOOL 6f28363ce960e1c1a762fe78ac0b5d96e31ff7072155a65a5a6b9ae95a7472b37aa3db4bba29edb67b3fa8c4d437662d19e8a8e41b54e80f66848cafc9697bbb
+MISC ChangeLog 38249 SHA256 152b5d0d93bafcffc8004dcfd73c8a77d3934eb17bc9dbba189003d56e0dd2bb SHA512 647c493d3f3068f435936408542291f7ae64eb7d1a65c76e112006568c087a342e770d70caac4290d6a8e7ac5003067dbc9d72bcf203808867a3f32da36a7f21 WHIRLPOOL 3adaddf1a3d9f0955513273a73684b5353a75494ecdbf04210a67a4f15c2e3c9302ad5330b635e86cb2c4bd09b8bc6c086c755f411cce0d3148d98793f528291
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJZPTcACgkQCaWpQKGI+9QIhgCdGqHIZOxkgPM+QdIWkLpgNB0+
-2EIAn1N/O7B42HI/qWXyU5uYORP/DJ6R
-=Nxg9
+iQIcBAEBCAAGBQJS0rW7AAoJEJOE+m71LUu6yoQQAIDA7g/QFM4Xg6888DM4kLmi
+I29xbuldRdsEsZQqVRZSV0CXBux0v0JtLM8RKAfX2VCRhtDRRUz5ICcTs3H6Q0Z0
+vKhtDb1iWu4WKS/bKlSpeGPNamqdR9Z1Yqp6vBoW7FoSnxoASqNsC/9Tyo5zs+Fs
+AUXZRugoKQs/cciP3HQztBCiS5Bk93TbMpufZJuHRU79pTilxKw5HarsccnP3FAz
+UbckIbQCr3Vgn9adKprSD7k799mV6RycdenmmJaqtRp7sewXtDQGrjVhIlYdwaLK
+yzkMLu8qeTVeXLDlQnMKJkCB8B1ZXkgC7jJMbL2ccGmzyny7bB4JF6VUG8QGX2rI
+PrCnmz7OTkOmudnbaWILN7eoy9A/ebBdGnMeIDF61UxhzKJikBNg6IgkDCWV7AQX
+bTBtMiDik4VJWnEU1YY4KeCeEFHrXNWBGrhtwVRo1lAsxo8m/z+5notve6yFBUsI
+NiizqFlW76OO29WHoXFBT0thijAmQgN7b/W/fJqnZa7N9hzBnEY5CEq1cgBsmRk6
+t/p2BfnZGTzWpY6YJrwfOGsno2eJ2NX7Xcw81ygCDmONv84rnQCAijywvdto4aqa
+838LOJ4pe1Y8D6/o+mwR7fccfYFteBOKz+A4eJ5mlSGNND6hjxvUGFzoa/cFmPgL
+peGJrervSPJZAb1QFE7l
+=30wJ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.30-r1.ebuild b/net-dns/avahi/avahi-0.6.30-r1.ebuild
deleted file mode 100644
index 53f6c25faa94..000000000000
--- a/net-dns/avahi/avahi-0.6.30-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.14 2013/08/03 09:45:41 mgorny Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-inherit autotools eutils mono python multilib flag-o-matic user
-
-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 ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
-kernel_linux mdnsresponder-compat mono python qt4 test utils"
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-COMMON_DEPEND=">=dev-libs/libdaemon-0.14
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( ${DBUS_DEPEND} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	mdnsresponder-compat? ( ${DBUS_DEPEND} )
-	python? (
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.5
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-RDEPEND="${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-
-	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
-	if use utils && ! { use gtk || use gtk3; }; then
-		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
-	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_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch"
-
-	# Fix init scripts for >=openrc-0.9.0 (bug #383641)
-	epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(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 gtk3) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
-	if use autoipd; then
-		echo
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.31-r1.ebuild b/net-dns/avahi/avahi-0.6.31-r1.ebuild
deleted file mode 100644
index 900b0f8f10ec..000000000000
--- a/net-dns/avahi/avahi-0.6.31-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r1.ebuild,v 1.3 2013/08/03 09:45:41 mgorny Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils mono python multilib flag-o-matic user systemd
-
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
-kernel_linux mdnsresponder-compat mono python qt4 test utils"
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-COMMON_DEPEND=">=dev-libs/libdaemon-0.14
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( ${DBUS_DEPEND} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	mdnsresponder-compat? ( ${DBUS_DEPEND} )
-	python? (
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.5
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-RDEPEND="${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-
-	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
-	if use utils && ! { use gtk || use gtk3; }; then
-		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
-	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_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(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 gtk3) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	# /usr/bin/avahi-bookmarks is installed only with USE="bookmarks dbus gtk python".
-	# /usr/bin/avahi-discover is installed only with USE="dbus gtk python".
-	use dbus && use gtk && use python && python_convert_shebangs -r 2 "${ED}usr/bin"
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
-	if use autoipd; then
-		echo
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.31.ebuild b/net-dns/avahi/avahi-0.6.31.ebuild
deleted file mode 100644
index ab34a8c9e5ad..000000000000
--- a/net-dns/avahi/avahi-0.6.31.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31.ebuild,v 1.5 2013/08/03 09:45:41 mgorny Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils mono python multilib flag-o-matic user systemd
-
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
-kernel_linux mdnsresponder-compat mono python qt4 test utils"
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-COMMON_DEPEND=">=dev-libs/libdaemon-0.14
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( ${DBUS_DEPEND} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	mdnsresponder-compat? ( ${DBUS_DEPEND} )
-	python? (
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.5
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-RDEPEND="${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-
-	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
-	if use utils && ! { use gtk || use gtk3; }; then
-		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
-	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_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0 (bug #383641)
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(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 gtk3) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	# /usr/bin/avahi-bookmarks is installed only with USE="bookmarks dbus gtk python".
-	# /usr/bin/avahi-discover is installed only with USE="dbus gtk python".
-	use dbus && use gtk && use python && python_convert_shebangs -r 2 "${ED}usr/bin"
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
-	if use autoipd; then
-		echo
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-}