Require newer boost and completely disable lua support for now.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

4 files changed, 46 insertions, 9 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 15e638557b2f..1e77870ca250 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.67 2011/07/23 22:26:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.68 2011/07/30 09:59:10 swegener Exp $
+
+  30 Jul 2011; Sven Wegener <swegener@gentoo.org> pdns-3.0.ebuild,
+  +files/pdns-3.0-lua-config.patch:
+  Require newer boost and completely disable lua support for now.
 
 *pdns-3.0 (23 Jul 2011)
 
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index deae9f437431..5d9ca4ee3c26 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -4,16 +4,17 @@ 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
+AUX pdns-3.0-lua-config.patch 830 RMD160 c01cb4e58819b109a80a8542206b0bd5554d529c SHA1 61e3914558bae431945f617dc6ac75a1fa36929f SHA256 0eb3301df0e8168b4204a27eda49a0443a5c05941efa566c6b360d571a1c8ce4
 DIST pdns-2.9.22.tar.gz 1072257 RMD160 be9bff3edac0a9700eaf8ac30c77bfc8336b7d92 SHA1 2c0888c8252299c5a17dc69eec289e90c7e8f3ff SHA256 7c03da01c2cbd8bbe897180bc3bd50ca8cfaa63ada94dc6b29f7745b82e17525
 DIST pdns-3.0.tar.gz 1202795 RMD160 d4042f6711743f7b35439de313fe675d06354236 SHA1 d5de28ec125fa14deebc834d01a48922f9bac910 SHA256 a468b24b35c2595cc81119c3c8f2db4bd3566266431853e7d6be5930f692b0a2
 EBUILD pdns-2.9.22-r1.ebuild 2747 RMD160 06a8f7f24526a695ee89c38de7a8bedbea13ced2 SHA1 0f3dbe384f3d482e87ca2065c017efaa134f0e5b SHA256 c34872aab77f9fba398645a407eeba1b0cd9bf2554ecffa0df454b0877ca8b2c
-EBUILD pdns-3.0.ebuild 2590 RMD160 6f2a1aa7c8648d9656d1cb564248c4a788feccc1 SHA1 aa07bac8b9e39ae8cacf0abd7e98eda5e02ec8fc SHA256 fa38ae009604312cd709e3bc18e16d3250287ed72b1754f50a775b3e5b00e03e
-MISC ChangeLog 9992 RMD160 d1dde8433026d7138b18521e31caefa4279a474c SHA1 b5b9f6f4ab28b0279407ae87f94892e7ae6484ef SHA256 c409b16803d9806e94647884f8c6771e3f2efa33b7af58b650e70d401e8b7c29
+EBUILD pdns-3.0.ebuild 2695 RMD160 cc632a14b1640a651a65e9495026f84a7345bc25 SHA1 5fff41d950b80c3028eaac8cf247f92061a31247 SHA256 1bad87922251316553a136f4a99465c236f5d52e96c2c89c8d98d1907675514b
+MISC ChangeLog 10162 RMD160 3a9b2e2d2be84902ac1ac94066ba32ae704b682d SHA1 89340d91c7cbcbec6ecf7ec1f8e8f293b2f4f7ae SHA256 4b95a6b4164174c00c2ed395b2a59cda3a61705327e952708363287cb7e646b6
 MISC metadata.xml 642 RMD160 2e3952ead3fb41058449c624d4dd3e1570909902 SHA1 c85a8704535cfaa547813f2b249f6298eb01883b SHA256 dcaf084b93e161fb39f7c21d321484b045b17b886406c3e780b2dbefc0364092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4rSpAACgkQI1lqEGTUzySz9ACfR1YKetUcz5Dl1NECJmL6jqOu
-6awAnitguzEiW6DXyA4Dz0PTIw6UrG3T
-=Laso
+iEYEARECAAYFAk4z1fYACgkQI1lqEGTUzyQ5uACfTTw02O6GOu0ddU2QJsnHYjk9
+3nQAoKIuWoALRYOUB5VImdkU2372XE57
+=eDUC
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/pdns-3.0-lua-config.patch b/net-dns/pdns/files/pdns-3.0-lua-config.patch
new file mode 100644
index 000000000000..86e0b434777f
--- /dev/null
+++ b/net-dns/pdns/files/pdns-3.0-lua-config.patch
@@ -0,0 +1,25 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 2250)
++++ configure.ac	(working copy)
+@@ -26,7 +26,7 @@
+ 
+ dnl Check for lua
+ AC_MSG_CHECKING(if with lua)
+-AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua]), WITH_LUA=$withval],[WITH_LUA=yes])
++AC_ARG_WITH(lua, AC_HELP_STRING([--with-lua],[lua]), [WITH_LUA=$withval],[WITH_LUA=yes])
+ 
+ AC_MSG_RESULT($WITH_LUA)
+ if test "$WITH_LUA" != "no"; then
+Index: pdns/lua-pdns-recursor.cc
+===================================================================
+--- pdns/lua-pdns-recursor.cc	(revision 2250)
++++ pdns/lua-pdns-recursor.cc	(working copy)
+@@ -1,6 +1,6 @@
+ #include "lua-pdns-recursor.hh"
+ 
+-#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR)
++#if !defined(HAVE_LUA) || !defined(LIBDIR)
+ 
+ // stub implementation
+ 
diff --git a/net-dns/pdns/pdns-3.0.ebuild b/net-dns/pdns/pdns-3.0.ebuild
index 2185b184c6cb..e17449fbb97e 100644
--- a/net-dns/pdns/pdns-3.0.ebuild
+++ b/net-dns/pdns/pdns-3.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.ebuild,v 1.1 2011/07/23 22:26:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.ebuild,v 1.2 2011/07/30 09:59:10 swegener Exp $
 
 EAPI=2
-inherit eutils multilib
+
+inherit eutils multilib autotools
 
 DESCRIPTION="The PowerDNS Daemon"
 SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz"
@@ -20,10 +21,15 @@ RDEPEND="mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-2.8* )
 	sqlite3? ( =dev-db/sqlite-3* )
 	opendbx? ( dev-db/opendbx )
-	>=dev-libs/boost-1.31"
+	>=dev-libs/boost-1.34"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lua-config.patch
+	eautoreconf
+}
+
 src_configure() {
 	local modules="pipe geo" myconf=""
 
@@ -45,6 +51,7 @@ src_configure() {
 		--with-pgsql-lib=/usr/$(get_libdir) \
 		--with-mysql-lib=/usr/$(get_libdir) \
 		--with-sqlite-lib=/usr/$(get_libdir) \
+		--without-lua \
 		$(use_enable static static-binaries) \
 		${myconf} \
 		|| die "econf failed"