Cleanup.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

7 files changed, 10 insertions, 266 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index d0d210efbaa4..d2741a0fe19a 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.34 2010/02/01 19:46:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.35 2010/02/21 21:47:01 swegener Exp $
+
+  21 Feb 2010; Sven Wegener <swegener@gentoo.org>
+  -pdns-recursor-3.1.7.ebuild,
+  -files/pdns-recursor-3.1.7-boost-1.37.0.patch,
+  -pdns-recursor-3.1.7.1.ebuild,
+  -files/pdns-recursor-3.1.7.1-error-message.patch,
+  -files/pdns-recursor-3.1.7-error-message.patch:
+  Cleanup.
 
   01 Feb 2010; Markus Meier <maekke@gentoo.org>
   pdns-recursor-3.1.7.2.ebuild:
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 2a503e2e0b78..11c6740cda93 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,24 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX pdns-recursor-3.1.7-boost-1.37.0.patch 3786 RMD160 f02a3477ddb1e3eb0786b1bcbb10c020cb01fe58 SHA1 6827c65ff12d1c7bca8daaf90cd0c12ed67fbf9f SHA256 37ede1f3c59bd60011a2bac42331170f2014bef95c85645b9d7ef95d7536353d
-AUX pdns-recursor-3.1.7-error-message.patch 459 RMD160 bfccb73616ff69999c4f509d613e649a9dd21abe SHA1 edf0aac4fc2ff223dd5f78e02db9284c9a83cc12 SHA256 240997d49805155a8a820c502256909ca00ba95896e8a15360bdc20c545a0d67
-AUX pdns-recursor-3.1.7.1-error-message.patch 463 RMD160 098864d5b52a0950bb92bef834f868ac531b8026 SHA1 9e937d6c08771b0c6bf1031b73082ee28fe3409c SHA256 0c77f50080093a7b5f93ec4ec507a499015f205868f23e04f8ebe9909e3be8e4
 AUX pdns-recursor-3.1.7.2-error-message.patch 463 RMD160 882dc9fe0e92d41e7987a69d35ad05c3719ee926 SHA1 3bbff55122980a5a90f99d32f01deec92640f360 SHA256 b2c55bc015c88fb4a297d1bac8ba417d81b026df990d1f14f9e9667e51771f5d
 AUX precursor 580 RMD160 71be0984e72763e09173b81f7a76bb5df56667a6 SHA1 ea316b070e8eb123f02e24cd60c568b4dd5aefc6 SHA256 f17d76262bea558604fa01e9d661bbb54af387bd976b54a8a59f7ad4a5a56014
 AUX recursor.conf 452 RMD160 6708700e955dd29041e360d5f0a68c9d3293d665 SHA1 455cbbd4335dbd032b2274498044ba680693d306 SHA256 b36b3310a26785d5e8a38c03bce9afcf8a08e321a81ee385e9557dcaa3957255
-DIST pdns-recursor-3.1.7.1.tar.bz2 174715 RMD160 887bf7509a7260781b1f9658a3a13b1b502522b7 SHA1 3e0527ef1487777e85fa61b8569d52e21b3a451d SHA256 8428ec7cdd7322d0d3b94b5bd7f586272db165145bb7a23937e745e96c759c33
 DIST pdns-recursor-3.1.7.2.tar.bz2 174082 RMD160 2a1118763ab630646b9ba25273d6066e380e55c6 SHA1 9dcaca50fe0c373d601e135a78f24f5b85480020 SHA256 0f2fd93eec8d7c68578fbf1f680f6d1ab44c3249f0a08257a4e6531e48a9d2ea
