Cleanup.

(Portage version: 2.1.2_pre1-r3)
 (Signed Manifest commit)

4 files changed, 14 insertions, 152 deletions

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 0c17b76aaac7..3c5ea2fc29a8 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,11 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b SHA1 d265706bb723f1a878a65c7c0db59a88e67f0816 SHA256 228a6c42a11a2eab82b68f8c04d5881f8be39746010675feba7ebf16add18151
 MD5 90fb32e843326d14359c508cef855929 files/2.9.18-default-mysql-options.patch 606
 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b files/2.9.18-default-mysql-options.patch 606
 SHA256 228a6c42a11a2eab82b68f8c04d5881f8be39746010675feba7ebf16add18151 files/2.9.18-default-mysql-options.patch 606
-AUX 2.9.18-ldap-fix.patch 853 RMD160 534c56b2bbd3e4ee477166d7430e57aff1f7c75d SHA1 bcb6b9ada4fc9c6f5be94e862626bdc449cf34b9 SHA256 ce247e0f25da2296882bb08a09f04acaba237149deacf0eb7e92895dc49e5ccc
-MD5 48d0e8119d1617f7ab3594f836cd98fb files/2.9.18-ldap-fix.patch 853
-RMD160 534c56b2bbd3e4ee477166d7430e57aff1f7c75d files/2.9.18-ldap-fix.patch 853
-SHA256 ce247e0f25da2296882bb08a09f04acaba237149deacf0eb7e92895dc49e5ccc files/2.9.18-ldap-fix.patch 853
 AUX 2.9.20-ldap-deprecated.patch 457 RMD160 edcb367abfc83853e4739cc6646ca593ae7d5e9e SHA1 858cfe5e7169329f13dfb547c5ae8ff436eff64f SHA256 862728373669f7ea5544de7021c394cc0efa3ff5c65551d6657dad85cb654097
 MD5 2cc96f8436323eca57fb95a63ea39efd files/2.9.20-ldap-deprecated.patch 457
 RMD160 edcb367abfc83853e4739cc6646ca593ae7d5e9e files/2.9.20-ldap-deprecated.patch 457
@@ -22,27 +21,26 @@ AUX recursor.conf 436 RMD160 36a225c2be31e96c89a8c90c6cdb8f428c7570d4 SHA1 cd5d7
 MD5 f3c989017fade127569f37f86f1f8ce6 files/recursor.conf 436
 RMD160 36a225c2be31e96c89a8c90c6cdb8f428c7570d4 files/recursor.conf 436
 SHA256 1ac01b17aa9dcdd2c133d2ba29d3aa9319b2b2290b48cfe5603191b97a6d1c3f files/recursor.conf 436
-DIST pdns-2.9.18.tar.gz 825719 RMD160 175e526c10637b3d2e8f2331ff5b1cc70c8c9e3e SHA1 ae0a0fe9dbd31b34ecb560113fa1d735a41551a8 SHA256 a088cfc5732c9d09e6651debe93baa3e378deffaefbba7b25bb1266554af2b53
 DIST pdns-2.9.20.tar.gz 867520 RMD160 15d433bc29e7d60549d9296fca573724574614fc SHA1 45fde296f17d2feaac779c206cf467d1dae2aaa1 SHA256 28984207c78bc5d40542d40366d74f6695a9cf3a7ec4f431d908966d4fc35e3d
