Fix build with USE="debug", bug #398703.

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

5 files changed, 30 insertions, 12 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 958fb1f32295..948e4fc1da95 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.73 2012/01/12 19:05:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.74 2012/01/22 20:36:55 swegener Exp $
+
+  22 Jan 2012; Sven Wegener <swegener@gentoo.org> pdns-3.0.ebuild,
+  pdns-3.0.1.ebuild, +files/pdns-3.0-verbose-logging.patch:
+  Fix build with USE="debug", bug #398703.
 
 *pdns-2.9.22.5 (12 Jan 2012)
 
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index ff6ca27b4799..639f9e92d43c 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -5,20 +5,21 @@ AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7
 AUX pdns 1288 RMD160 9c8640f8a741a9943a0fc7eb00ac4dc4f747ae21 SHA1 7942dbaf04f1e42dda18c4d53ff7ee4663c186d2 SHA256 e616dd0ac4b955f74a4520cccee5e764945804e46564f1cde3464914d8104ed8
 AUX pdns-2.9.22-gcc44.patch 856 RMD160 3e477b236af42767aea3d55af4cb9f14cbca106d SHA1 0a206fee906f36eac630ad200a8d3866cd477a55 SHA256 1beba6a251e0c7a4a4d11dce41d2c5e9b809c3d32856aabce22225ebb02d3992
 AUX pdns-3.0-lua-config.patch 964 RMD160 34943feff5ecf18cd447e4f92eb84e4de9a7e5c9 SHA1 02f5a0b3da7a1f8d3b655f38478224807c2bd23c SHA256 8d79b7b71733aeb7de9d4d31a3f86bb8205dd1fbb955e6c1892ab84fe56fe720
+AUX pdns-3.0-verbose-logging.patch 667 RMD160 2cec56ecd7f0e33e8b273de77eed53e0443bee83 SHA1 75d0b286a10475aae42a050199dd4994a9f89b0f SHA256 0ba17f63285e39136411d27b5f7943aa7fde32ce325718b96c59bf21d842a9e9
 DIST pdns-2.9.22.5.tar.gz 1077617 RMD160 8be76a7a63c3366d55724815245e2f955ec0adda SHA1 7a514fe624c110afb8a262f4d76376d0f8e17bea SHA256 f85a18e8fec99b687854852738b04d32fca407bfd1198c681fc3c85dd6e83a07
 DIST pdns-2.9.22.tar.gz 1072257 RMD160 be9bff3edac0a9700eaf8ac30c77bfc8336b7d92 SHA1 2c0888c8252299c5a17dc69eec289e90c7e8f3ff SHA256 7c03da01c2cbd8bbe897180bc3bd50ca8cfaa63ada94dc6b29f7745b82e17525
 DIST pdns-3.0.1.tar.gz 1196471 RMD160 996fb9db4d94456d01df840c61c1500d40ea2b1e SHA1 88205f0fd80268113aadcc0a4cffd2dfd4b9df44 SHA256 922554431737b4a8126a8c4b5be3126eb8bf8ac2a086e3030d1cf4b3dfa7d1b9
 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-2.9.22.5.ebuild 2713 RMD160 fa6db9109933bb6d7c9adcc218822b5a10e874ce SHA1 5f17ab15ca86723abe5aea6beb4c1c789645a555 SHA256 44c96649b760191aa014aab901b849f36423730bd2e993c44c42c69ee1d3cca5
