Remove old

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

4 files changed, 19 insertions, 474 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 75ad48fb2fa5..d975e51b51f3 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.471 2013/08/12 05:10:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.472 2013/09/03 14:13:35 ago Exp $
+
+  03 Sep 2013; Agostino Sarubbo <ago@gentoo.org> -bind-9.9.2_p2.ebuild,
+  -files/bind-9.9.2_p1-libxml.patch:
+  Remove old
 
   12 Aug 2013; Rick Farina <zerochaos@gentoo.org> bind-9.9.3_p2.ebuild:
   clarify deps as requested by bug 479746
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index fbf4e5351f9e..3976c0f62d27 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -4,7 +4,6 @@ Hash: SHA512
 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 generate-rndc-key.sh 183 SHA256 7d9c010a62db7561770fefdfb557bdae17f18835e62bfb9761680054d851ab44 SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee WHIRLPOOL d071d473faa6e1feca55ce6e4dd68d76b566372b8cee2e27fd89b48fd4651fe3cff957ac66ad895dccdba1373f18b75f67daeb9bc292dc9a7bc6f3f6da330f91
 AUX localhost.zone-r3 426 SHA256 3f39e9b5be72435e961cd6f5acdfe396b05640bf370969acf918a939575122bc SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89 WHIRLPOOL 0b7bba480e8bb8cc61e0c9efe2eaba4288fd05b9ae6aeda5e691ad50fc2741bc19b7669a4de56821de2a792df0fe4501d98ff92287dc79cc0bdf766526d365bd
@@ -17,34 +16,31 @@ AUX named.init-r12 6095 SHA256 953e066b5d77f59917db59365cd2103c5bec19889775bd3f6
 AUX named.service 555 SHA256 2716ea68363f57b54d272eae70f418a19f3624687753d9249babd272efe5052e SHA512 b97dfe465ee19d8d896e0c1e248c8d47d6b68b2faeb34cc37d5b3750d921ceb2a1e25637e429f16533f387907f164f84201d7a55e1590bac681a5df546afbfe6 WHIRLPOOL 687203e25eac1e15e29a51a243fe41f6a40456e80a4c51f640b65c22e2bbdaccef5fba8e6164679394365e73f38a3cb8d9b8ce368572665cd49b88d724d12a7b
 DIST bind-9.8.3-P1-geoip-1.3.patch 54137 SHA256 9d5716d661fc3d76b3f201a0bcf563f4c1cd1fedf42c8434e4cce31f666866ff SHA512 33ed5855c1e20681667a7def229a6f6a721d309fb7e4a817825c80e652ce24036c220597c5a0252f6f4a11acaf652319868ae79d8eb3236ca52fb5311298a95a WHIRLPOOL b8e97e15c212710ed6efef508a883cc6adda530c1201263371b8208f85c813389ec9fd6c636d7fcc70ca848cfafea8c4f1edc9195b083995732ad4feef2e7dfe
 DIST bind-9.8.5-P2.tar.gz 7262961 SHA256 4c0e25e69e6a4665295b2322df94647f020e93c86189c39f6860d7654a411f1e SHA512 1d17acadb70d8cb9c4199ab0d27f87ac80b7996c307776d02b6add46bc0dda9e46ce9327981616fc3937b05d00f7774c3ccb93d8c56cfad13cd2535fe3b6f590 WHIRLPOOL f07a4b8f093ab453a408533f3d3b6808335410145fb2464b8ad492802d26c9c7146bb7c612348470bc33569a0c200f5fa5b4eef132f7f65301e10f668d3854f2
