12 files changed, 74 insertions, 188 deletions
diff --git a/dev-python/hcs-utils/Manifest b/dev-python/hcs-utils/Manifest
index 59bb7594cff7..a4f7a281b393 100644
--- a/dev-python/hcs-utils/Manifest
+++ b/dev-python/hcs-utils/Manifest
@@ -4,4 +4,4 @@ EBUILD hcs-utils-1.5.ebuild 692 SHA256 4f8576089d66df12fae55ad0a12347c50aff768b9
 EBUILD hcs-utils-2.0.ebuild 690 SHA256 380e7ea77b983458c42197512d2d71d2d3c50b3a0d467377b41c6ad5154b89aa SHA512 e5bd5e46cea8b920ceef6e35531056e3d14d657c338477fffafdfd42c9b944c0565f05feb0c1f67bc2f8cedf3642cfa90e7c14af85fcb43f4278909df6f5948f WHIRLPOOL e11d7faf6d3a9174d6e888f8e89229567b374c60dfea517a0a079c1d7c131982457f4d1b1901cc4fcae5c661fa61ed99a3784ea23036edf94975c603dc3cdcb3
 MISC ChangeLog 2650 SHA256 1115e3852edfff30ae57e01ba72420fa771fae7498abcdcd0453be11e7c58ff0 SHA512 31897daeec0a3284f8a4794e5e56d89dec9f246f753c3520b31b1cf067cc43cd96de45e9a77abb343b46097ac7dc89d5fb8e49e9cbdcda5f1510851ee6e5af8f WHIRLPOOL 34c2a70430aad1cce76f2cec5c12efeeaf5e1a72afbb2ab40996e20fb7373c0fc4fce673163b11c1cad6e694406505f9b5e9aded8df22390ca136b73f72dd96d
 MISC ChangeLog-2015 1888 SHA256 582d3c0f21780a911c8e9e4c899547f859a7ac311dad71063cf00b5e7ff46eea SHA512 5107ff1ba395aca69fd27416737888d3e95751b53bd202448b69180e4ef7d07db9e223614a36c9bc5f0f7a08211cb179612b19fb911f420c7f582e9208903676 WHIRLPOOL 28e082dedd4383179326a198964d0548d30cc6f233202a1728f76911ad4656f47fe0a5ad6bd1125af3d3eda78ec54f98e5f1e7fc65fe8e01e00cf7fda778c833
