Merge remote-tracking branch 'remotes/Coacher/aegisub-update-metadata'

update metedata.xml

30 files changed, 430 insertions, 111 deletions

diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
index bf94cc8fa8ab..463c6cedc1bd 100644
--- a/dev-python/Numdifftools/Manifest
+++ b/dev-python/Numdifftools/Manifest
@@ -1,3 +1,2 @@
-DIST Numdifftools-0.6.0.zip 184293 SHA256 56bee55a361c263dd250fcd009923ee9289dbc9bde635fe10b41d84e6a404549 SHA512 57c3a63e9fc2738478534cd81542d1398667824c80ad5263610be29bec38209f4f9963ad61f2b02327724946567d61fe310a9e82b1b301d1b36fe229f33445bd WHIRLPOOL 9780391abf8774137b3aaa03c88bed521ff6367c7bdefdb23c7e412e162ec8c81a6724a7af525ccddb69673b0afa1c862dbf7285f0faa659af46f758ad48ae9b
-DIST numdifftools-0.7.7.zip 181520 SHA256 c5a309a7a0b58f6177dc7e3d55c2830c07ca2715c9c706644d500fc4eca97c4d SHA512 ccb5f8a06bf21dfb803004fa104d36e07cdbebb72682d84577506cca6fc63abd2e4b1c13cbc960ad691ee70bef616c282b8dbb682f78d1ff8d230213afd58428 WHIRLPOOL b6579d64f1e6beded914189b392952988eb1396ee9ad06d4ba4b3edfbe4666c1e7de35cf1405c38422aa459e9a631a94d8f821a9fe22309a681043883ec56ae2
 DIST numdifftools-0.9.12.zip 236823 SHA256 eee07f03eaa9531c34949bfbb27b0fade7b1e927dd9daf18342d13fc1ee88eaa SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c WHIRLPOOL aef074b9aaf4caecfad8bff75ccb8bd95e36373e2dd4e1dfc4b700fa1925b9b8652d6c483f81133c82e857abae6f2628e9166c77d6b102db3f9bb58c72e682a7
+DIST numdifftools-0.9.13.zip 225820 SHA256 1aad0d9eba96846f5c3b82e6a8df0b1eaf4cd13e0b665cba64646756a0f2add6 SHA512 e16fe167cbcc7995e5f7b1784822b94bc82261821ebf35f8b9f774ef1fd601ef13a23a72670f28b54b5f288b509a9ffccbde09033bdec6a88e8a4ef78ed74b25 WHIRLPOOL f32e93f54a883a751f0efb987b81fc7f187c8b6e4c327de2166f4c30afb7f3cb1b076047036deced7b98b551cb9085483c2e22a08881a7730689a5bbbfae5926
diff --git a/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild b/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild
deleted file mode 100644
index 3fb5b1ee3d26..000000000000
--- a/dev-python/Numdifftools/Numdifftools-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://code.google.com/p/numdifftools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	"
-DEPEND="test? ( ${RDEPEND} )"
-
-# Seems to be broken
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} \
-		-c 'import numdifftools as nd; nd.test(coverage=False, doctests=False)' \
-		|| die
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild b/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild
deleted file mode 100644
index c14975083b39..000000000000
--- a/dev-python/Numdifftools/Numdifftools-0.7.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-MY_PN=numdifftools
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://code.google.com/p/numdifftools/ https://github.com/pbrod/numdifftools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/algopy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	"
-DEPEND="test? (
-	${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# Seems to be broken
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
new file mode 100644
index 000000000000..1e1d2c8cf9df
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pyscaffold[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed \
+		-e "/numpydoc/d" \
+		-e "/wheel/d" \
+		-i requirements.txt *egg*/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index 1886b93e2b9d..6c2941d1e4db 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,2 +1,2 @@
-DIST django-pipeline-1.3.25.tar.gz 41008 SHA256 92c4ba5543d3ad980cd3a65a121ced62a6ad6449a773269a693f54e0ca5c565f SHA512 2c66b8b60076a8d19049947a9465d96fd80098c6e560f6cb6ffa26fd17d267830d87913041f9876da1276b0224ef3e8b0183c56367741e11c0f010a236b87169 WHIRLPOOL 15ac71f71988b2c7f5bb2d7c322843c35f6e34532af526b72bc90c15458b512948b97af333aaa5d52f71fd785f70d9b04018f8337eefc037be2dd24f04c77d7f
 DIST django-pipeline-1.3.26.tar.gz 41054 SHA256 58433fc07cc81f213686b892caeb8d17d6ed4e00444ef95b35f21a5a3cc6357e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284 WHIRLPOOL 7ead1f6dbc6df1a5c4b26869e6b4ae73cd416ed52f22ba1ff16b57a295f476c7973a56af9c05d1b50097e82dcd286207f648920b3acadd88fc40ad26aae10285
+DIST django-pipeline-1.5.4.tar.gz 41115 SHA256 5e387e2a92880f67c299ade766577c8c66485ffb867fbcffb73f696ddb9b245d SHA512 2393d1b44ca38416589b5b0e731b66e4e95be0b1adcba89fd76905975df0f35857bcbe019fc239127c578ab3a1b77cec5892298068de3634b2020d79e74aa1ad WHIRLPOOL 79e63b07751fb4c216004ca8aa695690b2006346f6b65e075d59484c6411c2f29c7b138f9e12f2e523e8c68e68f11398e183ed4a6816b5a47ef833dbb22b2b02
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.25.ebuild b/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild
index f9ddebd95f42..9f9095a446d4 100644
--- a/dev-python/django-pipeline/django-pipeline-1.3.25.ebuild
+++ b/dev-python/django-pipeline/django-pipeline-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,15 +19,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/django-1.7[${PYTHON_USEDEP}]
 	dev-python/jsmin[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}] )"