-DIST bind-9.9.2-P2.tar.gz 7277958 SHA256 ff822734e3550969251411e20f6f7397d14a912613a42af423752e93fdb565d2 SHA512 d790e378444410d8e42ab6ca028f9a30b3c5c5f0f41b2ccef1a706a84d3d0115d505268a41c0ee4cfd33dcc6249d7a61bcd60346165076fed1331dd02e5520e8 WHIRLPOOL 170faff81d861d67d4526622658ec5e675ded6818d1ffb5bf66e65add35450660254be8ded96c7119b3b5c1a3ac97bff179655ee2c6cd74164220cfde56ba31a
 DIST bind-9.9.2-geoip-1.3.patch 54328 SHA256 0d87a1b547b42c775ffb591bc8104f92c18e99ebe2ab3a97e8c5bc5731be6fba SHA512 7673b3001bc7d64e80ee548c63ab083141affdd76edf6704da6980c26de341be7341d7566dd9bc8d3b02a0a08934ccd513bd61d2a426f61b3b47959ec14d21ae WHIRLPOOL f561baae427ff4141022b94ca557e2c3fba58434531f45c28b153ada537cadec2388694689b30c1a5b5db9c10e9cbaaad6c7a42797effc7c429c4403c6516404
 DIST bind-9.9.3-P2.tar.gz 7459422 SHA256 5e8ab06c7b73f38b47ce9ad12ca0afa7c714bbba2f6b7421c26c0d8b84b6c678 SHA512 def149b8b4050d65bf35109db5843502aaf785cd331d041b9336e0e25a43ede3c7337d5ef46f4726542bf1126bddb5e9404eaaad8f4ff9bcb464ef52df31225a WHIRLPOOL dd5ec585c33a3e6c2d1347d450fc7db8a55b1b321523ce695232c2d544761891c48b95447ded818b4333874607b53689feab6d41eb2d4421239f4d2ffc3e2e83
 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
 DIST rl-9.8.5-P2.patch 103552 SHA256 256da99443a6bb260197f28b88e07d273c9f6910513eff4b5ac90c84eaab2a6c SHA512 da6fa827d2c1f46fdd7c16bfd2653c95bf78cc4acd52266d4ed9255c0eb005519896e8fc2d041c1aaf6f24306a9418964a9ce77cf188ceb23c1301c021d8bddb WHIRLPOOL f30d6a86fb3ba2a6e96e9d1c01366bf3d6bbc9b75b83b73760a399346062ca5fb8d428af152b08e08b026301cee08ecd83f1379e34867a06bc18e0d3d1e5453c
-DIST rl-9.9.2-P2.patch 100619 SHA256 a4c814eb842a84afd3f138187786efd9f593bc2902b21fe3298f4fe6eed9ce40 SHA512 f68d6d32e685c1535d9eaa4bbec4fae05133d5eb8fc6d4274048bf96704b8ce90bcdffd9a3b7f0df681ac7dd3b83459f95a682eb2ec540b41f037726195b5107 WHIRLPOOL 4a9f93f951f20a6b5a7cbcd1c6e4cb4955553ad7b87096d5674469abdc7e0bb0178d75debf2fe24bd6b6d958052e75d531c298791df9efbc7a44735fa07b493a
 DIST rl-9.9.3-P2.patch 104064 SHA256 9aff9d39077160a7a156aa40456f19779b7f5ed2e5b42903b6c0f865acae2fae SHA512 f6e057cf33dd3baf95773637dc75ea1b3fc834e908048e096e57482b583f502cfe73a82104f4045d7f1668cfb531b18429c53b77caba9f12d3c4e605e4b51efa WHIRLPOOL e1a53d0cc7d3a2133e11b5d29e481deefda1562f8f335fc385c3f75205a229f1f861b78218a02e25871a55f572edceca49372e87e81a58dd62bca8d752abeccb
 EBUILD bind-9.8.5_p2.ebuild 12939 SHA256 42b16ed9fc754fb820af8bcdedb1bebc7fbbe547688aa1bccff965f21725548f SHA512 974fa7ee9b454e9b89593943907d3a90d750f2deee982885227f225be9c7876aabac9c0d451c8d6c8939b2d8fc36bcf5bcafd5be026a5e0db56d9f1db85a91ef WHIRLPOOL d6b3ba9a2f2df121d3139fff31a4b72a139ed4f566421e6f384caf6f51081060a9ad3e039aa4d340cbdbc597c462143fcc253a0b13a26a81fb1ea7e7dbd32ff8