-MISC metadata.xml 614 SHA256 4098444be094c5caa4ee1d72c127f3e512eaee75dd72e501eb4d69b08f1c39c1 SHA512 7d90ad7d9e58097c3100f898d2afcf3d6e76f0b3e6f3a36b7b98df3009edf24b7abb4b7d97453490a2f48e006903c7f99db7b1b4a38a4f1653bab95769a55070 WHIRLPOOL c7b88c8923fe28f7a5b397465cc71dfae13ea7e353ec9c7127ea7c9e088cbd9ce04df5983f7f6fbe89100d28a4add254d211777a0244ae9b1fdc07b3353af21e
+MISC metadata.xml 312 SHA256 b5b06e85b471ee10263ab751af6b44dcacde3366b5f12400219f2d3085c8d61b SHA512 6a0f224bbd633d17f96f5f8984e5ae48e7d830668c6b79d424202d0bd588cb1b4aa3536a39a018369a4cf6ea944f84082c39fcbc2ec1b55ddbadf1ca8a8e299d WHIRLPOOL 218617561de89f1827fa7d61e57cd9e0fda028b244a98ffd113a922dd89385e5fecce31096532b329b66598cc8890f2b389ce8bb6c87f29159a5d193fd0ead6d
diff --git a/dev-python/hcs-utils/metadata.xml b/dev-python/hcs-utils/metadata.xml
index f2f4912e4cf5..1b9790b37a1f 100644
--- a/dev-python/hcs-utils/metadata.xml
+++ b/dev-python/hcs-utils/metadata.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fabiano.francesconi@gmail.com</email>
-		<name>Fabiano Francesconi</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 05648525d7ba..be3a2362221a 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,11 +1,4 @@
-AUX python-dateutil-2.4.2-timelex.patch 468 SHA256 d8ea8e3b2b70a882e0f720024ab40116ca08356ef1cf6adea8a0182a9dde844a SHA512 d8a735921f73c09239838527e8caa7932199bd8d5499b549a00283a7355bd8454b19617b1e6087a58a4393ae01fa63c5814cda7d1b09db28b76d605bf96929f2 WHIRLPOOL c2ea1eea6d1b3a9f2e702e1f707e81939323752d018dc11250f520035e8fc09364c46b17c107932c783c12ca6e8eae569c6fac680eb3ccfae16dfa866b883e0a
-DIST python-dateutil-2.2.tar.gz 259085 SHA256 eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468 SHA512 cb278b8e18da3b991c6415ff59e9f3aa87cfb2e52048b3f74a9e3d183e0cc5bf71595123c644d0aea75084e653a885cbfa70c8ddd8b6a888bb13183624fcb46b WHIRLPOOL 545495d466cbea8f750b7e997699e2466131ce780ed73e18a880934a5255f759cee470b6f85a16a44f62bacaad14490e72a212c4cf6e53f0fe69b87492f9d055
-DIST python-dateutil-2.4.2.tar.gz 209120 SHA256 3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d SHA512 8e38721e6d132850f85e7808d2731285d2c12eae2a3e0cbebe05265d0837ad22d4d94b611e146028ea3d23a3e2611b281dd6224081a69dfe4b58cf3b378d7f0d WHIRLPOOL 88ddb75f52a95a6b7197b41364b80968bf2c21a3bda9c7b992726ef35ca934a66a5d8ccd773d7647f985541d87c66fa94af13600b0165707af9b73d1bff8887e
-DIST python-dateutil-2.6.0.tar.gz 258060 SHA256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 SHA512 1fec6dd6fc00650821fd826405414bcde79e1542a53608ebd837e924b4abc147a369214ec064adbff682fc5ff67440086f3000eaa77b274c7463c3f58686ced9 WHIRLPOOL 1cae1f1e3dfe09c3215bba031ee5a604ffe86bae7b70999320f37232ddaf5401edbb56697157b9b89316220d932faef07e7d7e6a2e68992fc17bb91bf86b24b3
 DIST python-dateutil-2.6.1.tar.gz 241428 SHA256 891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca SHA512 f16dd29fc975629f594dd2683a525e2a86acb020bf8962558d19040b14ac6f19d4ab07a910d6bb55c9db3cc02b5472774a3a05ccc86cf624ca5e5144463646db WHIRLPOOL 963b2d15373e0d83bfb611c1bd6ac86463f5c88b4a20f42ca13e32ebf9d442994ecc3b22be09e57ed2983b20072d229623ee15aa3e4d9ba884d898723cbe0c72
