radical update

Package-Manager: portage-2.2.14

30 files changed, 659 insertions, 261 deletions

diff --git a/dev-python/catbox/Manifest b/dev-python/catbox/Manifest
deleted file mode 100644
index 1d3c9c6..0000000
--- a/dev-python/catbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST catbox-1.6.2.tar.gz 16711 SHA256 fe56def25af3c583a96986b47c396d91f46953425a942174fa6d77e3dcb97ca8 SHA512 e3eccc9257c051fc7acd6b13587cea2da61265e2aee2ad3b72efb30653b6f19ffd769a81228209db20cba979c1123b20c0cb8f833fb007c107f8eac917a863ff WHIRLPOOL acfcca72061b1627b1ba9f5c88792e92285fee41f81b787fd9cddc850d069ef703330d3690f143b34c00534193132ba573b59a7d66a7e4ad772b3f253ba40e06
diff --git a/dev-python/catbox/catbox-1.6.2.ebuild b/dev-python/catbox/catbox-1.6.2.ebuild
deleted file mode 100644
index 0980071..0000000
--- a/dev-python/catbox/catbox-1.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast sandbox implementation for Python"
-HOMEPAGE=" https://github.com/Pardus-Linux/catbox"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/testify[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testify tests || die "Tests failed under ${EPYTHON}"
-}
-
-# Circular dep of testify to run the testsuite
-pkg_post_inst() {
-	elog "To run the testsuite, emerge testify spearately,"
-	elog, "then re-run using FEATURES=test"
-}
diff --git a/dev-python/changelog/Manifest b/dev-python/changelog/Manifest
new file mode 100644
index 0000000..3185b0d
--- /dev/null
+++ b/dev-python/changelog/Manifest
@@ -0,0 +1 @@
+DIST changelog-0.3.4.tar.gz 9985 SHA256 47184b00dec775d05827ef184be774d9b336fa9bc31624f04297c9c8ded5123e SHA512 38e0b3c663bda4b2c6768583078340fe838803b1c72156b44d54a694a1f6947ba38ae7cf3a1680db560af3f6e6dd45ad422ad7d86c9252cff9eb956bca92186a WHIRLPOOL 7654d9b1e38ec3bdeb522d6aeaf62b5a4d96a4cdeddf00bd12d84626937a5a2310dcff0d31f864b247988432b364478886ea6815708bddf4c8678f738435cf71
diff --git a/dev-python/changelog/changelog-0.3.4.ebuild b/dev-python/changelog/changelog-0.3.4.ebuild
new file mode 100644
index 0000000..76b2d89
--- /dev/null
+++ b/dev-python/changelog/changelog-0.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides simple Sphinx markup to render changelog displays"
+HOMEPAGE=" http://bitbucket.org/zzzeek/changelog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+#src_prepare () {
+        # Avoid install of xstatic.pkg namespace to permit
+        # setup of xstatic modules
+        #sed -e 's/'\'xstatic.pkg\','//g' -i setup.py
+        #rm xstatic/pkg/__init__.py
+#}
diff --git a/dev-python/characteristic/metadata.xml b/dev-python/changelog/metadata.xml
index 301d220..301d220 100644
--- a/dev-python/characteristic/metadata.xml
+++ b/dev-python/changelog/metadata.xml
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
deleted file mode 100644
index e05842c..0000000
--- a/dev-python/characteristic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST characteristic-14.1.0.tar.gz 24612 SHA256 91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d SHA512 21bb40814f405c73471a83e15d1cfb07f74ebd157e647799bedffffd3909271145347eaec8ec09470dddad7224d1a15e8984a75f1fce00bbe20f9e1cb385f9b9 WHIRLPOOL d8044dfcbb7d75a383834bee842bd619b4bec65c8a0f467a563b9a80ee908bcf5c7de791eb220f9ba3b35a259a9ea6c6985f743518e2677d8a03a62db70ad98c
diff --git a/dev-python/characteristic/characteristic-14.1.0.ebuild b/dev-python/characteristic/characteristic-14.1.0.ebuild
deleted file mode 100644
index 40de764..0000000
--- a/dev-python/characteristic/characteristic-14.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python attributes without the boilerplate"
-HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test -a "--cov characteristic --cov-report term-missing"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/characteristic/note.txt b/dev-python/characteristic/note.txt
deleted file mode 100644
index b09742e..0000000
--- a/dev-python/characteristic/note.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Once transferred to this overlay, repoman f groans over pytest-cov in service_identity and pyasn1-modules in 
-charcteristic.   They PASS FINE in my local portage tree.
-Something to do with portage accesses eclasses of something beyond which either interests me or I care 
-about.
-The other way of doing this is for me to git push them in my pverlay which is called
-improvise.
-I pondered terrorise but decided to go 'nice'.
-The final test is to pass repoman full in the local portage tree so these groans to me are
-nothing but a nuisance, brown noise.
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
deleted file mode 100644
index 0de7990..0000000
--- a/dev-python/flask-cors/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Flask-Cors-1.3.1.tar.gz 9988 SHA256 351c1be901e7b16f533ad1c11ba7e86911270620ad7ec5f8c01b622d2b05f91a SHA512 5922b5ef89e6e9b6ddca176a666ac8727246f301b86ebe58edec4f5204aae66a92f57321dd343307bbed619295a6d13dc77a39c6bea7d8e6a45950520a8038bc WHIRLPOOL 248e26d4858e1292dfb016a32ed5174d0f6d9d2f560214b96924d7b18e634e77b52166473ef403a4d0319ce9d73e3f113cfe01758a6dc09b5a422c48b7c0f2a0
-DIST Flask-Cors-1.6.1.tar.gz 13263 SHA256 24ae9e068d92963116ef3854e105b9840f42ddd759c1da836c2b86a3fb510736 SHA512 03db71cd13986b135e2170ef880d697c6bd9a2eac007d36cbf5f24685d21b4d7aaaac798ba5086126e0cf186184a4ab46b137d1ae06e4daa838960da3afcc69c WHIRLPOOL 36ee538096680efc443e2dd7bac9fd0a3ffc8daca960bb240ac0583d4a36468b258a257a28f0e7184b85978bc4b99673010bede363d31af8f435896efcb6820d
diff --git a/dev-python/flask-cors/flask-cors-1.3.1.ebuild b/dev-python/flask-cors/flask-cors-1.3.1.ebuild
deleted file mode 100644
index 41c874b..0000000
--- a/dev-python/flask-cors/flask-cors-1.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Cors"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Flask extension adding a decorator for CORS support"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-#	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
diff --git a/dev-python/flask-cors/flask-cors-1.6.1.ebuild b/dev-python/flask-cors/flask-cors-1.6.1.ebuild
deleted file mode 100644
index a1a2b38..0000000
--- a/dev-python/flask-cors/flask-cors-1.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Cors"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Flask extension adding a decorator for CORS support"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
new file mode 100644
index 0000000..2afc2c6
--- /dev/null
+++ b/dev-python/oslo-i18n/Manifest
@@ -0,0 +1 @@
+DIST oslo.i18n-1.0.0.tar.gz 31042 SHA256 008f86bc297ee05c63b1e2e4a85985802f086c81b16b0853e8e47df0592b23bc SHA512 907971cf4a85bfd2f935faf30dced837614eaa08397b7243a497c6fb50c1228c5cd5f562fb452ebc2a0ad929073724b1e44b38df9b5f424833ed958dcbfc96ab WHIRLPOOL b6ffb2bfce611bb5dd99bd62d24709dfa8626bc93edc7e51aa27e422f556851b31a3525e15fcb2481a72d6b225acc957ecf1ae64bdd38dcae8411173cc8b999d
diff --git a/dev-python/websocket-client/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index 0eca95e..9f400cd 100644
--- a/dev-python/websocket-client/metadata.xml
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>python</herd>
+  <herd>openstack</herd>
 </pkgmetadata>
