Cleanup due to security bug #525656

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

15 files changed, 19 insertions, 1122 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index e7ca8d518581..0472039a1794 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.437 2014/12/06 16:48:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.438 2014/12/09 18:45:10 pacho Exp $
+
+  09 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libxml2-2.9.0-manual-python.patch,
+  -files/libxml2-2.9.0-thread-alloc.patch,
+  -files/libxml2-2.9.1-compression-detection.patch,
+  -files/libxml2-2.9.1-external-param-entities.patch,
+  -files/libxml2-2.9.1-icu-pkgconfig.patch,
+  -files/libxml2-2.9.1-missing-break.patch,
+  -files/libxml2-2.9.1-non-ascii-cr-lf.patch,
+  -files/libxml2-2.9.1-python-2.6.patch, -files/libxml2-2.9.1-python3.patch,
+  -files/libxml2-2.9.1-python3a.patch,
+  -files/libxml2-2.9.1-xmllint-postvalid.patch, -libxml2-2.9.1-r4.ebuild,
+  -libxml2-2.9.1-r5.ebuild:
+  Cleanup due to security bug #525656
 
   06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libxml2-2.9.2.ebuild:
   Stable for ia64, wrt bug #525656
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index abe3906bb36b..a567da597241 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -3,43 +3,19 @@ Hash: SHA256
 
 AUX libxml2-2.7.1-catalog_path.patch 2209 SHA256 b3343f0611f9cb6e55bf62047a988653e3e9cc50f194b18adbc330b455236290 SHA512 99c1953865c560d2b7a01cf5fd61b1c5150857f3df8a9753ca583f6ff0a99e01c02d2586bb12220a615cf9c40a540dbe0d17996c0547bc0d20cbeefd6b45682d WHIRLPOOL 9b4daf434b38a0ae8103f02625ae033e7a94012a18cabc981f34b93fe8b422477905b74cfee300eb6a37e1af8bd358dd84804a5d0b6be8645ae9ee3e4c6fcd9b
 AUX libxml2-2.8.0_rc1-winnt.patch 2392 SHA256 c18b2c15550b3ff4709a85cd18d16368928319b1b7fd8875dc34acd67076b134 SHA512 e78d010c82f18386b4f0ff84497585755b43416563bccd11f8e4dbf0153ca8842934fe05dce6c2373d8360574a2165795a78ea991682aed9610000d2bfcb0164 WHIRLPOOL a87eefa17ad113ae4aed14744715b4e1781e0869a3bb789bdf4f243bdb3687d0d4b6ee2addc85bf5b2f86b9d1cc442d946f0329011f033e3a7855ae0ad79b745