+
 # As usual for test phase
 DISTUTILS_IN_SOURCE_BUILD=1
 
@@ -36,6 +38,7 @@ python_compile_all() {
 }
 
 python_test() {
+	# https://github.com/cyberdelia/django-pipeline/issues/381
 	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
 		|| die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f80359791b37..2e6a546156fc 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,3 +1,2 @@
 DIST hypothesis-1.12.0.tar.gz 76679 SHA256 5e90a8fa249de9c492b4fa573f6f2dc489de9dd3ed3e2a59754b393c42624362 SHA512 107747d835dbe27fe25a429a8be66166005d3f0514d56d585505e99a4e4427afc210b7b6a7459858988f37182e6e4797ffcd1fa0511f8ae985725a1c2bbe73d4 WHIRLPOOL 0539637b819e9d3e4e96d5997299366d68a4e16f9ad5fcbf576048a761172e8568f2538de77b787f36c60ed09758ec5b8a962ae936f8f22d90ffb9551f63d008
-DIST hypothesis-1.7.1.tar.gz 58959 SHA256 25ac0cb59bb2a707687f7eafb2fe12077852ccaeb8344ed678da61431e86d4c0 SHA512 7a30e325449b01c56cd2a13aecbd51374748b7f6aea6ad2ec75cccda33e911c7495820dc0b7e140e34aff9b30b3ddda8cb4a80964dd99bffc9e1d75dff30784e WHIRLPOOL 3c06dd1da1ad888d15cb5aadf0744577e1af81a4b37fda9540b02057dfd4e7926385816b6d8d13ad36d5fdf528699ef5c5bac5f3448a3e2f5667129e5e7166de
-DIST hypothesis-1.9.0.tar.gz 70605 SHA256 774fff913da11446fa5522b4f20661ddf81cfdf2865d48ec5d160f9491f3f19a SHA512 898f2a0d410cc367def992025b7191f148752acfa86413626eff3c58be7242fa19ea81af2dcfdeef307fd0da61ddd633f34a65b3ce43f37a891b0cd5fddca7d2 WHIRLPOOL db4fa35b1b183a13d90d040ff070e8777402139d8504aab252c370477bb514a21806b97aaf3c632b4a6c9ce4f6f92a74cae1f2a3669d06364183cb61eee1e3d6
+DIST hypothesis-1.14.0.tar.gz 77977 SHA256 be2bffac70569cb21d6007b0e0d4b013008e16fb66e6bc8090022310eccebd89 SHA512 427f45517ab63505ffe5c10c205f49140325cc3d7479232119bd9dd21b96c86fae563fa875e8882221a58194034bceafa884a2ba47db101b160f70cfe4dfd1a2 WHIRLPOOL ac003596fef4f33db2925102736e694754a573b2d840584f968e1034ceb6e132a97001987df3c1a958564df37db812e517243e7f1cbf1f61dccb9feb9d9b6b25
diff --git a/dev-python/hypothesis/hypothesis-1.9.0.ebuild b/dev-python/hypothesis/hypothesis-1.14.0.ebuild
index eb0b2a531e3e..f65d7fd3072e 100644
--- a/dev-python/hypothesis/hypothesis-1.9.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-1.14.0.ebuild
@@ -19,3 +19,11 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+#	optfeature "fake-factory support" dev-python/fake-factory
+}
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index fc4332f02f09..225e668c86f3 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,2 +1,3 @@
 DIST joblib-0.8.4.tar.gz 314213 SHA256 f185b87199525e0805281960f9f91c4f2e382e5834f05678cfcfa8ec666a4d2b SHA512 37d9a107c0f8f80c30cbcf7e4520a571eb925efdfb8729ca681fb12b3ec79cfd63c4b53660e560bbb3bc162664f79ab1d9fa7207f3dac00b5d5cddcdc12169c9 WHIRLPOOL f887c0153b4fa691e2289a9d3237a1b9ee51fabd7f6f3a54c7914f4296e23d50010ba822846723566fac5bcfd40c7b23c458121b6eff18d8ce15d6317ae5e638
 DIST joblib-0.9.2.tar.gz 480557 SHA256 aa20324c09428e35a93517156b5355aa69e070661cdcb3c983249c814d5f7b84 SHA512 8fb5362a6816cb9fb04611c7e2b0b9abdcee216932c966f960f490380d00a4931ddb2abbf3b30e73dca75d05056bcb4863ac92fe0d2a3e6d3842d1f116c1a3f9 WHIRLPOOL 0a04c3045979b23ddfd9554d748d42a7cbc7bed1cd02a7e68ceddc26273fe1c4aeb2c1b51597b5a3a4785aa180cabaa4f90ddd23988ef70cc66edcd8105e0120
