Added --with-pgsql-includes=/usr/include for older postgresql versions. Removed old ebuild.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 16 insertions, 107 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index bced9efa6638..bf848ac8ee13 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/pdns
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.20 2005/07/22 15:48:36 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.21 2005/07/30 00:02:40 swegener Exp $
+
+  30 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  -files/pdns-2.9.17-amd64-fix.diff, -pdns-2.9.17.ebuild,
+  pdns-2.9.18.ebuild:
+  Added --with-pgsql-includes=/usr/include for older postgresql versions.
+  Removed old ebuild.
 
   22 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> pdns-2.9.18.ebuild:
   Marked stable on amd64.
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 17dbdf0ec94a..fe1423e96b6f 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 36ab9f34213602fc7c379db812f662bf ChangeLog 3123
-MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
-MD5 172c916f2af3e12be9af6f65bc4ab881 pdns-2.9.17.ebuild 1313
-MD5 af96d8df0fe94b63047a94fa65b10bcf pdns-2.9.18.ebuild 2345
-MD5 62a8267bd54fd7edf57908299088c96a files/digest-pdns-2.9.17 63
-MD5 2d29230247ff445cea2a20fbdd25a219 files/pdns-2.9.17-amd64-fix.diff 1155
+MD5 b126006b34186e50cb4f1b1dfb7fdef1 ChangeLog 3349
 MD5 90fb32e843326d14359c508cef855929 files/2.9.18-default-mysql-options.patch 606
 MD5 48d0e8119d1617f7ab3594f836cd98fb files/2.9.18-ldap-fix.patch 853
-MD5 60d7355f48410a77e8df555a089025cb files/pdns 889
 MD5 e59bb419d93a7d7bdcb13764c57b3f6d files/digest-pdns-2.9.18 63
+MD5 60d7355f48410a77e8df555a089025cb files/pdns 889
 MD5 558969af8e34a040723147fe14a53a44 files/precursor 488
 MD5 bbb2b0b25869b840d8fa2d242a8b20c2 files/recursor.conf 392
+MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
+MD5 7e3f6249fc15cbedf45e33ba7167427c pdns-2.9.18.ebuild 2383
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC4RZY5mJXAu5GbtIRAtvUAJ9hPy1DZ3sdotSXhSAXSiyWbFotmwCcDQiq
-qd3XyJWGyIPi+OL3bGlRWvA=
-=pPoG
+iD8DBQFC6sO2I1lqEGTUzyQRAsiAAJ9H+8bCkar5GqgHpsos38qHw+GhPACdGK5y
+Yn5wkZJr8lqnicWQJoUHge0=
+=7GpC
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/digest-pdns-2.9.17 b/net-dns/pdns/files/digest-pdns-2.9.17
deleted file mode 100644
index 3d129e600343..000000000000
--- a/net-dns/pdns/files/digest-pdns-2.9.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 92489391182dc40012f1de7b2005ea93 pdns-2.9.17.tar.gz 782592
diff --git a/net-dns/pdns/files/pdns-2.9.17-amd64-fix.diff b/net-dns/pdns/files/pdns-2.9.17-amd64-fix.diff
deleted file mode 100644
index 18a247eea6e3..000000000000
--- a/net-dns/pdns/files/pdns-2.9.17-amd64-fix.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur pdns-2.9.17.orig/pdns/logger.cc pdns-2.9.17/pdns/logger.cc
---- pdns-2.9.17.orig/pdns/logger.cc	2004-09-13 13:55:07.000000000 -0500
-+++ pdns-2.9.17/pdns/logger.cc	2005-02-12 04:01:13.828334456 -0600
-@@ -131,6 +131,25 @@
-   return *this;
- }
- 
-+Logger& Logger::operator<<(unsigned long i)
-+{
-+  ostringstream tmp;
-+  tmp<<i;
-+ 
-+ *this<<tmp.str();
-+  
-+  return *this;
-+}
-+
-+Logger& Logger::operator<<(long i)
-+{
-+  ostringstream tmp;
-+  tmp<<i;
-+
-+  *this<<tmp.str();
-+
-+  return *this;
-+}
- 
- Logger& Logger::operator<<(ostream & (&)(ostream &))
- {
-diff -ur pdns-2.9.17.orig/pdns/logger.hh pdns-2.9.17/pdns/logger.hh
---- pdns-2.9.17.orig/pdns/logger.hh	2004-09-13 13:54:44.000000000 -0500
-+++ pdns-2.9.17/pdns/logger.hh	2005-02-12 04:02:32.779332080 -0600
-@@ -110,7 +110,9 @@
-   */
-   Logger& operator<<(const string &s);   //!< log a string
-   Logger& operator<<(int);   //!< log an int
-+  Logger& operator<<(long);  //!< log an long
-   Logger& operator<<(unsigned int);   //!< log an unsigned int
-+  Logger& operator<<(unsigned long);   //!< log an unsigned long
-   Logger& operator<<(Urgency);    //!< set the urgency, << style
- 
- #ifndef WIN32
diff --git a/net-dns/pdns/pdns-2.9.17.ebuild b/net-dns/pdns/pdns-2.9.17.ebuild
deleted file mode 100644
index a68f01333382..000000000000
--- a/net-dns/pdns/pdns-2.9.17.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.17.ebuild,v 1.1 2005/02/12 11:35:41 jhhudso 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="x86 amd64"
-IUSE="mysql postgres static ldap"
-
-DEPEND="virtual/libc
-	mysql? ( >=dev-db/mysql-3.23.54a )
-	postgres? ( >=dev-cpp/libpqpp-4.0-r1 )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	epatch ${FILESDIR}/pdns-2.9.17-amd64-fix.diff
-}
-
-src_compile() {
-	local myconf=""
-	local modules=""
-
-	use static && myconf="$myconf --enable-static-binaries"
-	use postgres && myconf="$myconf --with-pgsql-includes=/usr/include"
-
-	use mysql && modules="gmysql $modules"
-	use postgres && modules="gpgsql $modules"
-	use ldap && modules="ldap $modules"
-
-	econf --with-modules="$modules" \
-		$myconf || die "Configuration failed"
-
-	emake || die "Make failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog HACKING INSTALL README TODO WARNING pdns/COPYING
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/pdns
-
-	mv ${D}/etc/pdns.conf-dist ${D}/etc/pdns.conf
-}
diff --git a/net-dns/pdns/pdns-2.9.18.ebuild b/net-dns/pdns/pdns-2.9.18.ebuild
index 3c38f4def7f7..7d711cd82cdb 100644
--- a/net-dns/pdns/pdns-2.9.18.ebuild
+++ b/net-dns/pdns/pdns-2.9.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.6 2005/07/22 15:48:36 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.18.ebuild,v 1.7 2005/07/30 00:02:40 swegener Exp $
 
 inherit eutils
 
@@ -45,6 +45,7 @@ src_compile() {
 	econf \
 		--with-modules= \
 		--with-dynmodules="${modules}" \
+		--with-pgsql-includes=/usr/include \
 		$(use_enable static static-binaries) \
 		$(use_enable recursor) \
 		${myconf} \