Cleanup.

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

8 files changed, 11 insertions, 359 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index 715341c5b245..2b65a4443c72 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.28 2009/05/31 21:13:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.29 2009/07/04 18:12:37 swegener Exp $
+
+  04 Jul 2009; Sven Wegener <swegener@gentoo.org>
+  -pdns-recursor-3.1.6.ebuild, -files/pdns-recursor-3.1.6-gcc-4.3.patch:
+  Cleanup.
 
   31 May 2009; Markus Meier <maekke@gentoo.org> pdns-recursor-3.1.7.ebuild:
   amd64 stable, bug #270627
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.6-gcc-4.3.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.6-gcc-4.3.patch
deleted file mode 100644
index f36db1503531..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.6-gcc-4.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gcc-4.3 no longer includes this by default.
-
---- pdns-recursor-3.1.6/dns_random.cc
-+++ pdns-recursor-3.1.6/dns_random.cc
-@@ -1,6 +1,7 @@
- #include "aescpp.h"
- #include <iostream>
- #include <cstring>
-+#include <limits>
- #include <sys/types.h>
- #include <unistd.h>
- #include <sys/time.h>
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild
deleted file mode 100644
index 6a84d066517a..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild
+++ /dev/null
@@ -1,53 +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/pdns-recursor/pdns-recursor-3.1.6.ebuild,v 1.6 2008/10/06 08:24:14 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=""
-
-DEPEND=">=dev-libs/boost-1.33.1"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	epatch "${FILESDIR}"/${PN}-3.1.7-error-message.patch
-
-	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
-}
-
-src_compile() {
-	filter-flags -ftree-vectorize
-
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		|| 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/ChangeLog b/net-dns/pdns/ChangeLog
index 3a2ff561deac..b8fe2a81493c 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.62 2009/05/31 21:12:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.63 2009/07/04 18:10:23 swegener Exp $
+
+  04 Jul 2009; Sven Wegener <swegener@gentoo.org>
+  -files/2.9.20-ldap-deprecated.patch, -files/2.9.21.2-zone2ldap.patch,
+  -pdns-2.9.21.2.ebuild, -files/2.9.21-gcc-4.3.patch:
+  Cleanup.
 
   31 May 2009; Markus Meier <maekke@gentoo.org> pdns-2.9.22.ebuild:
   amd64 stable, bug #270627
diff --git a/net-dns/pdns/files/2.9.20-ldap-deprecated.patch b/net-dns/pdns/files/2.9.20-ldap-deprecated.patch
deleted file mode 100644
index 6fa2b154b52a..000000000000
--- a/net-dns/pdns/files/2.9.20-ldap-deprecated.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur pdns-2.9.20.orig/modules/ldapbackend/Makefile.am pdns-2.9.20/modules/ldapbackend/Makefile.am
---- pdns-2.9.20.orig/modules/ldapbackend/Makefile.am	2006-03-15 18:29:39.000000000 +0000
-+++ pdns-2.9.20/modules/ldapbackend/Makefile.am	2006-06-01 20:23:42.047117750 +0000
-@@ -2,6 +2,8 @@
- 
- EXTRA_DIST=OBJECTFILES OBJECTLIBS
- 
-+DEFS+=-DLDAP_DEPRECATED
-+
- libldapbackend_la_SOURCES=ldapbackend.cc ldapbackend.hh \
- 		powerldap.hh powerldap.cc utils.hh
- 
diff --git a/net-dns/pdns/files/2.9.21-gcc-4.3.patch b/net-dns/pdns/files/2.9.21-gcc-4.3.patch
deleted file mode 100644
index fedd0dc40dc0..000000000000
--- a/net-dns/pdns/files/2.9.21-gcc-4.3.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Fix compilation with gcc-4.3.
-
-(modified to not patch Makefile.am)
-
-http://bugs.gentoo.org/show_bug.cgi?id=219693
-
-Index: pdns/sstuff.hh
-===================================================================
---- pdns/sstuff.hh	(revision 1093)
-+++ pdns/sstuff.hh	(revision 1094)
-@@ -189,12 +189,14 @@
-     struct sockaddr_in remote;
-     socklen_t remlen=sizeof(remote);
-     int bytes;
--    if((bytes=recvfrom(d_socket, d_buffer, d_buflen, 0, (sockaddr *)&remote, &remlen))<0)
--      if(errno!=EAGAIN)
-+    if((bytes=recvfrom(d_socket, d_buffer, d_buflen, 0, (sockaddr *)&remote, &remlen))<0) {
-+      if(errno!=EAGAIN) {
- 	throw NetworkError(strerror(errno));
--      else
-+      }
-+      else {
- 	return false;
--    
-+      }
-+    }
-     dgram.assign(d_buffer,bytes);
-     ep.address.byte=remote.sin_addr.s_addr;
-     ep.port=ntohs(remote.sin_port);
-Index: pdns/misc.hh
-===================================================================
---- pdns/misc.hh	(revision 1093)
-+++ pdns/misc.hh	(revision 1094)
-@@ -19,6 +19,7 @@
- #ifndef MISC_HH
- #define MISC_HH
- #include <stdint.h>
-+#include <cstring>
- 
- #if 0
- #define RDTSC(qp) \
-@@ -234,7 +235,7 @@
-   return c==' ' || c=='\t' || c=='\r' || c=='\n';
- }
- 
--inline const char dns_tolower(char c)
-+inline char dns_tolower(char c)
- {
-   if(c>='A' && c<='Z')
-     c+='a'-'A';
-Index: pdns/pdns_recursor.cc
-===================================================================
---- pdns/pdns_recursor.cc	(revision 1093)
-+++ pdns/pdns_recursor.cc	(revision 1094)
-@@ -416,7 +416,7 @@
-   set<DNSResourceRecord>nsset;
- 
-   if(::arg()["hint-file"].empty()) {
--    static char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53", 
-+    static const char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53",
- 		       "192.36.148.17","192.58.128.30", "193.0.14.129", "198.32.64.12", "202.12.27.33"};
-     DNSResourceRecord arr, nsrr;
-     arr.qtype=QType::A;
-Index: pdns/dns.hh
-===================================================================
---- pdns/dns.hh	(revision 1093)
-+++ pdns/dns.hh	(revision 1094)
-@@ -115,7 +115,7 @@
- #pragma pack (pop)
- #endif 
- 
--typedef enum  {
-+enum  {
-         ns_t_invalid = 0,       /* Cookie. */
-         ns_t_a = 1,             /* Host address. */
-         ns_t_ns = 2,            /* Authoritative server. */
-@@ -137,7 +137,7 @@
-         ns_t_afsdb = 18,        /* AFS cell database. */
-         ns_t_x25 = 19,          /* X_25 calling address. */
-         ns_t_isdn = 20,         /* ISDN calling address. */
--	ns_t_rt = 21,           /* Router. */
-+        ns_t_rt = 21,           /* Router. */
-         ns_t_nsap = 22,         /* NSAP address. */
-         ns_t_nsap_ptr = 23,     /* Reverse NSAP lookup (deprecated). */
-         ns_t_sig = 24,          /* Security signature. */
-Index: pdns/resolver.cc
-===================================================================
---- pdns/resolver.cc	(revision 1093)
-+++ pdns/resolver.cc	(revision 1094)
-@@ -397,12 +397,12 @@
-   if(mdp->d_header.id != d_randomid) {
-     throw ResolverException("Remote nameserver replied with wrong id");
-   }
--  if(mdp->d_header.rcode)
-+  if(mdp->d_header.rcode) {
-     if(d_inaxfr)
-       throw ResolverException("Remote nameserver unable/unwilling to AXFR with us: RCODE="+itoa(mdp->d_header.rcode));
-     else
-       throw ResolverException("Remote nameserver reported error: RCODE="+itoa(mdp->d_header.rcode));
--  
-+  }
-     if(!d_inaxfr) {
-       if(mdp->d_header.qdcount!=1)
- 	throw ResolverException("resolver: received answer with wrong number of questions ("+itoa(mdp->d_header.qdcount)+")");
-Index: pdns/dynmessenger.cc
-===================================================================
---- pdns/dynmessenger.cc	(revision 1093)
-+++ pdns/dynmessenger.cc	(revision 1094)
-@@ -18,6 +18,7 @@
- */
- #include "dynmessenger.hh"
- #include <cstdio>
-+#include <cstdlib>
- #include <cstring>
- #include <cerrno>
- #include <iostream>
-Index: pdns/distributor.hh
-===================================================================
---- pdns/distributor.hh	(revision 1093)
-+++ pdns/distributor.hh	(revision 1094)
-@@ -82,7 +82,6 @@
-   struct QuestionData
-   {
-     Question *Q;
--    time_t created;
-     void (*callback)(const AnswerData &);
-     int id;
-   };
-Index: modules/ldapbackend/powerldap.cc
-===================================================================
---- modules/ldapbackend/powerldap.cc	(revision 1093)
-+++ modules/ldapbackend/powerldap.cc	(revision 1094)
-@@ -1,7 +1,8 @@
- #include "powerldap.hh"
-+// for timeval
-+#include <sys/time.h>
- 
- 
--
- PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls )
- {
- 	int protocol = LDAP_VERSION3;
diff --git a/net-dns/pdns/files/2.9.21.2-zone2ldap.patch b/net-dns/pdns/files/2.9.21.2-zone2ldap.patch
deleted file mode 100644
index 5689a4a05beb..000000000000
--- a/net-dns/pdns/files/2.9.21.2-zone2ldap.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: pdns/pdns/backends/bind/zone2ldap.cc
-===================================================================
---- pdns/pdns/backends/bind/zone2ldap.cc	(revision 1057)
-+++ pdns/pdns/backends/bind/zone2ldap.cc	(revision 1058)
-@@ -27,6 +27,7 @@
- #include "bindparser.hh"
- #include "statbag.hh"
- #include <boost/function.hpp>
-+#include "dnsrecords.hh"
- #include "misc.hh"
- #include "dns.hh"
- #include "zoneparser-tng.hh"
-@@ -155,7 +156,7 @@
- #if __GNUC__ >= 3
- 		ios_base::sync_with_stdio( false );
- #endif
--
-+		reportAllTypes();
- 		args.setCmd( "help", "Provide a helpful message" );
- 		args.setSwitch( "verbose", "Verbose comments on operation" ) = "no";
- 		args.setSwitch( "resume", "Continue after errors" ) = "no";
diff --git a/net-dns/pdns/pdns-2.9.21.2.ebuild b/net-dns/pdns/pdns-2.9.21.2.ebuild
deleted file mode 100644
index e46fd5aad9e1..000000000000
--- a/net-dns/pdns/pdns-2.9.21.2.ebuild
+++ /dev/null
@@ -1,117 +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/pdns-2.9.21.2.ebuild,v 1.3 2009/01/22 18:11:21 swegener Exp $
-
-EAPI="2"
-
-inherit multilib eutils autotools
-
-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 sqlite sqlite3 static tdb opendbx"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( >=dev-cpp/libpqpp-4.0-r1 )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	opendbx? ( dev-db/opendbx )
-	tdb? ( dev-libs/tdb )
-	>=dev-libs/boost-1.31"
-
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	default
-	cd "${S}"
-
-	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
-	epatch "${FILESDIR}"/2.9.20-ldap-deprecated.patch
-	epatch "${FILESDIR}"/2.9.21-gcc-4.3.patch
-	epatch "${FILESDIR}"/2.9.21.2-zone2ldap.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use sqlite3 && modules="${modules} gsqlite3"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	use tdb && modules="${modules} xdb"
-	use debug && myconf="${myconf} --enable-verbose-logging"
-
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--disable-recursor \
-		--with-modules= \
-		--with-dynmodules="${modules}" \
-		--with-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-sqlite-lib=/usr/$(get_libdir) \
-		--with-sqlite3-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	default
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	doinitd "${FILESDIR}"/pdns
-
-	keepdir /var/empty
-
-	dodoc ChangeLog README TODO
-	use doc && dohtml -r codedocs/html/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-	elog
-}