+
diff --git a/dev-python/oslo-i18n/oslo-i18n-1.0.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.0.0.ebuild
new file mode 100644
index 0000000..5286b0b
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-1.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.4.0.ebuild,v 1.3 2014/09/27 20:09:28 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+MY_PN="oslo.i18n"
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="doc test"
+RESTRICT="test"		# suite doesn't work out of the box and fail tests when from tox anyway
+
+COMMON_DEPEND="
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		${COMMON_DEPEND}
+		>=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] )
+	doc? ( ${COMMON_DEPEND} )"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init || die "testr init failed"
+	PYTHONPATH=. testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/build/html/. )
+		doman doc/build/man/osloi18n.1
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
new file mode 100644
index 0000000..2368da0
--- /dev/null
+++ b/dev-python/oslo-utils/Manifest
@@ -0,0 +1 @@
+DIST oslo.utils-1.0.0.tar.gz 32719 SHA256 4d1fdb896eb7a690ddf2a04b47c347caefaf1117bb2be83723546fbaa5141864 SHA512 09c6b759f39eb90ec382f68f3cf70e600847bdc6c44802a82e279a10be75587fe5e67f5e5b136ab6ac338b69ff484a869dbf236e0e46fc72a90ca69619a53c9b WHIRLPOOL 470720887a248afc953c691ba8e659fb010b3b59708992a34387814487b3077f723879f603d931d1a14efd87fe95f868103ca7beaa8bb78c97a9510c28e8364c
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
new file mode 100644
index 0000000..9f400cd
--- /dev/null
+++ b/dev-python/oslo-utils/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>openstack</herd>
+</pkgmetadata>
+
diff --git a/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild
new file mode 100644
index 0000000..1366495
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.4.0.ebuild,v 1.3 2014/09/27 20:09:28 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+MY_PN="oslo.utils"
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-0.2.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# A testsuite is present but it's unable to be run because
+# versions of some of its deps are currently unavailable.
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/build/html/. )
+		doman doc/build/man/osloutils.1
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
new file mode 100644
index 0000000..c8b7bf9
--- /dev/null
+++ b/dev-python/pypy3/Manifest
@@ -0,0 +1 @@
+DIST pypy3-2.3.1-src.tar.bz2 19526174 SHA256 924ca36bf85e02469c71d451c145f9a6d19b905df473a3d1c25179c63ea79d74 SHA512 fdb8eb1f5e938eb399f863e5977f8229c1057bf65c1a0793cdfa9303fb5a2fb39fd38284bbac6430a05a3f764671eab590bc24703b2a70862a2809b7966c91bf WHIRLPOOL ca18590a62dd364eac734784504a08d4e55089dfad981f1d65958ede4be4eb77da22207885a662420e2a9187193dc871e790d6311466efc581f23d524edd4872
diff --git a/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
new file mode 100644
index 0000000..65321bb
--- /dev/null
+++ b/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
@@ -0,0 +1,11 @@
+--- a/lib-python/2.7/distutils/unixccompiler.py
++++ b/lib-python/2.7/distutils/unixccompiler.py
+@@ -297,7 +297,7 @@
+         # this time, there's no way to determine this information from
+         # the configuration data stored in the Python installation, so
+         # we use this hack.
+-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
++        compiler = os.path.basename(self.compiler[0])
+         if sys.platform[:6] == "darwin":
+             # MacOSX's linker doesn't understand the -R flag at all
+             return "-L" + dir
diff --git a/dev-python/pypy3/files/1.9-scripts-location.patch b/dev-python/pypy3/files/1.9-scripts-location.patch
new file mode 100644
index 0000000..7453908
--- /dev/null
+++ b/dev-python/pypy3/files/1.9-scripts-location.patch
@@ -0,0 +1,11 @@
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -87,7 +87,7 @@
+         'purelib': '$base/site-packages',
+         'platlib': '$base/site-packages',
+         'headers': '$base/include',
+-        'scripts': '$base/bin',
++        'scripts': '/usr/bin',
+         'data'   : '$base',
+         },
+     }
diff --git a/dev-python/pypy3/files/21_all_distutils_c++.patch b/dev-python/pypy3/files/21_all_distutils_c++.patch
new file mode 100644
index 0000000..c5aec72
--- /dev/null
+++ b/dev-python/pypy3/files/21_all_distutils_c++.patch
@@ -0,0 +1,262 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
++++ Lib/distutils/cygwinccompiler.py
+@@ -136,9 +136,13 @@
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -162,8 +166,12 @@
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -294,10 +302,15 @@
+         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
+                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mno-cygwin -O -Wall',
++                             compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
+                              linker_exe='gcc -mno-cygwin',
+                              linker_so='%s -mno-cygwin %s %s'
+                                         % (self.linker_dll, shared_option,
+-                                           entry_point))
++                                           entry_point),
++                             linker_exe_cxx='g++ -mno-cygwin',
++                             linker_so_cxx='%s -mno-cygwin %s %s'
++                                            % (self.linker_dll, shared_option,
++                                               entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+         # (-mthreads: Support thread-safe exception handling on `Mingw32')
+--- Lib/distutils/emxccompiler.py
++++ Lib/distutils/emxccompiler.py
+@@ -63,8 +63,12 @@
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -81,8 +85,12 @@
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+--- Lib/distutils/sysconfig.py
++++ Lib/distutils/sysconfig.py
+@@ -170,9 +170,12 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         newcc = None
+         if 'CC' in os.environ:
+@@ -181,19 +184,27 @@
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -202,13 +213,17 @@
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+--- Lib/distutils/unixccompiler.py
++++ Lib/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["cc"],
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -108,12 +111,19 @@
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -171,22 +181,16 @@
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+--- Lib/_osx_support.py
++++ Lib/_osx_support.py
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -454,7 +454,7 @@
+ 	    *\ -s*|s*) quiet="-q";; \
+ 	    *) quiet="";; \
+ 	esac; \
+-	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
++	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
+ 		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
+ 
+ # Build the platform-specific modules
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/pypy3/metadata.xml
index 4ffdee1..2439f21 100644
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -4,11 +4,12 @@
 	<herd>python</herd>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>idella4@gentoo.org</email>