-AUX libxml2-2.9.0-manual-python.patch 1409 SHA256 647023249861bece60c719c49421a539342ab11a9c9023ee3175e29faaa24974 SHA512 1e06c52c729752d5bb72ac57ec0aa5c384eed49f79d38088eb9514c0a15c0f433309cd60ebfabbe75bf6166d93d1c7eb2a5ba6fd44a18bea8583590fdbcb3f11 WHIRLPOOL ec9653cab65af8833fef1264fe96ceeb8863047a3f699b8e69afbe8e5e47ef50e4e589a62d305d58352f560507cb606e45e1be5603b3b3758474fa192bb51506
-AUX libxml2-2.9.0-thread-alloc.patch 1819 SHA256 ab0e44f05903ea70babeff17aaac09f344c9ce069264ecb4f27f9a6929c6af73 SHA512 80308f3f0087bcc0f08848e10c75b6333247f960190940e7a20575ce41d382fbd46350b0b8631a6c877f8edb06bcc930659c9e9e8ea71bc381f0a4287c22c935 WHIRLPOOL 24c4ba69c70ff949848795418cbfe59326c09a0b90126c67853fe7ee39854a824c56e092e7dacfe6a969eb4d451e6d2354c382c03e6d5c657eab07a50c14babe
-AUX libxml2-2.9.1-compression-detection.patch 3415 SHA256 02497f74371338b681e372b3fa6cdb3d24aa675caaa7a2e50fcf9bb117f29951 SHA512 28e1b914d60dea06d72de0523d289a4dca82ab3c505d796a223880fecebe22578369400a31f5d0f6ac02375e171ccb96368c0eb06ddaa67d9be377fc37c03357 WHIRLPOOL ca3eddb2ae8cdd088bb6b6a62c697a56d149a1134b892d2108d20baed4f4d951b8709604ac9d1b6cb8d6371a41b730c01e295de463242c6986401e25b518e622
-AUX libxml2-2.9.1-external-param-entities.patch 1374 SHA256 4066788b3c1b3be48ff8e79c35096c9cbe9c08d1da8d74d75d2a5992ba27a764 SHA512 020ba4c532776e09f4e2084419a532c75f4545235c080af9ffa9934703b6485fa32156ae7b287e13c219a47c6ce01a13298c448d8d61d905b5446d5cef1c4e5a WHIRLPOOL 661ca93431638c1025e56513e63ffa146a5fb9c9c48b11445e034e344cfe223bc03123b90a90b552cee005ce1fde82949f279cf5f96e9cfe85a74e5c506086b8
-AUX libxml2-2.9.1-icu-pkgconfig.patch 653 SHA256 e4a02666bd25e0771dcfa75edd4b22c4d2035c4c47f47f29f30b925a58bc38f7 SHA512 3d63f1f19b06a3edc92024e6b057a9d6c47274659ebebe59d20bc8e2fb62c902f19b1407aeb0903fa618aff4f43093997621dfc05dfef780df65db7d6bc2c44d WHIRLPOOL 28502cbd819bb6aedce3059ae6482cefab895053ff5dbf0d79aeb69663c77ffd38bee18a07a0e67d92424c32b6911089ba877c7a68b5badd91a321fe59dc59f5
-AUX libxml2-2.9.1-missing-break.patch 670 SHA256 98681d90b279174160e8bd3901f468544a7956d163c86473a60756be05191bad SHA512 2efee76fffd0da39e197b9a51bcc3925323ae4e1e861f55daec9ae7872166b24ed207970ef8573d306c267215f1ddf5439b45f2cb6b6d308bf749b22accf5c97 WHIRLPOOL f51d55103ad2060c883091e23554e5d70724fa4b2a58767b6d15143f447f445aa09df1ad7ac022f84d53f5339478e4f9ab8624918ab61f44402e6f59b2a7785e
-AUX libxml2-2.9.1-non-ascii-cr-lf.patch 5842 SHA256 1613e564814437ab1ddc28cb468cdebaff7e46587b364a4a6c7904c7b8da78b9 SHA512 1db9a31c1457e5ca6cb4397eb898a93e8985f1c73a5e213cbc1b70bc569fcef08c77af2f9123ed5b814903acda6cdf2e8b38434c81665f4456c8de4adb9345eb WHIRLPOOL adf9bb6dbff21494439589dc4f7b41d0719e0905811acc6719f637deffc0257f5aaf82534b8bf7761793a4ab7ecb12232a3de9d86c01391e6137043dbda22678
-AUX libxml2-2.9.1-python-2.6.patch 912 SHA256 5a6e6def4dda78be1f44eb72c0e108f9c5deb4e74324d7845d024d643042c0b7 SHA512 9bf67f06301e1c59b232b00540305cf570b9dc32e8ac7b91d7bcfe188a668dfa6e5cfa13399267f9683ff484df317433536ad1a4d0c49a4ed068ea55d841cee2 WHIRLPOOL 99de5f267813e0f6ae13e408bc6e596bdd228cf7b72f3f38e2edeceff4ed6fc1ad1a2b1ee1e1d85bd4d3a7f9a27e215e8d1d7f264f3a2e25e3d8313dfd46d3d7
-AUX libxml2-2.9.1-python3.patch 1328 SHA256 3702b2aec5e40b906358d13c11864fa0933b83f908f634171310e912bd6c2cd9 SHA512 29bbc4c4e58d8a5f24b6c58f61b3adef916becd2ba0a4c098faf5e889d0537d7f696237045b47a239b323babf637aa220f964d18cc047b8fb1bd3bf3b829d85c WHIRLPOOL ace0531053dbf8b0d8bafeb8ea03e1ff972608cc44dee8b238163264d43e8e8ffff8550066b30946b8f9a185f05f58b3a7e0892939802a0fc54e0a2c6963d0f0
-AUX libxml2-2.9.1-python3a.patch 1745 SHA256 0df91eae57ccd8db35c80ae479ea155c1b1cb28d6793b0526792a0d02c835028 SHA512 0d5b253af29fa88c1d7011d9f977283fd37aa6899689fad00b4c05cb7aa412fbaffcdc514a03a3da69708e5b347aa7519a901ffa2ae3fa271e9bca53efd802af WHIRLPOOL 61e8a7cd40ddfa89e6997bd47a8d9491e3f6bd15208c6448f6c2d61c99de4c4da6da6257d95eefeed7399cc768de0fb3658f3a441e8c78983cf91ed77b107c85
-AUX libxml2-2.9.1-xmllint-postvalid.patch 1167 SHA256 68e8448e81f56a2ce5e6f87d6330197e1afc8fd95f65705cd90a97f4613e2b7c SHA512 90f1cf6bc58fde94538f3fcc0f9ab8de97443ebafaeb96a4420ac107d4d3ab6c795544db774b3ad58fabc96098dfca7e4f3c8a51384b35cd2ccd02e6310ef98e WHIRLPOOL 220a58c6dc64054d4b925fd59c8cb93950e04eae0d528ddd20950611e1807868f12a88cf2fc537aaaaaacf427429b74653598d20afd796fd01afcd1663ef56ff
 AUX libxml2-2.9.2-icu-pkgconfig.patch 653 SHA256 b7e0e8ce27990d1ad8ef8eb3372a6cb9f8d7de5b0674613082ec3f6cdf214af1 SHA512 516fe55dc1500146e3fb1b8cf1c567aca668f54e65d7b595694cf668278217f0c2c82a03201dcdb463f8d5adda2620b42176a799bbaf2e1521500f8ed3971601 WHIRLPOOL f49a55065ab1a7d4159aa32b3182ae79c0b1d753f4aa81ef109eb38a2baa86c53a2ac98c391eebf0d1152206ec967adc1e4b41d6bbdabe3e6de791360d5c17af
 AUX libxml2-2.9.2-revert-missing-initialization.patch 715 SHA256 160258250f519b9d71e7d4ba913df6b2ba6109e1ac533bd19a3061ffbe82cd18 SHA512 cdad2b866684cc3193a5f3254339659e28ab4af988ba257ac0c41d42bf18c82665127cc705d36313f3bd4e5d6e1bb5bab0e966e9068398c62755ba54adea6b17 WHIRLPOOL 9addff866a02bee035b7aeccd4bd50baa74b0104c166cf02927fd779c92e41b119896a7fb2dcd0e255c7614018a80585b37f954ec36ae1a5871e0f885baff187
