Fix libxml-2.9.x detection, bug 463626

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 47 insertions, 11 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 659212df79dc..8410b729a388 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.441 2013/02/28 22:45:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.442 2013/03/28 21:45:20 idl0r Exp $
+
+  28 Mar 2013; Christian Ruppert <idl0r@gentoo.org> bind-9.9.2_p1-r1.ebuild,
+  +files/bind-9.9.2_p1-libxml.patch:
+  Fix libxml-2.9.x detection, bug 463626
 
 *bind-9.9.2_p1-r1 (28 Feb 2013)
 *bind-9.8.4_p1 (28 Feb 2013)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 6761b6d5549b..6ac9211c5a01 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 10bind.env 27 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650 SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55 WHIRLPOOL 8fe00482e9ba95698cd814893784bd502ac0edb318450edac60bff4d2b4810068cd5e1f58cfce1ca5e05d5967d36728bf67cd927ce7d991832d1a07593d27c37
 AUX 127.zone-r1 533 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626 SHA512 c165e903cee1553483e53d917224ce4b1410248ad04602be80af27e87216fea113b6358057369ca167037344ebeda39b71702e84469bb239131656dcadcdf30e WHIRLPOOL e067518f0aa32277911b836c90c6bdb8be2397846d1a94008d8ca1a5931df40e21d74da5e754dcb49113a4c5330764c2cb2f71fb8b1204c0e226b20330a01a67
 AUX bind-9.7.3-odbc-dlz-detect.patch 517 SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa SHA512 d3505beb1a87059aa30e03c205b6c1144900dc76b362b684f6ce875297bf77b6f92ad1d779ae08ac6752bd47d46a447d7731caa8c60e250bc3f4591305385810 WHIRLPOOL 56c476d669a314d9b8342d634ce9bc2d6a58cc0cb3b8afd38fb210c4ee6810ee2eee2631637836b33990291367a4866c60d53e72349955317b563858388e7587
+AUX bind-9.9.2_p1-libxml.patch 713 SHA256 6fcfafaad7532fa53b8d1e6abdec8790c1b63767ad3d149a22a6c23bc9cd47d1 SHA512 a94253a1e310e15c2a0dbe211e75cede1b744497c510dc81553e084ebd79cef72d2a8cb2f89b6bc2aca180142b364ead27510a4ee0c9b9ca3b83eaee532e8f79 WHIRLPOOL ce4c90c99f56ebb49a721cd207e141115380787f38589252bafda922cb75b23864e3e738365288f4bb9f9fee8d564fc3bf3ec1881ed668e68951193ce8c51932
 AUX bind-dlzmysql5-reconnect.patch 1842 SHA256 7376ac37c2d3fbcf5d8e886008639bdbe642f44c9021f435af370bddd3f03bd4 SHA512 0b3faed4d1736cc8f641e88532ccc4e402b3f67ba4dea124e6b1b0ce6ec75e895d514e69887d44a5869c5ae4e53e82d3b27e029855f2c3861cd2e7fda8428e01 WHIRLPOOL f85ff8ee5c9f4b5f8443698cb0e1a4e542347242e455f108a8c4cd97b62c76b08a9a2ead324bbd9b1d9974df6cf01ff2e4a4f79c6723aeffb5f1e24644d28002
 AUX localhost.zone-r3 426 SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89 WHIRLPOOL 0b7bba480e8bb8cc61e0c9efe2eaba4288fd05b9ae6aeda5e691ad50fc2741bc19b7669a4de56821de2a792df0fe4501d98ff92287dc79cc0bdf766526d365bd
 AUX named.cache 3048 SHA256 2e19682ad79bee201e3fc0454b73d45d04be7ba7dceb28612ec71fff0add6de4 SHA512 f84a7c83b424fa59126617062c1442dd8fb28905cd082f5f60087da03fe0e10c55a2c20fc398d9c69af7c1f75f7c72f78f4c203503cf51a6c06be22df8132996 WHIRLPOOL 6d3a843535cd0685703b99474be5eb599ba13b81be98d337236ef826e672aa534d4cdf4fe54f3aa0e838c8e7568a4201764c423d3bb490a9f842c446a58c1722