-EBUILD bind-9.9.2_p2.ebuild 13571 SHA256 5031cf77ecd7b2de513276007fb4cbd4224cd73fb05e7e59e8faaa4261f15c2d SHA512 18e072bc7af82903ceda969743b28914df8c7679250218f9130fb616fde2c492b183df50beacd8298de22696b5e62b08b21370a8528e7a470b863ad8f153d860 WHIRLPOOL 373b270be193b239ff0149108e945ec989515010d8430eb69be5257cde10121ac818df0574dee5ab2d8ca51df58d57327bf35fda9ad7d692b8f68474ad98f80a
 EBUILD bind-9.9.3_p2.ebuild 13724 SHA256 0e9fde4f883f96ef8e05c268bdfb593a73c9f7bcf3b4e32461a1118af6c0447c SHA512 a15247529c9086fec20da5c3463e6e2e355a7ba90c39b581b82085ba7e590af4eb8f965be30a2e350b0a7225cff3acf0604498018f2c6bc54969840ec8673aec WHIRLPOOL a4378b5266f40ef987db65b9133f0a5d9b3e95dc63e53af70571078cb1ca9e4d38abd2a582e9786ae44a81c06f6ac2f22f8ccc5ec57f4e3aa2e7f5ffc1bc2fe0
-MISC ChangeLog 75936 SHA256 05fd092e1fbdd6dcc1facca1f8441bb274c1c89da281005393351ca8d3a88527 SHA512 a1ad86586d09265c2305dccdb6f836e40776fdb1e8d90261a98ca1f5159d1a241129568d71bdb48158f2a820d7da9abdbc1982872b247a2b0988ddf78cd0d220 WHIRLPOOL 987925aef6667b6746b1ce2bb0b7665e600643c19165598813a68be9188d490521ed1682ba87ba28e2c6a9622a6c289cd37d0f73cf54eb2658187a9e309e5a7b
+MISC ChangeLog 76053 SHA256 1f6fa039ad2bfa251567ac94bb77a9fd7672b72ee16fb06008a90f5aef052f16 SHA512 dbda220ed02c3052831cdeb42b5b0b004c3f27ed8cda77228a647315acb0e1536a3f7d9a0dc850ee7801284713083e77d0ddf9b0685a021fc3d0afd6b5361542 WHIRLPOOL f9baedbc79aea17bf01f257925b2f1184d989724fc8b6e5c1b1a11551ec72689ac638b924f326973d59be525b120607916463dd3e4664f557921a326b3330651
 MISC metadata.xml 860 SHA256 0fce4fc0233c67076d886f2103083172217f79d36af3d651c3435cad719762ae SHA512 df24c1a19401a50681d32370dfed6b5735b591b9db828b290c39cf1701ce5697f7cad83b4f5410eb063482fecbb1694cc6508ded74d3dcd7bf2cc7f3c6d0db94 WHIRLPOOL 4b04fd631b0c3dc03f06599f81d113bcc7f36d9d54d54fb49c49a741c539248d37ec5c2df24f6f994ddf0bcb55c9b12fa80fe4bec16855a48a53bdf07d813039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSCG5fAAoJEKXdFCfdEflK5toP+weDIbl69w45OHbpFhKwW4dJ