-	</maintainer>
-	<maintainer>
-		<email>wking@tremily.us</email>
-		<name>W. Trevor King</name>
+		<email>alice.ferrazzi@gmail.com</email>
+		<name>Alice Ferrazzi</name>
 		<description>Proxy maintainer</description>
 	</maintainer>
+	<use>
+		<flag name="sandbox">Enable sandboxing functionality</flag>
+		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/pypy3/pypy3-2.3.1.ebuild b/dev-python/pypy3/pypy3-2.3.1.ebuild
new file mode 100644
index 0000000..17fba3b
--- /dev/null
+++ b/dev-python/pypy3/pypy3-2.3.1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1.ebuild,v 1.1 2014/06/18 23:37:41 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2} pypy )
+inherit check-reqs eutils multilib multiprocessing pax-utils \
+	python-any-r1 toolchain-funcs vcs-snapshot versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/${PN/3/}/${PN/3/}/downloads/${P}-src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="3/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	dev-libs/expat
+	dev-libs/openssl
+	bzip2? ( app-arch/bzip2 )
+	ncurses? ( sys-libs/ncurses )
+	sqlite? ( dev-db/sqlite:3 )
+	tk? (
+		dev-lang/tk:0
+		dev-tcltk/tix
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	CHECKREQS_MEMORY="2G"
+	use amd64 && CHECKREQS_MEMORY="4G"
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.9-scripts-location.patch"
+	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+#	pushd lib-python/3 > /dev/null || die
+#	epatch "${FILESDIR}/21_all_distutils_c++.patch"
+#	popd > /dev/null || die
+
+	epatch_user
+	rm -rf "${S}"/lib-python/2.7/ || die "dud"
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+
+	echo "dest tree is ${INSDESTTREE}"
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy3"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy3
+#	dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
+	einfo "pax-mark 2 done"
+	dodoc README.rst
+
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/3/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/3/idlelib \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
+	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	export LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi cache
+	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
+	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
+	if use sqlite; then
+		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
+	fi
+	if use tk; then
+		"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
+	fi
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
new file mode 100644
index 0000000..3fd5058
--- /dev/null
+++ b/dev-python/pytest-xdist/Manifest
@@ -0,0 +1 @@
+DIST pytest-xdist-1.11.tar.gz 38215 SHA256 631dbe843ec7cdadaf2398c50343d887078d4f9374a0e30758a35023f865fbe9 SHA512 f1cb3588da13a554b2c2dc817819d72ed3e013571df45afccf4db255cbc6b236fb1d2d4d31a6b52b8ec747babd14b9389c35e433792a733ca84ed17d8c1c4194 WHIRLPOOL ddbab2806e17790f9e26f7872916f99506fcd4cfeb01cbf312fb15f4a776de28712c6624dc710d97d9d65deae024ec1c1ecc08043343d16c716a814d44776c23
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/pytest-xdist/metadata.xml
index 301d220..301d220 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/pytest-xdist/metadata.xml
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.11.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.11.ebuild
new file mode 100644
index 0000000..16d0f6d
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/hpk42/pytest-xdist"
+	SRC_URI=""
+else
+  SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="A distributed testing plugin for py.test"
+HOMEPAGE="https://bitbucket.org/hpk42/pytest-xdist https://pypi.python.org/pypi/pytest-xdist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]"
+DEPEND="
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	distutils_install_for_testing
+	rsync -av "${BUILD_DIR}/pytest_xdist.egg-info/" "${TEST_DIR}/lib/pytest_xdist-1.11-py2.7.egg/EGG-INFO/"
+	py.test || die "Testsuite failed under ${EPYTHON}"
+#	py.test testing
+}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
deleted file mode 100644
index 4d5625d..0000000
--- a/dev-python/service_identity/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST service_identity-14.0.0.tar.gz 26033 SHA256 3105a319a7c558490666694f599be0c377ad54824eefb404cde4ce49e74a4f5a SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2 WHIRLPOOL bc6f3cba3e3bec83c527df60dc3cd4387d74baab5a88b5c2cb731661804139c78c86074902060b64e402364ac641b4b2617c98448d4a9e6b367dc0f9d6cd5dac
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
deleted file mode 100644
index ec5a9d9..0000000
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service_identity"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
-		>=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test --cov service_identity --cov-report term-missing || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
deleted file mode 100644
index 947ae10..0000000
--- a/dev-python/websocket-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST websocket-client-0.17.0.tar.gz 187176 SHA256 94ab783bf67c91e46c9f97134a37c2d583e377864ffec493b2eb76b3ba30c8e4 SHA512 2462f9128e41955e3c1c1cfefbe5a25bd25ee37ddf8675ec6d5f9984a254b90412f6ffab9b242eb268d16b0cd9421f92c1c0d8a38bdc67cba2d722f5c37a4492 WHIRLPOOL e2f00be1374d3d889a9743cd40bc64f85ee1abdc8ae8352d928e675c159eb58752369ed6b8d3a5788b82fb9d24c1d0b520499bb78e6b57b61a7e682525e8cfa6
diff --git a/dev-python/websocket-client/websocket-client-0.17.0.ebuild b/dev-python/websocket-client/websocket-client-0.17.0.ebuild
deleted file mode 100644
index e780fe8..0000000
--- a/dev-python/websocket-client/websocket-client-0.17.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A WebSocket client for python that provides the low level APIs for WebSocket"
-HOMEPAGE="https://github.com/liris/websocket-client https://pypi.python.org/pypi/websocket-client"
-SRC_URI="https://github.com/liris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Required to avoid file collisions at install
-	sed -e 's:"tests", ::' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" tests/test_websocket.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}