-EBUILD pdns-3.0.1.ebuild 2703 RMD160 2bdc8586b369150d6b1cfe1a896137ded001df39 SHA1 91e0fe251fb068ac0ef29ce35f628b407f577bdb SHA256 029b9fc70cf3f0d71544894ab91a3f604000096a45e6a0fbdf5bd933aeafb822
-EBUILD pdns-3.0.ebuild 2695 RMD160 cc632a14b1640a651a65e9495026f84a7345bc25 SHA1 5fff41d950b80c3028eaac8cf247f92061a31247 SHA256 1bad87922251316553a136f4a99465c236f5d52e96c2c89c8d98d1907675514b
-MISC ChangeLog 10748 RMD160 574541726d72355c1d28b68c6317e483524eb3ba SHA1 a51d357208515e1dae168d3965688c8aca9b9a5c SHA256 930da8b63e2443c492cef4149bc88d3e009d9ca2e0a47bed532419d9c6af410d
+EBUILD pdns-3.0.1.ebuild 2751 RMD160 60319f50dcb10f31e2e61ef712ce9f91f58194e8 SHA1 b3334b653a6dad08ea7f5d42df676bcbbb7ff23b SHA256 545d7015d95404e3d847afc592962bc5583f812a3f80ba90bfd43ba2dc916972
+EBUILD pdns-3.0.ebuild 2745 RMD160 5e79c88bb39f7e0ded5e02a3dba4f5b1a73cdef1 SHA1 a7f9f26a1d93f03dd966974609bf178c44c94c14 SHA256 3bcf19fe593793fb1517ee68da59eccec2ba741cb759fcf43c2d59af0e5d6f6c
+MISC ChangeLog 10919 RMD160 c0cf8b93a4f1b854dca4efbbe2ada1f8277a5929 SHA1 62311bb6929aaaaf24b7dfbcdc0ca0ffdd60f9fd SHA256 00ef8871d6cc60894c743c06650cb1816bdcb44583ead57022b6343fafe5aade
 MISC metadata.xml 621 RMD160 b3abde0169582f9767bdc7bf0388714f942b2dbb SHA1 060f3699149a71c8db8811a026e8b4e191cc7aff SHA256 97dc634cfab302b5b4b61f6e2fd34253f8425fd3449fff155afce234ec5a2194
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAk8PLwkACgkQI1lqEGTUzyQnlwCgi0dCFjaFyLgPCxdmIVxq9lEk
-HscAmPJCn3Rje9OlYUSf0lNX+LDXuFQ=
-=kVOi
+iEYEARECAAYFAk8cc28ACgkQI1lqEGTUzyTOXQCffdyVhB+kOsBLaCwlD24HTU5f
+30sAoLhEEqoTIlS3lB2ACoW5vgGbRabb
+=7mou
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/pdns-3.0-verbose-logging.patch b/net-dns/pdns/files/pdns-3.0-verbose-logging.patch
new file mode 100644
index 000000000000..d3324b8395b6
--- /dev/null
+++ b/net-dns/pdns/files/pdns-3.0-verbose-logging.patch
@@ -0,0 +1,11 @@
+Index: trunk/pdns/pdns/nameserver.cc
+===================================================================
+--- trunk/pdns/pdns/nameserver.cc	(revision 2230)
++++ trunk/pdns/pdns/nameserver.cc	(revision 2259)
+@@ -180,5 +180,5 @@
+ {
+   const string& buffer=p->getString();
+-  DLOG(L<<Logger::Notice<<"Sending a packet to "<< p->remote.toString() <<" ("<< buffer.length()<<" octets)"<<endl);
++  DLOG(L<<Logger::Notice<<"Sending a packet to "<< p->getRemote() <<" ("<< buffer.length()<<" octets)"<<endl);
+   if(buffer.length() > p->getMaxReplyLen()) {
+     cerr<<"Weird, trying to send a message that needs truncation, "<< buffer.length()<<" > "<<p->getMaxReplyLen()<<endl;
diff --git a/net-dns/pdns/pdns-3.0.1.ebuild b/net-dns/pdns/pdns-3.0.1.ebuild
index 664405474dfc..bd644cf49cb1 100644
--- a/net-dns/pdns/pdns-3.0.1.ebuild
+++ b/net-dns/pdns/pdns-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.1.ebuild,v 1.2 2012/01/12 17:29:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.1.ebuild,v 1.3 2012/01/22 20:36:55 swegener Exp $
 
 EAPI=2
 
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-lua-config.patch
+	epatch "${FILESDIR}"/${PN}-3.0-lua-config.patch \
+		"${FILESDIR}"/${PN}-3.0-verbose-logging.patch
 	eautoreconf
 }
 
diff --git a/net-dns/pdns/pdns-3.0.ebuild b/net-dns/pdns/pdns-3.0.ebuild
index e17449fbb97e..b643402a0570 100644
--- a/net-dns/pdns/pdns-3.0.ebuild
+++ b/net-dns/pdns/pdns-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2 2011/07/30 09:59:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.ebuild,v 1.3 2012/01/22 20:36:55 swegener Exp $
 
 EAPI=2
 
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-lua-config.patch
+	epatch "${FILESDIR}"/${P}-lua-config.patch \
+		"${FILESDIR}"/${PN}-3.0-verbose-logging.patch
 	eautoreconf
 }