Fix libxml2 detection, bug 425170, thanks to Bruno <bonbons67@internet.lu>.

Package-Manager: portage-2.1.10.65/cvs/Linux i686

4 files changed, 440 insertions, 20 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index c4556adfd437..5f1cc886329a 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.401 2012/07/27 16:34:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.402 2012/07/28 20:06:32 idl0r Exp $
+
+*bind-9.9.1_p2-r1 (28 Jul 2012)
+
+  28 Jul 2012; Christian Ruppert <idl0r@gentoo.org> +bind-9.9.1_p2-r1.ebuild,
+  +files/bind-libxml2-2.8.x.patch:
+  Fix libxml2 detection, bug 425170, thanks to Bruno <bonbons67@internet.lu>.
 
   27 Jul 2012; Anthony G. Basile <blueness@gentoo.org> bind-9.9.1_p2.ebuild:
   Stable arm, bug #427966
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 81eca63daa73..6b8ebd23fe0b 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,34 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.8.1-sdlz_helper.patch 565 SHA256 861f111725a5a42c663a8e0bbcb7a6f8ecd77017c5441458fc3c3896fec802c7 SHA512 157f58b7a2a1185c9ec7b7616f9d619e4e352657a794fb0e2021d1c7344fb5be6507bd5fa43e23645404c472752037eb30777434639d285b294afa07412db4e8 WHIRLPOOL 3336e2f2779c4b863fd5ba8b826a7cd07405ff55b60944f2129d9128b937e251197250c1f634f356f150849e77ef86b06904a1e1903b49bce84173f0611a6658
-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 eb0ce2b11bf2302a716fa8ef21d55e55f1892dfd853c73c71319bfa5e171eff3 SHA512 058ae1ef089eb4d5ad43ffb83e9f48d586cdfcd4cd4efe9b531a0628d4ee1a69e489187572747a224059a00efd9187012bf59a6da05c4ddfbfa1b7719ff6cbdc WHIRLPOOL 896df0ffaf307c7208a5102058a2cc6e033c9c297602e5441ea8eeec6fc9937d5e90ddb4e5832020cf624607bc92560c394cc7aa2a2e71d383be0e737873f0e1
-AUX named.conf-r5 4119 SHA256 a5bcfe16562672e46550c2d84bfff63405998f512b639cc27a53f0b0fdf7f24e SHA512 232a3935eeb8609578a440ba45a75e87afe1521993e87d1dd2892184883807cd784b80f2a5b10414a614b8e5f31983efc58ae0088738ca622c07eef98f1e8369 WHIRLPOOL 8c57c646fb037e3801f0ab9dd5e1695bd769392d93bd407f7af937f28934a8848941ade303a8dd68a3509c3bf37db16b8e1e8aa93afe4a6781eac99753f605dd
-AUX named.confd-r6 1368 SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492 SHA512 074c37ecfa6d59de4ac70782b4722ffbeb3d66fae7cfa66810a67a06a1915d4e73f03b1f497d6005f125749aff61d11adf2927dcdb5a3d4fc4fb407fafa02dd1 WHIRLPOOL 3347b6887f1c516d3a4b2d40eb42195669b7a2ec01d02df21c7c0d4c27fe8984e1a2985d32f7631c1cd31b16c0f5031e69abfe5fd3d9c9debd156fd04d5c6910
-AUX named.init-r11 6134 SHA256 8de85e03b2c1e8cc6e79a65e70a1c85a3d873d956425fef3291626c2db006884 SHA512 810e2e8fc410c35fae42f0851cb5bbdaabb2343e9825a36729e443fefb5be2d9d23a7fda07fcc74e1f86de44b2dd2d9c86243b4b0b18e93a53faea585d986fca WHIRLPOOL d55d7863639ac5e5e6e8c10a3e19c95ec24e01131f5892e9d49d1444c849059fad1f8af6529da803fffaa670d486c91e881153604e71e41dd1a189dca2a83f66
+AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
+AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626
+AUX bind-9.7.3-odbc-dlz-detect.patch 517 RMD160 2103729c77088500c9640206b4aa0fd3888e0555 SHA1 28ab80dfe8f9d65d52fbf3f8b33a7522388d526a SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa
+AUX bind-9.8.1-sdlz_helper.patch 565 RMD160 3151d8bcb62bbe7dc1de715af979023ef47cdd6f SHA1 744f475f18e841ac594bc5448d9404c5a333db66 SHA256 861f111725a5a42c663a8e0bbcb7a6f8ecd77017c5441458fc3c3896fec802c7
+AUX bind-dlzmysql5-reconnect.patch 1842 RMD160 687f6128b6511dbeecdfc81b197520b1afd74005 SHA1 7b9b8e1b85f1344e4b5d8566ab868fcb1e87a049 SHA256 7376ac37c2d3fbcf5d8e886008639bdbe642f44c9021f435af370bddd3f03bd4
+AUX bind-libxml2-2.8.x.patch 625 RMD160 b51c2a0a97043819457a9e5c0f0a53b185697c25 SHA1 04659421144452ecc38fd926e48222d322392802 SHA256 dfba427e9fe306d51f455b2e9ef03e6533fd5ba5978bc7287da92cfd8e8ebdc2
+AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b84babc535466cacc7001e4c6eb21e22ae11b22d SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc
+AUX named.cache 3048 RMD160 a09a6729dac34397e676db3c74b0564b52f2a827 SHA1 cbdecd1ea8e7b612b33b63d66bc57273795d1f54 SHA256 eb0ce2b11bf2302a716fa8ef21d55e55f1892dfd853c73c71319bfa5e171eff3
+AUX named.conf-r5 4119 RMD160 d5447d9d6b368d18b4f67fe72014ce5b9149c571 SHA1 68ec3dad63621f8d079f0ec3d3c14f9d58be0978 SHA256 a5bcfe16562672e46550c2d84bfff63405998f512b639cc27a53f0b0fdf7f24e
+AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d5d6ead7fb5ba0ff8016b5fee2518fbde6f90c SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492
+AUX named.init-r11 6134 RMD160 e006702b9c5bd7d63b32d4c8f2d2e53eaa5facde SHA1 95cef2357b7dedad435b267d3b47860cbf06c365 SHA256 8de85e03b2c1e8cc6e79a65e70a1c85a3d873d956425fef3291626c2db006884
 DIST bind-9.8.3-P1-geoip-1.3.patch 54137 SHA256 9d5716d661fc3d76b3f201a0bcf563f4c1cd1fedf42c8434e4cce31f666866ff SHA512 33ed5855c1e20681667a7def229a6f6a721d309fb7e4a817825c80e652ce24036c220597c5a0252f6f4a11acaf652319868ae79d8eb3236ca52fb5311298a95a WHIRLPOOL b8e97e15c212710ed6efef508a883cc6adda530c1201263371b8208f85c813389ec9fd6c636d7fcc70ca848cfafea8c4f1edc9195b083995732ad4feef2e7dfe
 DIST bind-9.8.3-P1.tar.gz 7112920 SHA256 850aede364f89e706dbfcbe7d70887bc3c2df468146da5cae8c8ab9ee4621891 SHA512 7ec96fc697e3229284a62684fe4cd32116a7d098fa597a7c305d7bcf673903f63101e7b67aea5bc08d60a73620f719f3d157d3786c162fc9527d12c2d04889ec WHIRLPOOL 594f97ff6fd00a3684dbbc47e1b9597c6681c345a9f1364f96a33592d3654fc03a3f51022d9cfb9e3f1b2d95df2ef17f7123861bd619cd3aa3e60a100b5473f8
 DIST bind-9.8.3-P2.tar.gz 7113192 SHA256 b95d2e81b54ba972215c7fd52744fbe4711bd3fd6f217845ba95114d82c43588 SHA512 0da4ee60d477c1db3084d60136d503cc708abae52b6e60fbeb9f4dbc738d82728d4ff9870493ffb954d893d8b08ffd36324acc7d19ed7196cebae3ff881e10b1 WHIRLPOOL a1db62a05527927b1a9ce0af0a233f12407ca6a216a65b772e305b290ff28889c3c1c78800a87855335c3316c7e044c9662b1e03b7c53d53acca88dc2441cf0c
 DIST bind-9.8.3-geoip-1.3.patch 54133 SHA256 84233681dd1f70ab5fb4e9d155b9d66c8781ddee20044b7496c5f58323843201 SHA512 072da1a492118a60970c148c847181d49857b6904e0e0ec03b482eadf7b5613889142c4c43c1daf59e02dc2234bd089ee13746167a148b9bc0d12ef2f43d8ac5 WHIRLPOOL 1b1f447ccf416b9a8a2495306452e3d683080dff3e6e70229c5b6a9e209ebc36ee7c9158c5dc053321d2ba7e1ed7e7ed955d6eee5ce6f5f5ea286c1f92de4c75
 DIST bind-9.9.1-P1-geoip-1.3.patch 54332 SHA256 d876f58c60d60bafb3603067f66bc014e2867c2328f293aedbe26a65598e68b7 SHA512 93d4e0a10def2a41c6e0f050225642cbef25bf2e973d74ca9994a8a67a37bffd2b3ef97c3d41f06607f870e7de3244ed6f690792b5c3843d151ae6a921f85f28 WHIRLPOOL 7cd7cd33b8fe6d2bba8b9734e6c7bb4ecd45bd12fdfa0a549d734e11d4df79076a1aa4b63f616db007d32edf0ef8b350d76a84ac1bc0b0d2e86cff23fe124daf
