Remove obsolete dev-libs/tdb (xdb) backend and include stdio.h for GCC 4.4 wrt #276817

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

4 files changed, 143 insertions, 12 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index b8fe2a81493c..e5385b079b43 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,13 @@
 # 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.63 2009/07/04 18:10:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.64 2009/07/06 20:00:15 ssuominen Exp $
+
+*pdns-2.9.22-r1 (06 Jul 2009)
+
+  06 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +pdns-2.9.22-r1.ebuild, +files/pdns-2.9.22-gcc44.patch:
+  Remove obsolete dev-libs/tdb (xdb) backend and include stdio.h for GCC 4.4
+  wrt #276817
 
   04 Jul 2009; Sven Wegener <swegener@gentoo.org>
   -files/2.9.20-ldap-deprecated.patch, -files/2.9.21.2-zone2ldap.patch,
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 308b31983602..1e7132944389 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b SHA1 d265706bb723f1a878a65c7c0db59a88e67f0816 SHA256 228a6c42a11a2eab82b68f8c04d5881f8be39746010675feba7ebf16add18151
 AUX pdns 1253 RMD160 f576dd3edda7b22155ebc2cb8c060459ba871471 SHA1 174beeed51f22fbe35f883b22465a94f6c569d85 SHA256 d4b1e4ae4330c8572ed8a9b16d3a1524d62f1380f22f33ba581aaf9599e44113
+AUX pdns-2.9.22-gcc44.patch 856 RMD160 3e477b236af42767aea3d55af4cb9f14cbca106d SHA1 0a206fee906f36eac630ad200a8d3866cd477a55 SHA256 1beba6a251e0c7a4a4d11dce41d2c5e9b809c3d32856aabce22225ebb02d3992
 DIST pdns-2.9.22.tar.gz 1072257 RMD160 be9bff3edac0a9700eaf8ac30c77bfc8336b7d92 SHA1 2c0888c8252299c5a17dc69eec289e90c7e8f3ff SHA256 7c03da01c2cbd8bbe897180bc3bd50ca8cfaa63ada94dc6b29f7745b82e17525
+EBUILD pdns-2.9.22-r1.ebuild 2793 RMD160 e764ccbedf0878d04bf649c3e9a29d8b7ed49e34 SHA1 ae81a5bf8b3dd1c8a058291595ba0d769cae3c73 SHA256 107546cdde5821c81f94b815087344873d08d874e4bb18a1c0acb420ac3015ed
 EBUILD pdns-2.9.22.ebuild 2815 RMD160 0cc35800bfd3e1bb5cadc08c1fa9c2048d4f7d64 SHA1 aa5113b5139f15d6eb92e1bb765127b3d1519868 SHA256 2a3a24ee8c98f1b8b4815f009cd2d5cbef30c257ec2a83944cc3ddcba548b9ed
-MISC ChangeLog 9383 RMD160 e68040ee01b14469e49f4a804f0ed9b2c6217c8a SHA1 c97b8c3eb9f6704e3fc993ebc73154b29205e7cd SHA256 1818a7926c1bd80ffb0e803e8fa1fa83b15846fceeaa698f14a47f60b481ac7a
+MISC ChangeLog 9619 RMD160 c982bb67751b2a25257fb030727f7723c168d69d SHA1 0c6fa92aff08711136f39e0e3f555a38dcd0118a SHA256 3d10940ac2ca52f90afb4dc59fd74cb63233d02cd9fcb656f296e75d260f8f12
 MISC metadata.xml 709 RMD160 01ea2530b412ec56a4a52196e7d08229386a927a SHA1 4883719a029bf18655e83f37b46420cb2921895e SHA256 b9bc7bbd88f60ed3e6e8e9784ee611755f3ddbc284e36fc09b5ce57089c79c3f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAkpPmxUACgkQI1lqEGTUzyQ4/QCeLiL8SqcSQlHUKb1aKKrl981R
-FkoAnRBMFSTiix9WjK5LhDpQvY5mGnoZ
-=pgAr
------END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/pdns-2.9.22-gcc44.patch b/net-dns/pdns/files/pdns-2.9.22-gcc44.patch
new file mode 100644
index 000000000000..35c1c77775e0
--- /dev/null
+++ b/net-dns/pdns/files/pdns-2.9.22-gcc44.patch
@@ -0,0 +1,22 @@
+diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc
+--- pdns-2.9.22.orig/pdns/dnsparser.cc	2008-11-15 22:32:46.000000000 +0200
++++ pdns-2.9.22/pdns/dnsparser.cc	2009-07-06 22:09:02.000000000 +0300
+@@ -16,6 +16,7 @@
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
++#include <stdio.h>
+ #include "dnsparser.hh"
+ #include "dnswriter.hh"
+ #include <boost/lexical_cast.hpp>
+diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc
+--- pdns-2.9.22.orig/pdns/rcpgenerator.cc	2008-11-15 23:20:27.000000000 +0200
++++ pdns-2.9.22/pdns/rcpgenerator.cc	2009-07-06 22:07:26.000000000 +0300
+@@ -16,6 +16,7 @@
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
++#include <stdio.h>
+ #include "rcpgenerator.hh"
+ #include "dnsparser.hh"
+ #include "misc.hh"
diff --git a/net-dns/pdns/pdns-2.9.22-r1.ebuild b/net-dns/pdns/pdns-2.9.22-r1.ebuild
new file mode 100644
index 000000000000..5c5292492774
--- /dev/null
+++ b/net-dns/pdns/pdns-2.9.22-r1.ebuild
@@ -0,0 +1,110 @@
+# 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.22-r1.ebuild,v 1.1 2009/07/06 20:00:15 ssuominen Exp $
+
+EAPI="2"
+
+inherit multilib 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 sqlite sqlite3 static 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 )
+	>=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 \
+		"${FILESDIR}"/${P}-gcc44.patch
+}
+
+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 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
+}