-DIST libxml2-2.9.1.tar.gz 5172503 SHA256 fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb SHA512 7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b WHIRLPOOL 5d2874527b637e666ca6afe710991aecb60c490de38edbe09a703c8e80c776d3f121544cc383146c336d46c573f3a3c9a2491c6c9cd5f22c5474d66dcb8ecf9b
 DIST libxml2-2.9.2.tar.gz 5444991 SHA256 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc SHA512 a4e3b20e2efceed39c20379b32b746d4a1cf65c0cf7719d26c9bf7483c1f04a4e5a442ae2f36dc4ae8a4d011b67cfb58d9f6d0be034fa3e897a49059c9289565 WHIRLPOOL d7a77cb6ad49533cf62f6a759668e297a60dd7f70c9e13b29f682c64dfb25ae46eb9db552500130f40e3f969897bda996001d18236a4630e3713f6dd5acbe686
 DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda
 DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
 DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d
-EBUILD libxml2-2.9.1-r4.ebuild 6844 SHA256 0f70fc40ba1c7648be51cc7120468f8f3af6c8f3e07cc4b29beb1c95a5d5f518 SHA512 3d6e247c03d4a044fb0a5cefeefa1c36eb505301f04606eb38c8dc2cea5380ca28914f899bafef28993e5d60edf680fca7e5384e533be8d4c0ba558d63f9da85 WHIRLPOOL a662604a03c7d221049227f76865ec9a43eff52846c98a43d41d3ad167faed16cee387e121518505f3a6ca0dcf79d5b7bbdcb04a9383932c199961a81ee00391
-EBUILD libxml2-2.9.1-r5.ebuild 6904 SHA256 98548735420b4c438465d184301d1be6e54791b9b5e67ad676f76154f26ccc29 SHA512 f8b248e5dcf2e2ea5ef8589094946b6b36f9225e8226c373899165076957d9d1fbc9aea3adb9095159b2e5a3a460e3931c0873ccc958bc1966b524c1e9722ea8 WHIRLPOOL 44a5fe3bf62c731e316f54f976b75bf0082ac389cbade522788dbf195d5ae0772ae6724500af802f506d505c1880456b01d4c8522c7494ea0ed98b991ff946f8
 EBUILD libxml2-2.9.2.ebuild 6518 SHA256 f33bd194efc2b3fae15b2bf8db1213b6ec2cea0501f8d2969728c729a75c400a SHA512 f5fc8de20ef45f425d28da6771dfbb86c41803adca8236df44e5c98cdec24ddd19db555134077d62ec5b80352a4f32af6d421cca1df93c3a8204e1d29de60f01 WHIRLPOOL 9e5ce658f128ef194171492c2484671e89b24c6156ae00d278bbc011961ad4aeff2c038e63c273108658a511417aa44cc9dd19d51943cd576618c3c3c63dd469