-EBUILD python-dateutil-2.2.ebuild 1329 SHA256 176ee8ca862bf41dd12ace470afd421a5e7b1712e2eeced3c01aec85e260666f SHA512 214a17457643f7a9630402037fea398f0d432c038c3bbd14bab9811a2cf701bd11b8dd9658f7fe54f54553b2f61c64e74ab9055c5b4044fc02897ac1d68a399b WHIRLPOOL 94931bc3a568a54f2011027bb8a0f6cb0891d48e1c6463c30a66414fecba28dff842d584fc7c4125b08ffd22bd141ef451554d87beca2de3785c45277c93b06e
-EBUILD python-dateutil-2.4.2-r1.ebuild 985 SHA256 ba899e25874a1da0e9d1cfc5d690ac79bb52ea52600bb7356d4e0519d62684e8 SHA512 f719c816007cc83c483412e6436eeb652cbd33bf9f1533762c72449b110c1c703ea2ec0c7ccc8e22b382d418149689f3cb1e1ae39b6c2747bb8f7091b56fa176 WHIRLPOOL 0052f73737a56d6062459179b87f825e35f87dc59b439d21c2ccb02af8a124212d5569c134aae9339795a7da9025ffeca15c983320dce6696ecfa4c1379513a9
-EBUILD python-dateutil-2.6.0.ebuild 946 SHA256 d510b505b773b5c74214a256b10c1ee5424139481ba73adf7f4961dead33fa20 SHA512 7edb361545ebb50c60c553b4a726b613e038657cfd62a86e577e6394482d7488d0d2afe2e650259ef2d8283dcbd87abd471cffeb39d33348213e4c7b9e0d7a34 WHIRLPOOL 550ffb4abaeae3ff1ae2f42f29b684c8a94e78138db4f7bacff617b8f8fc760adda8cbf60adb85d7d78404b3101b724bcef884eefe78915e495f732d356deba8
 EBUILD python-dateutil-2.6.1.ebuild 937 SHA256 219fca4fcc8dbf79961d4d7121019221618996156b09555f36f18ea638aba4d1 SHA512 df34b5e1c8d87b23be9ab7564c1e601557c3f8a5e3093ed4926252c11364ef917714ad1b9768c63d5bbad82cdc3e0dab93ed5a2b3c6d5e24b8aa0b7063382bf4 WHIRLPOOL f858f7362846e4932bdc2b42c27d920afefd1e44ec1e95d61be60660a06289b2eb22fde767b66ffcca2cffdce03d9f124169cc84ec2497624ec7279b2ecc76f9
 MISC ChangeLog 4906 SHA256 a19b62b4b3d86b3b045709ce17b511328ad0ab8ac93e8ed89b988800498eb485 SHA512 af7e5c97eabf3472dee4c03f73db9aa4580aa302473181e13d5088c0e333d2a4d15d29281003edfb2e431af68095cc0a394dfab450935195e20c61bff66b5eef WHIRLPOOL 377286b3363fe1e78d94dcff64fdea2c765a587f0c51fe98b8013f3f607793a57f193ce7fbfb1b5009dc99ba0152ef4be9f9e2c4081aae40329fe27a11b186b6
 MISC ChangeLog-2015 10635 SHA256 636cebef239d2c893b631cac56b4f411b835e5f4957890a4f77f8751d9909d0b SHA512 18af6739457392aabf58dba688fe6a8016c0b4dcc622c1010076ec38ff334f419aaba065a062da376371b2385bccd8e5e0ed5a2bf51e3e2015c1fd7ab2db09cd WHIRLPOOL 7032c6eda78eff8f24d1c7e0f03dd85a1cd9c3fecfc98430203ea56edb31dad70331503acbdb9b64e31b2510efa5647ed64d60f0945cade4165165f0621369e5