-DIST pdns-recursor-3.1.7.tar.bz2 174424 RMD160 359b3e3fff942f9fd14bebe4bc16b9d6cd23d0e3 SHA1 3e9c46e432d57edd58f767311247e750350883e9 SHA256 2255ea25071f7ccb3e096e85c7fb38f860a02d29f277dfbef66c7a1f5735051f
-EBUILD pdns-recursor-3.1.7.1.ebuild 1380 RMD160 0d6043b661638bdc4ff7af13c88a59ff36f5898c SHA1 632bc936245289858732a8637d27c66c0642da4e SHA256 3c31dc281735fe390eb25bca29024c64239330ec99b588cbe16803342719b95a
 EBUILD pdns-recursor-3.1.7.2.ebuild 1376 RMD160 6c3bf7e2769c3cbca3b655dab5ff2b2c152827ea SHA1 c219457d6b316aabb719613d068f1601d7f6624c SHA256 547a96290f9127d7830476724a2cffef6bf641b70f18342e0b93b3ea639bebed
-EBUILD pdns-recursor-3.1.7.ebuild 1422 RMD160 57927bb958eae537bb690241f1208a492f4e3f74 SHA1 19e1b12912147ae70133a3bf1310c7c6549fbd21 SHA256 d9088296f998e6b6195ca3e2aff94c25b720154819b6dfdf30bdc028be4c672d
-MISC ChangeLog 5579 RMD160 86d06f25692b03533c3626517944a5a2481a77e6 SHA1 6ed8bbd74b9900ce063bcea3eca75afa60a46bcf SHA256 dc1d44a120305b7e7386e7aecc52ff518977b86bf7e3c43c45d4be28cf27cf93
+MISC ChangeLog 5858 RMD160 862720b18d02f6674a61922b2ac1969b40872f25 SHA1 e760d52f8a0b1ab376e61179881f20a5e424ae20 SHA256 3a6818372e11699ec1b509cf9b1c03bb8c45f0caa6c97392a91d242abc1fa190
 MISC metadata.xml 837 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 SHA1 4b574c68576b1c058956085df7a07e250361455c SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktnL3kACgkQkKaRLQcq0GIb+QCggSFASXeY6aak1LRkdlO3kB3P