-MISC ChangeLog 62428 SHA256 93b363196a77b72c98366e2db231f86e0378bfa172aeb23a6edbc0afdac5ffd3 SHA512 91eb9503a379e7499f6e24d469ff3663f5b707286e7ff8e90eed61f5d3be44add92ac2751fef61a69a1f03a002e9b54154d774125f61c9630a0281019136886c WHIRLPOOL 124427e3eccfc4e6c50483553577503dd4f7c19b8a89f70d0613e4d32c6bf2db0fe1130da2c4bf34bdbc82ca67568fcd42da81b4539a03975d7f1a618439c850
+MISC ChangeLog 63060 SHA256 9a569ff706616f8401fe35a56bb2bac6c2b3345829849a226f305ed6e5440c85 SHA512 3cdb9731e828a59889a0457b57017d3ce280bf4f50079fa0227bab7ea416168a889086235fd26fcee48d3293560b73fa00256092378e3389466436ef38407632 WHIRLPOOL d86792cc16f7ce9d1e4494b5f7d26d173acd137c070e59356ccfa620d45fb8670d65775e86851d032225af0894ca0829e484b13e75db04a2dbdf3189b5cacce6
 MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgzNtAAoJELp701BxlEWf44UP/1u7b4dBz1CnC4DbyMfR+tGP