-EBUILD pdns-2.9.18.ebuild 2421 RMD160 719be69597f2b428c0000d7a19c3bdc842914203 SHA1 77a5a61210e2e8daad03f3251c41f5a4808e95e2 SHA256 d6b3bc0ca4bc37d82f678ee4d335eb64ededc89674866057a1968cbfd35bf278
-MD5 e33e1e030cf8bc11bfb4dcd387766d41 pdns-2.9.18.ebuild 2421
-RMD160 719be69597f2b428c0000d7a19c3bdc842914203 pdns-2.9.18.ebuild 2421
-SHA256 d6b3bc0ca4bc37d82f678ee4d335eb64ededc89674866057a1968cbfd35bf278 pdns-2.9.18.ebuild 2421
 EBUILD pdns-2.9.20-r1.ebuild 2859 RMD160 5aa227a41f8c73a8632951745e9c5f7b3abcecfc SHA1 c3d70431676b2fd839fda869fa68d5be767cbbce SHA256 697543edac74e2cc3d7244765aae5aeb2cb8b518a8781e1844994c7e3edc1ada
 MD5 e14d8933453a6a43145aea17e3b6c763 pdns-2.9.20-r1.ebuild 2859
 RMD160 5aa227a41f8c73a8632951745e9c5f7b3abcecfc pdns-2.9.20-r1.ebuild 2859
 SHA256 697543edac74e2cc3d7244765aae5aeb2cb8b518a8781e1844994c7e3edc1ada pdns-2.9.20-r1.ebuild 2859
-MISC ChangeLog 6204 RMD160 670c1453ebf2b577d62603dc2cad2802127aee36 SHA1 300613538d8db3833ef592ae9642d062e379b501 SHA256 df6323c97fa1b5c908b354da74b76d8315e7c377faea8d6156f3668bb1485e2d
-MD5 b091e8c2ba1adcff86e2a654bd5f4857 ChangeLog 6204
-RMD160 670c1453ebf2b577d62603dc2cad2802127aee36 ChangeLog 6204
-SHA256 df6323c97fa1b5c908b354da74b76d8315e7c377faea8d6156f3668bb1485e2d ChangeLog 6204
+MISC ChangeLog 6322 RMD160 a26e5c2b5802949d96eeee11ef6be819a1ed2918 SHA1 73340b6c2128036e1cd9f8e0557f2e251b5f1786 SHA256 cd5a9687ab26d3def286b95b14169e672e8d61a87b63eef1a0775f466acff82f
+MD5 0197863168d8f2eb640f0816d7ffddfe ChangeLog 6322
+RMD160 a26e5c2b5802949d96eeee11ef6be819a1ed2918 ChangeLog 6322
+SHA256 cd5a9687ab26d3def286b95b14169e672e8d61a87b63eef1a0775f466acff82f ChangeLog 6322
 MISC metadata.xml 573 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 SHA1 01c4329b63991b54af3559d2220251520cb7147a SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3
 MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 metadata.xml 573
 SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3 metadata.xml 573
-MD5 21bf300283a38e88c4515dc438009a88 files/digest-pdns-2.9.18 235
-RMD160 132e2e4536dc86f6634ffca55488a0eaf9d953bf files/digest-pdns-2.9.18 235
-SHA256 a21a44ca2d23eca35292f6b9b04f31d2bb71e146542c208c316b740b6c80fff4 files/digest-pdns-2.9.18 235
 MD5 4d4c82f77383d45b0f3c812506353f02 files/digest-pdns-2.9.20-r1 235
 RMD160 dcc067109bce2032ef801cb2f77a19cf70b863dc files/digest-pdns-2.9.20-r1 235
 SHA256 d2ac1f7a38f80ff664956d619e704adceb479b42cb6f1b792d48efe666bb51f2 files/digest-pdns-2.9.20-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGs9UI1lqEGTUzyQRAnJjAJ414npeL6349GPDQJcmycE7+M3oEQCfWyou