-P6lwJ1j5S6sPK6RsVfWYiFHO45IUAlCSJit/RqBAQzTPqdOqUwFaCAi8KWcslOnP
-/2KH6zQoj8ZTS0Qk3vytvy/MOLbBxO2mMA8KzDMzPjdzAlJtpXgq9viC1W2/oUTc
-CHK1S5ftydPzGZ82MMZsOLIYlKBWWzHw3Jo/BGERTxfaliQbHXh7hz79ekXcPTHp
-AXUuBZD8KNsf2AlcdG6aFC5n3fpqbAKl63nsSWb4lgLQWhP7n0x7wRHiJhbMOP+v
-whpElrQnpDwIqu93e3MvVh71PcxPnRksc+4Mzvgnt3VC8md1bXYubII40l9DX1vc
-FdEUVWbiGeg4G+ielXbEqJNLHjTvtLSa1oiD9Pe01F9tIvssqejgGrD83ff8LWK1
-PGDB8HJ3emO/I4XJyV+FebwaforJIeO5jCVBVehXlTMc0oA3+uNQxTRRFRFIS3m7
-E+Yvoa0bO7h/dELOiJCl4Rv1aJwhEah3PkcjbpmgQxj40Nfc24DIfc1Zki+lnMtd
-Iqifh8Exf4KKaqjg5ae6o1Ayufq9wR4YFLqA+DlI+PsdWgUUWEkt+emgf4K6icb1
-GNfbz+Pz7sSD+VhSz3w+eya+/vXATQhHfZh86hZc4mLbxZEnthbXEOBpRjeUW+sU
-f03ejotwAXHzMM3dX94/
-=KNa0
+iQIcBAEBCgAGBQJSJe6MAAoJELp701BxlEWf8RwQALLtEQvp9s4LZyFt8T3oW13D
+a+yOx8Aj/ewUPT3mdpc14OOJU8+Rx5g9zTW1S2rTYO0s8sKfLmkQMECRhNBd4ML+
+ALBiuDpb0AJumbeV3VDN/vWBiCJJn9dvCdD8VMq7Bw+FvLfjmUOMLg0ehbBIOqsr
+WuavNnktEkokpqbSceP8j2RvdSWnUh9DANSMOAiP4qZ7yw//X/ljyobHI7+HiciW
+fqwW1noVkosijTbWkRqLiamDN/W7yIdURAZBXApkLKB5ACMj3oze0Lj24TfOLCbO
+A1+G0XnnmXHyXmVvswZtIFD8LNUVRbXmJU+zY/Sg5944QZLaWCWe3yhDoGnmhdjF
+zUirwY+3FYhBzB2SKksTVksE+9PWErhcVTVRWjrXBNwv/Yy9XTqjFN9D3vuojb+d
+hjbiVz7Q3Z84sUTC5d/ndv9yewjKFbqdIGOaERVDD8BAz6ROCljUXPpm6ujOQose
+kw16Aa5as8/UZQFW5yhIDeuDncve71Rkd6yhHDtt1a+5tgOh8vukakdHs5MpB80u
+rlXTGnA1rFoPiZ88MnUAFVD+Xxxx5KgCKyNINVXj5wRiQIyrTpnZ4eFn/mJhXEcY
+JHWK5GqMxEvc/PavovV8cjmXtDD3AvhZH47TCSxDNHryRdYZI5GumPtSx1QU8aIO
+4hI6NP2RcKVT+0KdUzhC
+=6Ipy
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.2_p2.ebuild b/net-dns/bind/bind-9.9.2_p2.ebuild
deleted file mode 100644
index 96ae94488e89..000000000000
--- a/net-dns/bind/bind-9.9.2_p2.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# 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_p2.ebuild,v 1.13 2013/04/14 11:46:42 ago 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"
-
-PYTHON_DEPEND="python? 2:2.7 3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python 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.2"
-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/"
-
-RRL_PV="${MY_PV}"
-
-# GeoIP: http://bind-geoip.googlecode.com/
-# DNS RRL: http://www.redbarn.org/dns/ratelimits/
-# SDB-LDAP: http://bind9-ldap.bayour.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
-	)
-	rrl? ( http://ss.vix.su/~vjs/rl-${RRL_PV}.patch )"
-
-LICENSE="ISC BSD BSD-2 HPND JNIC openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
-postgres python rpz rrl 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[-bindist] )
-	python? ( virtual/python-argparse )"
-
-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 ${?}
-
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-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
-
-	# Fix libxml-2.9.x detection, bug 463626
-	epatch "${FILESDIR}/${PN}-9.9.2_p1-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/)
-		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=2:' \
-			${GEOIP_PATCH_A} || die
-#		sed -i -e 's:RELEASEVER=2:RELEASEVER=3:' ${GEOIP_PATCH_A} || die
-		epatch ${GEOIP_PATCH_A}
-	fi
-
-	if use rrl; then
-		cp "${DISTDIR}"/rl-${RRL_PV}.patch "${S}" || die
-#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
-#			-e 's:^ RELEASEVER=: RELEASEVER=1:' \
-#			rl-${RRL_PV}.patch || die
-
-		# Response Rate Limiting (DNS RRL) - bug 434650
-		epatch rl-${RRL_PV}.patch
-	fi
-
-	# 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 "${EPREFIX}"/usr) \
-		$(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) \
-		$(use_with python) \
-		--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
-		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null
-	fi
-
-	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r6 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-r12 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
-
-	if use python; then
-		install_python_tools() {
-			python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds
-			exeinto /usr/sbin
-			newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI}
-		}
-		python_execute_function install_python_tools
-
-		rm -f "${D}/usr/sbin/dnssec-checkds"
-		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds"
-	fi
-
-	# bug 450406
-	dosym 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-9.9.2_p1-libxml.patch b/net-dns/bind/files/bind-9.9.2_p1-libxml.patch
deleted file mode 100644
index d07b09a696cf..000000000000
--- a/net-dns/bind/files/bind-9.9.2_p1-libxml.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-