-DIST bind-9.9.1-P2.tar.gz 7223896 SHA256 a46ecf6177b69d6e9a83a15f792d0594adcc8e800086208dd9b84452afb84d0e SHA512 9c3adf1621ea0f953cd81c9ff6c2d0a6a2dd766b2558ec43ebd6143f16738db011730d235052514d52200f87a6b16107acf173a38a6f5c8885f63a7e6384e852 WHIRLPOOL 3652e660f551b30ad28a43941cc910683b706cf3bc306c7c88622ac6f967ae9961626d0321c32bc8206e1f799c10658b0d8cda0479bd5f2cfa5d34494509239d
+DIST bind-9.9.1-P2.tar.gz 7223896 RMD160 76b8f61a1930922223544ed3671dd017a4f593d1 SHA1 449b12c32682b5bef64c7b53cd0fc0c6b731c8a7 SHA256 a46ecf6177b69d6e9a83a15f792d0594adcc8e800086208dd9b84452afb84d0e
 DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
-EBUILD bind-9.8.3_p1.ebuild 12079 SHA256 b6d491f3300240f3a8a2330e53066e52de9c8e8b91cd28519e1d8923afc0996f SHA512 ba19180b15b3f6b47e6f28bba111c7879e5391b1b273f69b150f916ecc1e9d37eda5698449fa27c0ad4e170c552430e40036c4f871425d62bf55f8252b205f68 WHIRLPOOL 68d7b87e2af22b6748e05e9e96d8cb6c1e04d96d045f34ec1399645ea2c36ee0df2ba1a1199990e1cac336e5d2363b8e16996505d2acd22645b1998f956ace0e
-EBUILD bind-9.8.3_p2.ebuild 12157 SHA256 e57fb7b1b19b693e3542749848a3851d30a59a0764a86346ba8305fdf2593a11 SHA512 606e604ba82eefec2f9b248d3a79582dcad5a03dec6ed695614a247d70919394b5db32e09efbfd1c417ac70ddc019ce30c56d2342c4480fc252d1a30b1635836 WHIRLPOOL e64e12029864f96e22040bde0d52258e03bdc1465d01071a7fc08adc60161e8cd8266cc977ffd1b61d728f1bebbd3709e592440669ca2cfeb3ef95e0f9e24ac4
-EBUILD bind-9.9.1_p2.ebuild 12261 SHA256 5c65a9aab29ada321aa81120f03888296d7e818467db6620a3593884a76c7b19 SHA512 9c6cdedf6fd38daa3a3ef6718aaf944c3e1610f64ddfe1852da46172108aa8d3288bd73a0ba625cd816821d276bc0bae6a28cc84569cd8965a759ee721afd9c8 WHIRLPOOL 924dcea7b6349b62495825e96bea64f600a8b1ee4d356aec7f0ef90e5024c24e79ece5d41baeac690d58b79bd7d826d28aefa5dbaff193616f21280c5e29aaee
-MISC ChangeLog 66807 SHA256 262cc0ae6bee8c05322ad993d2ee6fd993c2a73a7810b2db8de99caa306ddf39 SHA512 69a929852d8fea9236b0306f9839a1a3ca81fb232f937f7300b415614f5f8dc36aa7a021b23b136e4a9d7723064e85a5017b50667cdbb9ade157118a8efcda79 WHIRLPOOL a626f578ccafe3de3b3d57b39b7175407189a4870a511a560c6c057f324be78d6d45eac5f49e70ebdc37763aaf13a8cd3959e24870622e57c3204300716174dc
-MISC metadata.xml 790 SHA256 e93f44047cd6b599990e3a3d449eb11118ee865279c9f909251e8501763c2877 SHA512 021d3c667ef94e03e0d0431ff74a3c6b9a3ad7b4827591cd0e3902d5710516cccd83c55b482ed9de3cbba500d1b4b7d8898c8e536affb5f6be31f464d518ddaf WHIRLPOOL 5e108d8c3891096207496adad49f229e9e97d5ce41356e86e3051f1af08f78cb9c3e7a57e13c1462fb6e10e9f11d611bb16c8239d31e57a88b5bf54258361e3a
+EBUILD bind-9.8.3_p1.ebuild 12079 RMD160 578496b8f5911cb05fc08de743ed7dcae32eb8af SHA1 da97f76c5e00a2d9209b868d92414620cbd64d99 SHA256 b6d491f3300240f3a8a2330e53066e52de9c8e8b91cd28519e1d8923afc0996f
+EBUILD bind-9.8.3_p2.ebuild 12157 RMD160 af01e5aa7fc67f78cada1429833817ca34d583d0 SHA1 595994ddf5d9d4a8cd59062b42db5f3aa77bb444 SHA256 e57fb7b1b19b693e3542749848a3851d30a59a0764a86346ba8305fdf2593a11
+EBUILD bind-9.9.1_p2-r1.ebuild 12315 RMD160 4eeaf6f0151a08ca8e6f5b6d6f486a81040b96df SHA1 71574e527ba2736d1c54a63dffef27e5075ae743 SHA256 b3a7f702db05e75bb1d0241d677e1d390de2186976a7227fd9b81aec99303b3e
+EBUILD bind-9.9.1_p2.ebuild 12261 RMD160 8c1ca32070c70ba137088fe001f5e66477575d9a SHA1 6930c236aa21da64cbb31d7cbcbe5cf6f3bb0178 SHA256 5c65a9aab29ada321aa81120f03888296d7e818467db6620a3593884a76c7b19
+MISC ChangeLog 67029 RMD160 879b615ae80b6e167f4cdf0dc806f31347573117 SHA1 2ec53a95d01f8a621f71895d368d5944a07ed3eb SHA256 b16cbd3fab783024cccb37d89de6b3619ac97780425c963e057cf5aa2fc7f28a
+MISC metadata.xml 790 RMD160 3693077439d5075b0d144989b77fa29c198e30fc SHA1 11d4c5043fbef15af4b49d634c2de4c8c2b386e5 SHA256 e93f44047cd6b599990e3a3d449eb11118ee865279c9f909251e8501763c2877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlASwzUACgkQl5yvQNBFVTXmJgCcDV2Hg5P3EZdWZtIpJLHeix/X
-0k8AnjK8akl6AR8XFamilxWaaGNLU22u
-=3wTr
+iQEcBAEBCAAGBQJQFEZPAAoJEMOx0zmdw4Z1HfYH/3jo5n42DGq2hKiS7V3THiGR
+elIhoyPX7fc4FS9XiVvxrZSwVNGp1vgZTuvzDXnT/8OZJf7q3I6x72B6rNot96Zh
+pO5AZXaGIF1HGfKaa3VcAGTHkTIAMXgf5MJdEoVz+jBRNfB1EEa9RUBkazK2Mou+
+LpzM73FrDBuGKzy0DUtndYJwd8Vt+z9K4Ja9DMLmbrAVQwaG6XqCXZm0RA8OFF+X
+EzY6sgtwObddjRz7cFrp3O55hxYFkA3f71Vi4QGUwoqejSEaofPaKdMlo2eH8Swt
+MGwtpOpTSdVNfTPu9YWnes9VB0ZG0yn5GdVRvoEb2q8shvlXOE7cCc51rYjB0vA=
+=lAM2
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.1_p2-r1.ebuild b/net-dns/bind/bind-9.9.1_p2-r1.ebuild
new file mode 100644
index 000000000000..051d10c89135
--- /dev/null
+++ b/net-dns/bind/bind-9.9.1_p2-r1.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.1_p2-r1.ebuild,v 1.1 2012/07/28 20:06:32 idl0r Exp $
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="4"
+
+inherit eutils autotools toolchain-funcs flag-o-matic multilib db-use user
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+# bind-9.8.0-P1-geoip-1.3.patch
+GEOIP_PV=1.3
+#GEOIP_PV_AGAINST="${MY_PV}"
+GEOIP_PV_AGAINST="9.9.1-P1"
+GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}"
+GEOIP_PATCH_A="${GEOIP_P}.patch"
+GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
+GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
+			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
+	sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc postgres rpz sdb-ldap
+selinux ssl static-libs threads urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz !threads )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	sdb-ldap? ( dlz )
+	gost? ( ssl )
+	threads? ( caps )"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+	mysql? ( >=virtual/mysql-4.0 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/idnkit )
+	postgres? ( dev-db/postgresql-base )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	gssapi? ( virtual/krb5 )
+	sdb-ldap? ( net-nds/openldap )
+	gost? ( >=dev-libs/openssl-1.0.0 )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+	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/)
+		if use mysql && has_version ">=dev-db/mysql-5"; then
+			epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+		fi
+
+		if use odbc; then
+			epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch"
+		fi
+
+		# sdb-ldap patch as per  bug #160567
+		# Upstream URL: http://bind9-ldap.bayour.com/
+		# New patch take from bug 302735
+		if use sdb-ldap; then
+			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+		fi
+	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
+
+	if use geoip; then
+		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
+#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
+#			-e 's:RELEASEVER=:RELEASEVER=1:' \
+#			${GEOIP_PATCH_A} || die
+		sed -i -e 's:RELEASEVER=1:RELEASEVER=2:' ${GEOIP_PATCH_A} || die
+		epatch ${GEOIP_PATCH_A}
+	fi
+
+	epatch "${FILESDIR}"/bind-libxml2-2.8.x.patch
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm {aclocal,libtool}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	use geoip && myconf="${myconf} --with-geoip"
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		$(use_enable threads) \
+		$(use_with dlz dlopen) \
+		$(use_with dlz dlz-filesystem) \
+		$(use_with dlz dlz-stub) \
+		$(use_with postgres dlz-postgres) \
+		$(use_with mysql dlz-mysql) \
+		$(use_with berkdb dlz-bdb) \
+		$(use_with ldap dlz-ldap) \
+		$(use_with odbc dlz-odbc) \
+		$(use_with ssl openssl) \
+		$(use_with idn) \
+		$(use_enable ipv6) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_enable rpz rpz-nsip) \
+		$(use_enable rpz rpz-nsdname) \
+		$(use_enable caps linux-caps) \
+		$(use_with gost) \
+		$(use_enable filter-aaaa) \
+		--without-readline \
+		${myconf}
+
+	# $(use_enable static-libs static) \
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc CHANGES FAQ README
+
+	if use idn; then
+		dodoc contrib/idn/README.idnkit
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc doc/misc/*
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/*
+
+		docinto contrib
+		dodoc contrib/named-bootconf/named-bootconf.sh \
+			contrib/nanny/nanny.pl
+
+		# some handy-dandy dynamic dns examples
+		cd "${D}"/usr/share/doc/${PF}
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+	fi
+
+	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r5 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	doins "${FILESDIR}"/named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/127.zone-r1 127.zone
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r11 named
+	newconfd "${FILESDIR}"/named.confd-r6 named
+
+	if use gost; then
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+	else
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+	fi
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+	rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	dosym /var/bind/named.cache /var/bind/root.cache
+	dosym /var/bind/pri /etc/bind/pri
+	dosym /var/bind/sec /etc/bind/sec
+	dosym /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/{run,log}/named
+
+	fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn}
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key
+		chmod 0640 /etc/bind/rndc.key
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+
+	ewarn
+	ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
+	ewarn "you may need to fix your named.conf!"
+	ewarn
+	ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
+	ewarn "To fix the permissions do:"
+	ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}"
+	ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+	ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+	ewarn "chmod 0750 /etc/bind /var/bind/pri"
+	ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}"
+	ewarn
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT}
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}}
+	mkdir -m 0750 -p ${CHROOT}/etc/bind
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named}
+	# As of bind 9.8.0
+	if has_version net-dns/bind[gost]; then
+		if [ "$(get_libdir)" = "lib64" ]; then
+			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+			ln -s lib64 ${CHROOT}/usr/lib
+		else
+			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+		fi
+	fi
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
+
+	mknod ${CHROOT}/dev/null c 1 3
+	chmod 0666 ${CHROOT}/dev/null
+
+	mknod ${CHROOT}/dev/zero c 1 5
+	chmod 0666 ${CHROOT}/dev/zero
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9
+		chmod 0666 ${CHROOT}/dev/urandom
+	else
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 0666 ${CHROOT}/dev/random
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/
+		cp -a /var/bind ${CHROOT}/var/
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/files/bind-libxml2-2.8.x.patch b/net-dns/bind/files/bind-libxml2-2.8.x.patch
new file mode 100644
index 000000000000..539f5a47ca40
--- /dev/null
+++ b/net-dns/bind/files/bind-libxml2-2.8.x.patch
@@ -0,0 +1,25 @@
+From d2da04f6e412b1c115ceb8c2fb857c724de1faa7 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sat, 28 Jul 2012 21:42:36 +0200
+Subject: [PATCH] Detect libxml2-2.8.x
+
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2c3f1f2..b0d5ff7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1222,7 +1222,7 @@ case "$use_libxml2" in
+ 		;;
+ 	auto|yes)
+ 		case X`(xml2-config --version) 2>/dev/null` in
+-		X2.[[67]].*)
++		X2.[[678]].*)
+ 			libxml2_libs=`xml2-config --libs`
+ 			libxml2_cflags=`xml2-config --cflags`
+ 			;;
+-- 
+1.7.3.4
+