-QxhSUYMD54qOX1Tg7SMX2CrgdCZPjhdU1avM2ibcIejFpuzQktRS7YgqQjnYrWvy
-gatVij2EuXYqYSQ7CGc9J2m7DqYhT8jtPeEHJcvBP2Z9t+nT5GB8vO7SBLdBEK0+
-Wpw4xwnRWaJB6Oo31BbVxwU030gp8JrEbzP70qjErWwfpotoygFXeWmOmgGY/3zH
-SEkZke5wBFKYdsjXmqziNK3vq+p3wNCzbDlDWY3xp3rpM7XPrWJY6hFPtFncQtHN
-Cn7qIG0wPJuRcA1ADLOufTlFK7b1gLKBs6FlADsGo1Uftkt7w7wwPENhteQnpSCC
-5Zs7+JC37Cgau1bRkwlEQqZc0s00ns5VMaHq/7L89aW1j9A64CXFK6aCIU4+1udi
-x3ZeuZ+8+6k8vB1/i5nOxpquaOV/QxzH1S0hk/Naz1NP+B4fjH8g5BDr3xIkV8vI
-ZFbtPWgxTHTkS2rzs3rhbCywYPpOhbL8Se08B29RSVuh8QTQFPaaClyWtIuvQ23u
-2G6Smh+qMNNQngd5KAi0VllBUsO4ld61++y0uncUinbamlROO1Y665dsKteRoG11
-CP+/8Th1YmHuyu38FXKjhWXLbtJlzID+elXId/fG+8giI+n8BIRpEJd8cOr/r8D9
-/knFuM+jMXGu1z6pFkPv
-=CZ1Q
+iEYEAREIAAYFAlSHQzoACgkQCaWpQKGI+9QtYQCggWUvJH70j2nO+HHrFCGUv+s1
+hGAAnRuaeCq2n6I7C8tczR0A1/l4HaLY
+=6GsE
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch b/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
deleted file mode 100644
index 2ebb4f040ada..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2a74d41325c9e8043a2beec8b957ddf66f57cfd5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 18 Dec 2012 02:09:14 -0500
-Subject: [PATCH] build/test/install python bindings manually
-
-To support building for multiple python ABIs, we want to skip checks for
-python in configure, and build/test/install python bindings manually.
----
- configure.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 3d5f48b..b467c51 100644
---- a/configure.in
-+++ b/configure.in
-@@ -748,7 +748,7 @@ PYTHON_INCLUDES=
- PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
--if test "$with_python" != "no" ; then
-+if false ; then
-     if test -x "$with_python/bin/python"
-     then
-         echo Found python in $with_python/bin/python
-@@ -823,7 +823,7 @@ if test "$with_python" != "no" ; then
- else
-     PYTHON=
- fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
-+AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no")
- if test "$PYTHON_INCLUDES" != ""
- then
-     PYTHON_SUBDIR=python
-@@ -1429,7 +1429,7 @@ else
-     echo "Enabled Schemas/Relax-NG support"
-     WITH_SCHEMAS=1
-     TEST_SCHEMAS="Schemastests Relaxtests"
--    if test "$PYTHON_INCLUDES" != "" ; then
-+    if test "$with_python" != "no" ; then
-         PYTHON_TESTS="$PYTHON_TESTS RelaxNGPythonTests SchemasPythonTests"
-     fi
-     with_regexps=yes
--- 
-1.8.0.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
deleted file mode 100644
index 2d0d5f788a4e..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0ad948ede2b5060a144c72e4e27c38d24a272ef4 Mon Sep 17 00:00:00 2001
-From: Tim Starling <tstarling@wikimedia.org>
-Date: Mon, 29 Oct 2012 13:41:55 +1100
-Subject: [PATCH] Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h
-
-Otherwise, direct calls to xmlFree() etc. from the application will
-use a different set of allocation functions to what was used to allocate
-the memory internally.
----
- configure.in                   | 4 +++-
- include/libxml/xmlversion.h.in | 9 +++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 6da057c..245c033 100644
---- a/configure.in
-+++ b/configure.in
-@@ -954,6 +954,7 @@ WITH_THREADS=0
- THREAD_CFLAGS=""
- TEST_THREADS=""
- THREADS_W32=""
-+WITH_THREAD_ALLOC=0
- 
- if test "$with_threads" = "no" ; then
-     echo Disabling multithreaded support
-@@ -1017,7 +1018,7 @@ else
-     fi
- fi
- if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then
--    THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED"
-+    WITH_THREAD_ALLOC=1
- fi
- 
- AC_SUBST(THREAD_LIBS)
-@@ -1025,6 +1026,7 @@ AC_SUBST(BASE_THREAD_LIBS)
- AC_SUBST(WITH_THREADS)
- AC_SUBST(THREAD_CFLAGS)
- AC_SUBST(TEST_THREADS)
-+AC_SUBST(WITH_THREAD_ALLOC)
- AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"])
- 
- dnl
-diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
-index c98e7ca..00a836f 100644
---- a/include/libxml/xmlversion.h.in
-+++ b/include/libxml/xmlversion.h.in
-@@ -98,6 +98,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
- #endif
- 
- /**
-+ * LIBXML_THREAD_ALLOC_ENABLED:
-+ *
-+ * Whether the allocation hooks are per-thread
-+ */
-+#if @WITH_THREAD_ALLOC@
-+#define LIBXML_THREAD_ALLOC_ENABLED
-+#endif
-+
-+/**
-  * LIBXML_TREE_ENABLED:
-  *
-  * Whether the DOM like tree manipulation API support is configured in
--- 
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch b/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
deleted file mode 100644
index 16ea5c192703..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 63588f476f2dc89d4c6ef70a474d7230fbf4d45e Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 10 May 2013 14:01:46 +0800
-Subject: [PATCH] Fix a regression in xmlGetDocCompressMode()
-
-The switch to xzlib had for consequence that the compression
-level of the input was not gathered anymore in ctxt->input->buf,
-then the parser compression flags was left to -1 and propagated
-to the resulting document.
-Fix the I/O layer to get compression detection in xzlib,
-then carry it in the input buffer and the resulting document
-
-  This should fix
-    https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=3456
----
- parser.c |  4 ++++
- xmlIO.c  | 17 +++++++++++++++++
- xzlib.c  | 25 +++++++++++++++++++++++++
- xzlib.h  |  1 +
- 4 files changed, 47 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 1d478c3..4a442bb 100644
---- a/parser.c
-+++ b/parser.c
-@@ -10681,6 +10681,10 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
-         ctxt->sax->startDocument(ctxt->userData);
-     if (ctxt->instate == XML_PARSER_EOF)
- 	return(-1);
-+    if ((ctxt->myDoc != NULL) && (ctxt->input != NULL) &&
-+        (ctxt->input->buf != NULL) && (ctxt->input->buf->compressed >= 0)) {
-+	ctxt->myDoc->compression = ctxt->input->buf->compressed;
-+    }
- 
-     /*
-      * The Misc part of the Prolog
-diff --git a/xmlIO.c b/xmlIO.c
-index 847cb7e..fc4e111 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2669,6 +2669,12 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #endif
- 	}
- #endif
-+#ifdef HAVE_LZMA_H
-+	if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) &&
-+		(strcmp(URI, "-") != 0)) {
-+            ret->compressed = __libxml2_xzcompressed(context);
-+	}
-+#endif
-     }
-     else
-       xmlInputCallbackTable[i].closecallback (context);
-@@ -3325,6 +3331,17 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
-     if (res < 0) {
- 	return(-1);
-     }
-+
-+    /*
-+     * try to establish compressed status of input if not done already
-+     */
-+    if (in->compressed == -1) {
-+#ifdef HAVE_LZMA_H
-+	if (in->readcallback == xmlXzfileRead)
-+            in->compressed = __libxml2_xzcompressed(in->context);
-+#endif
-+    }
-+
-     len = res;
-     if (in->encoder != NULL) {
-         unsigned int use;
-diff --git a/xzlib.c b/xzlib.c
-index 928bd17..150e803 100644
---- a/xzlib.c
-+++ b/xzlib.c
-@@ -182,12 +182,37 @@ xz_open(const char *path, int fd, const char *mode ATTRIBUTE_UNUSED)
-     return (xzFile) state;
- }
- 
-+static int
-+xz_compressed(xzFile f) {
-+    xz_statep state;
-+
-+    if (f == NULL)
-+        return(-1);
-+    state = (xz_statep) f;
-+    if (state->init <= 0)
-+        return(-1);
-+
-+    switch (state->how) {
-+        case COPY:
-+	    return(0);
-+	case GZIP:
-+	case LZMA:
-+	    return(1);
-+    }
-+    return(-1);
-+}
-+
- xzFile
- __libxml2_xzopen(const char *path, const char *mode)
- {
-     return xz_open(path, -1, mode);
- }
- 
-+int
-+__libxml2_xzcompressed(xzFile f) {
-+    return xz_compressed(f);
-+}
-+
- xzFile
- __libxml2_xzdopen(int fd, const char *mode)
- {
-diff --git a/xzlib.h b/xzlib.h
-index 43c75e1..29ba55e 100644
---- a/xzlib.h
-+++ b/xzlib.h
-@@ -15,4 +15,5 @@ xzFile __libxml2_xzopen(const char *path, const char *mode);
- xzFile __libxml2_xzdopen(int fd, const char *mode);
- int __libxml2_xzread(xzFile file, void *buf, unsigned len);
- int __libxml2_xzclose(xzFile file);
-+int __libxml2_xzcompressed(xzFile f);
- #endif /* LIBXML2_XZLIB_H */
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch b/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
deleted file mode 100644
index 81f692fc71f6..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 22 Apr 2014 15:30:56 +0800
-Subject: [PATCH] Do not fetch external parameter entities
-
-Unless explicitely asked for when validating or replacing entities
-with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com>
----
- parser.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 9347ac9..c0dea05 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- 		    xmlCharEncoding enc;
- 
- 		    /*
-+		     * Note: external parsed entities will not be loaded, it is
-+		     * not required for a non-validating parser, unless the
-+		     * option of validating, or substituting entities were
-+		     * given. Doing so is far more secure as the parser will
-+		     * only process data coming from the document entity by
-+		     * default.
-+		     */
-+                    if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
-+		        ((ctxt->options & XML_PARSE_NOENT) == 0) &&
-+			((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
-+			(ctxt->validate == 0))
-+			return;
-+
-+		    /*
- 		     * handle the extra spaces added before and after
- 		     * c.f. http://www.w3.org/TR/REC-xml#as-PE
- 		     * this is done independently.
--- 
-1.9.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
deleted file mode 100644
index ab330389d62c..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 7374564..13c8d4e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
- AC_SUBST(WITH_ICONV)
- 
- WITH_ICU=0
--ICU_LIBS=""
- if test "$with_icu" != "yes" ; then
-     echo Disabling ICU support
- else
--    ICU_CONFIG=icu-config
--    if ${ICU_CONFIG} --cflags >/dev/null 2>&1
--    then
--        ICU_LIBS=`${ICU_CONFIG} --ldflags`
--        WITH_ICU=1
--        echo Enabling ICU support
--    else
--        AC_MSG_ERROR([libicu config program icu-config not found])
--    fi
-+    PKG_CHECK_MODULES(ICU, icu-i18n)
-+    WITH_ICU=1
- fi
- AC_SUBST(WITH_ICU)
- AC_SUBST(ICU_LIBS)
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch b/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
deleted file mode 100644
index 57665323892d..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10ec19ab0a49936ca8ca0d6962d24d3f889960a5 Mon Sep 17 00:00:00 2001
-From: dcb <dcb314@hotmail.com>
-Date: Thu, 2 May 2013 16:11:46 +0800
-Subject: [PATCH] Fix missing break on last() function for attributes
-
-pointed out by cppcheck
----
- python/libxml.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index 03cfb9f..3338b83 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -2683,6 +2683,7 @@ libxml_last(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
-                 xmlAttrPtr attr = (xmlAttrPtr) cur;
- 
-                 res = attr->last;
-+		break;
-             }
-         default:
-             res = NULL;
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch b/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
deleted file mode 100644
index 51a92adaf9bc..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From dcc19503193c71596278a252064a8ce66331b3cd Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 22 May 2013 22:56:45 +0200
-Subject: [PATCH] Fix a parsing bug on non-ascii element and CR/LF usage
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698550
-
-Somehow the behaviour of the internal parser routine changed
-slightly when encountering CR/LF, which led to a bug when
-parsing document with non-ascii Names
----
- parser.c                   |  6 +++++-
- result/japancrlf.xml       |  4 ++++
- result/japancrlf.xml.rde   |  7 +++++++
- result/japancrlf.xml.rdr   |  7 +++++++
- result/japancrlf.xml.sax   | 11 +++++++++++
- result/japancrlf.xml.sax2  | 11 +++++++++++
- result/noent/japancrlf.xml |  4 ++++
- test/japancrlf.xml         |  6 ++++++
- 8 files changed, 55 insertions(+), 1 deletion(-)
- create mode 100644 result/japancrlf.xml
- create mode 100644 result/japancrlf.xml.rde
- create mode 100644 result/japancrlf.xml.rdr
- create mode 100644 result/japancrlf.xml.sax
- create mode 100644 result/japancrlf.xml.sax2
- create mode 100644 result/noent/japancrlf.xml
- create mode 100644 test/japancrlf.xml
-
-diff --git a/parser.c b/parser.c
-index 4a442bb..4739add 100644
---- a/parser.c
-+++ b/parser.c
-@@ -3404,6 +3404,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-     int len = 0, l;
-     int c;
-     int count = 0;
-+    const xmlChar *end; /* needed because CUR_CHAR() can move cur on \r\n */
- 
- #ifdef DEBUG
-     nbParseNCNameComplex++;
-@@ -3413,6 +3414,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-      * Handler for more complex cases
-      */
-     GROW;
-+    end = ctxt->input->cur;
-     c = CUR_CHAR(l);
-     if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */
- 	(!xmlIsNameStartChar(ctxt, c) || (c == ':'))) {
-@@ -3434,12 +3436,14 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- 	}
- 	len += l;
- 	NEXTL(l);
-+	end = ctxt->input->cur;
- 	c = CUR_CHAR(l);
- 	if (c == 0) {
- 	    count = 0;
- 	    GROW;
-             if (ctxt->instate == XML_PARSER_EOF)
-                 return(NULL);
-+	    end = ctxt->input->cur;
- 	    c = CUR_CHAR(l);
- 	}
-     }
-@@ -3448,7 +3452,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-         xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName");
-         return(NULL);
-     }
--    return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len));
-+    return(xmlDictLookup(ctxt->dict, end - len, len));
- }
- 
- /**
-diff --git a/result/japancrlf.xml b/result/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
---- /dev/null
-+++ b/result/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/result/japancrlf.xml.rde b/result/japancrlf.xml.rde
-new file mode 100644
-index 0000000..0bc5af7
---- /dev/null
-+++ b/result/japancrlf.xml.rde
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1 
-+	
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1 
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.rdr b/result/japancrlf.xml.rdr
-new file mode 100644
-index 0000000..0bc5af7
---- /dev/null
-+++ b/result/japancrlf.xml.rdr
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1 
-+	
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1 
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.sax b/result/japancrlf.xml.sax
-new file mode 100644
-index 0000000..c3bbdc6
---- /dev/null
-+++ b/result/japancrlf.xml.sax
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElement(入力メッセージ, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+	, 2)
-+SAX.startElement(c8c:Ele, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endElement(c8c:Ele)
-+SAX.characters(
-+, 1)
-+SAX.endElement(入力メッセージ)
-+SAX.endDocument()
-diff --git a/result/japancrlf.xml.sax2 b/result/japancrlf.xml.sax2
-new file mode 100644
-index 0000000..878eae4
---- /dev/null
-+++ b/result/japancrlf.xml.sax2
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.characters(
-+	, 2)
-+SAX.startElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.endElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+, 1)
-+SAX.endElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endDocument()
-diff --git a/result/noent/japancrlf.xml b/result/noent/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
---- /dev/null
-+++ b/result/noent/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/test/japancrlf.xml b/test/japancrlf.xml
-new file mode 100644
-index 0000000..480cb2d
---- /dev/null
-+++ b/test/japancrlf.xml
-@@ -0,0 +1,6 @@
-+<入力メッセージ
-+	xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele
-+		xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"
-+	/>
-+</入力メッセージ>
-\ No newline at end of file
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
deleted file mode 100644
index c79709db2824..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 722923bc9b788f028e4221c77138fc66735a3113 Mon Sep 17 00:00:00 2001
-From: Petr Sumbera <petr.sumbera@oracle.com>
-Date: Fri, 3 May 2013 22:25:38 +0800
-Subject: [PATCH] Fix for compilation with python 2.6.8
-
-Remap PyCapsule to PyCObject based on the macro being available
-instead of using the python version
----
- python/libxml_wrap.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h
-index a9b9739..53a0618 100644
---- a/python/libxml_wrap.h
-+++ b/python/libxml_wrap.h
-@@ -34,11 +34,11 @@
- #define PyBytes_AsString PyString_AsString
- #define PyBytes_AS_STRING PyString_AS_STRING
- #define PyBytes_GET_SIZE PyString_GET_SIZE
--
-+#endif
-+#ifndef PyCapsule_New
- #define PyCapsule_New PyCObject_FromVoidPtrAndDesc
- #define PyCapsule_CheckExact PyCObject_Check
- #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
--
- #endif
- #endif
- 
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
deleted file mode 100644
index 5c4e83da0c10..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 927faac6113b625a9a3423eef8f144fc7d9a8547 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 10 Jul 2013 23:00:54 -0400
-Subject: [PATCH] python: fix drv_libxml2.py for python3 compatibility
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703979
----
- python/drv_libxml2.py | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index e43fb1d..c9075e6 100644
---- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -34,12 +34,20 @@ TODO
- 
- """
- 
--__author__  = u"Stéphane Bidoul <sbi@skynet.be>"
-+__author__  = "Stéphane Bidoul <sbi@skynet.be>"
- __version__ = "0.3"
- 
-+import sys
- import codecs
--from types import StringType, UnicodeType
--StringTypes = (StringType,UnicodeType)
-+
-+if sys.version < "3":
-+    __author__  = codecs.unicode_escape_decode(__author__)[0]
-+
-+    from types import StringType, UnicodeType
-+    StringTypes = (StringType,UnicodeType)
-+
-+else:
-+    StringTypes = (str)
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -65,7 +73,7 @@ def _d(s):
- 
- try:
-     import libxml2
--except ImportError, e:
-+except ImportError as e:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
-                                 "import error was: %s" % e)
- 
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
deleted file mode 100644
index d07a1e2831fe..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6dd7775f3506741093890d99f09c242e0b34b55f Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail..com>
-Date: Fri, 12 Jul 2013 11:18:11 +0800
-Subject: [PATCH] Another round of fixes for older versions of Python
-
----
- python/drv_libxml2.py | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index c9075e6..c2ec3e2 100644
---- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -40,14 +40,12 @@ __version__ = "0.3"
- import sys
- import codecs
- 
--if sys.version < "3":
-+if sys.version_info[0] < 3:
-     __author__  = codecs.unicode_escape_decode(__author__)[0]
- 
--    from types import StringType, UnicodeType
--    StringTypes = (StringType,UnicodeType)
--
-+    StringTypes = (str, unicode)
- else:
--    StringTypes = (str)
-+    StringTypes = str
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -73,9 +71,9 @@ def _d(s):
- 
- try:
-     import libxml2
--except ImportError as e:
-+except ImportError:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
--                                "import error was: %s" % e)
-+                                "import error was: %s" % sys.exc_info()[1])
- 
- class Locator(xmlreader.Locator):
-     """SAX Locator adapter for libxml2.xmlTextReaderLocator"""
-@@ -142,7 +140,7 @@ class LibXml2Reader(xmlreader.XMLReader):
-         self.__parsing = 1
-         try:
-             # prepare source and create reader
--            if type(source) in StringTypes:
-+            if isinstance(source, StringTypes):
-                 reader = libxml2.newTextReaderFilename(source)
-             else:
-                 source = saxutils.prepare_input_source(source)
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
deleted file mode 100644
index 7ce2f3b95f41..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 May 2014 22:46:00 -0400
-Subject: [PATCH] xmllint: a posteriori validation needs to load exernal
- entities
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=730290
----
- xmllint.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xmllint.c b/xmllint.c
-index 9d46ac5..b142b3b 100644
---- a/xmllint.c
-+++ b/xmllint.c
-@@ -3530,7 +3530,12 @@ main(int argc, char **argv) {
- 	xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
-     if (noent != 0) xmlSubstituteEntitiesDefault(1);
- #ifdef LIBXML_VALID_ENABLED
--    if (valid != 0) xmlDoValidityCheckingDefaultValue = 1;
-+    /* If we will validate only a posteriori, ensure that entities get loaded,
-+     * but suppress validation messages during initial parsing */
-+    if (postvalid != 0 && valid == 0)
-+	options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
-+    else if (valid != 0)
-+	xmlDoValidityCheckingDefaultValue = 1;
- #endif /* LIBXML_VALID_ENABLED */
-     if ((htmlout) && (!nowrap)) {
- 	xmlGenericError(xmlGenericErrorContext,
--- 
-1.9.3
-
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild
deleted file mode 100644
index eb30b15af694..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild,v 1.12 2014/06/24 19:59:48 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-#	epunt_cxx # if we don't eautoreconf
-
-	# Important patches from 2.9.2
-	epatch "${FILESDIR}/${P}-missing-break.patch" \
-		"${FILESDIR}/${P}-python-2.6.patch" \
-		"${FILESDIR}/${P}-compression-detection.patch" \
-		"${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3a.patch"
-
-	# Security fixes from 2.9.2
-	epatch "${FILESDIR}/${P}-external-param-entities.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=730290
-	epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-
-	# Use pkgconfig to find icu to properly support multilib
-	epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_parallel_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use python; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/python
-		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
-	fi
-
-	if ! use examples; then
-		rm -rf "${ED}/usr/share/doc/${PF}/examples"
-		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
deleted file mode 100644
index 9a2f7e39f5c2..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild,v 1.1 2014/09/03 09:51:22 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-#	epunt_cxx # if we don't eautoreconf
-
-	# Important patches from 2.9.2
-	epatch "${FILESDIR}/${P}-missing-break.patch" \
-		"${FILESDIR}/${P}-python-2.6.patch" \
-		"${FILESDIR}/${P}-compression-detection.patch" \
-		"${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3a.patch"
-
-	# Security fixes from 2.9.2
-	epatch "${FILESDIR}/${P}-external-param-entities.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=730290
-	epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-
-	# Use pkgconfig to find icu to properly support multilib
-	epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_parallel_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use python; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/python
-		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
-	fi
-
-	if ! use examples; then
-		rm -rf "${ED}/usr/share/doc/${PF}/examples"
-		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}