+DIST joblib-0.9.3.tar.gz 445258 SHA256 ac68f659cd4cfdb102423e9d87f9d94fe1d76f1e02dcbf8c99aea7fcb223be4d SHA512 dada1e628c6f875c663cbb5e7c3339e4a56482f89bcc323f95f996821111c4d5fdc1e66511bd6158dd4b255e5d3d0de9321b7fee42c3e51ec9dcc01695a8235d WHIRLPOOL ef60a41e5939b758ec049a2739b9a0c980e6cb401c4e5f45e2036bf329660cca6b02fb65879bffdbde4aef0f45229529ac6fb769244bb0790ec35bd0dc283f84
diff --git a/dev-python/joblib/joblib-0.9.3.ebuild b/dev-python/joblib/joblib-0.9.3.ebuild
new file mode 100644
index 000000000000..991fe2f50cdd
--- /dev/null
+++ b/dev-python/joblib/joblib-0.9.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="http://pythonhosted.org/joblib/ https://github.com/joblib/joblib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+# Usual; req'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
+	fi
+}
+
+python_test() {
+	# https://github.com/joblib/joblib/issues/143
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
+		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
+	fi
+
+	nosetests -w ${PN}/test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml
index 59cc2bd80c22..35b86bedc8c3 100644
--- a/dev-python/joblib/metadata.xml
+++ b/dev-python/joblib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index f81a73bc7825..b809778efd75 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,2 +1,3 @@
 DIST jsmin-2.1.1.tar.gz 9783 SHA256 582f70f5fef561c8d561271206f45258d0c420eec31a8628914e87c73a2192e1 SHA512 1f889bb6a2916da21c315b5aff468cb8c479cbaedb99dfb4bb9298de6414615f274a4f37eeaee108a5f136ceea6893bddc5f564375bb2b2e7f14836a7f1d3dc1 WHIRLPOOL 941453d4765e983ca1b6d65a7f3afc390f967070fa8962a62ac783428071f2af70b42f5e80a4aea60dc8b0e724f490281a502cb13c58653035b34715dfe2f701
 DIST jsmin-2.1.2.tar.gz 9995 SHA256 5e710e9db14f210dfd55ebec43bca5c812d34c5b6179dbcba2e61d9f965bf4e1 SHA512 9723e2ff2feb243b84d3b8d1869a6591bbf1f3224d6f706eb7264293ed083508560586ee4466a4da370bcb4a611a48e9c78d1c25ede363312cafe9189ff97e5d WHIRLPOOL 41896e65703f45bacd0793b2ffb16c12eef4d4f012aa9c12d7282566efeafd49b3c26668c9ba2157a6112bc17d35f66f9f60430618f99dddc69e2be04be45809
+DIST jsmin-2.1.6.tar.gz 11858 SHA256 c20e7f58a68207b8efdffae8d4c885e823615da3b605905fb0794a56e6aac4a3 SHA512 df0ac0b02df54411ca0cb20adb8eabc2bbfbd35f28b3cb1b6a5184ea3ffa8bdb6d091ff42a8531449a739c5d1ffc872840108bfd4e4c2d2ac98fbb59e8c4e820 WHIRLPOOL 5e0409230aad1c69d044e96ceb7333903a8859752661f6fdac8facc4618b70e5cff289e97c4c3cf09242e2194ca84a780f9444b1a1c593b4b712e7cf9ebb31f1
diff --git a/dev-python/hypothesis/hypothesis-1.7.1.ebuild b/dev-python/jsmin/jsmin-2.1.6.ebuild
index 7e106ee01a14..c86327c6564b 100644
--- a/dev-python/hypothesis/hypothesis-1.7.1.ebuild
+++ b/dev-python/jsmin/jsmin-2.1.6.ebuild
@@ -3,18 +3,22 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
 inherit distutils-r1
 
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis"
+DESCRIPTION="JavaScript minifier"
+HOMEPAGE="https://bitbucket.org/dcs/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+LICENSE="MIT"
+SLOT="0"
 
-RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m ${PN}.test || die
+}
diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
index f5b16b1f5680..adc42560851d 100644
--- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
@@ -100,8 +100,6 @@ REQUIRED_USE="
 		|| ( gtk gtk3 )
 		)"
 