+wzPY30VqGz3E+cFd1aebsns=
+=d83z
+-----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/2.9.18-ldap-fix.patch b/net-dns/pdns/files/2.9.18-ldap-fix.patch
deleted file mode 100644
index 15b0f86847a7..000000000000
--- a/net-dns/pdns/files/2.9.18-ldap-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: modules/ldapbackend/utils.hh
-===================================================================
---- modules/ldapbackend/utils.hh	(revision 452)
-+++ modules/ldapbackend/utils.hh	(revision 453)
-@@ -73,7 +73,7 @@
- }
- 
- 
--inline string ip2ptr4( string ip )
-+inline string ip2ptr4( const string& ip )
- {
- 	string ptr;
- 	vector<string> parts;
-@@ -89,7 +89,7 @@
- }
- 
- 
--inline string ip2ptr6( string ip )
-+inline string ip2ptr6( const string& ip )
- {
- 	string ptr, part, defstr;
- 	vector<string> parts;
-@@ -116,4 +116,19 @@
- 	return ptr + "ip6.arpa";
- }
- 
-+
-+inline string strbind( const string& search, const string& replace, string subject )
-+{
-+	size_t pos = 0;
-+
-+
-+	while( ( pos = subject.find( search, pos ) ) != string::npos )
-+	{
-+		subject.replace( pos, search.size(), replace );
-+		pos += replace.size();
-+	}
-+
-+	return subject;
-+}
-+
- #endif
diff --git a/net-dns/pdns/files/digest-pdns-2.9.18 b/net-dns/pdns/files/digest-pdns-2.9.18
deleted file mode 100644
index 13fe5821d126..000000000000
--- a/net-dns/pdns/files/digest-pdns-2.9.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bcfb0573311e80dbeff0bb16f2764363 pdns-2.9.18.tar.gz 825719
-RMD160 175e526c10637b3d2e8f2331ff5b1cc70c8c9e3e pdns-2.9.18.tar.gz 825719
-SHA256 a088cfc5732c9d09e6651debe93baa3e378deffaefbba7b25bb1266554af2b53 pdns-2.9.18.tar.gz 825719
diff --git a/net-dns/pdns/pdns-2.9.18.ebuild b/net-dns/pdns/pdns-2.9.18.ebuild
deleted file mode 100644
index 0c3d3a97f39f..000000000000
--- a/net-dns/pdns/pdns-2.9.18.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.18.ebuild,v 1.8 2006/04/30 00:14:14 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="The PowerDNS Daemon"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz"
-HOMEPAGE="http://www.powerdns.com/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc ldap mysql postgres recursor sqlite static tdb"
-
-DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
-	postgres? ( >=dev-cpp/libpqpp-4.0-r1 )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	recursor? ( >=dev-libs/boost-1.31 )
-	tdb? ( dev-libs/tdb )"
-
-RDEPEND="${DEPEND}
-	recursor? ( !net-dns/pdns-recursor )"
-
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-default-mysql-options.patch
-	epatch "${FILESDIR}"/${PV}-ldap-fix.patch
-}
-
-src_compile() {
-	local modules="pipe geo" myconf=""
-
-	use mysql	&& modules="${modules} gmysql"
-	use postgres	&& modules="${modules} gpgsql"
-	use sqlite	&& modules="${modules} gsqlite"
-	use ldap	&& modules="${modules} ldap"
-	use tdb		&& modules="${modules} xdb"
-	use debug 	&& myconf="${myconf} --enable-verbose-logging"
-
-	econf \
-		--with-modules= \
-		--with-dynmodules="${modules}" \
-		--with-pgsql-includes=/usr/include \
-		$(use_enable static static-binaries) \
-		$(use_enable recursor) \
-		${myconf} \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	mv "${D}"/etc/pdns.conf{-dist,}
-	doinitd "${FILESDIR}"/pdns
-
-	if use recursor
-	then
-		doinitd "${FILESDIR}"/precursor
-		insinto /etc
-		doins "${FILESDIR}"/recursor.conf
-	fi
-
-	dodoc ChangeLog README TODO
-	use doc && dohtml -r codedocs/html/.
-}
-
-pkg_postinst() {
-	einfo
-	einfo "pdns now provides multiple instances support. You can create more instances"
-	einfo "by symlinking the pdns init script to another name."
-	einfo
-	einfo "The name must be in the format pdns-<suffix> and PowerDNS will use the"
-	einfo "/etc/pdns-<suffix>.conf configuration file instead of the default."
-	einfo
-	einfo "Also all backends, except the bind and random backends, are now compiled as"
-	einfo "loadable modules and must be loaded with load-modules= in the configuration"
-	einfo "file."
-	einfo
-}