clean old

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 8 insertions, 592 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 9e141b49322d..e0b003b82e94 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/djbdns
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.117 2009/03/23 05:13:21 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.118 2010/07/20 18:34:59 mr_bones_ Exp $
+
+  20 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -djbdns-1.05-r17.ebuild, -djbdns-1.05-r19.ebuild, -djbdns-1.05-r21.ebuild,
+  -djbdns-1.05-r22.ebuild:
+  clean old cruft
 
   23 Mar 2009; Jeroen Roovers <jer@gentoo.org> djbdns-1.05-r23.ebuild:
   Stable for HPPA (bug #260975).
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index dd429469bad6..e27ee97beef1 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.05-errno.patch 238 RMD160 b479d8c16dd8fe7206cba19125dd8866c2584301 SHA1 f23206f3ffc1a8aa6768fdb2ef588012c17eaa79 SHA256 40e01efac08e95bf87b46e2d86378b0a60c234c64080b7f42039178ac6de61af
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch 10049 RMD160 9154f495cfc5eebcb6617b8fa65ee0bea0cbbf80 SHA1 0461b199c048c6b94b659280d04a4f537cdb9c04 SHA256 56c7db6c5bed3200e1f6e4995018c96158085f2f7169c7b148c7c034ddff8111
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch 9914 RMD160 c416dd6575819cfd40ef0d306ccb14d34a5afc90 SHA1 8dd3ce7758d3a97cafbe6a60ea83f48e916f496d SHA256 b5e030e96ed98d96d36c39e3466e04d98d39c5f1c7e94254ea3da5e99381eed6
@@ -15,29 +12,8 @@ AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1
 AUX fwdzone-fix.patch 438 RMD160 c7a6e0072f565b2dda7aa57aae02930b621bea71 SHA1 35280a09915c929827dbd2cf45a9334649326c48 SHA256 e9da00cbce418fe2afabebca6b28a220b4fd034deaeb98bd66fa31b4d24189d4
 AUX headtail.patch 1780 RMD160 332af6647e08f3b792bd1b7821974f15041a6b58 SHA1 1b996c6cbe5df1c981f998d004d066ae344bfba8 SHA256 28ebe521132fe35559273b6542505ab4f0bb7b7ccb88585522e4cc2fe8376dd4
 AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222c22f924882a3b2d496f7d8fbdf61eb4eb0e8 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea
-DIST djbdns-1.0.5-datadir.patch 2918 RMD160 95ca3f4dc00d2a3f86948b1582d2cd0c92f35a5d SHA1 02ec4d73e6cf42360c83c0569622e94d73801968 SHA256 b6913a52720a60d87956bb5f798ef42cffa754e3e6b9c7e0fb9e0f00dd3ce18f
-DIST djbdns-1.04-fwdzone.patch 6479 RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d SHA1 0939b630d037598e30f68c5c7b299e802923f804 SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9
-DIST djbdns-1.05-multi_tinydns_data.patch 1616 RMD160 805af99dab036084489c066747f2b42de2e747ce SHA1 353760a3d0a97fcfaf7da25c6c0be560ea8bdf85 SHA256 6137e58853e3686576095c26498db3a23b03c59edf9791a97d1aaea0844d0093
-DIST djbdns-1.05-multiip.diff 5522 RMD160 2c60f2fbed9410106ead6b007897c34690a5072f SHA1 0850dd8269af35cc5a3601cb6c2c3ea9846098ab SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294
 DIST djbdns-1.05-test23.diff.bz2 18480 RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 SHA1 34251597d211ff00791cb6546e8ef60d75ce5477 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
 DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA1 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
-DIST dnscache-cname-handling.patch 7569 RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 SHA1 a8cb2014ec9118b6f32eb6654cbedbc8bec125ee SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43
-DIST dnscache-multiple-ip.patch 7601 RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e SHA1 0f1bb62d7cc1002ffb6227248fce827df9ddbd4e SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3
-DIST dnscache-strict-forwardonly.patch 1768 RMD160 92c09aae2d5d8ec96a446620afb0e5fbb3fae4c6 SHA1 344b919ee2bd1ea43f5bcac2dcf4f6798bfda322 SHA256 42a01e292523e82a0443ac14de9d46f824221cec0859dfd710ced4145bdfee1a
-DIST round-robin.patch 3239 RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 SHA1 9d468c424d62c57c0a618a318a98a7f0a6aac8d5 SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f
-DIST tinydns-alias-chain-truncation.patch 1994 RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 SHA1 ad24766be537f990ce749888fcec3a94dd5da567 SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb
-DIST tinydns-data-semantic-error.patch 5096 RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a SHA1 731ee8409982d0fdb7e0c75126a1a0389e72a2dd SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40
-EBUILD djbdns-1.05-r17.ebuild 5056 RMD160 ba3c7b670539f88b12c5c821908a7960057f5a76 SHA1 fb8f8528702f23636fda0dadc5a85dfe42024638 SHA256 13ce07f6904d378365dfc168e6cb40e183a332b456199f243058eaaff4f8179e
-EBUILD djbdns-1.05-r19.ebuild 5591 RMD160 2ff41c6ab18c2bed511e55ef14580ba833aaa946 SHA1 4e307120389b1f925579ae1ae11a0b20471fded7 SHA256 d827b404a5bf0ac7c794ad9cbbd836faa4a92e3a8fdf3d4f50d3b1abd419c6ee
-EBUILD djbdns-1.05-r21.ebuild 3219 RMD160 8ed5402131bf61b6c42a5315dff16c12867e83ba SHA1 c62e395457c34f70eba38bd4672edaacf7ed67d6 SHA256 feb1a2e6183ffdcc2768bbff345f673fdc39cee12becbe0199891b39febc79ca
-EBUILD djbdns-1.05-r22.ebuild 3399 RMD160 c507763f581f209dcbfcac6540bd8eb40329769d SHA1 f2fd53e364d859b2f5dbec273f87f6d78137e314 SHA256 e80ca1c2e2c52e9b355eb8864a9d7ff854ef9d9e03d4e26012e6b919d958a213
 EBUILD djbdns-1.05-r23.ebuild 3691 RMD160 8cb00e7161ec74421ec14c266f3d3843e789b8b5 SHA1 1b28a658b23648a0096262598e1fb5a9583d8a2c SHA256 803fc70d3508d897350f580f300dc4bb5e1e4e97be4342001851a6204c116ae8
-MISC ChangeLog 18622 RMD160 161036aaa77f87b55f91cd15ff47caeea415a334 SHA1 e95b2f48c24f1d70e6e5a9733e379d8a3e591a81 SHA256 7cdf6a748cc445cf254c612dcae244ffe8a4cf11f9fabf659e66421032da72c0
+MISC ChangeLog 18806 RMD160 4549142a435bd2c6216d2d81bd7d2ce58d285e0e SHA1 b8d1732af6e87a31812421ca39b87e874f2bc81f SHA256 342f0949a0058c50afe3763ed1ac37cc91f17a9d9ad3ad070136e96a365f1e58
 MISC metadata.xml 935 RMD160 19aa777dc8890d43ceae0e03b13d453477846ebd SHA1 6f2812ba35b0b7952a6f1053101b2ed44512a241 SHA256 a8b3df0343dc03943f444c38f59eb40de1316122a0ae97e1d0e8d6865e6facf2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrkft0ACgkQV3J2n04Eauz8vACggvf3i4R6gMZrU/OBAUurnmPb
-db0An2YPQlzZSghEu+kyopC083wIRKuW
-=DE0J
------END PGP SIGNATURE-----
diff --git a/net-dns/djbdns/djbdns-1.05-r17.ebuild b/net-dns/djbdns/djbdns-1.05-r17.ebuild
deleted file mode 100644
index 72cb27881592..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r17.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r17.ebuild,v 1.12 2008/01/04 23:02:06 hanno Exp $
-
-IUSE="aliaschain cnamefix doc fwdzone ipv6 \
-	multipleip roundrobin semanticfix static selinux \
-	multidata datadir"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Excellent high-performance DNS services"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-URL1="http://www.skarnet.org/software/djbdns-fwdzone"
-URL2="http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns"
-URL3="http://dustman.net/andy/djbware/tinydns-datadir"
-IPV6_PATCH="test23"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-	fwdzone? ( ${URL1}/djbdns-1.04-fwdzone.patch )
-	roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch )
-	multipleip? (
-		http://danp.net/djbdns/dnscache-multiple-ip.patch
-		http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff
-	)
-	aliaschain? ( ${URL2}/tinydns-alias-chain-truncation.patch )
-	semanticfix? ( ${URL2}/tinydns-data-semantic-error.patch )
-	cnamefix? ( ${URL2}/dnscache-cname-handling.patch )
-	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )
-	datadir? ( ${URL3}/0.0.0/djbdns-1.0.5-datadir.patch )
-	multidata? (
-		http://js.hu/package/djbdns-conf/djbdns-1.05-multi_tinydns_data.patch
-	)"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
-
-RDEPEND=">=sys-process/daemontools-0.70
-	doc? ( app-doc/djbdns-man )
-	sys-apps/ucspi-tcp
-	selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	use ipv6 && use cnamefix && \
-		die "ipv6 cannot currently be used with the cnamefix patch"
-
-	use ipv6 && use multipleip && \
-		die "ipv6 cannot currently be used with the multipleip patch"
-
-	if use ipv6 && ( use fwdzone || use roundrobin ); then
-		eerror "ipv6 cannot currently be used with the fwdzone or "
-		eerror "roundrobin patch."
-		eerror
-		eerror "If you would like to see ipv6 support along with one of "
-		eerror "those other patches please submit a working patch that "
-		eerror "combines ipv6 with either fwdzone or roundrobin but not "
-		eerror "both at the same time, since the latter 2 patches are "
-		eerror "mutually exclusive according to bug #31238."
-		die
-	fi
-
-	use fwdzone && use roundrobin && \
-		die "fwdzone and roundrobin do not work together according to bug #31238"
-
-	use datadir && use multidata && \
-		die "The datadir and multidata patches are not compatible with each other"
-
-	use cnamefix && \
-		sed 's:\r::g' < ${DISTDIR}/dnscache-cname-handling.patch \
-		> ${WORKDIR}/dnscache-cname-handling.patch && \
-		epatch ${WORKDIR}/dnscache-cname-handling.patch
-	use aliaschain && \
-		epatch ${DISTDIR}/tinydns-alias-chain-truncation.patch
-	use semanticfix && \
-		epatch ${DISTDIR}/tinydns-data-semantic-error.patch
-
-	use fwdzone && epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
-	use roundrobin && epatch ${DISTDIR}/round-robin.patch
-	use multipleip && \
-		epatch ${DISTDIR}/dnscache-multiple-ip.patch && \
-		epatch ${DISTDIR}/djbdns-1.05-multiip.diff
-	use datadir && \
-		epatch ${DISTDIR}/djbdns-1.0.5-datadir.patch
-	use multidata && \
-		epatch ${DISTDIR}/djbdns-1.05-multi_tinydns_data.patch
-
-	epatch \
-		${FILESDIR}/headtail.patch \
-		${FILESDIR}/dnsroots.patch \
-		${FILESDIR}/dnstracesort.patch
-
-	if use ipv6; then
-		elog "At present dnstrace does NOT support IPv6. It will " \
-		     "be compiled without IPv6 support."
-		cp -pR ${S} ${S}-noipv6
-		# Careful -- >=test21 of the ipv6 patch includes the errno patch
-		epatch ${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2
-		cd ${S}-noipv6
-	fi
-
-	epatch ${FILESDIR}/${PV}-errno.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake -j1 || die "emake failed"
-
-	# If djbdns is compiled with ipv6 support it breaks dnstrace.
-	# Therefore we must compile dnstrace separately without ipv6
-	# support.
-	if use ipv6; then
-		einfo "Compiling dnstrace without ipv6 support"
-		cd ${S}-noipv6
-		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-		echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-		echo "/usr" > conf-home
-		emake -j1 dnstrace || die "emake failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins dnsroots.global
-	into /usr
-	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-	use ipv6 && dobin dnsip6 dnsip6q ${S}-noipv6/dnstrace
-
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	dobin ${FILESDIR}/dnscache-setup
-	use fwdzone && cd ${D}${DESTTREE}/bin && \
-		epatch ${FILESDIR}/fwdzone-fix.patch
-	dobin ${FILESDIR}/tinydns-setup
-	newbin ${FILESDIR}/djbdns-setup-${PR} djbdns-setup
-}
-
-pkg_postinst() {
-	enewgroup nofiles
-	enewuser dnscache -1 -1 /nonexistent nofiles
-	enewuser dnslog -1 -1 /nonexistent nofiles
-	enewuser tinydns -1 -1 /nonexistent nofiles
-
-	elog "Use (dnscache-setup + tinydns-setup) or djbdns-setup to configure djbdns."
-}
diff --git a/net-dns/djbdns/djbdns-1.05-r19.ebuild b/net-dns/djbdns/djbdns-1.05-r19.ebuild
deleted file mode 100644
index c0c408718cd3..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r19.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r19.ebuild,v 1.5 2008/01/04 23:02:06 hanno Exp $
-
-IUSE="aliaschain cnamefix doc fwdonly fwdzone ipv6 \
-	multipleip roundrobin semanticfix static selinux \
-	multidata datadir"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Excellent high-performance DNS services"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-IPV6_PATCH="test23"
-
-JBP_PATCHES="http://homepages.tesco.net/~J.deBoynePollard/Softwares/djbdns"
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-	fwdzone? (
-		http://www.skarnet.org/software/djbdns-fwdzone/djbdns-1.04-fwdzone.patch
-	)
-	fwdonly? ( ${JBP_PATCHES}/dnscache-strict-forwardonly.patch )
-	roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch )
-	multipleip? (
-		http://danp.net/djbdns/dnscache-multiple-ip.patch
-		http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff
-	)
-	aliaschain? ( ${JBP_PATCHES}/tinydns-alias-chain-truncation.patch )
-	semanticfix? ( ${JBP_PATCHES}/tinydns-data-semantic-error.patch )
-	cnamefix? ( ${JBP_PATCHES}/dnscache-cname-handling.patch )
-	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )
-	datadir? (
-		http://dustman.net/andy/djbware/tinydns-datadir/0.0.0/djbdns-1.0.5-datadir.patch
-	)
-	multidata? (
-		http://js.hu/package/djbdns-conf/djbdns-1.05-multi_tinydns_data.patch
-	)"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND=">=sys-process/daemontools-0.70
-	doc? ( app-doc/djbdns-man )
-	sys-apps/ucspi-tcp
-	selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}"
-
-	use ipv6 && use cnamefix && \
-		die "ipv6 cannot currently be used with the cnamefix patch"
-
-	use ipv6 && use multipleip && \
-		die "ipv6 cannot currently be used with the multipleip patch"
-
-	if use ipv6 && ( use fwdzone || use roundrobin ); then
-		eerror "ipv6 cannot currently be used with the fwdzone or "
-		eerror "roundrobin patch."
-		eerror
-		eerror "If you would like to see ipv6 support along with one of "
-		eerror "those other patches, please submit a working patch that "
-		eerror "combines ipv6 with either fwdzone or roundrobin but not "
-		eerror "both at the same time, since the latter 2 patches are "
-		eerror "mutually exclusive according to bug #31238."
-		die
-	fi
-
-	use fwdzone && use roundrobin && \
-		die "fwdzone and roundrobin do not work together according to bug #31238"
-
-	use datadir && use multidata && \
-		die "The datadir and multidata patches are not compatible with each other"
-
-	use cnamefix && \
-		sed 's:\r::g' < "${DISTDIR}/dnscache-cname-handling.patch" \
-		> "${WORKDIR}/dnscache-cname-handling.patch" && \
-		epatch "${WORKDIR}/dnscache-cname-handling.patch"
-	use aliaschain && \
-		epatch "${DISTDIR}/tinydns-alias-chain-truncation.patch"
-	use semanticfix && \
-		epatch "${DISTDIR}/tinydns-data-semantic-error.patch"
-	use fwdzone && \
-		epatch "${DISTDIR}/djbdns-1.04-fwdzone.patch"
-	use roundrobin && \
-		epatch "${DISTDIR}/round-robin.patch"
-	use multipleip && \
-		epatch "${DISTDIR}/dnscache-multiple-ip.patch" && \
-		epatch "${DISTDIR}/djbdns-1.05-multiip.diff"
-	use datadir && \
-		epatch "${DISTDIR}/djbdns-1.0.5-datadir.patch"
-	use multidata && \
-		epatch "${DISTDIR}/djbdns-1.05-multi_tinydns_data.patch"
-	use fwdonly && \
-		epatch "${DISTDIR}/dnscache-strict-forwardonly.patch"
-
-	epatch \
-		"${FILESDIR}/headtail.patch" \
-		"${FILESDIR}/dnsroots.patch" \
-		"${FILESDIR}/dnstracesort.patch"
-
-	if use ipv6; then
-		elog "At present dnstrace does NOT support IPv6. It will"\
-		     "be compiled without IPv6 support."
-		cp -pR "${S}" "${S}-noipv6"
-		# Careful -- >=test21 of the IPv6 patch includes the errno patch
-		epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
-		cd "${S}-noipv6"
-	fi
-
-	epatch "${FILESDIR}/${PV}-errno.patch"
-
-	if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]
-	then
-		echo
-		ewarn "You enabled custom patches from ${DJBDNS_PATCH_DIR}."
-		ewarn "Be warned that you won't get any support when using "
-		ewarn "this feature. You're on your own from now!"
-		ebeep
-		epatch "${DJBDNS_PATCH_DIR}/"*
-		echo
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake -j1 || die "emake failed"
-
-	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
-	# Therefore we must compile dnstrace separately without IPv6
-	# support.
-	if use ipv6; then
-		einfo "Compiling dnstrace without ipv6 support"
-		cd "${S}-noipv6"
-		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-		echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-		echo "/usr" > conf-home
-		emake -j1 dnstrace || die "emake failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins dnsroots.global
-
-	into /usr
-	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-	use ipv6 && dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
-
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	dobin "${FILESDIR}/dnscache-setup"
-	use fwdzone && cd "${D}${DESTTREE}/bin" && \
-		epatch "${FILESDIR}/fwdzone-fix.patch"
-	dobin "${FILESDIR}/tinydns-setup"
-	newbin "${FILESDIR}/djbdns-setup-${PR}" djbdns-setup
-}
-
-pkg_setup() {
-	# The nofiles group is provided by baselayout
-	enewuser dnscache -1 -1 -1 nofiles
-	enewuser dnslog -1 -1 -1 nofiles
-	enewuser tinydns -1 -1 -1 nofiles
-}
-
-pkg_postinst() {
-	elog "Use dnscache-setup & tinydns-setup or djbdns-setup to configure djbdns."
-}
diff --git a/net-dns/djbdns/djbdns-1.05-r21.ebuild b/net-dns/djbdns/djbdns-1.05-r21.ebuild
deleted file mode 100644
index 54bce57352fb..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r21.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r21.ebuild,v 1.10 2008/05/13 13:44:27 jer Exp $
-
-IUSE="doc ipv6 selinux static"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Excellent high-performance DNS services"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-IPV6_PATCH="test23"
-
-SRC_URI="
-	http://cr.yp.to/djbdns/${P}.tar.gz
-	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )
-"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha ~amd64 hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=sys-process/daemontools-0.70
-	sys-apps/ucspi-tcp
-	doc? ( app-doc/djbdns-man )
-	selinux? ( sec-policy/selinux-djbdns )
-"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}"
-
-	echo
-	elog 'Several patches have been dropped from this djbdns ebuild revision.'
-	elog 'Please use the DJBDNS_PATCH_DIR variable to specify a directory'
-	elog 'of custom patches.'
-	elog
-	elog 'Some of them can be found at http://tinydns.org/ or'
-	elog 'http://homepages.tesco.net/J.deBoynePollard/Softwares/djbdns/'
-	elog
-
-	epatch \
-		"${FILESDIR}/headtail.patch" \
-		"${FILESDIR}/dnsroots.patch" \
-		"${FILESDIR}/dnstracesort.patch"
-
-	if use ipv6; then
-		elog "At present dnstrace does NOT support IPv6. It will"\
-		     "be compiled without IPv6 support."
-		cp -pR "${S}" "${S}-noipv6"
-		# Careful -- >=test21 of the IPv6 patch includes the errno patch
-		epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
-		cd "${S}-noipv6"
-	fi
-
-	epatch "${FILESDIR}/${PV}-errno.patch"
-
-	if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]
-	then
-		echo
-		ewarn "You enabled custom patches from ${DJBDNS_PATCH_DIR}."
-		ewarn "Be warned that you won't get any support when using "
-		ewarn "this feature. You're on your own from now!"
-		echo
-		ebeep
-		cd "${S}" && epatch "${DJBDNS_PATCH_DIR}/"*
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake -j1 || die "emake failed"
-
-	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
-	# Therefore we must compile dnstrace separately without IPv6
-	# support.
-	if use ipv6; then
-		elog "Compiling dnstrace without ipv6 support"
-		cd "${S}-noipv6"
-		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-		echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-		echo "/usr" > conf-home
-		emake -j1 dnstrace || die "emake failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins dnsroots.global
-
-	into /usr
-	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-	use ipv6 && dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
-
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	dobin "${FILESDIR}/dnscache-setup"
-	dobin "${FILESDIR}/tinydns-setup"
-	newbin "${FILESDIR}/djbdns-setup-${PR}" djbdns-setup
-}
-
-pkg_setup() {
-	# The nofiles group is provided by baselayout
-	enewuser dnscache -1 -1 -1 nofiles
-	enewuser dnslog -1 -1 -1 nofiles
-	enewuser tinydns -1 -1 -1 nofiles
-}
-
-pkg_postinst() {
-	elog "Use dnscache-setup & tinydns-setup or djbdns-setup to configure djbdns."
-}
diff --git a/net-dns/djbdns/djbdns-1.05-r22.ebuild b/net-dns/djbdns/djbdns-1.05-r22.ebuild
deleted file mode 100644
index 24ceca74a191..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r22.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r22.ebuild,v 1.9 2009/03/18 22:30:35 ranger Exp $
-
-IUSE="doc ipv6 selinux static"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Excellent high-performance DNS services"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-IPV6_PATCH="test23"
-
-SRC_URI="
-	http://cr.yp.to/djbdns/${P}.tar.gz
-	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )
-"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=sys-process/daemontools-0.70
-	sys-apps/ucspi-tcp
-	doc? ( app-doc/djbdns-man )
-	selinux? ( sec-policy/selinux-djbdns )
-"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}"
-
-	echo
-	elog 'Several patches have been dropped from this djbdns ebuild revision.'
-	elog 'Please use the DJBDNS_PATCH_DIR variable to specify a directory'
-	elog 'of custom patches.'
-	elog
-	elog 'Some of them can be found at http://tinydns.org/ or'
-	elog 'http://homepages.tesco.net/J.deBoynePollard/Softwares/djbdns/'
-	elog
-
-	epatch \
-		"${FILESDIR}/headtail.patch" \
-		"${FILESDIR}/dnsroots.patch" \
-		"${FILESDIR}/dnstracesort.patch"
-
-	if use ipv6; then
-		elog "At present dnstrace does NOT support IPv6. It will"\
-		     "be compiled without IPv6 support."
-		cp -pR "${S}" "${S}-noipv6"
-		# Careful -- >=test21 of the IPv6 patch includes the errno patch
-		epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
-		cd "${S}-noipv6"
-	fi
-
-	# Fix CVE2008-4392
-	epatch \
-		"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
-		"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
-	epatch "${FILESDIR}/${PV}-errno.patch"
-
-	if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]
-	then
-		echo
-		ewarn "You enabled custom patches from ${DJBDNS_PATCH_DIR}."
-		ewarn "Be warned that you won't get any support when using "
-		ewarn "this feature. You're on your own from now!"
-		echo
-		ebeep
-		cd "${S}" && epatch "${DJBDNS_PATCH_DIR}/"*
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake -j1 || die "emake failed"
-
-	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
-	# Therefore we must compile dnstrace separately without IPv6
-	# support.
-	if use ipv6; then
-		elog "Compiling dnstrace without ipv6 support"
-		cd "${S}-noipv6"
-		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-		echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-		echo "/usr" > conf-home
-		emake -j1 dnstrace || die "emake failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins dnsroots.global
-
-	into /usr
-	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-	use ipv6 && dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
-
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	dobin "${FILESDIR}/dnscache-setup"
-	dobin "${FILESDIR}/tinydns-setup"
-	newbin "${FILESDIR}/djbdns-setup-r17" djbdns-setup
-}
-
-pkg_setup() {
-	# The nofiles group is provided by baselayout
-	enewuser dnscache -1 -1 -1 nofiles
-	enewuser dnslog -1 -1 -1 nofiles
-	enewuser tinydns -1 -1 -1 nofiles
-}
-
-pkg_postinst() {
-	elog "Use dnscache-setup & tinydns-setup or djbdns-setup to configure djbdns."
-}