-RESTRICT="mirror"
-
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index 86adcbf5e7e2..a92bbbc7fd38 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -105,8 +105,6 @@ RDEPEND="${COMMON_DEPEND}
 	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
 	"
 
-RESTRICT="mirror"
-
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
index cc6fe7edd615..ba3180e0597f 100644
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
@@ -64,9 +64,10 @@ DEPEND="${COMMON_DEPEND}
 		app-text/dvipng
 		virtual/python-imaging[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexrecommended
@@ -107,8 +108,6 @@ RDEPEND="${COMMON_DEPEND}
 	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
 	"
 
-RESTRICT="mirror"
-
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index a62eac5ee1f0..03462537f63d 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -107,8 +107,6 @@ RDEPEND="${COMMON_DEPEND}
 	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
 	"
 
-RESTRICT="mirror"
-
 # A few C++ source files are written to srcdir.
 # Other than that, the ebuild shall be fit for out-of-source build.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 205b8dd93144..33dff3aa48fc 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,2 +1,3 @@
 DIST numexpr-2.4.3.tar.gz 85171 SHA256 3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722 SHA512 b33984072fddd4303980be8533e1348b48ff27de5e150029147e3666ce6bb9e1147dbc45eb0ef22506aebaea6fb366d65ff01221235f9b9935d78ea70ba9aa53 WHIRLPOOL ac5981bac643b825d6ab2fbd6c46b6d73ad62374490e5f05a71fc0b9c4269ab401617da98079e1604b11f454863e64e009a2acc00b7b30499b20eff73efe033f
 DIST numexpr-2.4.4.tar.gz 87133 SHA256 dfa2fad1af040e93a8022fbe4437f2183bf80e5f64d466381ad589308a73565b SHA512 abc53f8aafb39e55b6b811c1f08c01eefca23c36fb9d20a82484ef658c8062ffe51d8841d6651f43fb7f8cea6420270623df6ba9f98a95a0f7a09e6ceef91b35 WHIRLPOOL 9ab19609189e866a11c03b0aeaa3b93124d8018d53e8dec641721eff39eb73c969c34c457209d63988361ffadef13a205ba5b71d19ad120e9f44313f42c7cd1b
+DIST numexpr-2.4.6.tar.gz 87481 SHA256 052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3 SHA512 fb68e0e782fd9e9e3cef9288addc0dfc3b79dbf01f0e72422cda6d5effd0f1629a49f9e5b89dcd16fa904423e0e9c776f3f276b4817e83cc58029c90a8627096 WHIRLPOOL 485eb98636f1ee5e1efbc843b404a23f3495d1b6682de15b67275a9c4082c87a1550d1bb91a19a7942f10f2f137af4a6294aaed95d7fd746f2db45d7319b70ec
diff --git a/dev-python/numexpr/numexpr-2.4.6.ebuild b/dev-python/numexpr/numexpr-2.4.6.ebuild
new file mode 100644
index 000000000000..d264e55baa75
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.4.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		local ext
+		use amd64 && ext=_lp64
+		cat <<- EOF > "${S}"/site.cfg
+		[mkl]
+		library_dirs = ${MKLROOT}/lib/em64t
+		include_dirs = ${MKLROOT}/include
+		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+		mkl_intel_thread, mkl_core, iomp5
+		EOF
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	"${PYTHON}" -c "import numexpr; numexpr.test()" || die
+	pushd > /dev/null
+}
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
index 6facd378531b..ca145a85e4a2 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"
 
-RDEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
 DEPEND="${RDEPEND}
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="test? ( gmp )"
 
 python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	local PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
 	# Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
 	# https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a
 	sed \
@@ -48,7 +48,7 @@ python_configure_all() {
 
 python_compile_all() {
 	if use doc; then
-		rst2html.py Doc/pycrypt.rst > Doc/index.html
+		rst2html.py Doc/pycrypt.rst > Doc/index.html || die
 		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
 	fi
 }
diff --git a/dev-python/pycrypto/pycrypto-2.6.1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
index 9e69e40f764e..5e7504e20ac7 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp"
 
-RDEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/docutils
 		>=dev-python/epydoc-3 )"
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 28e772b26e45..a83c1e0f0849 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1,3 @@
 DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
 DIST pycurl-7.19.5.1.tar.gz 142140 SHA256 6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c SHA512 89a474d7285cb040099dc6107a238f326dcb22cdb2c2325139f0d7ebea56f0860869d20b6e8e3bb43882048a261a8ff5734c7fc3e790fde8a96de3fffd04894f WHIRLPOOL 87eac50707acb4d764941e334a490d1c72c28433e8ff72caa7811f23d3f8ab2c6949a25ba8edd0cdacb27e498e60e728745c787a05853f1428ede8d91294a5cc