@@ -22,18 +23,18 @@ DIST rl-9.8.4-P1.patch 95560 SHA256 d67a75465ff7196c05e1ab0c426f7f714ff9dc56931f
 DIST rl-9.9.2-P1.patch 95625 SHA256 79a6f6298fe8a69bc4b981041122152a0a7aa12781e438cc7ec2b421338d02d0 SHA512 c230b6835544d6a43957472f7a3d3cde8bc396ce3a893213e47202a84f2dad5b5ce4997d706172131bb4ed0245b5957acb805b2fa79e1628ede71837ca5143fd WHIRLPOOL 9dc0b6f485a3994c92375700a8bd67a4b55860fdfeacb415f5742dc4b2f1cac08bccd314256edd32a57b6d241122508b1662e94a5115a30189593de212c1423e
 DIST rl-9.9.2.patch 91993 SHA256 0bf1935ce77cfbc7cf6fa9bdb3798545c612d6fa30f6bb097ad23258ea83ac2d SHA512 9e1ace18b4dc41bf2f2e292eb0b56ee1d12a256ac2714bd8aebe9f8b249254aea450571009e2c95f96d6fa478f0508e89fc1273000ce1e09e58298578b53cd0c WHIRLPOOL 8cdd514f98241a055ed8bdcf8bc808a95c022e0c54af3c953e3d7372b1410f3b62bc39ee81a6a72ba568ba7b7ee41d7082465f29bbbbe063982cd0cff3428523
 EBUILD bind-9.8.4_p1.ebuild 12838 SHA256 f6f73beb87741a88683f7510d18b745e8e5f0efcd90068d709fca1f1e48f4de9 SHA512 bd0c17d30cc4d406c339a08cc549387b62f8986886990ac28c53b82077e4522e926ff0a6fa003832b089744ff1ea4763b40379a99a38a4f278e36d5bc7d5fc71 WHIRLPOOL 0b852059c5f073df9a8dcab6132fbee7e3eafe288b6801d46f1ad26308f0323c485345af2d4503894d49f24699fadb9798c93ce5c0612de940d82151cfba7da5
-EBUILD bind-9.9.2_p1-r1.ebuild 13500 SHA256 f69a48fa1f881c6553bc822753936f5a5fe7d9544c8d7f1906f992ba5f082d5a SHA512 c52780e9fd3a6e035209436a6b4fcf6b2f226dfac52fdd0090741e7b4e8fbfcdfac8bfb5554185d656be5e2a122fa463bb0199198344bbf50cf9edc5990eb41e WHIRLPOOL 806a709fac4eda6582bab0e01356b9be08fb776c15dfcb6bbca602f3fa969eabc9ec87f17680d22ede0d7ef11b9c17a3f0f3d7c3649737ed606de7d0b258fd3e
+EBUILD bind-9.9.2_p1-r1.ebuild 13583 SHA256 e9c81915b2d3cc9e5ed0f0986596aeaee51ae0f8e5472d87a7fb6168f353b2a1 SHA512 de246b383b05755ca5551efb29ed0aae0bdabe10d71919d24ef96cf55bd8cc6012948e348d7c3689a1de8d66d07884935e43b5414595f93e182d893829d52538 WHIRLPOOL df7968034eaf997284f1f280230bca2ed1bd0dabcb1dd15d356b2bc82aac06f011e4336b16f69e7b93f2e210e0cbc2c3667501b0172a3c51481052aaf40eb8e8
 EBUILD bind-9.9.2_p1.ebuild 13478 SHA256 47f172e7c8101c7c19825b0895b9d437194f1ea2cea4d8b53864723293d088ec SHA512 bb8d15603f3ad465c2f07af2e9946165a3f73265b0ebb25fbbe3640f80737ddc127e5f0f06b03b4ef3f1969fac0a6f7e4c03a88db8e8cdd24ae67592e6613bc7 WHIRLPOOL e4320f10cdfb82ca48eb75e56ece658950ae7e5b27369944fd513c2c94845d79b38eee335482403d03f315d7dd808eeaac0e3e9f3ae5b9482669f478ea74a53d