-eEwAn27hDVoPEXQO81nPkzUIW9eXuq1u
-=2t2Q
------END PGP SIGNATURE-----
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-boost-1.37.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-boost-1.37.0.patch
deleted file mode 100644
index c468793b9168..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-boost-1.37.0.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-------------------------------------------------------------------------
-r1274 | ahu | 2008-11-15 21:31:37 +0100 (Sat, 15 Nov 2008) | 2 lines
-
-update pdns_recursor to support boost 1.37.0 (thanks Darix)
-
-------------------------------------------------------------------------
-Index: pdns/pdns/pdns_recursor.cc
-===================================================================
---- pdns/pdns/pdns_recursor.cc	(revision 1273)
-+++ pdns/pdns/pdns_recursor.cc	(revision 1274)
-@@ -568,7 +568,7 @@
-       
-       if(ret.size()) {
- 	shuffle(ret);
--
-+	
- 	for(vector<DNSResourceRecord>::const_iterator i=ret.begin(); i!=ret.end(); ++i) {
- 	  pw.startRecord(i->qname, i->qtype.getCode(), i->ttl, i->qclass, (DNSPacketWriter::Place)i->d_place); 
- 	  
-@@ -666,7 +666,7 @@
-   catch(MOADNSException& e) {
-     L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"STL error: "<<e.what()<<endl;
-   }
-   catch(...) {
-@@ -1183,7 +1183,7 @@
-     s_rcc.send(answer, &remote);
-     command();
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl;
-   }
-   catch(AhuException& ae) {
-@@ -1486,7 +1486,7 @@
-     SyncRes::s_negcache.clear(); 
-     return "ok\n";
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
-   }
-   catch(AhuException& ae) {
-@@ -1526,7 +1526,7 @@
- 	    string tmp=DNSRR2String(rr);
- 	    rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
- 	  }
--	  catch(exception &e) {
-+	  catch(std::exception &e) {
- 	    throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
- 	  }
- 	  catch(...) {
-@@ -1648,7 +1648,7 @@
-       }
-     }
-   }
--  catch(exception& e) {
-+  catch(std::exception& e) {
-     L<<Logger::Error<<"Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
-     return string("Retaining current script, error from '"+fname+"': "+string(e.what())+"\n");
-   }
-@@ -1772,7 +1772,7 @@
-     }
-     
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl;
-     exit(99);
-   }
-@@ -1958,6 +1958,12 @@
-     ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";
- #endif
-     ::arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
-+#ifndef WIN32
-+    ::arg().set("socket-owner","Owner of socket")="";
-+    ::arg().set("socket-group","Group of socket")="";
-+    ::arg().set("socket-mode", "Permissions for socket")="";
-+#endif
-+    
-     ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
-     ::arg().set("delegation-only","Which domains we only accept delegations from")="";
-     ::arg().set("query-local-address","Source IP address for sending queries")="0.0.0.0";
-@@ -2032,7 +2038,7 @@
-     L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
-     ret=EXIT_FAILURE;
-   }
--  catch(exception &e) {
-+  catch(std::exception &e) {
-     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
-     ret=EXIT_FAILURE;
-   }
-Index: pdns/pdns/lwres.cc
-===================================================================
---- pdns/pdns/lwres.cc	(revision 1273)
-+++ pdns/pdns/lwres.cc	(revision 1274)
-@@ -181,7 +181,7 @@
-     
-     return 1;
-   }
--  catch(exception &mde) {
-+  catch(std::exception &mde) {
-     if(::arg().mustDo("log-common-errors"))
-       L<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl;
-   }
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-error-message.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-error-message.patch
deleted file mode 100644
index 18d73a98c46c..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-error-message.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdns-recursor-3.1.7/rec_channel.cc
-+++ pdns-recursor-3.1.7/rec_channel.cc
-@@ -100,7 +100,7 @@
-   strcpy(remote.sun_path,(path+"/"+fname).c_str());
-   if(::connect(d_fd, (sockaddr*)&remote, sizeof(remote)) < 0) {
-     unlink(d_local.sun_path);
--    throw AhuException("Unable to connect to remote '"+path+fname+"': "+string(strerror(errno)));
-+    throw AhuException("Unable to connect to remote '"+path+"/"+fname+"': "+string(strerror(errno)));
-   }
- }
- 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.1-error-message.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.1-error-message.patch
deleted file mode 100644
index ed1f2285c797..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.1-error-message.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdns-recursor-3.1.7.1/rec_channel.cc
-+++ pdns-recursor-3.1.7.1/rec_channel.cc
-@@ -100,7 +100,7 @@
-   strcpy(remote.sun_path,(path+"/"+fname).c_str());
-   if(::connect(d_fd, (sockaddr*)&remote, sizeof(remote)) < 0) {
-     unlink(d_local.sun_path);
--    throw AhuException("Unable to connect to remote '"+path+fname+"': "+string(strerror(errno)));
-+    throw AhuException("Unable to connect to remote '"+path+"/"+fname+"': "+string(strerror(errno)));
-   }
- }
- 
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.7.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.7.1.ebuild
deleted file mode 100644
index 4d156a99feea..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.7.1.ebuild
+++ /dev/null
@@ -1,58 +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/pdns-recursor/pdns-recursor-3.1.7.1.ebuild,v 1.2 2009/11/14 09:56:34 swegener Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-error-message.patch
-
-	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control || die "dosbin failed"
-	doman pdns_recursor.1 rec_control.1 || die "doman failed"
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf || die "doins failed"
-
-	doinitd "${FILESDIR}"/precursor || die "doinitd failed"
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild
deleted file mode 100644
index c20c2337632b..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild
+++ /dev/null
@@ -1,59 +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/pdns-recursor/pdns-recursor-3.1.7.ebuild,v 1.7 2009/11/14 09:56:34 swegener Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lua"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1 )"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	>=dev-libs/boost-1.33.1"
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-error-message.patch
-	epatch "${FILESDIR}"/${P}-boost-1.37.0.patch
-
-	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		OPTFLAGS="" \
-		LUA_LIBS_CONFIG="-llua" \
-		LUA_CPPFLAGS_CONFIG="" \
-		LUA="$(use lua && echo 1)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control || die "dosbin failed"
-	doman pdns_recursor.1 rec_control.1 || die "doman failed"
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf || die "doins failed"
-
-	doinitd "${FILESDIR}"/precursor || die "doinitd failed"
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}