+DIST pycurl-7.19.5.2.tar.gz 153347 SHA256 98cc821555d152977fac99b6e5cb0f759275aabdf14e4928890c6fcc944ab736 SHA512 4f7b8fe59ce9a5597def6356c6af3b23c2fed52e2de022c048d70cd6d3f6e384b0cce8007c656703416284c20d159a0fcb953817e2780ef324ce521349e7041a WHIRLPOOL a42851c36c807349df6c9e33f6e6f0ef8924878d58e9209bfc8d0bdea16c41f81445ac4bc2c75efaea0c77af297149850120ac4d5413fc2622703ef4c3c351c1
diff --git a/dev-python/pycurl/pycurl-7.19.5.2.ebuild b/dev-python/pycurl/pycurl-7.19.5.2.ebuild
new file mode 100644
index 000000000000..9bc9ff802485
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.19.5.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="https://github.com/pycurl/pycurl https://pypi.python.org/pypi/pycurl"
+SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# https://github.com/pycurl/pycurl/issues/299
+RESTRICT=test
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	emake -j1 do-test
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest
new file mode 100644
index 000000000000..a69c5128b458
--- /dev/null
+++ b/dev-python/pyscaffold/Manifest
@@ -0,0 +1 @@
+DIST pyscaffold-2.4.1.tar.gz 108670 SHA256 bb91c4682c712b6a446d2b3b53dd27d0b8f2fb2050995e1b7f16aa8d6ec391c2 SHA512 ec5b5cf842b62f1989741bde84bf5ef5940583379e2b93672e95444a40685ae020286f40d47c31a4382f2c892dd17270349942f1544207036ff4e99a29e9e76d WHIRLPOOL d0ae0d1d69beaa21902f9f69ac1432734c11e15ff3c5d428602793f0ce4b2a53376a00c4f52004fb3f49da06bbd112f6ed72100fee7bdcfee26e7e23c54ec8af
diff --git a/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch b/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch
new file mode 100644
index 000000000000..ed7c8bd5ea33
--- /dev/null
+++ b/dev-python/pyscaffold/files/pyscaffold-2.4.1-loose-dep-restrictions-backport.patch
@@ -0,0 +1,36 @@
+From 513393e20f20cf62c09bd445057194ee378dda57 Mon Sep 17 00:00:00 2001
+From: Florian Wilhelm <Florian.Wilhelm@gmail.com>
+Date: Wed, 16 Sep 2015 12:59:49 +0200
+Subject: [PATCH] Fix issue 69
+
+---
+ CHANGES.rst      | 5 +++++
+ requirements.txt | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 922d41b..0478701 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -2,6 +2,11 @@
+ Release Notes
+ =============
+ 
++Version 2.4.2, 2015-09-16
++=========================
++
++- Fix version conflicts due to too tight pinning, issue #69
++
+ Version 2.4.1, 2015-09-09
+ =========================
+ 
+diff --git a/requirements.txt b/requirements.txt
+index f9695f8..a620a77 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,3 +1,3 @@
+ six
+-setuptools_scm>=1.7,<1.8a0
+-pbr>=1.7,<1.8a0
++setuptools_scm>=1.7
++pbr>=1.6
diff --git a/dev-python/pyscaffold/metadata.xml b/dev-python/pyscaffold/metadata.xml
new file mode 100644
index 000000000000..c1661663322e
--- /dev/null
+++ b/dev-python/pyscaffold/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild
new file mode 100644
index 000000000000..993b10447463
--- /dev/null
+++ b/dev-python/pyscaffold/pyscaffold-2.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="PyScaffold"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
+HOMEPAGE="https://pypi.python.org/pypi/PyScaffold http://pyscaffold.readthedocs.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-loose-dep-restrictions-backport.patch )
+
+python_prepare_all() {
+	sed \
+		-e 's: + pytest_runner::g' \
+		-i setup.py || die
+
+	# Creates all sort of mem problem due to fetch restrictions
+	rm tests/test_install.py || die
+
+	# Online tests
+	sed \
+		-e 's:test_api_with_cookiecutter:_&:g' \
+		-e 's:test_pyscaffold_keyword:_&:g' \
+		-i tests/*py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	esetup.py test
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 128a22cf66bf..130a687df378 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -11,6 +11,7 @@ DIST setuptools-18.1.tar.gz 630700 SHA256 ad52a9d5b3a6f39c2a1c2deb96cc4f6aff29d6
 DIST setuptools-18.2.tar.gz 630990 SHA256 0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d SHA512 964449faecce8b039343ea4364e73e035b7a99ba425939c07ee86c2db75b3b34ddbfc5d03b468ee11266eed74208b2038b3785332ff90d74087ee1d45620912e WHIRLPOOL d05c8a6f06e33efbe007a9ab1bdc9fa867f9b761510134b3580b1cedde16ae17b01ef43942d5c7e0a86e1deb605fb0f6cb08eafa43f853b0cfcb3482365bae1e
 DIST setuptools-18.3.2.tar.gz 626607 SHA256 8c4ab0c4f227730519dc1e020f875b3ef97e643c8f43a98a4fa0c46fbad12450 SHA512 0af522af1dc783e4d6b84c44d3cf4205aed75815bfc050ea89c4976434f08edd662501c4063b1618c0ce7a7120bcbd5331818d3f06912aa9136736018ec4b6a1 WHIRLPOOL 0b5275bbe6b595ebc88ba33bd0a344d3b7a9a63a81677449f862b51f10e16a1be4d4c97ff8f287299f1e0573e058c3f8fb5a0fc6e5643ac7137c2aa401397492
 DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e2df251fe4ccbea9afa5a7d111f SHA512 f45f0bdec365642d1648c502a964bafeb518e8f0ed63091a50b278629cf1e17df7f66769b0ddaab1e7c5ae2574673435ccab72886a2d5eb311eaac451c485854 WHIRLPOOL e0c5d69f57ce234b0e002a50c882df0bf1e908224c045baa8b5a62e91148d654f048cfbb64375b59f61f0845a5e850ec03594606933fdfaa9cce9b357bb45aa7
+DIST setuptools-18.5.tar.gz 626892 SHA256 4846755f18c0528d87583342d5e1221052858ce9922c5c38acbadd5015bd683d SHA512 d902b7e35c99d21e243168072bc96c07f88a7463e50035ba72d7e10818777e83ce534e4dab2ae0425620791f95f3d8cb2f9d9142be1ea24f05100d85d0d44835 WHIRLPOOL f3cabbc4bda9964bc00eba392e04605c99c1927fa96482ac55e21b1af7271b8a1c102017dea0b615ab02ca0f7219d9a8eab3b83eef6895d8b35f6bcbe4ed7747
 DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
 DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f
 DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d
diff --git a/dev-python/setuptools/setuptools-18.5.ebuild b/dev-python/setuptools/setuptools-18.5.ebuild
new file mode 100644
index 000000000000..d57da6bd7d2a
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+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"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	rm -r ./pkg_resources/_vendor || die
+	# 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 ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index 03a5f55256a6..dc3909a1a958 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -6,12 +6,15 @@
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
-        <maintainer>
-                <email>itumaykin+gentoo@gmail.com</email>
-                <name>Coacher</name>
-        </maintainer>
+	<maintainer>
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
 	<maintainer>
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Aegisub/Aegisub</remote-id>
+	</upstream>
 </pkgmetadata>