diff --git a/dev-python/python-dateutil/files/python-dateutil-2.4.2-timelex.patch b/dev-python/python-dateutil/files/python-dateutil-2.4.2-timelex.patch
deleted file mode 100644
index bccec4a56ddc..000000000000
--- a/dev-python/python-dateutil/files/python-dateutil-2.4.2-timelex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git dateutil/parser.py~ dateutil/parser.py
-index 8b6c2d28b8..75453ef49e 100644
---- dateutil/parser.py~
-+++ dateutil/parser.py
-@@ -32,7 +32,7 @@ __all__ = ["parse", "parserinfo"]
- class _timelex(object):
- 
-     def __init__(self, instream):
--        if isinstance(instream, text_type):
-+        if not hasattr(instream, 'read'):
-             instream = StringIO(instream)
-         self.instream = instream
-         self.wordchars = ('abcdfeghijklmnopqrstuvwxyz'
diff --git a/dev-python/python-dateutil/python-dateutil-2.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.2.ebuild
deleted file mode 100644
index 010d7200f1d1..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the standard Python datetime module"
-HOMEPAGE="http://labix.org/python-dateutil https://pypi.python.org/pypi/python-dateutil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-	!<dev-python/python-dateutil-2.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Use zoneinfo in /usr/share/zoneinfo.
-	sed -i -e "s/zoneinfo.gettz/gettz/g" test.py || die
-
-	# Fix parsing of date in non-English locales.
-	sed -e 's/subprocess.getoutput("date")/subprocess.getoutput("LC_ALL=C date")/' \
-		-i example.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test.py || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	rm -f "${D}$(python_get_sitedir)/dateutil/zoneinfo"/*.tar.*
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc example.py sandbox/*.py
-	fi
-}
diff --git a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
deleted file mode 100644
index 9be9f248eb87..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the standard Python datetime module"
-HOMEPAGE="
-	https://dateutil.readthedocs.org/
-	https://pypi.python.org/pypi/python-dateutil
-	https://github.com/dateutil/dateutil/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	sys-libs/timezone-data"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-timelex.patch
-)
-
-_python_prepare_all() {
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.0.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.0.ebuild
deleted file mode 100644
index 9f4ad2c27a3d..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensions to the standard Python datetime module"
-HOMEPAGE="
-	https://dateutil.readthedocs.org/
-	https://pypi.python.org/pypi/python-dateutil
-	https://github.com/dateutil/dateutil/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	sys-libs/timezone-data"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index f21954c80c29..2814695ea5d5 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,12 +4,14 @@ DIST setuptools-35.0.1.zip 624263 SHA256 eea7f2ff55d4a810b6bc39be1ad1c60c2702341
 DIST setuptools-35.0.2.zip 624829 SHA256 1e55496ca8058db68ae12ac29a985d1ee2c2483a5901f7692fb68fa2f9a250fd SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116 WHIRLPOOL 23b22065ced0a7df25ff35b79675b94e6146ec9ca7eff7c27a94d5aea64e4e9356e136fb537f642810a824eb3e0921d817b5739fe9cd3daf083cad99475354e9
 DIST setuptools-36.0.1.zip 711296 SHA256 e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8 WHIRLPOOL 9818d419a11ab6493027fcf27a48b087c80a10fe2bf3b0539893bd57b33be23ed5b90572682f0a27850044482f03d299905e04cc890f724d3cf719d34bf36464
 DIST setuptools-36.5.0.zip 721505 SHA256 ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43 WHIRLPOOL a18b45eb750bc92579d0179d0d5797d4cf949c20ab4e6cbf0b4ae154d351285983505829a1f0f0ee71b5b4aa3793bd3306ab3a9c44ea42b8306cb80cf3d273ec
+DIST setuptools-36.6.0.zip 725173 SHA256 62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7 SHA512 b1b7fbff45db72e24ffb0aef41509a8f49c3911f20e6dfa7335aace22d0b2c533615edd1626c6b58602960644d1a3ad7b2e6899efeec4138aa58a187d063c319 WHIRLPOOL 62e0e32eddd56b758dcd4da415a422e78f51acc58f83dc887d6ca67d7836cfe28dc1bdf4acb423b5e1f694c79ab4a392dbdc5f8ccb669e641f70f8c6f37f62b7
 EBUILD setuptools-30.4.0.ebuild 2058 SHA256 aff2e283d8acd9268d97a81fd7c22106760294a2652f4e03e7a4b0effb9bd727 SHA512 c14b6452d4e7084e3b645981b7b615d223b97e3fd50d75341e27274154d0f2e9362ca6605cc20a4a83dceac26dc65d018400606a43455aa292778911ac9f6cbc WHIRLPOOL cccce3eb867fad9608dfe120dcdd8d022a941fe2dc0747892fc54dd6a3da9abc936f1254d4874d13b44fac7a62e2216a586d97d1ff291db073cf4eec5b3a72af
 EBUILD setuptools-34.0.2-r1.ebuild 2041 SHA256 71c95e890e3b1e9159538ac9e74e619a89f8f87a2d0c28b8e77a586611fdd770 SHA512 8a9db9943611582d5276ed7f009cba5ae5c839b49d21e95ece52d94da6508a70811117e3aa1774f195f976428667d5b3872cc2192f78294456eb83fc50addba2 WHIRLPOOL 68aecc5618c6558a5bcaad96baa99fd3fb582679bf224945831c1c2dff68b65a61d3821e46e8c8ead7b86787381ae277120e5997b18c96730bfecbbbdbb63c2d
 EBUILD setuptools-35.0.1.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
 EBUILD setuptools-35.0.2.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
 EBUILD setuptools-36.0.1.ebuild 1902 SHA256 21e17a1e229890cd6bb9e86c9c33bc16fc04fb0e9196341d7d1b1eb1b11bc521 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b WHIRLPOOL c45c02f0e4ee088e6e44fa076abb33ad2317f2344777247eaeb9b33cf3af5105c9b45632644769da62d1ea00cc9865d264ac15b70121b3aea015c6dc9802abb8
 EBUILD setuptools-36.5.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
+EBUILD setuptools-36.6.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
 EBUILD setuptools-9999.ebuild 1896 SHA256 27917cfbea477fbcc04bab18db0547a18d69cfb9825eaffae785a4bb1a937547 SHA512 4a88df7828f94c34c4131626054fec2d6fb1f1dcf2abe48ae872efb0d020e07fda6c6bfdc126a53e4463d1e7f932f84bf24d992913726dbbe98488d539f9ff64 WHIRLPOOL fd6ab34da65bac9a0bc60bb0dd4fce0ef51920a648dbc87355d44a275e3a2a089be651210a8356330c413289da3323fef2ee3070e594961c761c80d87ca72aad
 MISC ChangeLog 17985 SHA256 b31d25f57897e897354a84f36573decb09bf17e88b4f8ceb1fe0cb8cbef64a3a SHA512 099eb73daea0a5a0035af624f7c59dc7ecdd77523df9de74741cceb01b64514d8b58ce98c13b58729d900f680416e97408a19e46ddca1c9c34f1a845af86ebc8 WHIRLPOOL c5e8a538a838684f6c57ac9eb516b36572c7ca62697ea12b59a9db6c89c7fd555f6af6877aa24761c6ee6fce5b262c4ba31cd9c03b44378532773653164262d6
 MISC ChangeLog-2015 40164 SHA256 688e239d071bc1023126c3f0bb1e62c72a1c217a7290312441ad91829ee51d84 SHA512 d009c942ddc4d8beb2ba9f756a0f00d292c1accd029288727ef23811dba8854b0cdffc4b753883975adaa1572c4cd15e5a1e14d9fb2afb50e852cb14e71b635f WHIRLPOOL dfe2b05139f33b1b94481d040c5b58cd687331b3d96f7d0cb6e49d28574c3b0f4325b22aec97cd5ba138ee7caec989f18c94456cdb0651bb19611328623e11be
diff --git a/dev-python/setuptools/setuptools-36.6.0.ebuild b/dev-python/setuptools/setuptools-36.6.0.ebuild
new file mode 100644
index 000000000000..569852df901c
--- /dev/null
+++ b/dev-python/setuptools/setuptools-36.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index f77762a4afbc..31855d735ac3 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,7 +1,5 @@
-DIST xmltodict-0.10.2.tar.gz 24854 SHA256 fc518ccf9adbbb917a2ddcb386be852ae6dd36935e1e8b9a3e760201abfdbf77 SHA512 f734c80740b99f0ebb1c0d955094f63c5f513cf1055ac8577395f91ce1ee95dfc3712512b3e6b1f971637be9c345073a7536bd3bccd0175f191017b40a4f4537 WHIRLPOOL 441bc2fd8b6f7efe43b24aca747c1ded764025cb999f9e62da7a8934956eb0cf5616733ad9f3fb8bd7f33e7728037d0ab0ab48b61da4eb208ceaa61a66486072
 DIST xmltodict-0.11.0.tar.gz 26589 SHA256 8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df SHA512 d42ef146a40f386a5389958f890605c560ce9db2da4447099b8725edc1998339b77ea732576fc7e77fbe5a755a2dc3239dfae4a82fc6593c5f977145ab445295 WHIRLPOOL 8e21f0cd47a3ce4986173047d8120c97a8f95207a63a8479b18131da6851d239ac48772e088d24d8f16e6b1bc207fcc8e03a64f68e9de42e9ec7a55c47edce56
-EBUILD xmltodict-0.10.2.ebuild 622 SHA256 9a9a1090bb6e9e34d1db68d7fb70f444fe456f1de5740f2c674b26119cf53483 SHA512 f052192e3f7dc21eba30ad66d734e55480082f19f643d62d5fbd6cf8fa53b251c56e829490722873b940fbeae07efbe227cbfac0c49e9194e453390338e3bd86 WHIRLPOOL d845ce0579bbea0129d667d3db46acb1c6378409f0c4c215424250b385a0ea752671fe4d0e5b3a3f8b3e8257d4691d6b29e9be21702720e44f01aee48b2183f2
-EBUILD xmltodict-0.11.0.ebuild 628 SHA256 adc00595ebc3392f26eff2ac548342e6a4802dbc9a6f3fa2b80703df10a7b9ac SHA512 b05e477eebcd6b97f12a461802cce7d1639c5c9c8cd51732c7265bdb93851fb9d572d37ad47c513b69c586da4c2c84f31dd2fa85d36053260762657c20b9e9ad WHIRLPOOL f4993be4875a280cf902c6f3cc359cffea157cfc514d76ad1d1ac5731b5f85af2b730a8720944da5abbbe246bc671df152be5621f7b87d086caa23d60729791b
+EBUILD xmltodict-0.11.0.ebuild 626 SHA256 81e9b8d3f736e903d9b5e4f93ec26d6e725edaa65b44e6d6310377ed90451b81 SHA512 b08fa66ae13b07c0c1e8c6053b4e27fcbaaa78d828f0dadbd73c7ccf6c92654ae404f102ac8e221bc37b80cf0511bc4f13f21765d9ff56336c9965f660821b1e WHIRLPOOL 3958bcdefb3537698c50773dd245efa36fc84a6266bcb313c77e52be6ae3a7a96ce0106a33f50755aa24cb7020660a01eb3dcd9a2c6442ea8cc5b7bb48badb51
 MISC ChangeLog 3442 SHA256 7a6717fba80ef908c4b449be9abe117699825489012a15577edfa30f1c235ea4 SHA512 754da0e926808dbdeeccee78bb235df69eb71546c153b4817d2f09314397bcb232afb76756363d0149928ec89d8f9adeed5dd0b827e931b8521c8e2e1a5dd6bf WHIRLPOOL 76d5d89fd5e03f030fc6fbe8db9c354c5ef90f845b44dda5e60b41a2d6cb98453fa66eec168419d5a0bb493610db2f294c00bb570794b9cc89f9c6e0a2056f41
 MISC ChangeLog-2015 1985 SHA256 f5588116c1621bd6350d3c5600158c2c251c85fbf623170554f38a6cccf904ce SHA512 fd2f0b087f34c9516363783b918deef747e4dc7acb3fe46b4a17a1099975647bc48dc08d71ca7013d6b68c0edfa2c93a0c95c8457b5ad45f2c7ee876d63e41d9 WHIRLPOOL afe0a8e1746a55822a2893dc5907026854693bbf08c4b71a0c1e096d86a6f8abbe0d72c18ae5906d61c8e9aa93dbed1b47b26fad59029e0b7cc9b8a12f0cc650
 MISC metadata.xml 385 SHA256 df20c27c43f00cf35d25b85607711cd8a7890b99fc1b1ccfd674c846c409a390 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794 WHIRLPOOL eb93d0c0fffedc7b7e3f65ed0eb5638665acb17137575933b85a828a404236440ab3445e8d3fcc08b83c90c8fd981bde2f27da481a69516712a71db7d75b6ad1
diff --git a/dev-python/xmltodict/xmltodict-0.10.2.ebuild b/dev-python/xmltodict/xmltodict-0.10.2.ebuild
deleted file mode 100644
index a1a62864f590..000000000000
--- a/dev-python/xmltodict/xmltodict-0.10.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.python.org/pypi/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
index 5e4278509d1c..66d3a13de164 100644
--- a/dev-python/xmltodict/xmltodict-0.11.0.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]