Cleanup.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

6 files changed, 9 insertions, 248 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/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
-}