-MISC ChangeLog 72180 SHA256 b4a21ce4005d06c93d71180db3b8ca73a1da704c7e155872446777a3bb7d8387 SHA512 60af55eae81c3e04467d3b353f31c09f274c64aee8d7d282b30a575978ba9d41f5eb740e3494b822ffa734da5d1f578d21e49c2ac4c339ee2d9dc760a800ac8b WHIRLPOOL 9ef42a29125ff43825b4a554b6e31159d40def140550a1fe2b4433a7ee848fcc6324c456e98e8c3f95ed8a154236d6c643356b20a17a7f6e954065d6f85e69b0
+MISC ChangeLog 72336 SHA256 b4905d6e92cde528abf5d2d14ed7dba9a4c53aabf107c1d28c656b868c8ace59 SHA512 76011e8680b11a4332866e78e0b5d792318e42b54b02d0f4c7de60d63aab047d7ab716fa2b33f6815150a223b28873e0e6b1dd79fb2608efbedff0c724021a70 WHIRLPOOL fcf0e01b9a938f20e529f1c2bff9676f644a1a492af58c2715c50cd01cb4bc8174af632ba799c816a71451805a73594d1e19564bbd16f51ff14186e3d9f265ad
 MISC metadata.xml 860 SHA256 0fce4fc0233c67076d886f2103083172217f79d36af3d651c3435cad719762ae SHA512 df24c1a19401a50681d32370dfed6b5735b591b9db828b290c39cf1701ce5697f7cad83b4f5410eb063482fecbb1694cc6508ded74d3dcd7bf2cc7f3c6d0db94 WHIRLPOOL 4b04fd631b0c3dc03f06599f81d113bcc7f36d9d54d54fb49c49a741c539248d37ec5c2df24f6f994ddf0bcb55c9b12fa80fe4bec16855a48a53bdf07d813039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRL94oAAoJEMOx0zmdw4Z1OAYIAIKoDoJlIV276F0QxIAYy2w3
-emGZgjYZA3EVMD1b4Dgk9NDJEiLCfhCvK2FKFqSpNDuixIKRhwg4aKjLol0KeZvT
-drtUazzzbnFsCSpEKoPcUcB+Au1Kwwz1w4wXd6nebmTtm42xmiNE9Fq3icL0L9We
-KDM1VMkc6A+MhEn/g4uvMml4l8QkUuSOtFj/YyixGH3LtYxpxGBORyU0bk0pgT9i
-lpeQIm3hDbMyQ5ascouS4WHFUDHogAESWOd98CDyrJOROe0srt1wQcI26HWL0eB4
-R6TaMPOkAhnnkCbHtHp3qhCxT2yYOOSfv0oLIrVI+GL3armEwUHfuB2FwWv0LXc=
-=f2X0
+iQEcBAEBCAAGBQJRVLnxAAoJEMOx0zmdw4Z1njcH/2vvW/5Z/8NWJRICNWv8H9eH
+GsbKmbAOiMgZOXO+0yxwM/nALZpGfJ1j3wZGDJsndgnNPo2wGja6mHVt5DQRuP0c
+CfYj4GE/ROG/6khvFRQmzayw0IzVtYrsBcof6qhvpZmAC2Jsqldu9GoOUxPVX4AB
+PU21MsIlLSZnZdj6anpRT7ie3vGzsDMBzIzUEN9k/JXHlSdCx3qLkoqaHArkZqWk
+gqlyWCbRpYENFCio6S8epZI2QJscb4FrC9MDfGNdS3wgIK4AN39ekygOGsAHBkE3
+DBKS/b/pafs12YtACBFtlKvgG/1uBoy6Hf+ZLNjPX9P6eR5X99hBvtL/plttAQ8=
+=142I
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.2_p1-r1.ebuild b/net-dns/bind/bind-9.9.2_p1-r1.ebuild
index ddf2c737c35a..f5e7453fbb8d 100644
--- a/net-dns/bind/bind-9.9.2_p1-r1.ebuild
+++ b/net-dns/bind/bind-9.9.2_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1-r1.ebuild,v 1.1 2013/02/28 22:45:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1-r1.ebuild,v 1.2 2013/03/28 21:45:20 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -107,6 +107,9 @@ src_prepare() {
 			"${i}" || die "sed failed, ${i} doesn't exist"
 	done
 
+	# Fix libxml-2.9.x detection, bug 463626
+	epatch "${FILESDIR}/${P}-libxml.patch"
+
 	if use dlz; then
 		# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
 		# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
diff --git a/net-dns/bind/files/bind-9.9.2_p1-libxml.patch b/net-dns/bind/files/bind-9.9.2_p1-libxml.patch
new file mode 100644
index 000000000000..d07b09a696cf
--- /dev/null
+++ b/net-dns/bind/files/bind-9.9.2_p1-libxml.patch
@@ -0,0 +1,28 @@
+From dcf14b1cba822f5c1a578ef25d02b7d1fc04a17b Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 28 Mar 2013 22:37:15 +0100
+Subject: [PATCH] Detect libxml-2.9.x properly
+
+https://bugs.gentoo.org/463626
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 9dafa48..1e743e4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1321,7 +1321,7 @@ case "$use_libxml2" in
+ 		;;
+ 	auto|yes)
+ 		case X`(xml2-config --version) 2>/dev/null` in
+-		X2.[[678]].*)
++		X2.[[6789]].*)
+ 			libxml2_libs=`xml2-config --libs`
+ 			libxml2_cflags=`xml2-config --cflags`
+ 			;;
+-- 
+1.8.1.5
+