gentoo resync : 17.10.2017

77 files changed, 303 insertions, 7111 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index bf682812a647..67458a0e43d6 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,6 +1,6 @@
 DIST QtPy-1.2.1.tar.gz 29210 SHA256 5803ce31f50b24295e8e600b76cc91d7f2a3140a5a0d526d40226f9ec5e9097d SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7 WHIRLPOOL c598789661a43c96b3b4db8fb766fbfdcc746a8c6bdf270175b4e3f2733b666939e44921a056c1f77d2d6683ec73a4221ab409c320c840cdc7ee2d00ccec6184
 DIST QtPy-1.3.1.tar.gz 25061 SHA256 08af2525d59f9eb639946d5ed7a72b002103c5b7369c0ef0dd70ad2696845313 SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008 WHIRLPOOL 7bd85d95fcbcea6f93d781d2c8e12252f4eff17dcfec269f24d97998d5aad50dec24f702641d1b5432c1235ba13f9ed5ec43f2ef20ff0b23d00873af8410e340
-EBUILD QtPy-1.2.1.ebuild 1046 SHA256 bf791cb5374ca77b32cc0e57b5f70567aab8617dcc53ecd98f50d32c52db8c85 SHA512 2a2eb52286a6f55b14cf8ab36243f526d5f6a9a9dad9734d1ad41139a92673eec9c4ac714854e0c52fded3d839d2867f42bba75f3e7aac6e7d40550ceb8f90f8 WHIRLPOOL 940be50c920bb97756b44e7ac7b59057b09114a52bbb8c4aea7c97643b089d7a0b9ad26e0604dc0ea30f5c4e1951e6e8530d6e1ee46c87a278933e1ca05b10e8
-EBUILD QtPy-1.3.1.ebuild 1580 SHA256 875ff4a73bbba58bb8ed7480615af77e8ad9593f57ba42cf9a19c446e8c21225 SHA512 04bb66f6fd55fe589440d87f101308789e17b83b03d0ec27fbc7abb85efc886413a5f854775d4cedc99d84408fbf6ef48591b79ce50ee2d794dd141d259bc321 WHIRLPOOL 1a3e87f4f990a1acfd50341da3e9b9b413242c444bd896d48888cccc1176b8d7af40760c571b034250b2340974037a9c03832ec334047d97cd74c96b1901dbcb
+EBUILD QtPy-1.2.1.ebuild 944 SHA256 b80e4dd69ca51e258376b6949dfba2fd436a58cfe595df9f3268bce45deb73a2 SHA512 c10bc35984b7db63d6dd2f5875a6d11aff9b4da13f415ad908e7351bb1a707d82565132f51ebe54d11655e3d138087c6decb5a7a39442f3edfd8ef81319433de WHIRLPOOL 833f44281d8f898fc84f496449b88fb256312a2ae3b225ae5b14d54dfd0e5f3cecd181ffaa261b7f9bf92b3a9e278c3e0b0bf9b31709ca0dbe223227866d232c
+EBUILD QtPy-1.3.1.ebuild 1359 SHA256 bbcde24abb6987e979e73bc990441c31a9a6490091b7c0eda40ebc846b22bb67 SHA512 3f310737a2de023840906e7aad9c66c8df32b104c19d4a31b71f1d07bdb583a0e619d14875e96ff80ee8a7bdc1c044362769c3a56e8abb57d8e207191e32a71b WHIRLPOOL 73226779df613a307d6c7c80f0b6e525e3852a191d3a1e189281f4bd5e58d3e1e395498ced246955b310fd3e406ff070be64be6edfe502e74e08b361a9cff881
 MISC ChangeLog 306 SHA256 9c42b8b57b614e1393711ebca625b114e697e9b8c396a1963c42227a68c331e5 SHA512 ef90e0e8de842a964b98304cef134fd8f746f0f0b3eeff67f1cc8afc034fb1597a0f71df4e336de84b85a3787a075387fdf78bfe4a2f6377936edce6d243f490 WHIRLPOOL 01ae8a7970ba4a10a41c02a801ad783c64b54c95ed0b2a7047e2b066af655a0d399027f711c2f2e7155dbc9b1839bf9929e9673e8542571563aa264583e324a9
-MISC metadata.xml 1495 SHA256 46b09f6eb7fd10b31f41a97968d369bb912d0a3768d64a2fda838deb32d39b6d SHA512 c3313293f62965020192201cabe53607657d8c5a3cc67cc420d7ae20d3d58aa2c12e1493181fe591733d0b2587c2702b05b225327e6269427a3d6a067d633521 WHIRLPOOL 2a26f7fc9d3295eeca1220f2eec3941d7436a5e2a2ed8be1e39a7f73c747e86a9c8a9724368d1de08484e201b0a3a1352b928ef7a1ec2ad5d0ed846aab7da1d7
+MISC metadata.xml 1418 SHA256 f65f33315838dd191cc048fb2f3654ae17165cb666b5808b003f69b0668bd35a SHA512 989337b00aef082788fde0802f444815d5db17afb3874dd2260c78ff1946043735679a59c2d2be80ca927b0272d9fb1164f13aaa2b1552bc26a6003e708c1ed3 WHIRLPOOL 37ab184c684aa22a2070f9da4e39f35989c1a7b2da6ec9c7af7bb6d38efa9134e6cd5fafcef5932d3565616836cf3ee48e3bd935beb7233bb4cbc56a07c18231
diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
index 86fa7592ebdc..51f9d64960b2 100644
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
 HOMEPAGE="https://github.com/spyder-ide/qtpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -18,20 +18,18 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit"
 
 RDEPEND="
-	|| (
-		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
-		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
-		  dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
-	   )
 	gui? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		  dev-python/PyQt4[${PYTHON_USEDEP},X]
-		  dev-python/pyside[${PYTHON_USEDEP},X]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/pyside[${PYTHON_USEDEP},X]
 	) )
 	testlib? ( || (
-		  dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-		  dev-python/PyQt4[${PYTHON_USEDEP},testlib]
-		  dev-python/pyside[${PYTHON_USEDEP},X]
-	) )"
-
+		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		dev-python/pyside[${PYTHON_USEDEP},X]
+	) )
+	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] )
+	!webkit? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=]
+		dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=]
+	) )
+"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
index 5d5c3d3f23c8..de40764e990a 100644
--- a/dev-python/QtPy/QtPy-1.3.1.ebuild
+++ b/dev-python/QtPy/QtPy-1.3.1.ebuild
@@ -7,30 +7,25 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
-DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+DESCRIPTION="Abstraction layer for PyQt5/PySide"
 HOMEPAGE="https://github.com/spyder-ide/qtpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl pyqt4 +pyqt5 pyside svg testlib webkit"
+IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit"
 
-REQUIRED_USE="|| ( pyqt4 pyqt5 pyside )"
+REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
 
 RDEPEND="
-	pyqt4? (
-		dev-python/PyQt4[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-		gui? ( dev-python/PyQt4[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/PyQt4[${PYTHON_USEDEP},testlib] )
-	)
 	pyqt5? (
 		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
 		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	)
 	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
 		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
 		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
 	)
@@ -40,9 +35,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 src_prepare() {
 	default
 
-	if ! use pyqt4; then
-		sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	fi
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
 
 	if ! use pyqt5; then
 		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 85ca2f8aaa37..58c106d81874 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,7 +18,6 @@
   <use>
     <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
     <flag name="gui">Build bindings for the QtGui module</flag>
-    <flag name="pyqt4">Enable the <pkg>dev-python/PyQt4</pkg> backend</flag>
     <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
     <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
     <flag name="svg">Build bindings for the QtSvg module</flag>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 592223429e86..106dd0d182a1 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -2,7 +2,7 @@ AUX httplib2-use-system-cacerts.patch 2357 SHA256 e903d680c389b6a588b2ee890e2bef
 AUX python-httplib2-0.9-cve-2013-2037.patch 1166 SHA256 25676fcd307ba6bd81afba1037a97f6326b8bb538c34c53c2e31ae08bf64bd2e SHA512 10a3ac8ae9be7796c3f933694081c36c7412016fabd80e366703ed4622cad47463a523e8b7c30548112f885243887eb6d389218ddfaad99de8181ea5ffa9b5b3 WHIRLPOOL 679ed573e7a9b78f855afcbd689c75790164213040728997644f8c05012905b08cadc6842aa36b6beea616fdf9b53cb6fe01896e0f04e31f6b243e3929e1a73f
 DIST httplib2-0.10.3.tar.gz 204500 SHA256 e404d3b7bd86c1bc931906098e7c1305d6a3a6dcef141b8bb1059903abb3ceeb SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa WHIRLPOOL da205bc1bb5ed6d253c857381300eb0eefe9e409abf87799f5706809eb2d06ac76322f03cf6480f1105c5d0c5820c8842268c0bd2af3496828c201c6d01a4689
 DIST httplib2-0.9.2.tar.gz 205165 SHA256 c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988 SHA512 cf1684f2d072588bc676c02491667480bdd2be0b3494703129d9cfa339d1233e14c0b4895b174d4c2ec5e2f5ae265d165b4e001b180f39f81db2178f91a032f8 WHIRLPOOL d795a016202821870e890531011e7c1c51dbc52f78f79ccf078e85fb3c1155dcf996b2e629b450ba79e34ccdda41e3df3d80293e102c39a76a57d174e51a884e
-EBUILD httplib2-0.10.3-r1.ebuild 946 SHA256 587f136625e4b892e86bbf187274e311e4f64d8afd224f23589734b77f1579c8 SHA512 08725c9058a1bdd64874fea180ce98bdbe3676421d1a180c66b88dcd66f41ae923da3ffef917496c9d9934437a698bd2b7cdcdee136f1493cfb84920fede7e2a WHIRLPOOL f0a1ad7bb424cb36aa36a201ab676c78d4edbd12d48ce00f086d7cbcec29b972e077f262434bb7565dc5994dc55a3617f9142009fdf98627a46f432914d1276a
+EBUILD httplib2-0.10.3-r1.ebuild 944 SHA256 f6673a98c612881c5d53f33c385c31f355a63f8d194f4ee35e9018f0b2d9ec48 SHA512 ed099e8af9edd0cec380bb2036cf4c8bd2e97b2eb0bd32923624a521c07f288972b3e7f02fb807f4c44bbeb9da639b7195a2ddf55efca3b15679eec3c0ec28a8 WHIRLPOOL 8194004a80a3d19b250b3adc44fa4132a4e8123d7a07f4180d5dd3b67c4f550bda1aba5f7c012e4c3b3d4fc3a74d7be53492db8fdb960d8a410e58b5b612e6fd
 EBUILD httplib2-0.10.3.ebuild 858 SHA256 90e88a8011f26c2d2c5ee0f1c10c8305c109f975cdbfa7eb926cfafc6d7211f5 SHA512 fdd5cba5008f9141881d5607f25787b73bebcfb1d0166018dd064addd636524f637d8d60a58970c10fdf8cc43281c10f3f8a9e3aa2d8f1d83d24f9c1adde941b WHIRLPOOL ac29cafcef363c5494615e5999425b358c72e40d30dcf5171b0549fa1baa38c2d48e36074bb690f82bd5e2cbd94f0cd535b2890c83c06f18fa6b1df13493913a
 EBUILD httplib2-0.9.2-r2.ebuild 918 SHA256 83a1846fef462e25a90160cf17cb5929521ecb8d2c2314dba574f61500c02c0d SHA512 8d225e3737f880defc870b78ce0cdf116dcab5880622bb5794af03b4f1a4006b0d768edde84304595c4f2af5aadde9f91043040c5d4dd248482f87402e14d7da WHIRLPOOL 810160739c4e37ba1a6d0f5a2b4be473b12fb29b20e5cc7fc91dd8a41ad4f6425f1f13448b3b055394edc5f8ece31ec3e06eaf8c98501874430a15ecf4196db8
 MISC ChangeLog 5663 SHA256 d3b1d7d55fd36051e43e7b66500343cdb2e9f49464d9748d8da03b7817ee3d3c SHA512 7558febb614bf93e3e599736dbea21820198153b4522f61599d27a71b2b8e15ecff1540b2ce0982095b2805f3fe72634e3f44e66e0641c2e11ca8752c7707333 WHIRLPOOL 00804ad2fbdf5b03cf22aa3e21e2a66f2779595ba80fcafde1e33d49c249d7191519c9f913186f7feb891d56e08b6b71c005cd4d2dd0d81fed5bb3925025430d
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
index 58351dcaf406..18d12684515e 100644
--- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
new file mode 100644
index 000000000000..2fc482d6fe0d
--- /dev/null
+++ b/dev-python/jwcrypto/Manifest
@@ -0,0 +1,3 @@
+DIST jwcrypto-0.4.2.tar.gz 74332 SHA256 3fc20ddc14c3a8f47bca4e25a4d96114ae1e0b604946b1c3755660143ba45f06 SHA512 38994a1274ce3a66d3a6a3e36f83b311b172e260129c94c70ae02e6d62b7a2fbcc07fd4353d3bf45f0c7f40c63322a3f489c8b1bda80c7511ae7a2136a2415dd WHIRLPOOL 96e3633a3aa328515e7c573820e2eda32e4d0c5207a11f3527b7f109742cfae0c3a6c164a0d3f4c14beb9437a7273f11edd0b92a3fb21447cb6967c8c0104772
+EBUILD jwcrypto-0.4.2.ebuild 656 SHA256 c75353e699a92593cdf8f5cf18cf9a8afc1a745a379317e14591c50a3d8f4cbd SHA512 1888109c694e969833c0a849b455c7199b432e44efafcc8db0b9a806d36662491e8d9bab682509e201912870213740494b5bb89e5b571cb2ef46dab0b9201406 WHIRLPOOL 5f1bc554408fbf7336166021553eb4d447dc38dd20b8b519b9b24bd64f2273ca62e20dc64504fc68450beb655534605d4f9d461377ec6ce0a95afeb1012ed62a
+MISC metadata.xml 368 SHA256 7baf7ff7f2863ce1a0224bd39da28ed45f78540fea99a8138ff90aa087dc3e1b SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735 WHIRLPOOL 57b8ee287e92168e5bb2186a624edec75bfbd47e0c635c603c040019980f81707bcb0c4de8d3ad25ab5f130175587790315d73b201fd3a71bc7fc224d5ae713a
diff --git a/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild b/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
new file mode 100644
index 000000000000..5403109a9b1b
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
@@ -0,0 +1,26 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+
+HOMEPAGE="https://github.com/latchset/jwcrypto"
+SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-1.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/jwcrypto/metadata.xml b/dev-python/jwcrypto/metadata.xml
new file mode 100644
index 000000000000..c5792763c772
--- /dev/null
+++ b/dev-python/jwcrypto/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jwcrypto</remote-id>
+		<remote-id type="github">latchset/jwcrypto</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0551480014e6..0e26da36eb7a 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,11 +1,11 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 SHA256 4d16cb9d2951fac9ec467d5fa9fd5d7c0565fd746eb8200924a75474def4c3bd SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b WHIRLPOOL 67b446ef6f66d5fca0fe4261d47508a2fa3e850cc03f7329b01fbe27476e844faacd6e310d8973654477361ea5ed7060d7c6b5290f521c3b6a6b02e2ee83eebd
 AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 SHA256 6f44d53b78ac07cdd87cd3653d236a62ca60d83b6dba1fef65aa4d9858d7ed71 SHA512 5ea10849df7966b8e1c55a699c1489f72714449de3564ee13b5d9410877db3691e82c1d37cb6ea60c30c2deac33bb839583f0bb81a3551baac39bf14ca066229 WHIRLPOOL 15589a917a2b8eff7989205c60368be8a462c2937db085c7bc8662a119382defda88d0e9129222711c857f417f81530194a7ca3a34d7c76a438ac3f5554935fd
-DIST lxml-3.7.3.tar.gz 3797713 SHA256 aa502d78a51ee7d127b4824ff96500f0181d3c7826e6ee7b800d068be79361c7 SHA512 9bf1142e81b6e1c8a47e296774d7e448d9ed47de3672f7442cc33274b07252baa47a9346efa9d2fda7b7bb66beb95bbc81f0ae16c9f808ff568f330991dd6d13 WHIRLPOOL d3881f308622ed8beb03a59bbf8256a55b92f5cf41c2c9a0c65c1e53acceea33ab93f420151330b09e8dbde3f717d5c095aa0275406355ec4a17105de46b6bae
 DIST lxml-3.8.0.tar.gz 3795205 SHA256 736f72be15caad8116891eb6aa4a078b590d231fdc63818c40c21624ac71db96 SHA512 08f6f352e22ed2bc199a5f34a1c6b5f7b41ec282dc0026c9f16a06466c27e39e8eb18608ba4493636170eeac4b0194f7050445e1cc9bd0a4628573c404593088 WHIRLPOOL b09d7509ca55df74c5ced03ca91b72e0f373df6cb22331a452a35cfe3aa305bb9417280ae0b4835cd4abd29f7df465468799fa25c1b8d732152222c74fee51e1
 DIST lxml-4.0.0.tar.gz 4217301 SHA256 f7bc9f702500e205b1560d620f14015fec76dcd6f9e889a946a2ddcc3c344fd0 SHA512 8aa85ab6a99097ae2eaa0087b3a663aae8ac81a0a4d685bf857571c811c8ccd6410afc414f14c68702a53e90265726af085d0609ec7f0d3cc96e3702772627e8 WHIRLPOOL 24ad26d075ecf8f7062a6aa695557628664ce9d23cee7f66218bc373c90feec07bdf8a7f6e4501b996bd4bb208ca173faac1609262c08c6313f5a2d155eed220
-EBUILD lxml-3.7.3.ebuild 2225 SHA256 31a982ad59109791756145d68de4f9bf57eb7108af300d50d2b8b37494999bfa SHA512 c50654ba48c2437f5fa8f27a04d58ec827dea8c11fc1d36a3112f56cf872da4bea02f664a74cdff7899e9dbd13722896e1cf6dfad8d9485313a1342017972d94 WHIRLPOOL 289b35a0ba855a747573a2761becf22360f4fb344223207bc217a058fc998071b6e519ff00af7baa76d5e66cf5b0252bf251b2c6fb19a97c0b298d148cccc2a5
+DIST lxml-4.1.0.tar.gz 4247102 SHA256 be3aaeb5f468a49f523f16736ccff7d82af2b4b303292ba3d052b5b28f3fbe47 SHA512 c4a1180a119ec2d21ab29d00cf60e72ca38a2c28eca4f221251d0fd1c481650fe78ec975532c38a6a59c441bb6f6469bbb110b6b0e9d6b6fffd68dbcad90fcb6 WHIRLPOOL 5e6ab72f5c93ea3e3cb47d530d71e3c41f7724e083e000bc3108974d501b9a387fe368ec1a441f4e9b64fe71fd2b11b540fd78cd659c0761c034e463500078ba
 EBUILD lxml-3.8.0.ebuild 2254 SHA256 c2f8ec55283ff70da5ceef74fa9900736d4badef700dc3d47414161a62fcd26a SHA512 bd042b2a97d121436bc890f017b908510e4c199a37524c0497c0adb0d81071c3061f67b0f9fc1435def6d47cd9a4970e9f7f94aba9a629b8964d351a7d58b75b WHIRLPOOL 7095b783b48e379e2de8ae2cd5897e519b93ddec199978b74c425bfef7c8e07b9ed6c69ea1f3953fd12e57048d6d95fec5a094855a4146597382629c0dafe2f1
 EBUILD lxml-4.0.0.ebuild 2264 SHA256 06ca03fe985b78c67c8da68fb9f8a0ac321b08d880e96d3f3ce3a0af1ab9ea2e SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6 WHIRLPOOL 958a8e6d94728bdd46ea1dda4d6e37b6cb169db602a586cabca303f41b0f34c3989c2b1e949df133892014b47b5c4e646a59a0621dade74b4eda9d51febf26f5
+EBUILD lxml-4.1.0.ebuild 2264 SHA256 06ca03fe985b78c67c8da68fb9f8a0ac321b08d880e96d3f3ce3a0af1ab9ea2e SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6 WHIRLPOOL 958a8e6d94728bdd46ea1dda4d6e37b6cb169db602a586cabca303f41b0f34c3989c2b1e949df133892014b47b5c4e646a59a0621dade74b4eda9d51febf26f5
 MISC ChangeLog 11862 SHA256 6fd242f3eee218860f8744e0c5656c51599e9a80cbc75e12c954a543a03ead94 SHA512 220b3df834fd4e8d85cfc46bec8a414042c06d4cd05efa887f619e855b452c7e69c7713d70478cdea9264a83f5012b5f0d0604c7511e07f495d8a0d02ae0a721 WHIRLPOOL 9771d6651fa6a474fd3e234504e419b18f9d1e266253bef4b6500e33b3d3c477aca2d2d45d6b72b9fbd144f6e9875700df0cf84e96c45482ad228e3eb89da280
 MISC ChangeLog-2015 27655 SHA256 585c3b7babb59fabf24b0bbd3abfa0abbe5f35c92faaccb0df995c61b5878b24 SHA512 0a05a247257042ba708d9914e6757aa60ece30eb67d1892b164f49d2d2825d467b4fe60396bbbadb692fc0a6f11e28efc8b6cce6176966a9e4f4669b1fff651a WHIRLPOOL d031211ffd5cc010d16cc3d872a6ed17d348103302f65e7ecb9af1082659f85e6b65babf36ec347ae1c03cf8822d71bc679eb6738bbcb892d8dbeeb322c34082
 MISC metadata.xml 317 SHA256 cd18e04d042e1f29961f6fd28916572028bba9f9fc0dfe26da78c3347b4d49e9 SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae WHIRLPOOL 093286f5009a9dff327e1f6931f18e9081a7972a86ed88d1f04f612d68e9dbb94bc5847c8430554ffb29a51cc0b233de03d82f8d4d086a116a124826faeabcd7
diff --git a/dev-python/lxml/lxml-3.7.3.ebuild b/dev-python/lxml/lxml-4.1.0.ebuild
index f2a0ffd01303..2ab0055cd819 100644
--- a/dev-python/lxml/lxml-3.7.3.ebuild
+++ b/dev-python/lxml/lxml-4.1.0.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 4452dcfcb620..b41e6a5fc2a4 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,7 +1,7 @@
 DIST pexpect-3.3.tar.gz 132330 SHA256 dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa WHIRLPOOL e708e722d4e2598958f8d724b84148608e9a53041077b1a1a2af84d5281e11f0c6c050ee88489eebc48bd5556c22e0fe9386680d34b1941ddf21539296629513
 DIST pexpect-4.2.1.tar.gz 143980 SHA256 3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261 WHIRLPOOL 35176b56bdee1d7066705925c54014c33e18679e40f9182f15a223190904a6fead235c0d676806cc55a3f0f64666f446182056a29b27217ccc8990ecd9b8184e
 EBUILD pexpect-3.3.ebuild 1068 SHA256 d5ab249b9afb276372db9ab7a35271d9a6ac541186af0c45a3ab1617b0b145e0 SHA512 0273ebbbba5c3ce1f60956fd7c8b99f374d148e40e6fdc6910e0febc71bd6bc64e83f28f01520ed54a0dc1b400e8b9f6131d63020a2d79974f04b673a13bb5b6 WHIRLPOOL 18984dd935a20733b97c73dc7915c5d45d9f64d66226eefb7a169095648a4fca90c26c68b125ceaf4876e738569eb622b00c920001084534932d40420f42eb61
-EBUILD pexpect-4.2.1.ebuild 1171 SHA256 c9ca32480f2078b43c02821bf86c0cfbcd34f9397c0f4eee66dcd79e73819846 SHA512 366dd4e99b56a9b9eaf79c55b5825ff9d7fb1dd4aec16e69152b1f62e6a15f93414dcd962571fd92e4a96cdcc9cc305a23e5a55b3ca241b5c0abecee8da02ad1 WHIRLPOOL 2bfe87b5ac78d891f575a29ce3eafd4e9cbbd3579df99245b14d91c5d8052f1379f3cd7ca6d49bd254f3c563d01e412b9e38456f9e918076e9b01ece130bfbc4
+EBUILD pexpect-4.2.1.ebuild 1170 SHA256 5fc087541be46cd7e19d3aa0fd3c20fdd3eafbdee848b16d90ddbbcd3d1a74a5 SHA512 654e1153cc269f4d4fc3282e87d82a23908b18869aedf6c11e5ea7ca72302ca53856e6e2826ee9bb33117f49c401047ac8b24fae2a2d444abe1261e36e8d3d32 WHIRLPOOL 865c25eeec287e9e0a1ad973f0948da30607ea780f9e86b1092bb5d0d34d6c0c6f3407058214921b91fc6b9babadd09d87690d2231b00533d487f503e63fead9
 MISC ChangeLog 5819 SHA256 ce40004ec45a10f2ae2a9a4200bad347eef4111f5ce9f927d015f1cb6292abfb SHA512 ad8d2be641ec91a806f722dc05a101ccdd0a44eda19e75ae14dcff363b504b1310b3c023066437fbdf3cdc2025b7c5371b12e71cf478ffe21263487f6f9b3577 WHIRLPOOL 879905b8ce46670fedc447d1e4aa1ac4a5bf02ca9235c6d365b6e9604075f7dced6ca7620524259dcecbbeeb0fcb0b458db6451ca0f072b6b3d97e878e665b59
 MISC ChangeLog-2015 9840 SHA256 72bd8513660d70da0c3e6f10f8c5768d95c185d6038a3a985a622cbe730bdd3d SHA512 15c7d741bfc96626b9cd87c72d4f1a301ed97e526e5e04ef8f415409f1ecc52475faac2c339189144e3027f70a2ad3bafff743151a6ac6e9bfc4e1a0e6e347c0 WHIRLPOOL de3274b0164e3f154706ce7444fe2c9e8918c4a73274bd7d3f14b861396dbdfb1360d6162e8b5a18d567289c3c94687e363fbbbbaf7c59dc166da3797f247b08
 MISC metadata.xml 377 SHA256 ce566bac90629ab4c9c07dfab27277b6c7e8825452a00b5e5afc8d3cb75e0e88 SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464 WHIRLPOOL 89f3dd9835233d4c20e80550859342aeb86ddbe67b19464f9a5d1cc7be6ed0d1ab1c2d5c883b9af91991dcb4dd93ce7c58a3a3ecec4115688cc5f8ab4774427b
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index a9e4f2ebcdaa..79b3a0dff221 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 72ba294a32e5..c460d95a9f84 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,7 +1,7 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 SHA256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad WHIRLPOOL ba327a02a847f7c5e4b62e6bf8ba0f070f8a22ff584045d7ed3cc134f8a922b9d75e397992cd5df5ca4569f563d234ea2a194b5a557606978a37a4f04559ee1e
 DIST ptyprocess-0.5.2.tar.gz 69297 SHA256 e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553 WHIRLPOOL de6f42fe487b948b5b7801a9c0375f7586aedcac5c7e7563f0f7cf56a3a8d7c2abea42d256544b32cf5c0bb71bc71602b8582d581199cf0e2234a648a6017be3
 DIST ptyprocess-0.5.tar.gz 14923 SHA256 dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59 SHA512 6619bfc1dfc7c980ffc72dba62697692eb749f19500616e8783cfdc3c35980276eb39070f4cd7932775abb5e798c921b9320c5f51b9052f526585f01cd56259e WHIRLPOOL b1bd0da485ea106a3d366ab21dc714418b8d392a32fc3386ef734362da8ee455a38f9330cedfe35687be09bea3ff622c54440119fca72d7787d9a29518717b77
-EBUILD ptyprocess-0.5.1.ebuild 608 SHA256 7f0f1246ead310a3278c0ed4b478cd6c2f82dd8008a653a0579d0570e03c6068 SHA512 ac54b2da2df188d90859252012ea1eb0f3445cf76518bd7a631c62b167e43206be31677698c11d5702613d423796dd3bcbcd2b389512690ab7d1b7e194fb5ce8 WHIRLPOOL 00f5b8cccae3cda65c246244812514511356dd444a984062a93a371a4f818834e61d32578b41043a53726b37b59300bf4c31b16fb40ace955d76178163f9939a
+EBUILD ptyprocess-0.5.1.ebuild 607 SHA256 9f410c856810e96eb246fe183d633b28abfd073938826c4d0adc0878853d292a SHA512 bc65d7b28bbea47bcc33ab9d0cfb18f9896f29bd212239c88b5f93b9344f13ff50c8120648c4d028af52d7fed5de95e1dd82e5b4aa3bac1777b9ba5dea36ec46 WHIRLPOOL b6f413528dfda1ad30f64edba73afc5ac0ee8d610dca6479973286caf5ab2c9286091b9e61575267aab6c1d3b4840c43515354b7505f7b03e49f3567fea17fa9
 EBUILD ptyprocess-0.5.2.ebuild 628 SHA256 123192b7f51075b035533bd7566694a6c0dcadbc8e29e95c0f913ae25b46f6c5 SHA512 10325f39029c41113f1bd0670b0a2c8a539fbc70e40083aa7599b7da78c649824c2eb163c5d09f8f233abde03db10e0b32fe81f01145e909c0789c514f6ae71c WHIRLPOOL 22a1a3108382ad0384a31d4b90d13a7a1fe568292c0a2e7fae7687e94b9746e5716470bd1e4c5f9393a9449e4a7e881f302f55ccc4c45bf75a8d599de799f45d
 EBUILD ptyprocess-0.5.ebuild 610 SHA256 4ea670f95be32179a1e84e923da9cac8534557e2192157974eaff371f218a51f SHA512 076adc28648cbd054a8988191dbc654c2d6c133232c1d8c36e0327eb815b1d38fdeeb96cbcbe87d574a480ab29efa306d53520f0d0fe9ee0c0418c725f76cfb9 WHIRLPOOL ed94a4fe36815c3227e3243480e18241c12c216f7144c4ee370d0d68e0bf96192d91a4ccd9625132d65fb7094af95338dfb859678f268530d377071900bbea22
 MISC ChangeLog 4460 SHA256 f44f851cdeb6894fbf80620684ab12c3174cc1d919baf2aafaf2f758ebc1fd8f SHA512 f72a44e2d7c1d457da08facf02cd5588ecd69e0d6ae23a69c734ad7a7bc1a4c94838d0c84990813aa1eb0914f6b91d25820ea42fe0a5e898a499a9657c01a500 WHIRLPOOL 27472013506d12aa3ce6d81d95ff4fdb32b96b195fa7116f9f7c289c9e7b18e19006429738d634900d439bcda5e4e80f9c0e8f4ec2ccadb2c7d624a2bbefe010
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index d9be5e09d48e..a6a5b1ab0a43 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index e1d101db7031..2b8e1efe5a3f 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,28 +1,9 @@
-AUX py2cairo-1.10.0-ppc-darwin.patch 446 SHA256 c957cd14eb2c3fce0169a54b13665522fe1ada1af61a865903aad595afa309b1 SHA512 003e3266542242d349baa522552392aa448738f91a37ef0e6c8dedc3e0c179ca98167ab2ea7d75bd7d708f24f286099440a7a6a784767530eca161486403b033 WHIRLPOOL 0695123f4c9b3e82c22f1ba632243226d1dfe50442ea515abe440632221984c10aff233b8407a0e8dd4f594a1464c4fb7f121e43cfd0d03a2529ed1163e1a649
-AUX py2cairo-1.10.0-svg_check.patch 2912 SHA256 c35d96be5be571c2f4c3415e4016a7e70a5edd6164818af80d16855e4e4efe72 SHA512 e0069738659db0fa3c0532efa7e53fed5f088ee4ce276fd6ddcfcd0ee1e8b4861a09330afe8a30bb45b912c7a93cf6e42dd6057ad7f5adabfdddeb58bc10bbe8 WHIRLPOOL 90ccae77f2641c1f9f4ad6f6497fd7912a952b7b948fe64845e8c60629d4f70c590fd33dd276c54cbc8251d45e8bd201841d7bc3fa04a37a314f1f375b8250c7
-AUX py2cairo-1.10.0-xpyb.patch 952 SHA256 d6809bf00608d007f866040025392174e0cf3efe3ac03277436e00bacdcef54a SHA512 45fa1d32a8a4fc79b10e9221af286eef3f9d2c2b4991c066b1e18bd329feb764d07c4ebc58e1926ae86c4cb4a2ed0fd172f75f7479cec0be51ec5c5da6d4f13d WHIRLPOOL f8818581d471735748b546ffa0f4ac42bc5f623ae0ab383a70cf5977727ba933509497d3071aeb572e764c5e164680c16f8d476b0d8f1b7659dda7190b226cda
-AUX pycairo-1.10.0-101_pycairo-region.patch 27745 SHA256 93e189149e85c982607e0eafbb622da0b14f259662c8f81b6b59a1f639a52797 SHA512 5a66da5dc1c0888c423e2f62ae618b1ffbe03df9af249fc026cedc927d1eaff43e31fac38a58e4d59a2876be95e17e4a05679420162aaee111caf4d199a38552 WHIRLPOOL 15bac5be6149e86a3e96a72fe4b73c16d285c6fd555787023c91221ad6ed5c0e6977fb9a89af76806d452bb556395bfc3186ab180eacaa924295366bcf298b2e
-AUX pycairo-1.10.0-50_specify-encoding-in-waf.patch 1132 SHA256 611947d3f66fbb3b5a7900a5fb827c21b18ff6c97dad27c874eeef4d8744b842 SHA512 1136413bcecf1e34101d8b7b1930c506a401baa3594c22978e9c6b53eb3d555c40153b608007402428a6a8806348129de6397460a42b219e39f823adcc1951fd WHIRLPOOL d78cc1879a6358f4cfbfe164f75a71a602e1823a25128483727ad2151593016d626124cda293f909944cc76a148a8ed31b81950a3ac6491a195e01f7cd9a3715
-AUX pycairo-1.10.0-80_fix-pickle.patch 1057 SHA256 f42993b81d9c0a7bf2cdd4f23e79f6424a3f6ddd09a096c3a151e396e03f6d1e SHA512 934386e2fb3dd470a067c359e70dc1985a303e9e28a4592e1a482dc253abd80f4933d90448cc4fea10bfaa01a8f3f2b83c865e926db7da699768e05a4e3d53e1 WHIRLPOOL 5792affc16265e7b14cc77ebd7d7ed4c0c5dcd10c8ba280fcc823d429721c9c47b0ce63df52210cff7a6246b9d8758e475d098e3c2811758d53b413d67c0e896
-AUX pycairo-1.10.0-81_pickling-again.patch 973 SHA256 f5445061bb0403edc4d937b3a6842fcbe51a39b278c9fb606e6badd2c2e0d13e SHA512 5379b94ca473541b41af34e8c1f23ff8705a972b87bb1eeba3e21519ca1508be92cc5d603610e89be3188e0dbca1069e19148f54cf8884fe0acb70d934dfd95c WHIRLPOOL 53a67d84f8cdd87059bdf6660a0e669bce6ca9205f14463803c5bf9c44a9ea45be4e13176c7de5cf83939c9f8c16fa319b3246442d9a2ef66c2bb2e7c908542b
-AUX pycairo-1.10.0-svg_check.patch 2924 SHA256 f9d2bac70bcca57c523e69403cb7332bf4ade0427998b6a3dc16730bcc17b6c7 SHA512 a05fc725c9c8ac48b262795c6c6e56b3a432f73d69657565763292f74cbd8b3d4eaabc1a5dd5db0b74cad297cc330caed271c40fbb16d459019b4c75ab33ccef WHIRLPOOL ceaf8bf26f9783bd017fbfb6b81f00ece0122d1f57ad6ae3d87f40b39d7a4bbb47bab89891f3f12357f44f26039a6c63bf46b25765fac2412bd079c6e17dd6cf
-AUX pycairo-1.10.0-waf-py3_4.patch 511 SHA256 a4c5526c045972087ec12f68192e14f3f6910b2c2ea4e7a7b742dfd8520cd475 SHA512 7f8b76483b8f193ba03b89030f9f418632d6a062e4026534404031612c870f206392c82f52f2c64a9960e3e5b43562155449baedd7e3dbd0562a65f32ab33315 WHIRLPOOL 23a846d28676cded354b1b3a9f3e9010fc955d47b4db7d6d6f3bc9247d37afb98f8b928a203d47e454113a5a69d228de36249b4d07d86eeade112c40cc0f23ea
-AUX pycairo-1.10.0-waf-unpack.patch 262 SHA256 ad9f1b924397b5b14fcf2e903f4da9851f06414e25fa4d5fa1a4c36a0586b9ae SHA512 05ff350976729122238d97bf69ec5e55bc489404ec1d8cae478ecb28baa6676a100b520aedc0d3dd6bf77385bc6f34de6cd32d33a5c5b0c593059309e3628d0a WHIRLPOOL b66d080e98a5cb70634b90fb7922c13e7c2bc338b64e1a9f3a38ccd5111592e72668d55e3fbccdcfe904c1296150273005a7b93202b4300ff6f792476873a5f1
-AUX pycairo-1.10.0-xpyb.patch 1112 SHA256 5c6ae65a5f1b6eee0e56fb39f7fade34dc20dc38c7cefa5841a45d8c23bb9a0c SHA512 69c826970b36075b3a1ce63b2db89ac1779902a570af95b28c07536ce91c3c9adce234444a86b6211e9b53b0293a56173de88d76f50f77a0ed3aa17e2aefcfb3 WHIRLPOOL 30d18f9910ed29d798d5eae610f608af76d2b0c1fb89801f25b1ca9b97e58d2a15ab1c948386ad326d249ffe899e0187561c2708b692287b80039e21f5185b88
 DIST py2cairo-1.10.0.tar.bz2 402070 SHA256 d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 SHA512 cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc WHIRLPOOL 60b57d55b27f06acd62714ac6ad7973ab973d42995fb536ae800263a2e8c7451a24ccafd96fe30f5bfa26e1ae218934d4fafaafec3e9666a39b33c78672407e2
+DIST pycairo-1.10.0-gentoo-patchset.tar.bz2 9669 SHA256 31b5aef32b5d2fb3d8e1c6f9629e6d78e6b3928a3a1c7e44af2120f38490d00e SHA512 c367a7d8fa771ac900ca3363cb7dfd50de045cf67c73c6e552d05018c6933b13dd5660b033be59e1acf8af79f16253a8e56aaa3f135a262a8148711ae8b7a587 WHIRLPOOL 65890911ee35568fceaa5146bf5e4718011eb2f606dc6c180e7ce612fe2351488c7ad2ea2322ec1ca55eb0f8b6f4fb3fb759152be525d20f80922d707108bc9e
 DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76
-DIST pycairo-1.13.1.tar.gz 123690 SHA256 d8f58de67ddd01eda9e5112de57599b7d0154d71c9474821e98866c228794641 SHA512 705979aec5166d1e750ddf2938934edb18d5093e340d9e604a70dc02499ec478db7b0c84572f7ff287139c1b3982a31a254c36641123aee183b3053efe299d59 WHIRLPOOL 307e052d632a4591b67776b62ea173b647273151411bb8bfa9cc4d6dd066dbba30b3ea2bd1b066f6c91fe0a7275e76d1a6c0ebcb15c9113ab28a3ceec04e59fa
-DIST pycairo-1.15.0.tar.gz 167963 SHA256 b469b782ffabeeeb5973b64ee55e993521f32ac658b24baccbcd3f939c4f44f8 SHA512 e27f1b31225fe6eba7722a412a4eb9c591a3ce4887ba5a7edb738f757efa8372c1e2cd6ecd52386c350bb5058d8fa1806ee1d5ecabc2377d1934ded29b8592c9 WHIRLPOOL fcd5764ba1f71513ae164555eea081f21565c03ebd2a48cf89adfe29b3f7b3bdd364b5b19f403e5ade3109beddfc81bfbcd25666285dec1a2833c11e8559f249
-DIST pycairo-1.15.1.tar.gz 175924 SHA256 987d392270247343595d37591f80639ed902fce7e30bd2f944cb1b0a9093553d SHA512 931b6ca704fcae501b7671dd6cd964746951e08b5d09dc7118e3ff5c3c1f8aba9d211efe7867b77bb30f14f4700f888c7ed297ec5e8afca06d3d7327835c8e1f WHIRLPOOL 3d85ebebfab81a9447e4073f00f77ad0dc204f7f18799cec37b1afde50831faaa8fb01a713548917fa6dc80f7a165a4a032c92224cf09c9837b0b6e47e7bb973
-DIST pycairo-1.15.2.tar.gz 176051 SHA256 a66f30c457736f682162e7b3a33bc5e8915c0f3b31ef9bdb4edf43c81935c914 SHA512 ce0ee0b1775eac75eaee9eddcd9dda21d99a6327bac55e0d2e15ce3a8a1869e4d44c59eada1725ba3cdda16fac4ce33a7c350ffdae3892dac85c5e70033e3ee1 WHIRLPOOL 89d8f9a97c3cd7d5d1b2360641ff361dfca0f2567d01fdc96035f57f5389f49249976c341ff5995d9af515c52171a1e5d0ab222b07d00e4020579b3d35a08a2a
 DIST pycairo-1.15.3.tar.gz 177056 SHA256 8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8 WHIRLPOOL e9248366c8eb541bc70ad73c9c6eea995a2527d189584a1ec6f6b835fdeae57d1aa63e2deaa9f790042d0670e7d07af8867b111ac107b53befd354c3cfc70ca1
-EBUILD pycairo-1.10.0-r4.ebuild 4045 SHA256 922c9a0faabaf52f1badd0694b19f88de7dd7bcb14d4de7c38c59c1a975d35f4 SHA512 d9de003ee4a8412ec1acefd8bbbb0010a53a516ea1385774ac2b8a8864c95e4ed2d14af7ab1a4df9ce07ebf0739637a03e5bcad5e5db0075a03577cf5c6b9ea6 WHIRLPOOL a6ca16158367d3dbdddb04c50d332dfe4fdff9fb8282547c647efe7b9c2018e4eaa7f5036a52dcbaead22032b32aa9652a831277ba5934b405bbb11d6e67ade3
-EBUILD pycairo-1.10.0-r5.ebuild 4495 SHA256 ad07524254a26ee0c98d4a2b84836ceb8b17c69d8d744899431b787e376b2892 SHA512 31bc472872e47ef634111d74e1e2dd38506938fa27415b42068970b8b753d13e71fbd018cae6bf9e0e68c0ae10111dd0ed60e0f735a103ff5bc6fe7faadc8fa4 WHIRLPOOL c3ba51755525740e1d0a75898c1d6acb851c57ce6a3ef33ab414baa52f5d3039dc3f957f68df912419ec2c0d561d06400bb646de53b2e85819b9ec0af1690465
-EBUILD pycairo-1.13.1-r1.ebuild 1582 SHA256 8034147a9892aff7f60de1252278c0dfcb35ee0c32abed19eaf419f82650fe03 SHA512 032b6a99d81593387db6be0014fa29a20a78c87aa1450a0626729fce31b165e6eecec70797686a93a8342fe69c6ed134117876d6e6e007efe81bf8547fad3b92 WHIRLPOOL 7e84775c8126956dbfe8b72f26b99245a9722f92493c23374317fd7847436777acd07d25afcce6e77169c2512cb981be9a7e6b98486736c7f056f684e31373c5
-EBUILD pycairo-1.15.0.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
-EBUILD pycairo-1.15.1.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
-EBUILD pycairo-1.15.2.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
-EBUILD pycairo-1.15.3.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
+EBUILD pycairo-1.10.0-r5.ebuild 4801 SHA256 1933c92394e858f016a9a85ce19cd4a49743fe4271300da987ae8fcc704ad2dc SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a WHIRLPOOL f297032c612fc23b3a48bbc169babdd9c6b5c68c37de47bad4b49b2f22c5d71da232e357aee4622ee0821864a78ce7f79fcf1aacf51b0a6b782adce7c2c35daf
+EBUILD pycairo-1.15.3.ebuild 1614 SHA256 60eb8212dd285e92ac3a306f7584ceaf463ad1977100616a958dbc20684eaeed SHA512 1d5445d6dc0c73405e6bb94e933cb6e2d43b0cb5d6169d238faea596fa099a4aec07ffa2d37c888c056e4ff01758384320dcd99ac66072a453cc99e4195a9332 WHIRLPOOL 711ff6b6cb393de9e7eb6e579300ddf08279f00f7608c968d52fea05617f8ccde358e70b16a974e44d917cf648f580e4d909b30734da9ce7149a54e65ba8e1d3
 MISC ChangeLog 4405 SHA256 0290ffffd0f0c4c7daa5273929bff3e300f971663f78f268b7e6bcc8fff9b321 SHA512 15f3867446f2e1c27cdd63624c4f8014623162394982fdd10d11176118f099522963cddb461f62a6e2c240de8403dadc1a465ee795084b954f728452b55de8f0 WHIRLPOOL 689ea1a3fdbe13cd1253ff04895afddb70ccc278a7e98de65732bbff55564192bd0811ede6dbdf2f1840ec38bd35367d6864a26dfa20eee9ae68ec108538ad0b
 MISC ChangeLog-2015 19702 SHA256 fe08ff0a819ad0b3a356f5f40a1a41df91a1f23b724a40d2f918629c722daccb SHA512 d5a3f9c9798f2a90ddb9ebcaf3883222d2e56fa8836a120ea8ff63890ce46aeeef7dfeb45e0a8c94d93e76aa463c65ca3a965db2a04917169841673eff2120f2 WHIRLPOOL 01e7b92dfefbb54123b9329c032657fc6e63d592b7d6b4d68a4e2a9e506ef0a50c2d680ee16c518d4e07858254a6ed2933260e891da934e3426ee0546fcc9f4e
 MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch b/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch
deleted file mode 100644
index e921ac34acd2..000000000000
--- a/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-inspired by:
-http://groups.google.com/group/waf-users/browse_thread/thread/2bd6774056c850bc/
-27bfdcac2fb9ec05?lnk=gst#27bfdcac2fb9ec05
-
-we cannot "fix" the buildsystem, since it's bzip2-tarred *sigh*
-
-
---- waf
-+++ waf
-@@ -154,6 +154,8 @@
- 
- wafdir = find_lib()
- sys.path.insert(0, wafdir)
-+from waflib.Tools.c_config import MACRO_TO_DESTOS 
-+MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
- 
- if __name__ == '__main__':
- 	import waflib.extras.compat15
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch b/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
deleted file mode 100644
index 4cd755c8d574..000000000000
--- a/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- src/cairomodule.c
-+++ src/cairomodule.c
-@@ -127,7 +127,7 @@
- #else
-   0,
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
-   &PycairoSVGSurface_Type,
- #else
-   0,
-@@ -223,7 +223,7 @@
-   if (PyType_Ready(&PycairoPSSurface_Type) < 0)
-     return;
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
-   if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
-     return;
- #endif
-@@ -305,7 +305,7 @@
-   PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
- #endif
- 
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
-   Py_INCREF(&PycairoSVGSurface_Type);
-   PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
- #endif
-@@ -379,7 +379,7 @@
- #else
-   PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
-   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
- #else
-   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
---- src/private.h
-+++ src/private.h
-@@ -86,7 +86,7 @@
- extern PyTypeObject PycairoPSSurface_Type;
- #endif
- 
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- extern PyTypeObject PycairoSVGSurface_Type;
- #endif
- 
---- src/pycairo.h
-+++ src/pycairo.h
-@@ -182,7 +182,7 @@
- #define PycairoPSSurface_Type       *(Pycairo_CAPI->PSSurface_Type)
- #endif
- 
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- #define PycairoSVGSurface_Type      *(Pycairo_CAPI->SVGSurface_Type)
- #endif
- 
---- src/surface.c
-+++ src/surface.c
-@@ -83,7 +83,7 @@
-     type = &PycairoPSSurface_Type;
-     break;
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
-   case CAIRO_SURFACE_TYPE_SVG:
-     type = &PycairoSVGSurface_Type;
-     break;
-@@ -1015,7 +1015,7 @@
- 
- 
- /* Class SVGSurface(Surface) ----------------------------------------------- */
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- #include <cairo-svg.h>
- 
- static PyObject *
-@@ -1125,7 +1125,7 @@
-   0,                                  /* tp_is_gc */
-   0,                                  /* tp_bases */
- };
--#endif  /* CAIRO_HAS_SVG_SURFACE */
-+#endif  /* PYCAIRO_ENABLE_SVG */
- 
- 
- #if CAIRO_HAS_WIN32_SURFACE
---- wscript
-+++ wscript
-@@ -1,6 +1,7 @@
- # -*- python -*-
- 
- import os
-+import subprocess
- 
- top = '.'
- out = 'build_directory'
-@@ -11,6 +12,17 @@
- cairo_version_required = '1.10.0'
- 
- 
-+def check_svg():
-+  if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
-+    return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
-+    if return_code == 0:
-+      return True
-+    else:
-+      return False
-+  else:
-+    return False
-+
-+
- def options(ctx):
-   print('  %s/options()' %d)
-   ctx.tool_options('gnu_dirs')
-@@ -39,6 +51,8 @@
-   ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
-   ctx.define('PYCAIRO_VERSION_MINOR', version[1])
-   ctx.define('PYCAIRO_VERSION_MICRO', version[2])
-+  if check_svg():
-+    ctx.define('PYCAIRO_ENABLE_SVG', 1)
- 
-   ctx.write_config_header('src/config.h')
- 
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch b/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch
deleted file mode 100644
index c136cb0c39a1..000000000000
--- a/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- py2cairo-1.10.0/wscript
-+++ py2cairo-1.10.0/wscript
-@@ -10,6 +10,7 @@
- APPNAME='py2cairo'
- VERSION='1.10.0'
- cairo_version_required = '1.10.0'
-+xpyb_version_required  = '1.3'
- 
- 
- def check_svg():
-@@ -23,6 +24,17 @@
-     return False
- 
- 
-+def check_xpyb():
-+  if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None:
-+    return_code = subprocess.call(['pkg-config', '--exists', 'xpyb'])
-+    if return_code == 0:
-+      return True
-+    else:
-+      return False
-+  else:
-+    return False
-+
-+
- def options(ctx):
-   print('  %s/options()' %d)
-   ctx.tool_options('gnu_dirs')
-@@ -41,6 +53,9 @@
-   ctx.check_python_headers()
-   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
-                  args='--cflags --libs')
-+  if check_xpyb():
-+    ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required,
-+                  args='--cflags --libs', mandatory=False)
- 
-   # add gcc options
-   if env['CC_NAME'] == 'gcc':
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
deleted file mode 100644
index 4143f33cb247..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
+++ /dev/null
@@ -1,917 +0,0 @@
-Description: Add support for cairo_region_t
- This patch fix missing support for cairo_region_t.
-Author: Bug Fly
-Origin: https://bugs.freedesktop.org/attachment.cgi?id=61553
-Bug-Debian: http://bugs.debian.org/688079
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/py3cairo/+bug/1028115
-Last-Update: 2012-08-20
-Applied-Upstream: http://cgit.freedesktop.org/pycairo/commit/?id=75e82a1b3f495a3abbc78e50a5c66356d320fb15
-
---- py3cairo-1.10.0+dfsg.orig/doc/pycairo_c_api.rst
-+++ py3cairo-1.10.0+dfsg/doc/pycairo_c_api.rst
-@@ -51,6 +51,8 @@ Objects::
-   PycairoGradient
-   PycairoLinearGradient
-   PycairoRadialGradient
-+  PycairoRectangleInt
-+  PycairoRegion
-   PycairoScaledFont
-   PycairoSurface
-   PycairoImageSurface
-@@ -78,6 +80,8 @@ Types::
-   PyTypeObject *Gradient_Type;
-   PyTypeObject *LinearGradient_Type;
-   PyTypeObject *RadialGradient_Type;
-+  PyTypeObject *RectangleInt_Type;
-+  PyTypeObject *Region_Type;
-   PyTypeObject *ScaledFont_Type;
-   PyTypeObject *Surface_Type;
-   PyTypeObject *ImageSurface_Type;
-@@ -115,6 +119,12 @@ Functions
- .. c:function::  PyObject * PycairoPattern_FromPattern(cairo_pattern_t *pattern, PyObject *base)
- 
- 
-+.. c:function::  PyObject * PycairoRectangleInt_FromRectangleInt(const cairo_rectangle_int_t *rectangle_int)
-+
-+
-+.. c:function::  PyObject * PycairoRegion_FromRegion(const cairo_region_t *region)
-+
-+
- .. c:function::  PyObject * PycairoScaledFont_FromScaledFont(cairo_scaled_font_t *scaled_font)
- 
- 
---- py3cairo-1.10.0+dfsg.orig/doc/reference/index.rst
-+++ py3cairo-1.10.0+dfsg/doc/reference/index.rst
-@@ -15,5 +15,6 @@ Reference
-    matrix
-    paths
-    patterns
-+   region
-    surfaces
-    text
---- /dev/null
-+++ py3cairo-1.10.0+dfsg/doc/reference/region.rst
-@@ -0,0 +1,52 @@
-+.. _region:
-+
-+******
-+Region
-+******
-+Region — Representing a pixel-aligned area
-+
-+.. currentmodule:: cairo
-+
-+
-+class Region()
-+==============
-+*Region* is a simple graphical data type representing an area of
-+integer-aligned rectangles. They are often used on raster surfaces to track
-+areas of interest, such as change or clip areas.
-+
-+
-+.. class:: Region([rectangle_int|rectangle_ints])
-+
-+   :param rectangle_int: a rectangle or a list of rectangle
-+   :type rectangle_int: :class:`RectangleInt` or [:class:`RectangleInt`]
-+
-+   Allocates a new empty region object or a region object with the containing
-+   rectangle(s).
-+
-+
-+   .. method:: copy()
-+
-+      :returns: A newly allocated :class:`Region`.
-+      :raises: :exc:`NoMemory` if memory cannot be allocated.
-+
-+      Allocates a new *Region* object copying the area from original.
-+
-+
-+class RectangleInt()
-+====================
-+*RectangleInt* is a data structure for holding a rectangle with integer
-+coordinates.
-+
-+
-+.. class:: RectangleInt(x=0, y=0, width=0, height=0)
-+
-+   :param x: X coordinate of the left side of the rectangle
-+   :type x: int
-+   :param y: Y coordinate of the the top side of the rectangle
-+   :type y: int
-+   :param width: width of the rectangle
-+   :type width: int
-+   :param height: height of the rectangle
-+   :type height: int
-+
-+   Allocates a new *RectangleInt* object.
---- /dev/null
-+++ py3cairo-1.10.0+dfsg/src/region.c
-@@ -0,0 +1,598 @@
-+/* -*- mode: C; c-basic-offset: 2 -*-
-+ *
-+ * Copyright © 2005,2010 Steve Chaplin
-+ *
-+ * This file is part of pycairo.
-+ *
-+ * Pycairo is free software: you can redistribute it and/or modify it under
-+ * the terms of the GNU Lesser General Public License version 3 as published
-+ * by the Free Software Foundation.
-+ *
-+ * Pycairo is distributed in the hope that it will be useful, but WITHOUT ANY
-+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with pycairo. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define PY_SSIZE_T_CLEAN
-+#include <Python.h>
-+#include "structmember.h"
-+
-+#include "config.h"
-+#include "private.h"
-+
-+/* PycairoRectangleInt_FromRectangleInt
-+ * Create a new PycairoRectangleInt from a cairo_rectangle_int_t
-+ * rectangle_int - a cairo_rectangle_int_t to 'wrap' into a Python object.
-+ *        rectangle_int is unreferenced if the PycairoRectangleInt creation
-+ *        fails.
-+ * Return value: New reference or NULL on failure
-+ */
-+PyObject *
-+PycairoRectangleInt_FromRectangleInt (cairo_rectangle_int_t *rectangle_int) {
-+  PyObject *o;
-+
-+  assert (rectangle_int != NULL);
-+
-+  o = PycairoRectangleInt_Type.tp_alloc (&PycairoRectangleInt_Type, 0);
-+  if (o)
-+    ((PycairoRectangleInt *)o)->rectangle_int = *rectangle_int;
-+  return o;
-+}
-+
-+static void
-+rectangle_int_dealloc(PycairoRectangleInt *o) {
-+#ifdef DEBUG
-+  printf("rectangle_int_dealloc start\n");
-+#endif
-+  //o->ob_type->tp_free((PyObject *)o);
-+  Py_TYPE(o)->tp_free(o);
-+#ifdef DEBUG
-+  printf("rectangle_int_dealloc end\n");
-+#endif
-+}
-+
-+static PyObject *
-+rectangle_int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
-+  static char *kwlist[] = { "x", "y", "width", "height", NULL };
-+  int x, y, w, h;
-+  x = y = w = h = 0;
-+  cairo_rectangle_int_t rect;
-+
-+  if (!PyArg_ParseTupleAndKeywords(args, kwds,
-+				   "|iiii:RectangleInt.__new__", kwlist,
-+				   &x, &y, &w, &h))
-+    return NULL;
-+
-+  rect.x = x;
-+  rect.y = y;
-+  rect.width = w;
-+  rect.height = h;
-+
-+  return PycairoRectangleInt_FromRectangleInt(&rect);
-+}
-+
-+static PyObject *
-+rectangle_int_str(PycairoRectangleInt *rect_o) {
-+  PyObject *s;
-+  cairo_rectangle_int_t *rect = &(rect_o->rectangle_int);
-+  char buf[80];
-+  PyOS_snprintf(buf, sizeof(buf), "cairo.RectangleInt(%d, %d, %d, %d)",
-+      rect->x, rect->y, rect->width, rect->height);
-+  s = PyUnicode_FromString(buf);
-+  return s;
-+}
-+
-+static PyObject *
-+rectangle_int_richcompare(PycairoRectangleInt *self,
-+    PycairoRectangleInt *other, int op) {
-+  int res = 0;
-+  PyObject *b;
-+
-+  if (op != Py_EQ && op != Py_NE) {
-+    PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
-+    return NULL;
-+  }
-+  if (!PyObject_IsInstance((PyObject*)other,
-+        (PyObject*)&PycairoRectangleInt_Type)) {
-+    res = 0;
-+  }
-+  else if (
-+      self->rectangle_int.x == other->rectangle_int.x &&
-+      self->rectangle_int.y == other->rectangle_int.y &&
-+      self->rectangle_int.width == other->rectangle_int.width &&
-+      self->rectangle_int.height == other->rectangle_int.height
-+      )
-+    res = 1;
-+  res = op == Py_NE ? !res : res;
-+  b = res ? Py_True : Py_False;
-+  Py_INCREF(b);
-+
-+  return b;
-+}
-+
-+static PyMemberDef RectangleInt_members[] = {
-+  {"x",      T_INT, sizeof(PyObject), 0,
-+    "X coordinate of the left side of the rectangle"},
-+  {"y",      T_INT, sizeof(PyObject)+sizeof(int), 0,
-+    "Y coordinate of the the top side of the rectangle"},
-+  {"width",  T_INT, sizeof(PyObject)+sizeof(int)*2, 0,
-+    "width of the rectangle"},
-+  {"height", T_INT, sizeof(PyObject)+sizeof(int)*3, 0,
-+    "height of the rectangle"},
-+  {NULL}
-+};
-+
-+PyTypeObject PycairoRectangleInt_Type = {
-+  PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+  "cairo.RectangleInt",			/* tp_name */
-+  sizeof(PycairoRectangleInt),		/* tp_basicsize */
-+  0,					/* tp_itemsize */
-+  (destructor)rectangle_int_dealloc,	/* tp_dealloc */
-+  0,					/* tp_print */
-+  0,					/* tp_getattr */
-+  0,					/* tp_setattr */
-+  0,					/* tp_compare */
-+  0,		                	/* tp_repr */
-+  0,					/* tp_as_number */
-+  0,              			/* tp_as_sequence */
-+  0,					/* tp_as_mapping */
-+  0,					/* tp_hash */
-+  0,					/* tp_call */
-+  (reprfunc)rectangle_int_str,	    	/* tp_str */
-+  0,                             	/* tp_getattro */
-+  0,					/* tp_setattro */
-+  0,					/* tp_as_buffer */
-+  Py_TPFLAGS_DEFAULT,			/* tp_flags */
-+  0,      				/* tp_doc */
-+  0,					/* tp_traverse */
-+  0,					/* tp_clear */
-+  (richcmpfunc)rectangle_int_richcompare, /* tp_richcompare */
-+  0,					/* tp_weaklistoffset */
-+  0,              		        /* tp_iter */
-+  0,					/* tp_iternext */
-+  0,			        	/* tp_methods */
-+  RectangleInt_members,			/* tp_members */
-+  0,					/* tp_getset */
-+  0,                                    /* tp_base */
-+  0,					/* tp_dict */
-+  0,					/* tp_descr_get */
-+  0,					/* tp_descr_set */
-+  0,					/* tp_dictoffset */
-+  0,	            	                /* tp_init */
-+  0,					/* tp_alloc */
-+  (newfunc)rectangle_int_new,      	/* tp_new */
-+};
-+
-+/* PycairoRegion_FromRegion
-+ * Create a new PycairoRegion from a cairo_region_t
-+ * region - a cairo_region_t to 'wrap' into a Python object.
-+ *        region is unreferenced if the PycairoRegion creation fails, or if
-+ *        region is in an error status.
-+ * Return value: New reference or NULL on failure
-+ */
-+PyObject *
-+PycairoRegion_FromRegion (cairo_region_t *region) {
-+  PyObject *o;
-+
-+  assert (region != NULL);
-+
-+  if (Pycairo_Check_Status (cairo_region_status(region))) {
-+    cairo_region_destroy (region);
-+    return NULL;
-+  }
-+
-+  o = PycairoRegion_Type.tp_alloc (&PycairoRegion_Type, 0);
-+  if (o)
-+    ((PycairoRegion *)o)->region = region;
-+  else
-+    cairo_region_destroy (region);
-+  return o;
-+}
-+
-+static void
-+region_dealloc(PycairoRegion *o) {
-+#ifdef DEBUG
-+  printf("region_dealloc start\n");
-+#endif
-+  if (o->region) {
-+    cairo_region_destroy(o->region);
-+    o->region = NULL;
-+  }
-+  //o->ob_type->tp_free((PyObject *)o);
-+  Py_TYPE(o)->tp_free(o);
-+#ifdef DEBUG
-+  printf("region_dealloc end\n");
-+#endif
-+}
-+
-+static PyObject *
-+region_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
-+  PyObject *s = NULL;
-+  PycairoRectangleInt *rect_obj = NULL;
-+  cairo_region_t *region = NULL;
-+  cairo_rectangle_int_t *rect = NULL;
-+
-+  if (PyArg_ParseTuple(args, "|O!:Region.__new__",
-+        &PycairoRectangleInt_Type, &rect_obj)) {
-+      if (rect_obj != NULL) {
-+          region = cairo_region_create_rectangle(&(rect_obj->rectangle_int));
-+      }
-+  } else if (!PyArg_ParseTuple(args, "|O:Region.__new__", &s)) {
-+    PyErr_SetString(PyExc_TypeError,
-+        "argument must be a RectangleInt or a sequence of RectangleInt.");
-+    return NULL;
-+  }
-+  PyErr_Clear(); /* Clear possible err in the 1st arg parser. */
-+
-+  /* list of rectangle_int or no args */
-+  if (s != NULL) {
-+    int i;
-+    int rect_size;
-+    PyObject *seq = NULL;
-+    seq = PySequence_Fast (s,
-+        "argument must be a RectangleInt or a sequence of RectangleInt.");
-+    if (seq == NULL) {
-+      return NULL;
-+    }
-+    rect_size = PySequence_Fast_GET_SIZE(seq);
-+    rect = PyMem_Malloc (rect_size * sizeof(cairo_rectangle_int_t));
-+    if (rect == NULL) {
-+      Py_DECREF(seq);
-+      return PyErr_NoMemory();
-+    }
-+
-+    for(i=0; i<rect_size; i++) {
-+      PyObject *obj_tmp = PySequence_Fast_GET_ITEM(seq, i);
-+      if (PyObject_IsInstance(obj_tmp,
-+            (PyObject*)&PycairoRectangleInt_Type) != 1) {
-+        Py_DECREF(seq);
-+        PyMem_Free(rect);
-+        return NULL;
-+      }
-+      rect_obj = (PycairoRectangleInt*) obj_tmp;
-+      rect[i] = rect_obj->rectangle_int;
-+    }
-+
-+    region = cairo_region_create_rectangles(rect, rect_size);
-+
-+    Py_DECREF(seq);
-+    PyMem_Free(rect);
-+  }
-+
-+  if (region == NULL) {
-+      region = cairo_region_create();
-+  }
-+
-+  RETURN_NULL_IF_CAIRO_REGION_ERROR(region);
-+  return PycairoRegion_FromRegion(region);
-+}
-+
-+PyObject *
-+region_copy (PycairoRegion *o) {
-+  cairo_region_t *res;
-+  Py_BEGIN_ALLOW_THREADS;
-+  res = cairo_region_copy (o->region);
-+  Py_END_ALLOW_THREADS;
-+  RETURN_NULL_IF_CAIRO_REGION_ERROR(res);
-+  return PycairoRegion_FromRegion(res);
-+}
-+
-+
-+PyObject *
-+region_get_extents (PycairoRegion *o) {
-+  cairo_rectangle_int_t rect;
-+  Py_BEGIN_ALLOW_THREADS;
-+  cairo_region_get_extents(o->region, &rect);
-+  Py_END_ALLOW_THREADS;
-+
-+  return PycairoRectangleInt_FromRectangleInt(&rect);
-+}
-+
-+
-+PyObject *
-+region_num_rectangles (PycairoRegion *o) {
-+  int res;
-+  Py_BEGIN_ALLOW_THREADS;
-+  res = cairo_region_num_rectangles(o->region);
-+  Py_END_ALLOW_THREADS;
-+  return Py_BuildValue("i", res);
-+}
-+
-+
-+PyObject *
-+region_get_rectangle (PycairoRegion *o, PyObject *args) {
-+  cairo_rectangle_int_t rect;
-+  int i;
-+  int total;
-+  if (!PyArg_ParseTuple (args, "i:Region.get_rectangle", &i))
-+    return NULL;
-+  total = cairo_region_num_rectangles(o->region);
-+  if (i >= total || i < 0) {
-+    if ( i < 0)
-+      PyErr_SetString(PyExc_ValueError, "index must be a positive number");
-+    else
-+      PyErr_SetString(PyExc_ValueError, "index is to big for the region");
-+    return NULL;
-+  }
-+  Py_BEGIN_ALLOW_THREADS;
-+  cairo_region_get_rectangle(o->region, i, &rect);
-+  Py_END_ALLOW_THREADS;
-+  return PycairoRectangleInt_FromRectangleInt(&rect);
-+}
-+
-+
-+PyObject *
-+region_is_empty (PycairoRegion *o) {
-+  cairo_bool_t res;
-+  PyObject *b;
-+  Py_BEGIN_ALLOW_THREADS;
-+  res = cairo_region_is_empty(o->region);
-+  Py_END_ALLOW_THREADS;
-+  b = res ? Py_True : Py_False;
-+  Py_INCREF(b);
-+  return b;
-+}
-+
-+
-+PyObject *
-+region_contains_point (PycairoRegion *o, PyObject *args) {
-+  int x, y;
-+  cairo_bool_t res;
-+  PyObject *b;
-+  if (!PyArg_ParseTuple (args, "ii:Region.contains_point", &x, &y))
-+    return NULL;
-+  Py_BEGIN_ALLOW_THREADS;
-+  res = cairo_region_contains_point(o->region, x, y);
-+  Py_END_ALLOW_THREADS;
-+  b = res ? Py_True : Py_False;
-+  Py_INCREF(b);
-+  return b;
-+}
-+
-+
-+PyObject *
-+region_contains_rectangle (PycairoRegion *o, PyObject *args) {
-+  cairo_region_overlap_t res;
-+  PycairoRectangleInt *rect_int;
-+  if (!PyArg_ParseTuple (args, "O!:Region.contains_rectangle",
-+			 &PycairoRectangleInt_Type, &rect_int))
-+    return NULL;
-+  Py_BEGIN_ALLOW_THREADS;
-+  res = cairo_region_contains_rectangle(o->region, &(rect_int->rectangle_int));
-+  Py_END_ALLOW_THREADS;
-+  return Py_BuildValue("i", res);
-+}
-+
-+
-+PyObject *
-+region_equal (PycairoRegion *o, PyObject *args) {
-+  cairo_bool_t res;
-+  PyObject *b;
-+  PycairoRegion *region_obj;
-+  if (!PyArg_ParseTuple (args, "O!:Region.equal",
-+			 &PycairoRegion_Type, &region_obj))
-+    return NULL;
-+  Py_BEGIN_ALLOW_THREADS;
-+  res = cairo_region_equal (o->region, region_obj->region);
-+  Py_END_ALLOW_THREADS;
-+  b = res ? Py_True : Py_False;
-+  Py_INCREF(b);
-+  return b;
-+}
-+
-+static PyObject *
-+region_richcompare(PycairoRegion *self, PycairoRegion *other, int op) {
-+  int res = 0;
-+  PyObject *b;
-+
-+  if (op != Py_EQ && op != Py_NE) {
-+    PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
-+    return NULL;
-+  }
-+  if (!PyObject_IsInstance((PyObject*)other, (PyObject*)&PycairoRegion_Type)) {
-+    res = 0;
-+  } else {
-+    res = cairo_region_equal (self->region, other->region);
-+  }
-+
-+  res = op == Py_NE ? !res : res;
-+  b = res ? Py_True : Py_False;
-+  Py_INCREF(b);
-+
-+  return b;
-+}
-+
-+PyObject *
-+region_translate (PycairoRegion *o, PyObject *args) {
-+  int x, y;
-+  if (!PyArg_ParseTuple (args, "ii:Region.translate", &x, &y))
-+    return NULL;
-+  Py_BEGIN_ALLOW_THREADS;
-+  cairo_region_translate (o->region, x, y);
-+  Py_END_ALLOW_THREADS;
-+  Py_RETURN_NONE;
-+}
-+
-+
-+PyObject *
-+region_intersect (PycairoRegion *o, PyObject *args) {
-+  cairo_status_t res;
-+  PyObject *other;
-+  if (!PyArg_ParseTuple (args, "O:Region.intersect", &other))
-+    return NULL;
-+
-+  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_intersect(o->region,
-+              ((PycairoRegion *)other)->region);
-+      Py_END_ALLOW_THREADS;
-+  } else if (PyObject_IsInstance(other,
-+              (PyObject*)&PycairoRectangleInt_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_intersect_rectangle(o->region,
-+          &(((PycairoRectangleInt *)other)->rectangle_int));
-+      Py_END_ALLOW_THREADS;
-+  } else {
-+    PyErr_SetString(PyExc_TypeError,
-+        "argument must be a Region or a RectangleInt.");
-+    return NULL;
-+  }
-+
-+  RETURN_NULL_IF_CAIRO_ERROR(res);
-+  Py_RETURN_NONE;
-+}
-+
-+PyObject *
-+region_subtract (PycairoRegion *o, PyObject *args) {
-+  cairo_status_t res;
-+  PyObject *other;
-+  if (!PyArg_ParseTuple (args, "O:Region.subtract", &other))
-+    return NULL;
-+
-+  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_subtract(o->region,
-+              ((PycairoRegion *)other)->region);
-+      Py_END_ALLOW_THREADS;
-+  } else if (PyObject_IsInstance(other,
-+              (PyObject*)&PycairoRectangleInt_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_subtract_rectangle(o->region,
-+          &(((PycairoRectangleInt *)other)->rectangle_int));
-+      Py_END_ALLOW_THREADS;
-+  } else {
-+    PyErr_SetString(PyExc_TypeError,
-+        "argument must be a Region or a RectangleInt.");
-+    return NULL;
-+  }
-+  RETURN_NULL_IF_CAIRO_ERROR(res);
-+  Py_RETURN_NONE;
-+}
-+
-+PyObject *
-+region_union (PycairoRegion *o, PyObject *args) {
-+  cairo_status_t res;
-+  PyObject *other;
-+  if (!PyArg_ParseTuple (args, "O:Region.union", &other))
-+    return NULL;
-+
-+  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_union(o->region,
-+              ((PycairoRegion *)other)->region);
-+      Py_END_ALLOW_THREADS;
-+  } else if (PyObject_IsInstance(other,
-+              (PyObject*)&PycairoRectangleInt_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_union_rectangle(o->region,
-+          &(((PycairoRectangleInt *)other)->rectangle_int));
-+      Py_END_ALLOW_THREADS;
-+  } else {
-+    PyErr_SetString(PyExc_TypeError,
-+        "argument must be a Region or a RectangleInt.");
-+    return NULL;
-+  }
-+  RETURN_NULL_IF_CAIRO_ERROR(res);
-+  Py_RETURN_NONE;
-+}
-+
-+PyObject *
-+region_xor (PycairoRegion *o, PyObject *args) {
-+  cairo_status_t res;
-+  PyObject *other;
-+  if (!PyArg_ParseTuple (args, "O:Region.xorg", &other))
-+    return NULL;
-+
-+  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_xor(o->region,
-+              ((PycairoRegion *)other)->region);
-+      Py_END_ALLOW_THREADS;
-+  } else if (PyObject_IsInstance(other,
-+              (PyObject*)&PycairoRectangleInt_Type) == 1) {
-+      Py_BEGIN_ALLOW_THREADS;
-+      res = cairo_region_xor_rectangle(o->region,
-+          &(((PycairoRectangleInt *)other)->rectangle_int));
-+      Py_END_ALLOW_THREADS;
-+  } else {
-+    PyErr_SetString(PyExc_TypeError,
-+        "argument must be a Region or a RectangleInt.");
-+    return NULL;
-+  }
-+  RETURN_NULL_IF_CAIRO_ERROR(res);
-+  Py_RETURN_NONE;
-+}
-+
-+static PyMethodDef region_methods[] = {
-+  /* methods never exposed in a language binding:
-+   * cairo_region_destroy()
-+   * cairo_region_get_type()
-+   * cairo_region_reference()
-+   *
-+   * cairo_region_status()
-+   * - not needed since Pycairo handles status checking
-+   *
-+   * _(intersect/subtract/union/xor)_rectangle are merged with the region
-+   * ones.
-+   */
-+  {"copy", (PyCFunction)region_copy,                        METH_NOARGS },
-+  {"get_extents", (PyCFunction)region_get_extents,          METH_NOARGS },
-+  {"num_rectangles", (PyCFunction)region_num_rectangles,    METH_NOARGS },
-+  {"get_rectangle", (PyCFunction)region_get_rectangle,      METH_VARARGS },
-+  {"is_empty", (PyCFunction)region_is_empty,                METH_NOARGS },
-+  {"contains_point", (PyCFunction)region_contains_point,    METH_VARARGS },
-+  {"contains_rectangle", (PyCFunction)region_contains_rectangle,
-+    METH_VARARGS },
-+  {"equal", (PyCFunction)region_equal,                      METH_VARARGS },
-+  {"translate", (PyCFunction)region_translate,              METH_VARARGS },
-+  {"intersect", (PyCFunction)region_intersect,              METH_VARARGS },
-+  {"subtract", (PyCFunction)region_subtract,                METH_VARARGS },
-+  {"union", (PyCFunction)region_union,                      METH_VARARGS },
-+  {"xor", (PyCFunction)region_xor,                          METH_VARARGS },
-+  {NULL, NULL, 0, NULL},
-+};
-+
-+PyTypeObject PycairoRegion_Type = {
-+  PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+  "cairo.Region",			/* tp_name */
-+  sizeof(PycairoRegion),		/* tp_basicsize */
-+  0,					/* tp_itemsize */
-+  (destructor)region_dealloc,		/* tp_dealloc */
-+  0,					/* tp_print */
-+  0,					/* tp_getattr */
-+  0,					/* tp_setattr */
-+  0,					/* tp_compare */
-+  0,		                	/* tp_repr */
-+  0,					/* tp_as_number */
-+  0,              			/* tp_as_sequence */
-+  0,					/* tp_as_mapping */
-+  0,					/* tp_hash */
-+  0,					/* tp_call */
-+  0,	        	        	/* tp_str */
-+  0,	                        	/* tp_getattro */
-+  0,					/* tp_setattro */
-+  0,					/* tp_as_buffer */
-+  Py_TPFLAGS_DEFAULT,			/* tp_flags */
-+  0,      				/* tp_doc */
-+  0,					/* tp_traverse */
-+  0,					/* tp_clear */
-+  (richcmpfunc)region_richcompare,	/* tp_richcompare */
-+  0,					/* tp_weaklistoffset */
-+  0,              		        /* tp_iter */
-+  0,					/* tp_iternext */
-+  region_methods,			/* tp_methods */
-+  0,					/* tp_members */
-+  0,					/* tp_getset */
-+  0,                                    /* tp_base */
-+  0,					/* tp_dict */
-+  0,					/* tp_descr_get */
-+  0,					/* tp_descr_set */
-+  0,					/* tp_dictoffset */
-+  0,	            	                /* tp_init */
-+  0,					/* tp_alloc */
-+  (newfunc)region_new,      		/* tp_new */
-+};
---- py3cairo-1.10.0+dfsg.orig/src/py3cairo.h
-+++ py3cairo-1.10.0+dfsg/src/py3cairo.h
-@@ -67,6 +67,16 @@ typedef struct {
- 
- typedef struct {
-   PyObject_HEAD
-+  cairo_rectangle_int_t rectangle_int;
-+} PycairoRectangleInt;
-+
-+typedef struct {
-+  PyObject_HEAD
-+  cairo_region_t *region;
-+} PycairoRegion;
-+
-+typedef struct {
-+  PyObject_HEAD
-   cairo_scaled_font_t *scaled_font;
- } PycairoScaledFont;
- 
-@@ -129,6 +139,14 @@ typedef struct {
- 
-   /* misc functions */
-   int (*Check_Status)(cairo_status_t status);
-+
-+  PyTypeObject *RectangleInt_Type;
-+  PyObject *(*RectangleInt_FromRectangleInt)(
-+      const cairo_rectangle_int_t *rectangle_int);
-+
-+  PyTypeObject *Region_Type;
-+  PyObject *(*Region_FromRegion)(const cairo_region_t *region);
-+
- } Pycairo_CAPI_t;
- 
- 
-@@ -156,6 +174,13 @@ typedef struct {
- #define PycairoRadialGradient_Type  *(Pycairo_CAPI->RadialGradient_Type)
- #define PycairoPattern_FromPattern   (Pycairo_CAPI->Pattern_FromPattern)
- 
-+#define PycairoRectangleInt_Type    *(Pycairo_CAPI->RectangleInt_Type)
-+#define PycairoRectangleInt_FromRectangleInt  \
-+                                  (Pycairo_CAPI->RectangleInt_FromRectangleInt)
-+
-+#define PycairoRegion_Type          *(Pycairo_CAPI->Region_Type)
-+#define PycairoRegion_FromRegion     (Pycairo_CAPI->Region_FromRegion)
-+
- #define PycairoScaledFont_Type      *(Pycairo_CAPI->ScaledFont_Type)
- #define PycairoScaledFont_FromScaledFont \
-                                      (Pycairo_CAPI->ScaledFont_FromScaledFont)
---- py3cairo-1.10.0+dfsg.orig/src/cairomodule.c
-+++ py3cairo-1.10.0+dfsg/src/cairomodule.c
-@@ -141,6 +141,12 @@ static Pycairo_CAPI_t CAPI = {
-   PycairoSurface_FromSurface,
- 
-   Pycairo_Check_Status,
-+
-+  &PycairoRectangleInt_Type,
-+  PycairoRectangleInt_FromRectangleInt,
-+
-+  &PycairoRegion_Type,
-+  PycairoRegion_FromRegion,
- };
- 
- static PyObject *
-@@ -230,6 +236,12 @@ PyInit__cairo(void)
-   if (PyType_Ready(&PycairoRadialGradient_Type) < 0)
-     return NULL;
- 
-+  if (PyType_Ready(&PycairoRectangleInt_Type) < 0)
-+    return NULL;
-+
-+  if (PyType_Ready(&PycairoRegion_Type) < 0)
-+    return NULL;
-+
-   if (PyType_Ready(&PycairoScaledFont_Type) < 0)
-     return NULL;
- 
-@@ -315,6 +327,12 @@ PyInit__cairo(void)
-   PyModule_AddObject(m, "RadialGradient",
- 		     (PyObject *)&PycairoRadialGradient_Type);
- 
-+  Py_INCREF(&PycairoRectangleInt_Type);
-+  PyModule_AddObject(m, "RectangleInt", (PyObject *)&PycairoRectangleInt_Type);
-+
-+  Py_INCREF(&PycairoRegion_Type);
-+  PyModule_AddObject(m, "Region", (PyObject *)&PycairoRegion_Type);
-+
-   Py_INCREF(&PycairoScaledFont_Type);
-   PyModule_AddObject(m, "ScaledFont", (PyObject *)&PycairoScaledFont_Type);
- 
-@@ -519,6 +537,10 @@ PyInit__cairo(void)
-   CONSTANT(PS_LEVEL_3);
- #endif
- 
-+  CONSTANT(REGION_OVERLAP_IN);
-+  CONSTANT(REGION_OVERLAP_OUT);
-+  CONSTANT(REGION_OVERLAP_PART);
-+
-   CONSTANT(SUBPIXEL_ORDER_DEFAULT);
-   CONSTANT(SUBPIXEL_ORDER_RGB);
-   CONSTANT(SUBPIXEL_ORDER_BGR);
---- py3cairo-1.10.0+dfsg.orig/src/wscript
-+++ py3cairo-1.10.0+dfsg/src/wscript
-@@ -25,6 +25,7 @@ def build(ctx):
-                     'font.c',
-                     'path.c',
-                     'pattern.c',
-+                    'region.c',
-                     'matrix.c',
-                     'surface.c',
-                     ],
---- py3cairo-1.10.0+dfsg.orig/src/private.h
-+++ py3cairo-1.10.0+dfsg/src/private.h
-@@ -60,6 +60,13 @@ extern PyTypeObject PycairoLinearGradien
- extern PyTypeObject PycairoRadialGradient_Type;
- PyObject *PycairoPattern_FromPattern (cairo_pattern_t *pattern,
- 				      PyObject *base);
-+ 
-+extern PyTypeObject PycairoRectangleInt_Type;
-+PyObject *PycairoRectangleInt_FromRectangleInt (
-+				       cairo_rectangle_int_t *rectangle_int);
-+
-+extern PyTypeObject PycairoRegion_Type;
-+PyObject *PycairoRegion_FromRegion (cairo_region_t *region);
- 
- extern PyTypeObject PycairoScaledFont_Type;
- PyObject *PycairoScaledFont_FromScaledFont (cairo_scaled_font_t *scaled_font);
-@@ -153,6 +160,15 @@ int Pycairo_Check_Status (cairo_status_t
-     if (status != CAIRO_STATUS_SUCCESS) {			\
-       Pycairo_Check_Status (status);				\
-       return NULL;						\
-+    }								\
-+  } while (0)
-+
-+#define RETURN_NULL_IF_CAIRO_REGION_ERROR(region)               \
-+  do {								\
-+    cairo_status_t status = cairo_region_status (region);	\
-+    if (status != CAIRO_STATUS_SUCCESS) {			\
-+      Pycairo_Check_Status (status);				\
-+      return NULL;						\
-     }								\
-   } while (0)
- 
---- py3cairo-1.10.0+dfsg.orig/test/api_test.py
-+++ py3cairo-1.10.0+dfsg/test/api_test.py
-@@ -84,3 +84,65 @@ def test_surface():
- 
- def test_text():
-   pass
-+
-+
-+def test_region():
-+  a = cairo.Region()
-+  assert a.is_empty() == True
-+  assert a.num_rectangles() == 0
-+
-+  b = cairo.RectangleInt(1, 2, 10, 12)
-+  d = cairo.RectangleInt(1, 1, 10, 12)
-+  e = cairo.RectangleInt(1, 3, 8, 12)
-+  assert (b.x, b.y, b.width, b.height) == (1, 2, 10, 12)
-+  c = cairo.Region((b, e))
-+  assert not c.is_empty()
-+  assert c.num_rectangles() == 2
-+  assert c.get_rectangle(1).y == 14
-+
-+  ex = c.get_extents()
-+  assert ex == cairo.RectangleInt(1, 2, 10, 13)
-+  assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_PART
-+
-+  c.translate(10, 20)
-+  assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_OUT
-+  assert c.get_rectangle(1) == cairo.RectangleInt(11, 34, 8, 1)
-+
-+  cp = c.copy()
-+  assert c.num_rectangles() == cp.num_rectangles()
-+  assert c.get_rectangle(0) == cp.get_rectangle(0)
-+  assert c == cp
-+  assert 3 != c
-+  assert c != "test"
-+
-+  c = cairo.Region((b, e))
-+  c.intersect(d)
-+  assert c.num_rectangles() == 1
-+  assert c.get_rectangle(0) == cairo.RectangleInt(1, 2, 10, 11)
-+
-+  c = cairo.Region((b, e))
-+  c.subtract(d)
-+  assert c.num_rectangles() == 2
-+  assert c == cairo.Region([
-+      cairo.RectangleInt(1, 13, 10, 1), cairo.RectangleInt(1, 14, 8, 1) ])
-+
-+  d = cairo.Region(d)
-+  c = cairo.Region((b, e))
-+  c.subtract(d)
-+  assert c.num_rectangles() == 2
-+  assert c.get_rectangle(0) == cairo.RectangleInt(1, 13, 10, 1)
-+
-+  c = cairo.Region((b, e))
-+  c.union(d)
-+  assert c.num_rectangles() == 2
-+  assert c == cairo.Region([
-+      cairo.RectangleInt(1, 1, 10, 13), cairo.RectangleInt(1, 14, 8, 1) ])
-+
-+  c = cairo.Region((b, e))
-+  c.xor(d)
-+  assert c.num_rectangles() == 3
-+  assert c == cairo.Region([
-+      cairo.RectangleInt(1, 1, 10, 1),
-+      cairo.RectangleInt(1, 14, 8, 1),
-+      cairo.RectangleInt(1, 13, 10, 1),
-+      ])
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
deleted file mode 100644
index 5356554e75fa..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: specify encoding in waf
- This patch specifies utf-8 as the encoding in waf library, because python 3.3
- doesn't fallback to utf-8 on default.
-Author: Matthias Klose <doko@ubuntu.com>
-Origin: http://launchpadlibrarian.net/120606963/py3cairo_1.10.0%2Bdfsg-3~exp2_1.10.0%2Bdfsg-3~exp2ubuntu1.diff.gz
-Bug-Debian: http://bugs.debian.org/691241
-Last-Update: 2012-10-28
-
---- py3cairo-1.10.0+dfsg.orig/waflib/Utils.py
-+++ py3cairo-1.10.0+dfsg/waflib/Utils.py
-@@ -77,8 +77,8 @@ except ImportError:
- 				return value
- is_win32=sys.platform=='win32'
- indicator=is_win32 and'\x1b[A\x1b[K%s%s%s\r'or'\x1b[K%s%s%s\r'
--def readf(fname,m='r'):
--	f=open(fname,m)
-+def readf(fname,m='r',enc=None):
-+	f=open(fname,m,encoding=enc)
- 	try:
- 		txt=f.read()
- 	finally:
---- py3cairo-1.10.0+dfsg.orig/waflib/Tools/c_preproc.py
-+++ py3cairo-1.10.0+dfsg/waflib/Tools/c_preproc.py
-@@ -44,7 +44,7 @@ def repl(m):
- 		return' '
- 	return m.group(3)or''
- def filter_comments(filename):
--	code=Utils.readf(filename)
-+	code=Utils.readf(filename, enc='utf-8')
- 	if use_trigraphs:
- 		for(a,b)in trig_def:code=code.split(a).join(b)
- 	code=re_nl.sub('',code)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
deleted file mode 100644
index 3e0cdc3e61f4..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: During the build process, a Context instance is pickled, or at
- least attempted to be.  This fails because self.node_class is assigned to a
- class which is nested inside the __init__() method.  Because Python cannot
- find this class at unpickling time (i.e. it cannot be imported), Python
- refuses to pickle the Context instance, leading to a FTBFS.  Since there's no
- obvious reason why the class has to be so nested, moving it to a module
- global solves the build failure.
-Author: Barry Warsaw <barry@debian.org>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=91561
-
---- a/waflib/Context.py
-+++ b/waflib/Context.py
-@@ -51,6 +51,8 @@
- 		global classes
- 		classes.insert(0,cls)
- ctx=store_context('ctx',(object,),{})
-+class node_class(waflib.Node.Node):
-+    pass
- class Context(ctx):
- 	errors=Errors
- 	tools={}
-@@ -60,8 +62,6 @@
- 		except KeyError:
- 			global run_dir
- 			rd=run_dir
--		class node_class(waflib.Node.Node):
--			pass
- 		self.node_class=node_class
- 		self.node_class.__module__="waflib.Node"
- 		self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
deleted file mode 100644
index 3aad32593b3c..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Follow up to 80_fix-pickle.patch.  Just disable pickling
- altogether since the previous patch doesn't really fix the problem, and not
- storing the pickle seems to have no adverse effects on the build, while
- avoiding the observed traceback.
-Author: Barry Warsaw <barry@debian.org>
-Forwarded: no
-
---- a/waflib/Build.py
-+++ b/waflib/Build.py
-@@ -151,6 +151,7 @@
- 				f.close()
- 		self.init_dirs()
- 	def store(self):
-+		return
- 		data={}
- 		for x in SAVED_ATTRS:
- 			data[x]=getattr(self,x)
---- a/waflib/Context.py
-+++ b/waflib/Context.py
-@@ -51,8 +51,6 @@
- 		global classes
- 		classes.insert(0,cls)
- ctx=store_context('ctx',(object,),{})
--class node_class(waflib.Node.Node):
--    pass
- class Context(ctx):
- 	errors=Errors
- 	tools={}
-@@ -62,6 +60,8 @@
- 		except KeyError:
- 			global run_dir
- 			rd=run_dir
-+		class node_class(waflib.Node.Node):
-+			pass
- 		self.node_class=node_class
- 		self.node_class.__module__="waflib.Node"
- 		self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch b/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch
deleted file mode 100644
index 572a5f6cc717..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- src/cairomodule.c
-+++ src/cairomodule.c
-@@ -116,7 +116,7 @@
- #else
-   0,
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
-   &PycairoSVGSurface_Type,
- #else
-   0,
-@@ -247,7 +247,7 @@
-   if (PyType_Ready(&PycairoPSSurface_Type) < 0)
-     return NULL;
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
-   if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
-     return NULL;
- #endif
-@@ -337,7 +337,7 @@
-   PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
- #endif
- 
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
-   Py_INCREF(&PycairoSVGSurface_Type);
-   PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
- #endif
-@@ -399,7 +399,7 @@
- #else
-   PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
-   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
- #else
-   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
---- src/private.h
-+++ src/private.h
-@@ -75,7 +75,7 @@
- extern PyTypeObject PycairoPSSurface_Type;
- #endif
- 
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- extern PyTypeObject PycairoSVGSurface_Type;
- #endif
- 
---- src/py3cairo.h
-+++ src/py3cairo.h
-@@ -171,7 +171,7 @@
- #define PycairoPSSurface_Type       *(Pycairo_CAPI->PSSurface_Type)
- #endif
- 
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- #define PycairoSVGSurface_Type      *(Pycairo_CAPI->SVGSurface_Type)
- #endif
- 
---- src/surface.c
-+++ src/surface.c
-@@ -72,7 +72,7 @@
-     type = &PycairoPSSurface_Type;
-     break;
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
-   case CAIRO_SURFACE_TYPE_SVG:
-     type = &PycairoSVGSurface_Type;
-     break;
-@@ -1022,7 +1022,7 @@
- 
- 
- /* Class SVGSurface(Surface) ----------------------------------------------- */
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- #include <cairo-svg.h>
- 
- static PyObject *
-@@ -1133,7 +1133,7 @@
-   0,                                  /* tp_is_gc */
-   0,                                  /* tp_bases */
- };
--#endif  /* CAIRO_HAS_SVG_SURFACE */
-+#endif  /* PYCAIRO_ENABLE_SVG */
- 
- 
- #if CAIRO_HAS_WIN32_SURFACE
---- wscript
-+++ wscript
-@@ -1,6 +1,7 @@
- # -*- python -*-
- 
- import os
-+import subprocess
- 
- top = '.'
- out = 'build_directory'
-@@ -11,6 +12,17 @@
- cairo_version_required = '1.10.0'
- 
- 
-+def check_svg():
-+  if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
-+    return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
-+    if return_code == 0:
-+      return True
-+    else:
-+      return False
-+  else:
-+    return False
-+
-+
- def options(ctx):
-   print('  %s/options()' %d)
-   ctx.tool_options('gnu_dirs')
-@@ -39,6 +51,8 @@
-   ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
-   ctx.define('PYCAIRO_VERSION_MINOR', version[1])
-   ctx.define('PYCAIRO_VERSION_MICRO', version[2])
-+  if check_svg():
-+    ctx.define('PYCAIRO_ENABLE_SVG', 1)
- 
-   ctx.write_config_header('src/config.h')
- 
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch b/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch
deleted file mode 100644
index 6e79db9ba272..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/waflib/Tools/python.py
-+++ b/waflib/Tools/python.py
-@@ -169,7 +169,7 @@
- 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
- 	includes=[]
- 	if conf.env.PYTHON_CONFIG:
--		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-+		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
- 			if(incstr.startswith('-I')or incstr.startswith('/I')):
- 				incstr=incstr[2:]
- 			if incstr not in includes:
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch b/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch
deleted file mode 100644
index 7d54ba160d68..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/waf
-+++ b/waf
-@@ -153,6 +153,9 @@
- 	return dir
- 
- wafdir = find_lib()
-+if sys.argv[1:] == ['unpack']:
-+    print(wafdir)
-+    exit()
- sys.path.insert(0, wafdir)
- from waflib.Tools.c_config import MACRO_TO_DESTOS 
- MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch b/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch
deleted file mode 100644
index 33de2692f838..000000000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- pycairo-1.10.0/wscript
-+++ pycairo-1.10.0/wscript
-@@ -10,6 +10,7 @@
- APPNAME='pycairo'
- VERSION='1.10.0'
- cairo_version_required = '1.10.0'
-+xpyb_version_required  = '1.3'    # optional
- 
- 
- def check_svg():
-@@ -23,6 +24,17 @@
-     return False
- 
- 
-+def check_xpyb():
-+  if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None:
-+    return_code = subprocess.call(['pkg-config', '--exists', 'xpyb'])
-+    if return_code == 0:
-+      return True
-+    else:
-+      return False
-+  else:
-+    return False
-+
-+
- def options(ctx):
-   print('  %s/options()' %d)
-   ctx.tool_options('gnu_dirs')
-@@ -42,6 +54,12 @@
-   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
-                 args='--cflags --libs')
- 
-+# xpyb for Python 3 is not available yet.
-+# the Python 3 version should probably have a different name than 'xpyb'
-+#  if check_xpyb():
-+#    ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required,
-+#                  args='--cflags --libs', mandatory=False)
-+
-   # add gcc options
-   if env['CC_NAME'] == 'gcc':
-     env.append_unique('CCFLAGS', ['-std=c99', '-Wall'])
diff --git a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
deleted file mode 100644
index 4c9419103d4b..000000000000
--- a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils python-r1 waf-utils toolchain-funcs
-
-PYCAIRO_PYTHON2_VERSION="${PV}"
-PYCAIRO_PYTHON3_VERSION="${PV}"
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
-SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
-	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2"
-
-# LGPL-3 for pycairo 1.10.0.
-# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
-LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +svg test xcb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/cairo-1.10.0[svg?,xcb?]
-	xcb? ( x11-libs/xpyb )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-
-	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null
-	rm -f src/config.h || die
-	epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch"
-	epatch "${FILESDIR}/${PN}-1.10.0-xpyb.patch"
-	epatch "${FILESDIR}/${PN}-1.10.0-waf-unpack.patch"
-	epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
-	popd > /dev/null
-
-	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null
-	rm -f src/config.h || die
-	epatch "${FILESDIR}/py2cairo-1.10.0-svg_check.patch"
-	epatch "${FILESDIR}/py2cairo-1.10.0-xpyb.patch"
-	epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
-	popd > /dev/null
-
-	preparation() {
-		if python_is_python3; then
-			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
-			pushd "${BUILD_DIR}" > /dev/null
-			wafdir="$(./waf unpack)"
-			pushd "${wafdir}" > /dev/null
-			epatch "${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch"
-			popd > /dev/null
-			popd > /dev/null
-		else
-			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
-		fi
-	}
-	python_foreach_impl preparation
-}
-
-src_configure() {
-	if ! use svg; then
-		export PYCAIRO_DISABLE_SVG=1
-	fi
-
-	if ! use xcb; then
-		export PYCAIRO_DISABLE_XPYB=1
-	fi
-
-	tc-export PKG_CONFIG
-	# Also export the var with the slightly diff name that waf uses for no good reason.
-	export PKGCONFIG=${PKG_CONFIG}
-
-	# Added by grobian:
-	# If WAF_BINARY is an absolute path, the configure is different and fails to
-	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
-	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
-
-	# floppym:
-	# pycairo and py2cairo bundle different versions of waf (bug 447856)
-	WAF_BINARY="./waf"
-	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir waf-utils_src_compile
-}
-
-src_test() {
-	test_installation() {
-		./waf install --destdir="${T}/tests/${BUILD_DIR}"
-		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
-	}
-	python_foreach_impl run_in_build_dir test_installation
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir waf-utils_src_install
-
-	dodoc AUTHORS NEWS README
-
-	if use doc; then
-		pushd doc/_build/html > /dev/null || die
-		dohtml -r [a-z]* _static
-		popd > /dev/null || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names; next to waf producing dylibs (not bundles) and
-		# calling them .bundle, it also has no idea what it should do to create
-		# proper ones (dylibs)
-		fix_darwin_install_names() {
-			local x="$(python_get_sitedir)/cairo/_cairo.bundle"
-			install_name_tool -id "${x}" "${ED}${x}"
-		}
-		python_foreach_impl fix_darwin_install_names
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null || die
-}
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
index 7a63fcf48d49..b61eec3973dd 100644
--- a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
+++ b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
@@ -15,7 +15,8 @@ DESCRIPTION="Python bindings for the cairo library"
 HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
 SRC_URI="
 	http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
-	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2"
+	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
 
 # LGPL-3 for pycairo 1.10.0.
 # || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
@@ -39,19 +40,19 @@ src_prepare() {
 	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
 	rm -f src/config.h || die
 	epatch \
-		"${FILESDIR}/${PN}-1.10.0-svg_check.patch" \
-		"${FILESDIR}/${PN}-1.10.0-xpyb.patch" \
-		"${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" \
-		"${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch \
-		"${FILESDIR}"/pycairo-1.10.0-101_pycairo-region.patch
+		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-svg_check.patch" \
+		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-xpyb.patch" \
+		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-unpack.patch" \
+		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-101_pycairo-region.patch
 	popd > /dev/null
 
 	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
 	rm -f src/config.h || die
 	epatch \
-		"${FILESDIR}/py2cairo-1.10.0-svg_check.patch" \
-		"${FILESDIR}/py2cairo-1.10.0-xpyb.patch" \
-		"${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
+		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-svg_check.patch" \
+		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-xpyb.patch" \
+		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch
 	popd > /dev/null
 
 	preparation() {
@@ -61,10 +62,10 @@ src_prepare() {
 			wafdir="$(./waf unpack)"
 			pushd "${wafdir}" > /dev/null || die
 			epatch \
-				"${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" \
-				"${FILESDIR}"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
-				"${FILESDIR}"/pycairo-1.10.0-80_fix-pickle.patch \
-				"${FILESDIR}"/pycairo-1.10.0-81_pickling-again.patch
+				"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-py3_4.patch" \
+				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
+				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-80_fix-pickle.patch \
+				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-81_pickling-again.patch
 
 			popd > /dev/null
 			popd > /dev/null
diff --git a/dev-python/pycairo/pycairo-1.13.1-r1.ebuild b/dev-python/pycairo/pycairo-1.13.1-r1.ebuild
deleted file mode 100644
index 30b7fc97e0c4..000000000000
--- a/dev-python/pycairo/pycairo-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,62 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
-	>=x11-libs/cairo-1.12.0[svg,xcb?]
-"
-DEPEND="${RDEPEND}
-	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# Fix pkgconfig path
-	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	local enable_xpyb
-	[[ ${EPYTHON} == python2* ]] && enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.15.0.ebuild b/dev-python/pycairo/pycairo-1.15.0.ebuild
deleted file mode 100644
index 77146c084dc0..000000000000
--- a/dev-python/pycairo/pycairo-1.15.0.ebuild
+++ /dev/null
@@ -1,65 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg,xcb?]
-"
-DEPEND="${RDEPEND}
-	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Fix pkgconfig path
-	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.15.1.ebuild b/dev-python/pycairo/pycairo-1.15.1.ebuild
deleted file mode 100644
index 77146c084dc0..000000000000
--- a/dev-python/pycairo/pycairo-1.15.1.ebuild
+++ /dev/null
@@ -1,65 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg,xcb?]
-"
-DEPEND="${RDEPEND}
-	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Fix pkgconfig path
-	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.15.2.ebuild b/dev-python/pycairo/pycairo-1.15.2.ebuild
deleted file mode 100644
index 77146c084dc0..000000000000
--- a/dev-python/pycairo/pycairo-1.15.2.ebuild
+++ /dev/null
@@ -1,65 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test xcb"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg,xcb?]
-"
-DEPEND="${RDEPEND}
-	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Fix pkgconfig path
-	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py build ${enable_xpyb}
-}
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	local enable_xpyb
-	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
-
-	esetup.py test ${enable_xpyb}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
index 77146c084dc0..837b7b0e5ba8 100644
--- a/dev-python/pycairo/pycairo-1.15.3.ebuild
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test xcb"
 
 # Note: xpyb is used as the C header, not Python modules
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index d183b7313461..9f5c63c14e11 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,3 +1,5 @@
 DIST pyotherside-1.5.1.tar.gz 181457 SHA256 cb29853d66d2e33f68e28c62c28d054512ab82a763fed8b7b7df9dae722c5de2 SHA512 6f916ce44615c98aa7dffaee073fcb6d7f117996c008c0e3c0e7a8aaedd03f9ba853cc66850112dfc9529d698bd2faeb498a87a0d47c3776ab52b90f83b7067a WHIRLPOOL ad6693efa3aa3a15924010144bb46632fd512fb1af360e56972ddfd28631ff381c06c505acd40b57becb5010c324f4ccc509b3d49ed3716f87b4252027a94405
+DIST pyotherside-1.5.3.tar.gz 181811 SHA256 00049d5f42cac448368bc2a521edb8de36bb6d2a624e195b7f1004236758b805 SHA512 ff6aa43e72f5492b18403559514e6fdf0d2cee0965556fcafe5fe394b654a7dd2fc3a7d64d4b8f9c0ebf95485821b77022407772b2414539f2ab287e1fb01e93 WHIRLPOOL 1b515d4d64e47c015979a70214a99151d8449fc9991bccdc524ee64c2d2e36159c61c0b8191054e2062ffe4f86b33b6d370ba8932960a8b0ef0889f76961b999
 EBUILD pyotherside-1.5.1.ebuild 739 SHA256 c547641fd11d0736c754186974c53251b31980dba0c71c889d707a2093e2c084 SHA512 952366dfd4811d3d7cb1643ca70e5e1517d6c19e8d976d978607671282073d56f9d6f10de4262bf1b068cd267f3b3e7409753a6486da2297472c35bf5c00a32d WHIRLPOOL 65bd68cf91154a26612b31546c07c0b6796aac7107d9bb0458d71328af89c82f72610f4b9526f32119710e9808a769c0e3860c1fe33cee34594573e28783183d
+EBUILD pyotherside-1.5.3.ebuild 740 SHA256 97cc2dab3d004c9c7195107606db984ec3235cfb8a87f617609f905bba3bb9aa SHA512 c48d496aa397ab31db98d1ccaea787ef0fd688095d5b44b64a4ac4867fe974a3b19d9feb28331238c70d68b16e694b473a9f529133eb4d0aad10438706988be4 WHIRLPOOL fcb84772a41303130c2c23fc61910962c8793b663dc2ca20d9daf429734ad5ff82e218e60aaa56261689cd93b30cdbecdbb6e2c9b1fc1c13a7164a646e03f26e
 MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/dev-python/pyotherside/pyotherside-1.5.3.ebuild b/dev-python/pyotherside/pyotherside-1.5.3.ebuild
new file mode 100644
index 000000000000..4893f2c24289
--- /dev/null
+++ b/dev-python/pyotherside/pyotherside-1.5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit qmake-utils python-single-r1
+
+DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
+HOMEPAGE="https://github.com/thp/pyotherside http://thp.io/2011/pyotherside"
+SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e "s/qtquicktests//" pyotherside.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 44fd5438422f..b25341ed535b 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,20 +1,6 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 SHA256 110c15482123bc6fbf11e237df30eb0daad7f6032e2f73903e9e3c225121737a SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 WHIRLPOOL 14084d22388b2bbda7fbd19195f448265f99b1437b7cefdac276ccab52785c67b71768303e1d1ea9009f8533ba07de0014eb237b4de675cf8dbc1acbeacb8508
 AUX 4.0.0-gentoo-path.patch 1915 SHA256 106683dc3849851df2d4985f542825ae2b37e0b3ec57ff34d2a5cbd16f79f830 SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278 WHIRLPOOL 0c68c232e5ffeb1ce5e5d3e41471cbde45aca7765b2c85227c02b5b759891a33ab404ce5f444c048361e922a90868621845a8839207efceba6a70ebd5c70dfe0
-AUX 5.6.0_all_distutils_cxx.patch 17053 SHA256 77e2274dac32d065f861882daf59f9020064efc3b7ab39d5152538ea343d854c SHA512 79b3e073a57981ef78c42db3f6c6c0b410525d84d5c6166ac7f8947d66a7b00c52d1fd30516708eaf3d33664466302e11a954f73c40ae48a8aedfb554cec86a2 WHIRLPOOL ae97f0e6a8cf2c0b6df946297f4d6dae27fbe4dd0ea3576d6a17e869fa5e610971302c07465ca4018d6e1ced650d6531ae20639fa08a7d69693ff337a60216e1
-AUX 5.7.1_all_distutils_cxx.patch 18249 SHA256 33bf43330f0a2ae0dfb4b4999a7b27c74ba789a18f6f181928e13cb1553bd39e SHA512 a347cf438a0d308c69bc92cd04236be0bcf95f595daff1fbcb19eaadbbd7355e90fd661843d8a8d1588003da3ec37b3e3e9fa8a24af92baa5d2c0c0a866284dc WHIRLPOOL fe363fe49b70e4e291a092b5229e5f17d39f50f5edee97bb4aac8275410d2981c6963e096fa77d7ecf549d0d97ea0c6168947b2c1526e92d3e73919873ef68da
 AUX 5.8.0_all_distutils_cxx.patch 18248 SHA256 2f7c75a5966ebfd0750ca902ea855ca321829a0309a60e6c57f45eb418054dae SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a WHIRLPOOL 807d777cabd6db4cc909f6135de230705f289ac8d1ef851fd872abdbabb3b13e299c98b53e9bf993f044c64702576e15f0d1b3a1a9a4aa9a4458204267c25b92
-DIST pypy-bin-5.6.0-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 13093418 SHA256 5c8c78751a4afd89e98c5a644d4c1d5fa9b1c2dce9a6c6f8f1ad92068f4b26f5 SHA512 c9748eb5850f3948961451436e7d40eea3bb318a73626bcca0cf9bbd605a27de60383a11dcd8a6e9d93116cf811d5c541e4b8545adfe05ba3f56526cc698d114 WHIRLPOOL ba5fac6c6bc31461cbb83a1f68a780d7ce738bb3a9270385d1b35fe8859de7a4b029a8318f5ab90cca9e5f35e10b87a10211550d7685455bf24ef9e23a6806df
-DIST pypy-bin-5.6.0-amd64+bzip2+jit+ncurses.tar.lz 14167380 SHA256 7e8ea31eebcaf102b6c606400259da93a33bcc1a81f40c5c10070aff917e2ae3 SHA512 629bb65af656e1e16e2eb2f536015fa263f477e4a8744cad61b7f9bb65a17511944d09adbd9bef271f2b62445bf0e39405d88d60721d0c635a27d4a1a497d220 WHIRLPOOL 668ce5da583fc784de99d1aa0faa337ff8f769eb9b505d2d229e7c3c7e71a40c24c6437f25bf9e8f18fe2799ec605fb3f9cb745a8a6a646404119b526dfb02d7
-DIST pypy-bin-5.6.0-amd64+bzip2+ncurses.tar.lz 7337932 SHA256 d059ce9862a2cca587de08215caf2c6b814a5302087bc15c385f284b8d46e57a SHA512 7f168f4dc3dc3855dc27789682afbbef35dc8ebc04d1745f5ffeceed56918db3d3c16a5c90989daf3d00b48e994842f5712f77fdf9febdace2381d852336377f WHIRLPOOL 118fd413ac35ca6a77c9c4b3e6d9c8887c7b4880d8678d24606b2a72c4b05a0caa4a31913c0135623e65241b4fa572d6d7461750189b14b6dff5f194ff19beb8
-DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10451373 SHA256 34ee937087e78f9d445ad080718f2306dd3540483e968db4102692f841809b66 SHA512 81c7c354e96e6997692e22a2dc51330cd31853df7b9bbd6a17b03874b022fec8cfbbc5afe6bc4f22fdc3f06b36d6dcf7f27f32c88f8022b5850edb92fe8a07ed WHIRLPOOL 98c4cb9aaca48e24c82d2db375744e08859b79d69cbd00b479d304efb8d51ea815756f1a8a0e0c2c5f71b806a7b52cc1378ceab7e2aacb2004e16e4fe5862017
-DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+sse2.tar.lz 11678153 SHA256 3a1cafb572f3565862dce0e4a3386bcd63da26eb17a39301637e7751b827c2d4 SHA512 9608eed3c1583c09ce504b47a6efd82edaf27e83fc6471ee4e478a3167fcf38cae57470ba0246ef6e56398922ec270e81ceb75e7a6d0744a02f5bca454fa33cf WHIRLPOOL 24ad25b4cd686976de99494943135ad2fbb56898981f26e1ff339ea5b0d96171f0e65e24afa40374cfabcae75887ce4e59ab8a5f323bc4af41e1ccc38fc5d74c
-DIST pypy-bin-5.6.0-x86+bzip2+ncurses+sse2.tar.lz 6075399 SHA256 14e3dde904e6ee5b8d276f6785cf8a3339e3689f5d151d0b146f76cde77b7ca2 SHA512 b2c6ce1415b7c49be7c69a02c744884b03ccd17227d8c66c0b042f8b5421e006c3e81353f20d6c74bc886ff10927d2efaf0f4b938571e165678135e18870e06b WHIRLPOOL fc3c3e0554d96a52c0a9631080250a6fd825d3ccf5d3c31da172c6f820fea6106b7c4f1094ea2fe838deb786a6ce8b0e78a9a78b7864394c828db32d9c31adc1
-DIST pypy-bin-5.6.0-x86+bzip2+ncurses.tar.lz 6073628 SHA256 a667781d65abee8f535769a08cc9cf7e39ae2c12f6aa71cab32de53baf21ceb3 SHA512 adfe5c01c575378c537dc72eaa6cf98cf2f8f2642abeefcfde70f0930f26202b6c08bb715e0c6cf058495fcf1baa035f43e0452014e90e249a27118bcece4dda WHIRLPOOL 4b74440e22fc76c128d8330df57a54dd48a5d5b4fd390f6b912ace46a34d58b03f4a1f6990a274bd1ea8c88615e5f1d1fe56a124a25e1d6618798d7c3a00646a
-DIST pypy-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 12313034 SHA256 410f32b11f6d28ea4bdc59d6ee9de4239178b16834fcd35bf5e9f462e3a51ebd SHA512 e6a66b2aeb3b3d2fd8b99ef5d0fa49b9e99752f9baa996280d14d9031b4103795bd5f0180755e3a360889b808267e19939b32e504bd91811df3875c9ae634775 WHIRLPOOL 1ab24432bc071d2aea1c0023817a8ef89444b560f21276d7f66c4d5a3c72662eda4b2ec13b39a60920dade363b39051f610af8505f011b5cb626ff2cdebb65cb
-DIST pypy-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 7104886 SHA256 76373ee444a173287d02dda552a07bf029ee7b3c1d5b94784cf13b53d0b12584 SHA512 fed7f2f3ae78f7e1723cb22cd2de1772b2afb633e84714335e06c91ef8062ba1216f3539b2f49e1570e174e823417c83d30d9cff852c6118241b8ff7fe16d627 WHIRLPOOL b661b9a6f4033e15a6d398f724455ad7b9c06bf5ab2a4a06656a4a0888adfee5abfcefe6c27e1d9e4c38c99d38d944523cf1afd2da1084e7fefc9a6c91c89e6a
-DIST pypy-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz 9956906 SHA256 25638e27a0939268014c35b94f4b5e9031d5f3a92cb51e96adbe4b59befbb579 SHA512 1ef83113f832a71ee4370381f21a07c24059a3b1bd2cad14846f06aa4d8319c14cb3633314f81f6ee898ecd9d2612bd03b72a3c1a87264ff34214f716e13bc4f WHIRLPOOL 8896245974d5a9b7b524edc888399c88e1dd651561017a8688405ad82d9906ff5c81e899cee57eb64506903af583439045dc5fe7f8f5592d071642fb8bb6d9e2
-DIST pypy-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz 5958810 SHA256 05228eabb25b02aea0c80aca4902ee3d81c3767e64daae5662c4797b39ed6a07 SHA512 e27e84e4a060a7c20bcb862da7d0f32508f5588753b067d726d7cd43835307853a7409203c0bbb98844ac59affc03ea43dc650266d74c345a1afcb7e528f1a8f WHIRLPOOL 2169a6e306643669573434dc065235dc5272c8dffd34a09b136e5a23cd2b8bb70fef552cdf3d79018c7e3b3b1c4edb4d7dcde0a4feb550827dbeafea514742aa
-DIST pypy-bin-5.7.1-x86+bzip2+ncurses.tar.lz 5984920 SHA256 a1507fb0d55633b28fe6c249291f4dbf0097cfaf2e2a8d36f20636c5ccd34ea3 SHA512 769f62cb3768b762a09f83926ea695d2aea01f8bb3f33d921607f454a9f1d9ab30fc5400787274d1d94a8ca5b82027d737df4e5e693d639b6944c22eb69e75f8 WHIRLPOOL 825a531ae629015022ce1260e11258ee057535ae8e491f9f08fb90cc38a6eda4f02a5f9e32c8ecb85cdeb81c5de9f2353c415abd83d05e107ebce3669560b484
 DIST pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 13029615 SHA256 236b12d1abfea9bca81247be01d77b6e82ca9ce923f4e21cb1fceedf8b752675 SHA512 4234bb85c527999fc9ec91e7187d7b05e9aa5fa9965ac4a7fa7a652f678b1221cd04d119316073c5f8352d7bd533c4a7b1c79f5cafce6eb04f32b0a764fdf36d WHIRLPOOL 2b411e1eda2cb18c8a823bcc75de457d68eb9b6793431e3a3a2950bad0f8f5ba882f3cfc21064d0b3656b66bd7cb1389889cb70cb3c9181669286a1fbe0d229f
 DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 SHA256 3b8b42a1bc0ca612951452430fc078b8bf81a0dff42eb966fe0e7dc965401d5d SHA512 532d7fd9bdb92b1d5c8e8ebcf60c56fbe2a32b8b89f8650d91b6e0a7cfe6733e3e6b6b232f02a6f24bf9f30569dd8b9cce0b93268d0bb45cd808671ee41be3ae WHIRLPOOL c1a3051c91c747fe60d4bc080749d6b72c79825368da940c4a3ad701d62687ffa6ad81f2e1deb6d7113239443a1fb8e1d07d1e02563c9e59a82d8bc5da3b6ef1
 DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 SHA256 9d943e832695ec4d66b07ed9a6dc5e58885ea671d96ba7b728d03b18686111f7 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c WHIRLPOOL b473572a5a84b1ab0510f7274038546836ef3f61ed3cea3260f7ee4e4086093555673064f9fd58c2510b2d80848ec276ca7069372826ef466408c6cabdc74424
@@ -25,17 +11,12 @@ DIST pypy-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 7452420 SHA256 a7ffddd40bb61c18f0
 DIST pypy-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10218708 SHA256 c3130b6d01b03521e0333a3d90be643b1ce16ebdd207122d959eeb146377d8de SHA512 b2a4169dc7ad8216f754d1245283024d0accc0543d86acf6452a19e67051482ac4cf5b3cf4ae20be7c865bfdb1515b75030a5d4a02b8965252e7810baaefcff8 WHIRLPOOL abf4276d93be4b8e9370969ca6d8a730a3337ace944fbe1eb75b54032fcf1e2bcbf081dd820918afaadd416ead8cd10797735606d948c17b4bb676adbf358e52
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 SHA256 8d28e152919e01b6cce9aa9350107972307fc63918bec3d24408bfb1fa92f2ad SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622 WHIRLPOOL 9b484c003485daa36a5ecfb5aade84b431d692aeaa73e604868934b27e7006b530f7d6661aa580aaceafd1e52ff5573627ed8dd6c3c18da001c20eded9af21dd
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 SHA256 64207bf1703e3a3666c60effed55fa176e6be0282504db3271121616e81df8d8 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349 WHIRLPOOL 5e84a4ab7cbe3efff867d9e11c758e4e0ea0d9585745966fb29fea399fff1dc0dfa5dc727a21e84b6100cc659b6bc658a4a574d4e7e89607e3fe8fc90f4873fb
-DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
-DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
 DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d WHIRLPOOL 5cbfc6922469450fdd55cda79afbd41e5750446eb09396ea53a65d6fbe099905103f14ab08665ecd76bf4da44f11d2c4609d8df97999a41d03f2985d6fae32fa
-DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
-EBUILD pypy-bin-5.6.0.ebuild 6078 SHA256 6c54fd6211b18e489da8cf1e90dc1753087da35636a761bfa2271e0663020c3f SHA512 16a76d68a01ed73f7dc978332c131e1c1627431d80b52a44f6c82695815e380310b22157048d5a62099801070d58eff13514b6cfa9f89a15ad83a1727be18b39 WHIRLPOOL 5a009b06ec8f10fbe3cbfaf6ca4bac64b238aaaf460bce68f5a3579d6483b390473463d1683495a231c639458d6e5e76f8202cb072f8a9c52b0fe2e0c2166706
-EBUILD pypy-bin-5.7.1.ebuild 5819 SHA256 4ecdec56f1ae5457c36fa8bdafcd8f8ff8ce8c565ba1de8bc82f71b51a72ee68 SHA512 0abf25651d8432a51a32e4129fbee0046d9e1a838a3c866e66407433b4059aedf640d63a371a9934d6d4f7ec5b2a79665606cd9a18ee4b16a656610cc5b93b7f WHIRLPOOL 43db08fdadc7eddb4e292a515ca15f159529115decdf0630828f0bf9bbfe4f52fe56d6897c0426cece3c14f46f788282f32cb4df119e80248045a2ac73c5c342
 EBUILD pypy-bin-5.8.0.ebuild 5819 SHA256 a328766890d2a892513e895518884de98f67d3cf7429aaf18bcd7e182fcf872e SHA512 8ba2d88b641b86a6b7a64f271b56a80aa98139307bb4e294cba6f4ed34a0821a7fae66ec037cbdbf6a6fa00b2d381044b81b24c3f805345c2de77bac0e60b7cf WHIRLPOOL a877c7eec69b9020756a8e0addbc854e2656f897adf476f3fca341a7ed8e24061476843a551611dc6df6b5db1808a5692aaf9e99a50c65855317ad519ea9af3a
 EBUILD pypy-bin-5.9.0.ebuild 5819 SHA256 775790b1cb15fe94d626c5622ffc903fecdfb0cb0a3b9577223d2c54776d421d SHA512 fbc7150be4c5ec2fcd59e6727c2bd439257766d09c1b31aab6a3a4702447955193d8fe58723f90f50db2a7d57eb5bd58c124aa0043f06feb0a1aaf986e51b8ac WHIRLPOOL 9fe05ae695e9dc4a6e1db8054189dae98cd3adc9cf4b4ab38e7270bc224a8dfed41b579517e0240ba54523676f89a54fa41f8b75aa0ed0e9dee758610e5c7445
 MISC ChangeLog 9199 SHA256 9c47a49b40abc59f48abeb8422551c11d6fd22baa080d4748c480f998e4ab4b9 SHA512 f29475889f803f8e330e2811bd96aebb6bb829ca8043056ca539edacb6d513f772dd4b192a85b995caa626f468ce5bec3f98acbc8dcf41f54f16cebaf6783325 WHIRLPOOL 4231ef2b20556aa4e6853f40f1f89f58205206ea069204efe33ec2a2a5553e3e03d83c3e21b55226b64c4ee377d747b0e6352cc37f0e3b7f93c2862bd3c6ada0
 MISC ChangeLog-2015 7187 SHA256 ea84ecd028b95b790792d4f80386a8c5884a667de5de21d37747412ac6868d66 SHA512 afd832969505f5ea599a10a629fe0e068c3282d5b8f3d880dc04818e25034c9df1821b0dea2b623b91ae6561ca82ec9de6c4907badcc2befc2230dec986c9302 WHIRLPOOL 05c59d774d47ac5eabd74c1af2044ba0c2d2fdd0f4b3bb8f4cc9914c65a8133dcf59ee047c13d676783a84b28a4ea9c2fcbd9c910ec6057581b9c3ca227ef410
-MISC metadata.xml 514 SHA256 418905501db31b0962ef487f62db5c376e6cce16be2e7513553049979dae1968 SHA512 a4f6fbf391b7f566b99cef0dc503d41ad1c0eb119187650b550697c4c10b394bae847fcd809eb9db2883f578e5bcf3416146941cabddc0632b2e10dd50fb0315 WHIRLPOOL a510d10c48a29615969f1332fb78e91b5036c3e7cc5456981a627f96b72bc3fb407b6023d7e564da4ccf4170925d3c3902a42074b11f9af105b200e7cfebe58f
+MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb
diff --git a/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d9c2cd1a5ad..000000000000
--- a/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
-
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py
---- pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py	2016-12-08 16:59:26.213690338 +0100
-@@ -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_'
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py	2016-12-08 17:01:33.594553801 +0100
-@@ -126,19 +126,56 @@
-         setattr(compiler, executable, command)
- 
-     if compiler.compiler_type == "unix":
--        compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
-+        cc = ' '.join(compiler.compiler)
-+        cxx = ' '.join(compiler.compiler_cxx)
-+        ldshared = ' '.join(compiler.linker_so)
-+        ldcxxshared = ' '.join(compiler.linker_so_cxx)
-+
-+        cflags = ''
-+        cxxflags = ''
-+        ccshared = '-fPIC'
-+
-+        if 'CC' in os.environ:
-+            cc = os.environ['CC']
-+        if 'CXX' in os.environ:
-+            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 '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 'CFLAGS' in os.environ:
-+            cflags = os.environ['CFLAGS']
-+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-+        if 'LDFLAGS' in os.environ:
-+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-+
-+        cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-+        compiler.set_executables(
-+            preprocessor=cpp,
-+            compiler=cc_cmd,
-+            compiler_so=cc_cmd + ' ' + ccshared,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-+            linker_so=ldshared,
-+            linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx)
-         compiler.shared_lib_extension = get_config_var('SO')
--        if "CPPFLAGS" in os.environ:
--            cppflags = shlex.split(os.environ["CPPFLAGS"])
--            for executable in ('compiler', 'compiler_so', 'linker_so'):
--                customize(executable, cppflags)
--        if "CFLAGS" in os.environ:
--            cflags = shlex.split(os.environ["CFLAGS"])
--            for executable in ('compiler', 'compiler_so', 'linker_so'):
--                customize(executable, cflags)
--        if "LDFLAGS" in os.environ:
--            ldflags = shlex.split(os.environ["LDFLAGS"])
--            customize('linker_so', ldflags)
- 
- 
- from sysconfig_cpython import (
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py	2016-12-08 16:59:26.213690338 +0100
-@@ -120,8 +120,10 @@
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,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, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py	2016-12-08 16:59:26.213690338 +0100
-@@ -65,8 +65,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)
-@@ -83,8 +87,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, msg:
-                 raise CompileError, msg
- 
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py	2016-12-08 16:59:26.213690338 +0100
-@@ -171,10 +171,12 @@
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,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:
-@@ -210,13 +220,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 = so_ext
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py	2016-12-08 16:59:26.213690338 +0100
-@@ -55,14 +55,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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -129,12 +132,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, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,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 = 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)
diff --git a/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch
deleted file mode 100644
index 8249fbc91db8..000000000000
--- a/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 07:14:11 +0200
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
-
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
----
- _osx_support.py                | 10 ++---
- distutils/cygwinccompiler.py   | 21 ++++++++--
- distutils/emxccompiler.py      | 14 +++++--
- distutils/sysconfig_cpython.py | 26 ++++++++++---
- distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
- distutils/unixccompiler.py     | 55 ++++++++++++++-------------
- 6 files changed, 112 insertions(+), 51 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index d2aaae7..8bcdb05 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # 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_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index 767400c..7133097 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
-         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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
-                 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, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
-index a017205..bdc532c 100644
---- a/distutils/emxccompiler.py
-+++ b/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
-         # 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)
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
-                 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, msg:
-                 raise CompileError, msg
- 
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 35f39e4..8dd032d 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -171,10 +171,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,27 @@ def customize_compiler(compiler):
-             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:
-@@ -210,13 +220,17 @@ def customize_compiler(compiler):
-             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 = so_ext
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index 368f232..4fe1f08 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -67,6 +67,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "gcc -pthread -shared"
-+    g['LDCXXSHARED'] = "g++ -pthread -shared"
-     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
-     g['AR'] = "ar"
-     g['ARFLAGS'] = "rc"
-@@ -85,6 +86,7 @@ def _init_posix():
-             # just a guess
-             arch = platform.machine()
-         g['LDSHARED'] += ' -undefined dynamic_lookup'
-+        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
-         g['CC'] += ' -arch %s' % (arch,)
- 
-     global _config_vars
-@@ -168,37 +170,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         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:
-@@ -207,13 +224,17 @@ def customize_compiler(compiler):
-             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 = so_ext
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index dee88a5..558b568 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
-     # 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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
- 
-     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, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
-                 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 = 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)
--- 
-2.12.2
-
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index c1d59c6d4a0e..ff5bc95069a0 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alicef@gentoo.org</email>
-		<name>Alice Ferrazzi</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
-	</use>
 	<upstream>
 		<remote-id type="bitbucket">pypy/pypy</remote-id>
 	</upstream>
diff --git a/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild
deleted file mode 100644
index e15879131bd9..000000000000
--- a/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit eutils multilib pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.11-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		jit? ( shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz
-		) )
-		jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz
-		) )
-		!jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz
-		) )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz
-			) )
-			jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz
-			) )
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz
-			) )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz
-			) )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=[-bindist]
-	sys-libs/glibc:2.2=
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
-		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	epatch "${FILESDIR}"/5.6.0_all_distutils_cxx.patch \
-		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
-		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	use doc && dohtml -r pypy/doc/_build/html/
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild b/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild
deleted file mode 100644
index aaa6411b77bb..000000000000
--- a/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=[-bindist]
-	sys-libs/glibc:2.2=
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index fd8ee4b21800..f185819a7135 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,23 +1,15 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 SHA256 110c15482123bc6fbf11e237df30eb0daad7f6032e2f73903e9e3c225121737a SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 WHIRLPOOL 14084d22388b2bbda7fbd19195f448265f99b1437b7cefdac276ccab52785c67b71768303e1d1ea9009f8533ba07de0014eb237b4de675cf8dbc1acbeacb8508
 AUX 2.5.0-shared-lib.patch 734 SHA256 202b90461d5c51fddb3f2adcec8806300895597ee997a8e4352ec9d2c31f4d49 SHA512 c75281cc754d723c184a2e716cdd9d88e23db4041c143864205e7d8b40972507bb0423216cf3cdcee2bf7f8900d034bbc95b318fc347af6e550ec6e6ed1097da WHIRLPOOL 279b72ae78276020dba2ef7dc4f16581a21c742b1c6218a18dc8b3e8c847c50898beaf3868d76e13ceb62ba1189792f6c0ad220650e92799594bd1503b126e34
 AUX 4.0.0-gentoo-path.patch 1915 SHA256 106683dc3849851df2d4985f542825ae2b37e0b3ec57ff34d2a5cbd16f79f830 SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278 WHIRLPOOL 0c68c232e5ffeb1ce5e5d3e41471cbde45aca7765b2c85227c02b5b759891a33ab404ce5f444c048361e922a90868621845a8839207efceba6a70ebd5c70dfe0
-AUX 5.6.0_all_distutils_cxx.patch 17053 SHA256 77e2274dac32d065f861882daf59f9020064efc3b7ab39d5152538ea343d854c SHA512 79b3e073a57981ef78c42db3f6c6c0b410525d84d5c6166ac7f8947d66a7b00c52d1fd30516708eaf3d33664466302e11a954f73c40ae48a8aedfb554cec86a2 WHIRLPOOL ae97f0e6a8cf2c0b6df946297f4d6dae27fbe4dd0ea3576d6a17e869fa5e610971302c07465ca4018d6e1ced650d6531ae20639fa08a7d69693ff337a60216e1
-AUX 5.7.1-kill-flto.patch 919 SHA256 aed12afc66592ef9fe4bedd09c4275158fbfc30b4ec5003e9b092974ea020d73 SHA512 a8340c41e55e929521f649d64ee728a8b95e1be3008060a4fb2147e7f3914731640870503b4c06577a052deca00130ff3835b9477feeaf57fc0b8531abcc22c9 WHIRLPOOL 559115c01e6e027948e7cb55577be8d018661e811a3aff8db68a4e98de6f275673738199e928aa7ee17a0cc9b94ab1cc350067cb8a4fe003de8022eedbcbfbc0
-AUX 5.7.1_all_distutils_cxx.patch 18249 SHA256 33bf43330f0a2ae0dfb4b4999a7b27c74ba789a18f6f181928e13cb1553bd39e SHA512 a347cf438a0d308c69bc92cd04236be0bcf95f595daff1fbcb19eaadbbd7355e90fd661843d8a8d1588003da3ec37b3e3e9fa8a24af92baa5d2c0c0a866284dc WHIRLPOOL fe363fe49b70e4e291a092b5229e5f17d39f50f5edee97bb4aac8275410d2981c6963e096fa77d7ecf549d0d97ea0c6168947b2c1526e92d3e73919873ef68da
 AUX 5.8.0_all_distutils_cxx.patch 18248 SHA256 2f7c75a5966ebfd0750ca902ea855ca321829a0309a60e6c57f45eb418054dae SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a WHIRLPOOL 807d777cabd6db4cc909f6135de230705f289ac8d1ef851fd872abdbabb3b13e299c98b53e9bf993f044c64702576e15f0d1b3a1a9a4aa9a4458204267c25b92
 AUX 5.9.0-shared-lib.patch 826 SHA256 109e73bca4a7f5395a6c196de795ea4e3f2cd453445b0303e26475df25abc7f4 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945 WHIRLPOOL 9cb0b967e264a1ab73181b586a75780c0c68bd347579958accdc426fde240ddbc87680243d44ff8443d9874433ec7b82110f4bf4e688093876e75ea4b322383c
-DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
-DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
 DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d WHIRLPOOL 5cbfc6922469450fdd55cda79afbd41e5750446eb09396ea53a65d6fbe099905103f14ab08665ecd76bf4da44f11d2c4609d8df97999a41d03f2985d6fae32fa
-DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
-EBUILD pypy-5.6.0.ebuild 7755 SHA256 db94869c55bbb279fd4b70a945aadb21e333a73804b99215346c1ca416e15a1b SHA512 72803f33258e5382c39af0b567951d54bb2902af449a80f27bb21302e75cadbd1c4ecbdb0743c13d6d8a16e942f5a68f87ee4576b39d7efff43cf3f704843288 WHIRLPOOL 47db1d39582906ce8c1894e43d0e849ca3c1342cc99528e8939f7ff2a8774b8ba58cecb43232ef808b96849a50e89f0b431d64ecdea7fa3b6ba38a19afb3d943
-EBUILD pypy-5.7.1.ebuild 7776 SHA256 7a46bb10a331b6718f9a7b5a83709accdfd2fc32480b91812768c0a9f86cc6ff SHA512 00d83430e8ffcb12b8601574a01a0d0d23d4627e32f38025bea333f76e657e1b921dba82c61bd727525ca74582812dcb683218de4d4a3f3a6d0ade721527e927 WHIRLPOOL e3238f4eb5c9c4b17c5c6dfc4cf657e7a09d0cd1b582b41cc8c20365cfad12681f10eab712a2fe173aa30d0bdfd49dd7048555bda4355a24865e56ee190f65b2
-EBUILD pypy-5.8.0.ebuild 7707 SHA256 dae2698f117fd55e6fabbaac608ad7d05b0088c0fd75215f4075976cf17ae8c6 SHA512 5470d85e45363e10cf5f5f3ca3cfb656edc79104fd8998906e8b27c2e76d1150d43ea6108c39b68829e95a4c454c2a7d33312ad13a1cdcb7e98fe4804d93c326 WHIRLPOOL a889931458820d130d67b816f4953618e9f6f8d5143e1a905e2fb2c6c48a3ac91890fd05c8a838f6f96e591bcfe484c86495977a0851ba8cc11e51ea990bb2f1
-EBUILD pypy-5.9.0.ebuild 7707 SHA256 260f50bfe25a377baf9157c614586870a77f9f913d511e6eaabe1f69a872001e SHA512 4adb210caa243ce72edc3826a862e9195471383eaf4239ef8839b43202ff0522f6bc969686edb0cc44739e85afb2e8694f35f39bcbf67aa7a60bf7e3c7d0da06 WHIRLPOOL ff01ec077eea7e916d2f01d5b9b8881c30c43966c02b87e4a8a24f19968d8b1d01df7f893424390953b8c5e087f85599f9ce2cd83acec57c7a28f67ed300e63c
-EBUILD pypy-9999.ebuild 7717 SHA256 ef3578ec149463dd4b356dad3a08825f8df79b4cf5c8b40711aa261dffdfcd95 SHA512 fe4b5b06da8d10026952f745ad78ab2912885d3060f363675af109ecc33c2bb701147fb203c719ac7358d6129dc7b422448fabedcab3096881a020ea85391bba WHIRLPOOL 2c9669d1ac5f81c78a692daa685d405533bb1f956e3c53aafa8c5ae9c4c6f90cfe4fe2c355b88d7d6e75abfeb80f304581304721014774a0905333c3295b46e5
+EBUILD pypy-5.8.0.ebuild 7705 SHA256 4e058cb539b7735bdc0729941b0318d8f00120e913a2081222ec5e7b0f586f6f SHA512 99af9fcf702a83353b3c4c582ef0f0c3b3acfafa4239ba3599279ecdeb7cc45c7783234dfac2af956352de35e61b925ff8997772f242e408dcac59c3e9ced90c WHIRLPOOL 5e4750964256829e9e6b914aad54509d7bbfc7c59b91c3bcfd4a61d479999da23e97ca41863c8c09c17337b5889fd93230c8059e7bc00e2da22b1e12b331a63c
+EBUILD pypy-5.9.0.ebuild 7705 SHA256 5dcf88e1c930daee3e8840f9a9c6bf413360d1f1bfb6ac0d59e26c23f0ba7455 SHA512 e1991d9f01ac21f3ec8704a6480d8632e53271bfb00c4360567de811b04354cab4a5151896d0ab677c012b0cfa70c06e57b14310353d5ecb4bc898f007cf802c WHIRLPOOL 34c15b8a386378b7f087682f67e5277491bd29bd734938dd2a23ccfe36b002f2829dcfb637552005167d8a2a8b310f7974ef3ccd7f9f42d66f0c4122ce1916e1
+EBUILD pypy-9999.ebuild 7715 SHA256 9eeed5694ff50be33062f51d6036220ee2223fb72be63046ea2d281895651d4c SHA512 0ba1c84e971a0d41ddcd766e8c1c5a1684a9d1e57fe8e2dd55d29339edac9e61c117b031c3a61b998fd70d3a3b7b1f6b398cde7f92ea4142fd6befa73b0395bb WHIRLPOOL 80f318573a27f9495ab8151961a138b1cfac9547280f1982b9b953e39d95b14d342b29445533ac5d1c65d4d9557cb210bedf08550b3df3a4b9d9bff51da07330
 MISC ChangeLog 9456 SHA256 2c487622b9a986cf7e958164a53f87c23fec4c87fb491b0d04f5dd96f17f911f SHA512 b639ad32b6eb4e456547d2df9cb739f88e736760ccba2bbbcf044b9140991d2b9a58944ad79dd8199a20a444cd0da79b8a0248f9072d1c4e2fb2e6f299f924ac WHIRLPOOL 6cc1e181530a5a48ac39b6adb8c52d01bd406b7e94f8cb8bd874d25b1eb708c4ee77e52e2bbcc7b40e257e86d1dba3e6db9be387828578d0d28d33b73b0e63b1
 MISC ChangeLog-2015 16042 SHA256 657b5025da42db387e3dd4b8ca2b081412e2fbe4ed95d6b633f7058107538777 SHA512 9395cfaefb8972adb9cc709884eec37094387490fd26b1ed51b45fd957348174f17dc577e826e72f758b4ba215d12af3c7c79989187280d8d58032966571ce4b WHIRLPOOL 69229bea7c34d0c718648dedc4aaf1d46e540961f65a577290649b3f799fb7e47116b2bc55d39b00a92291e21755440f0024abae2053217140c50b5b9f145880
-MISC metadata.xml 985 SHA256 dbe84c030488808bce73f701c292b2ab6a1110273b6f4638de6108a8d640374c SHA512 cbf2f1765dca5391fa08b8f49836e6a3019ca0e95c6783d6c2ee4937a8c323c3c43cc9873ff8fd396fc2646fffff4474facc3be0472d905c195b6fad8e8a5e58 WHIRLPOOL ad1b1663e3bb18e95be36e1d36aa396b9b96867d2b4fb55bd1f47308b9fc45540b8f125db1f094c9833d71f1d4f48109d75fe4e3eab864d61a87f6cd8e251ef1
+MISC metadata.xml 636 SHA256 f73161c46ef3c8187a80d861f0c29e04816b04b2f5c7fbd56b8b7ff140459c9f SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 WHIRLPOOL 8eb2d191fcbb21aeb2e8bb10672a066165c809aedc45cbe4e7cbe00ed75db009cb95c16d57d7e87d80e6de5c3953e4742bd68a21a58367ae92f4efd9b8a8e794
diff --git a/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch b/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d9c2cd1a5ad..000000000000
--- a/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
-
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py
---- pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py	2016-12-08 16:59:26.213690338 +0100
-@@ -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_'
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py	2016-12-08 17:01:33.594553801 +0100
-@@ -126,19 +126,56 @@
-         setattr(compiler, executable, command)
- 
-     if compiler.compiler_type == "unix":
--        compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
-+        cc = ' '.join(compiler.compiler)
-+        cxx = ' '.join(compiler.compiler_cxx)
-+        ldshared = ' '.join(compiler.linker_so)
-+        ldcxxshared = ' '.join(compiler.linker_so_cxx)
-+
-+        cflags = ''
-+        cxxflags = ''
-+        ccshared = '-fPIC'
-+
-+        if 'CC' in os.environ:
-+            cc = os.environ['CC']
-+        if 'CXX' in os.environ:
-+            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 '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 'CFLAGS' in os.environ:
-+            cflags = os.environ['CFLAGS']
-+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-+        if 'LDFLAGS' in os.environ:
-+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-+
-+        cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-+        compiler.set_executables(
-+            preprocessor=cpp,
-+            compiler=cc_cmd,
-+            compiler_so=cc_cmd + ' ' + ccshared,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-+            linker_so=ldshared,
-+            linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx)
-         compiler.shared_lib_extension = get_config_var('SO')
--        if "CPPFLAGS" in os.environ:
--            cppflags = shlex.split(os.environ["CPPFLAGS"])
--            for executable in ('compiler', 'compiler_so', 'linker_so'):
--                customize(executable, cppflags)
--        if "CFLAGS" in os.environ:
--            cflags = shlex.split(os.environ["CFLAGS"])
--            for executable in ('compiler', 'compiler_so', 'linker_so'):
--                customize(executable, cflags)
--        if "LDFLAGS" in os.environ:
--            ldflags = shlex.split(os.environ["LDFLAGS"])
--            customize('linker_so', ldflags)
- 
- 
- from sysconfig_cpython import (
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py	2016-12-08 16:59:26.213690338 +0100
-@@ -120,8 +120,10 @@
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,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, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py	2016-12-08 16:59:26.213690338 +0100
-@@ -65,8 +65,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)
-@@ -83,8 +87,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, msg:
-                 raise CompileError, msg
- 
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py	2016-12-08 16:59:26.213690338 +0100
-@@ -171,10 +171,12 @@
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,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:
-@@ -210,13 +220,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 = so_ext
-diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py
---- pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py	2016-11-08 09:52:16.000000000 +0100
-+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py	2016-12-08 16:59:26.213690338 +0100
-@@ -55,14 +55,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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -129,12 +132,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, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,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 = 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)
diff --git a/dev-python/pypy/files/5.7.1-kill-flto.patch b/dev-python/pypy/files/5.7.1-kill-flto.patch
deleted file mode 100644
index 92395bdb6cab..000000000000
--- a/dev-python/pypy/files/5.7.1-kill-flto.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:03:46 +0200
-Subject: [PATCH] Kill -flto
-
----
- rpython/translator/platform/posix.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
-index a8d4768..20a2934 100644
---- a/rpython/translator/platform/posix.py
-+++ b/rpython/translator/platform/posix.py
-@@ -130,10 +130,6 @@ class BasePosix(Platform):
-         else:
-             cflags = tuple(self.cflags) + tuple(self.standalone_only)
- 
--        # xxx check which compilers accept this option or not
--        if not config or config.translation.gcrootfinder != 'asmgcc':
--            cflags = ('-flto',) + cflags
--
-         m = GnuMakefile(path)
-         m.exe_name = path.join(exe_name.basename)
-         m.eci = eci
--- 
-2.12.2
-
diff --git a/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch
deleted file mode 100644
index 8249fbc91db8..000000000000
--- a/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 07:14:11 +0200
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
-
-http://bugs.python.org/issue1222585
-http://bugs.gentoo.org/show_bug.cgi?id=599918
----
- _osx_support.py                | 10 ++---
- distutils/cygwinccompiler.py   | 21 ++++++++--
- distutils/emxccompiler.py      | 14 +++++--
- distutils/sysconfig_cpython.py | 26 ++++++++++---
- distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
- distutils/unixccompiler.py     | 55 ++++++++++++++-------------
- 6 files changed, 112 insertions(+), 51 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index d2aaae7..8bcdb05 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # 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_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index 767400c..7133097 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
-         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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
-                 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, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
-index a017205..bdc532c 100644
---- a/distutils/emxccompiler.py
-+++ b/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
-         # 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)
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
-                 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, msg:
-                 raise CompileError, msg
- 
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 35f39e4..8dd032d 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -171,10 +171,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -189,19 +191,27 @@ def customize_compiler(compiler):
-             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:
-@@ -210,13 +220,17 @@ def customize_compiler(compiler):
-             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 = so_ext
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index 368f232..4fe1f08 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -67,6 +67,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "gcc -pthread -shared"
-+    g['LDCXXSHARED'] = "g++ -pthread -shared"
-     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
-     g['AR'] = "ar"
-     g['ARFLAGS'] = "rc"
-@@ -85,6 +86,7 @@ def _init_posix():
-             # just a guess
-             arch = platform.machine()
-         g['LDSHARED'] += ' -undefined dynamic_lookup'
-+        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
-         g['CC'] += ' -arch %s' % (arch,)
- 
-     global _config_vars
-@@ -168,37 +170,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         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:
-@@ -207,13 +224,17 @@ def customize_compiler(compiler):
-             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 = so_ext
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index dee88a5..558b568 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
-     # 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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
- 
-     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, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
-                 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 = 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)
--- 
-2.12.2
-
diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index d82bf530e9e6..89f86a0b2bea 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alicef@gentoo.org</email>
-		<name>Alice Ferrazzi</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<use>
-		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. \
+		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint.
 			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
-			at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or \
-			swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
+			at the cost of lengthened build time.</flag>
 		<flag name="sandbox">Enable sandboxing functionality</flag>
-		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
 	<upstream>
 		<remote-id type="bitbucket">pypy/pypy</remote-id>
diff --git a/dev-python/pypy/pypy-5.6.0.ebuild b/dev-python/pypy/pypy-5.6.0.ebuild
deleted file mode 100644
index a6b8dc6a26ee..000000000000
--- a/dev-python/pypy/pypy-5.6.0.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.11-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	${PYTHON_DEPS}
-	test? ( dev-python/pytest )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
-		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
-		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	epatch "${FILESDIR}"/5.6.0_all_distutils_cxx.patch \
-		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
-		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	use doc && emake -C pypy/doc html
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	use doc && dohtml -r pypy/doc/_build/html/
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/pypy-5.7.1.ebuild b/dev-python/pypy/pypy-5.7.1.ebuild
deleted file mode 100644
index be54da7a981e..000000000000
--- a/dev-python/pypy/pypy-5.7.1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	${PYTHON_DEPS}
-	test? ( dev-python/pytest )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-	# disarm implicit -flto
-	eapply "${FILESDIR}"/5.7.1-kill-flto.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_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 sandbox --sandbox '')
-
-		${jit_backend}
-
-		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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	use doc && emake -C pypy/doc html
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild
index 8317a80f1480..ff7d02e64a20 100644
--- a/dev-python/pypy/pypy-5.8.0.ebuild
+++ b/dev-python/pypy/pypy-5.8.0.ebuild
@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
+check_env() {
+	if use low-memory; then
+		if ! python_is_installed pypy; then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy[low-memory]."
+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
 		fi
 
-		check-reqs_pkg_pretend
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
 	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
+		check_env
 
 		if python_is_installed pypy; then
 			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild
index 0ac7919c6ef2..3eff562c4ad6 100644
--- a/dev-python/pypy/pypy-5.9.0.ebuild
+++ b/dev-python/pypy/pypy-5.9.0.ebuild
@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
+check_env() {
+	if use low-memory; then
+		if ! python_is_installed pypy; then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy[low-memory]."
+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
 		fi
 
-		check-reqs_pkg_pretend
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
 	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
+		check_env
 
 		if python_is_installed pypy; then
 			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index f028a5b6e80d..62d8a0f73b85 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -44,33 +44,35 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
+check_env() {
+	if use low-memory; then
+		if ! python_is_installed pypy; then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy[low-memory]."
+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
 		fi
 
-		check-reqs_pkg_pretend
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
 	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
+		check_env
 
 		if python_is_installed pypy; then
 			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index aa4431ea1f92..4ebb94a8a1ed 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,18 +1,7 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 SHA256 831bacb5d5c7b23699971aedf7b07a93654ba0cf8d700babe369330115c29896 SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733 WHIRLPOOL 7124a9a1ec1a65bf1488060189306780e8e6890381a20fab27b00e031e59096b80d0fcd5193d1cd48393d51f4619bb294b846da6190b784aef92f1b09ff2acb8
 AUX 4.0.0-gentoo-path.patch 1906 SHA256 4f01ad3317e62147346d6548e0d5cf51bb1b01c4e4d34e48eb57dbefdaa82140 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747 WHIRLPOOL 8e3b2d477a3db79874f679473032f83478bfbcce0d9df1d782f30fb5fcabeb2556efd7a1da85e7d8a0243dbf80ffbef96982d45252beb6c37fbce2ac23edc50e
-AUX 5.2.0-distutils-c++.patch 14234 SHA256 a07e65f2b7e8f8f52af45aec6a146e09390d30856118978d2e4b4d2c7e2967c9 SHA512 dfc404a71f0314988905b976d6beb1e9b8368006840cc199a94eae47a86ab7e2be92d86c53be349928fc0a8b12f3a78c60b07476bfc27cc0f7a383970a2e2e95 WHIRLPOOL 769bb355adaadb980cbb7c77faa8b47b356dc471a25cd1d1b3bc604f7eb84aba6b39e38100c9d1ad5e1dd06fc562a640437917b0c770d8e8ad02627bc309f6c1
-AUX 5.7.1_all_distutils_cxx.patch 15897 SHA256 cc6475551f74f416bd77eec58bab9ab48d6c5fe3f0c1595e197ffe1080bce44b SHA512 f82c4efb258a0ab029faaad35fbd85a9bf9aa98e12d9317920a7872f2f0db75668a37506fd69a3838286e7349948a60e158360b1f3f5d671e91b07a0e56af809 WHIRLPOOL 08c193c5a41ff85d14e6443aa1ba7c3141a7c9ebf15cc6ed99f7e705efe04916bfe3c305ec23f36448521a0d79d3121ab9363491458d7271144914fe6420efbf
 AUX 5.8.0_all_distutils_cxx.patch 15896 SHA256 cbedcf9e08280a99a5f2bf1a033e2b2e17bb0ee2bf00ce82b87b6f89df2718a6 SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3 WHIRLPOOL 5ee53a44e6f85f0ceb93843d35856ddfe7da56662836c7ff25e9698e1bed0d75d5d72e4b5c8ee12b7ce4286903be46a6384a243f7f40e4918cfeaaaeca8f9209
 AUX python-3.5-distutils-OO-build.patch 3627 SHA256 9b0b86d8424304fe87a460bbf5ab503811d77ae4e557ad0c4081150a0af89a1f SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511 WHIRLPOOL 4730a9110662a3c45ab5f3e842ebc2f81ecfd98e4e844e71a0fe56d41baaa6bb01aafe313ec8dd12bea40c956ec01f1a68d6bca3d695bf65705a811f4afd0289
-DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 10860820 SHA256 46437ffdc3327b11fb116071ec8bb5c93aa94ac143a7105cadb678be708faeb5 SHA512 ed93e8452c82e627699aa876cfa55d2fd84d7ec7c6698e2a20bda2a5bb564def68b51a2e62ca45a36f88805cbca453b0a8a6565016428c4eef22a5539bb24647 WHIRLPOOL 858befe94e009628cee4e8527aaaa1e8e92fe264ff91b382fed74ba31314eccf914c403b376792eec322bcead140e8159d255b265bc88832accb3d65d16fd78c
-DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses.tar.lz 11610069 SHA256 a400bd9c2df450647278dec93d397e4d040fd058f78309e8cdaff8b0792b8c01 SHA512 e0dca44387c03306691c63263aae7d484a5244b686cfd57315d7c4bd630fd5fba888d8cb57855d3f84c9bda576194597e4048877990456812f747d7d099b5819 WHIRLPOOL 3f61e0b02bbfc77a413fe38aca59c626857b1b8a05b952e7a832e4d3cc20dd5d98d9173161d08cd92587e2a7b44a2a55ba61f516c632611cb4d16a20f3eb4e74
-DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+ncurses.tar.lz 6243046 SHA256 34ae3b199194a90f0867e95306b6530faa3acafb9dc9ef077ba4e229f3a5d0de SHA512 4fdae8644c40734281d81adb5c8273a0f2429c47bff8672a7f98988195c6e9ab82d9a1443e2d1c1bc2ca75d471c112ac40ac403e75808d8610dce94fee15031b WHIRLPOOL ca2c5b4f0334f1193ef5cd6bf7ebe9034fbd176f0ce34b6302125c6e2b175e69129ca53d21ef34327bb064cf90af907c10bd81d62ccb429298020043a41fdfa0
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 8656783 SHA256 52bff882b65d4664661c70657c927d69cbc0b9377c7d0ae20ed8ca562d8e13f4 SHA512 6ae588077d92d1c4d494e2b657a3d963989e3f3cf2d689ec4cf460f196d69234d13b88160ebb46334af0733f5ec13720abb0d2bc3184c6744b9218a8a5f6440a WHIRLPOOL 81593ba510a71cc7ef47f3013e89e468bb5671da32a0ca5cdbfc1579cd2df90ce3b53ed59f2974243bc1b21eb8ea8d509d66ea4d2539c56f8a15ba9a3e7c6127
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+sse2.tar.lz 9549100 SHA256 fdd95b1fb91d669e1861b2dff52b97af0d01aaedf61eb11f07c8f92cd398c7f6 SHA512 2ac8cb894cafae8da81bddb601185941b42933aa41bda8d1696eb70ca22cbeaa0c23385e4a4cd640c46f9e301acfc2f9bc89adaf5a7f5cbef4bc23ca8af550bb WHIRLPOOL e4c21be6b52468135ff6e53434a8ae8c0450880d0f5c8d37bdc18a99f9ceb0ae101c82b8a7a6ae2088297f9dbfa7146fcf80a24948dd3316d56f0f798cc7ecec
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses+sse2.tar.lz 5231919 SHA256 6a9848bc2d1d948a91bc15ce20768bc7024726ec7afdd2767bfba25926a35c7f SHA512 fbdc955b1c2873d07e8ad36dd697fbb21932ac50726e76fed20da1fca218b329f18c81b8b4a65cd7ece26091859529d5bb56c7ed2efaf14ae8d9988581d88d9b WHIRLPOOL 08ffd98122e4745af4e785ebb986cd7d185472ec0879bb9dc6070b14de6d35e4177e35a85326468329a06617df03880744e23a6bef825f67d40476c92c7d430e
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses.tar.lz 5232239 SHA256 d808aa66ecd5b3d868554ad29b0eee3948e3de69390826bcb5e6b8ceb2408037 SHA512 5e107304537855f459cc7bee92d3b2d05e16f2421d2249205c34f40f1f9415ca657f3e0842c79de98fed732e0a2752b280b44880f96eeeaa0d50d4b4bf2c525c WHIRLPOOL 562fe0c00aeb83a74d9f1ccba4ffed70b5efa6592ef04c82ea06c38afc560e97aa02b835de8b69925690149c1d6803ecfbcad7eefd59bdf4462bdbbbf82c2577
-DIST pypy3-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 10329767 SHA256 041d6b6af48ec4a2de0062a2ae48a3d2a8e827d450b76fc4232f4a9eca8cbc47 SHA512 a5959d4bd5d267ea0386e4fab4b86b83f7597aaa3174281f15f180e0c83125af1437c0a693b0d534929c7199df5958a5f48867c72d1ce24494b2238523cde2aa WHIRLPOOL 8eef898eac108726b89751e6af80c112f46800ab1dd4efad118e71adb6c7cbaccbe46360da3be7d5ad5702262a2e377bfc530b7519fc38532123884c84e0c1ee
-DIST pypy3-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 6352387 SHA256 0243a016a7b836af72e6e1172f2a4516b9705169a9ba2318093b5c3005917766 SHA512 a63b02dfc11b7675bd4ccceb58801aeb1fd40d0245196dd7fa9f646e4618f46c8e6c4d95072c6432381064d37bc13cb74fbd383d19f8769f069827a8969e7a95 WHIRLPOOL f09b82a6c8a4dada7597bfbe0b2ecd07d90d724eae3d2cc6f35a69c0f219b420236ed8ad37024ad8f9516d729389cbe919f58a48cf1aa323c3a74220c62b8aa3
 DIST pypy3-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 10706804 SHA256 fd8e3550426d747f65d52fb2edbe5b9133c1946eed5f1ada5a454fe5a99b489f SHA512 38e46503ba50987a36b68e7d6316b64a00c1e2fa0d2d0b0e0e517bbfa96cb777522346d2c4a78cc7bdf44fa237453dc97867f9323785ba38b21c1f1058d5e701 WHIRLPOOL 59ecc9f9c5d4a29819d0911cc1402f38bd9708ec3e28ba90cb33159b88e11a150a33390c2a73e26831de578ec77598018945e001a1bc3e8f2659b17743a3cdf6
 DIST pypy3-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 6626453 SHA256 f840fba90a52e0bfaf9f7f3197f47823154709b86b33dbe61df1f721d8eb46ef SHA512 51d418668c48f8e2d740264855e193353900d56893c0fc81de09e8fab338a36a696a725dd3387ee1d626f82e8319b797bfa4957a5cc8f0b11610b3e6ece67539 WHIRLPOOL 45348517cb0bf8e98ac53149314288716cf8ee972505c354192a46b6472fff694cc037689f2f61707396ed55b9baebe35fa4e99695789f93cb8edeaa08e71fe2
 DIST pypy3-bin-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 10510722 SHA256 e970e4750897e6fb2a703511adc863611fe4a9da1f0190b8b6231babbd56bc02 SHA512 659ed24c9f540168203098fc9b6086cc22a42767b55f3dbbf132b11cf8e1bc01a66baac78d7689dcc31d9f06e7f2ecfbda9969c9ba150d5af9c462e480aa288c WHIRLPOOL 4293c2d4912032360513cbfff03ad9271a90802652fc360c199c3469130871d66d8cf48c87a2d72c660f03e0318c8e08efb87fc33973b0c97b964bd61c2726cb
@@ -20,15 +9,10 @@ DIST pypy3-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 6589457 SHA256 e9ff832ce9a1d3384
 DIST pypy3-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8595527 SHA256 9d7a4d4b25f1a3f8a7376e5f19dfcbe98753233dee1c14a98d1a19fb7ca553bd SHA512 6d118cf2e9a657dcf719ca5e508b5b4bb2ab7f85ec3597840706b748ea2f6d582ed884fc34697a3ec36e343de4a40b113d7c8749683a53f2dda299a9e106a2f8 WHIRLPOOL 635f45fd92b94042e44d1f81a2b4312b6c0d79ffa776d21532c495501d344d1f5fa5561eba944f797a6c69a7c52ae59d0a2217af6c7f8e54197fc2fd99c4c83e
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 5654668 SHA256 7d8ced801dc94c0cf19ac580d7ebb21f7ebeae98f3a991ae8a37a925b4fe2669 SHA512 a378159ca39654fbf117e3bd5a0cdcdb23100a21caf837bba5d764b63bf039a791b27d397a6be918a2539d721fc8564f2b10a163df3bae89a4ddb3991ac33ec8 WHIRLPOOL 0e3ab5dacf2bdf5c2e08d21330fd4cad34b5f4424863a999469c53a1b61980fd4307795545f5e735b53aa198634646a11387a753552c66c40dba47599716c2ca
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 SHA256 13c47cdd603d647e8a5fe0d11a7165abd2599ad7ae2f6bbdd47829785b62f955 SHA512 663fae9004eb7f002b849d4697ef67fb72df33faddfba7272a6d795432ecca4c110dc1fab43617909f962584c7519582f085854f55829ccc63dc988654b6add5 WHIRLPOOL 57a16723235fc3a4e1fcb3defb68cecfa0a78f090750c6a3001904d68e1240094659828affc4d34113e81bb7aa5aed5865e4da6afb7aa3a16d815c26fd83c8c5
-DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
-DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
-DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
-EBUILD pypy3-bin-5.5.0_alpha.ebuild 6155 SHA256 2ecdd3d55dee03eb40a2e1cea70fdb95c34466d42a082e96ee8d1f7cda790241 SHA512 b91c633f0688fe20f4db14fe374225a5f30fb1aeddf6c160fa74d273b1859f6702242cd373db4222a06b6a923051ce11569a32f097b6fe8a7e96ca56dfac06aa WHIRLPOOL 5e16861cc4f5380750b15ade16fc84ff1270ae84ce5fcde91a649fa859a88d09259f1ca5f718bbe1618fcaf7dcce24c40f8a6c055b527774269d14302b2b8a7b
-EBUILD pypy3-bin-5.7.1-r1.ebuild 5345 SHA256 0755a2418e5be596f88c334a05651de62e43f4159ce6dced62778ee13b192a7e SHA512 22d5f22f531b675d9db272db7ffab8ede77a1fcf883ea9c2b7d67f3eb8837d83abbed3005f8bc60f904d746cc5b548d7823f6984189a6129318d062a7055413e WHIRLPOOL 815fd636b23cf9e022081faaf8ebe9780b4c6b354d1b6f3435396f9187e0401546ba1b271ffeaed8f157ac51b190b82fa351d569a148fd7ffe0a2c9505688fa5
 EBUILD pypy3-bin-5.8.0-r1.ebuild 5345 SHA256 8737f3cd44ddfcab4482136f839bb9ac57c6a141b5200ca3e50efde9151bbca9 SHA512 e3d34a52716a66b42e37c77dc7d4b3f98ac7a80bc511156fd63ce47c65f549441a1b96667df58d9c2bb51e3b7280244c8619744ba9ccfccc06b73df365cb2d1b WHIRLPOOL f0afc372fd717f09023b650bb1bf5babe775a121357f986683b47add213aad924436cca6243b916f4dc68dff096f1d5cd1c30fb1d4917556aa613d5b433f2aae
 EBUILD pypy3-bin-5.9.0.ebuild 5722 SHA256 3e62b74de8b71e815d4a3342482acac2776eedc2b920745ca8ba475f3887d4de SHA512 e3308ad3010489cf095ae0d2a06f97686193ce95bb961d05a467a5da97a5af71884855e912f515edd9e15434ab7edbcb2c436528257af3c5e5e921ab46e3993c WHIRLPOOL d1b52f2d50dd4552474904ffccb38c2b549a4310eb04ba7900d851400fc718749cde982551b8205f933bc25532ab6b95ccfc554a977e93a3b873097be4025702
 MISC ChangeLog 7700 SHA256 ba2326f1007aebe17871ea81213c69cc07c7dc334bbc267a50353ba79c0c4197 SHA512 e8b2817533bcacc09d120de24278ae3731235f26ce7120fb3f247fb202657667cf4b056e005786b40d2462d6e65f74dc94175e242f209725d24285192b64c2ac WHIRLPOOL de020e520c4befef4ca2bdf167d28ec7bd1b5ced194ecfb58c05d086e77c35abe0e17a20f4a65750c221aae0d1ca76c1cbbc524b9251a97584096aa5cd92ec65
 MISC ChangeLog-2015 975 SHA256 9ec6d637bd1373be724ded99f8deaa041e5587508f68cf15c8537f25235709fb SHA512 58290569acccc81298a0793b797e858365767629c94bc6d8b08790341cfa0c3efd6116c6c54e4585d65d158256767dd762a3eae431b8f3c0ca6571a98bb0bf34 WHIRLPOOL c52470823ec3e6e5b639fe454c705de58d02fd32155b72e49ae8cb94775839d9aee7b0b096f7128bde80f43a78dd6590a71daafc9bf52524161bcd548fc50947
-MISC metadata.xml 514 SHA256 418905501db31b0962ef487f62db5c376e6cce16be2e7513553049979dae1968 SHA512 a4f6fbf391b7f566b99cef0dc503d41ad1c0eb119187650b550697c4c10b394bae847fcd809eb9db2883f578e5bcf3416146941cabddc0632b2e10dd50fb0315 WHIRLPOOL a510d10c48a29615969f1332fb78e91b5036c3e7cc5456981a627f96b72bc3fb407b6023d7e564da4ccf4170925d3c3902a42074b11f9af105b200e7cfebe58f
+MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb
diff --git a/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch b/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch
deleted file mode 100644
index 1251694107d8..000000000000
--- a/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-From e3afe6721897c8de830055621313bc0659518415 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 9 Jun 2016 20:48:10 +0200
-Subject: [PATCH] distutils c++ fixes, python3.3 patch updated for pypy3.3
-
----
- lib-python/3/_osx_support.py                | 10 +++---
- lib-python/3/distutils/cygwinccompiler.py   | 21 +++++++++--
- lib-python/3/distutils/emxccompiler.py      | 14 ++++++--
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++++---
- lib-python/3/distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 83 insertions(+), 41 deletions(-)
-
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
-index 50b2d17..1d19599 100644
---- a/lib-python/3/_osx_support.py
-+++ b/lib-python/3/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # 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_'
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index e0074a1..1b383d3 100644
---- a/lib-python/3/distutils/cygwinccompiler.py
-+++ b/lib-python/3/distutils/cygwinccompiler.py
-@@ -124,8 +124,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -139,9 +141,13 @@ class CygwinCCompiler(UnixCCompiler):
-         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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -165,8 +171,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 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)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/lib-python/3/distutils/emxccompiler.py b/lib-python/3/distutils/emxccompiler.py
-index 3675f8d..17d2afa 100644
---- a/lib-python/3/distutils/emxccompiler.py
-+++ b/lib-python/3/distutils/emxccompiler.py
-@@ -63,8 +63,12 @@ class EMXCCompiler (UnixCCompiler):
-         # 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 @@ class EMXCCompiler (UnixCCompiler):
-                 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)
- 
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
-index b947988..3f19020 100644
---- a/lib-python/3/distutils/sysconfig_cpython.py
-+++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -191,9 +191,12 @@ def customize_compiler(compiler):
-                 _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 = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -208,19 +211,27 @@ def customize_compiler(compiler):
-             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:
-@@ -229,13 +240,17 @@ def customize_compiler(compiler):
-             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
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 6819d50..19345ee 100644
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # 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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -123,12 +126,19 @@ class UnixCCompiler(CCompiler):
- 
-     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)
- 
-@@ -186,22 +196,16 @@ class UnixCCompiler(CCompiler):
-                 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)
--- 
-2.8.4
-
diff --git a/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch
deleted file mode 100644
index 52a833f29d9e..000000000000
--- a/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-
-https://bugs.python.org/issue1222585
----
- _osx_support.py                | 10 +++---
- distutils/cygwinccompiler.py   | 21 +++++++++--
- distutils/sysconfig_cpython.py | 25 ++++++++++---
- distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
- distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index 13fcd8b..0525be1 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # 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_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index c879646..a6157fb 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 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)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 573724d..0a04f33 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
-                 _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 = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
-             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:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
-             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
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index a0a8dec..aa97c4e 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -72,6 +72,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "gcc -pthread -shared"
-+    g['LDCXXSHARED'] = "g++ -pthread -shared"
-     g['EXT_SUFFIX'] = so_ext
-     g['SHLIB_SUFFIX'] = so_ext
-     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
-@@ -156,36 +157,52 @@ def customize_compiler(compiler):
-                 _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 = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         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:
-@@ -194,13 +211,17 @@ def customize_compiler(compiler):
-             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
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index 254b22d..c9cacc1 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # 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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     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)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 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)
--- 
-2.12.2
-
diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
index c1d59c6d4a0e..ff5bc95069a0 100644
--- a/dev-python/pypy3-bin/metadata.xml
+++ b/dev-python/pypy3-bin/metadata.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alicef@gentoo.org</email>
-		<name>Alice Ferrazzi</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
-	</use>
 	<upstream>
 		<remote-id type="bitbucket">pypy/pypy</remote-id>
 	</upstream>
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild
deleted file mode 100644
index 98c88850bafc..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# some random parts need python 2...
-PYTHON_COMPAT=( python2_7 pypy )
-inherit eutils multilib pax-utils python-any-r1 unpacker versionator
-
-CPY_PATCHSET_VERSION="3.3.5-0"
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v${PV/_/-}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		jit? ( shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz
-		) )
-		jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz
-		) )
-		!jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz
-		) )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz
-			) )
-			jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz
-			) )
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz
-			) )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz
-			) )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
-
-LICENSE="MIT"
-# XX from pypy3-XX.so module suffix
-SLOT="0/55"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=
-	sys-libs/glibc:2.2=
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	test? ( ${PYTHON_DEPS} )"
-#	doc? ( ${PYTHON_DEPS}
-#		dev-python/sphinx )
-
-# Who would care about predictable directory names?
-S="${WORKDIR}/pypy3-v${PV%_*}-src"
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy-c
-	usr/lib*/pypy3/libpypy-c.so"
-
-src_prepare() {
-	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
-		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \
-		"${WORKDIR}"/patches/24_all_sqlite-3.8.4.patch
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-
-	#use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/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 ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
deleted file mode 100644
index a69f3049b290..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# some random parts need python 2...
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)"
-
-LICENSE="MIT"
-# XX from pypy3-XX.so module suffix
-SLOT="0/57"
-KEYWORDS="~amd64"
-IUSE="gdbm +jit sqlite test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=[-bindist]
-	sys-libs/glibc:2.2=
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-#	doc? ( ${PYTHON_DEPS}
-#		dev-python/sphinx )
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	#use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy3-c libpypy3-c.so
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy3-c libpypy3-c.so
-	fperms a+x ${dest}/pypy3-c ${dest}/libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	# Install docs
-	#use doc && dodoc -r pypy/doc/_build/html
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ab32736c25de..4ad977348100 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,22 +1,14 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 SHA256 831bacb5d5c7b23699971aedf7b07a93654ba0cf8d700babe369330115c29896 SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733 WHIRLPOOL 7124a9a1ec1a65bf1488060189306780e8e6890381a20fab27b00e031e59096b80d0fcd5193d1cd48393d51f4619bb294b846da6190b784aef92f1b09ff2acb8
 AUX 2.5.0-shared-lib.patch 734 SHA256 202b90461d5c51fddb3f2adcec8806300895597ee997a8e4352ec9d2c31f4d49 SHA512 c75281cc754d723c184a2e716cdd9d88e23db4041c143864205e7d8b40972507bb0423216cf3cdcee2bf7f8900d034bbc95b318fc347af6e550ec6e6ed1097da WHIRLPOOL 279b72ae78276020dba2ef7dc4f16581a21c742b1c6218a18dc8b3e8c847c50898beaf3868d76e13ceb62ba1189792f6c0ad220650e92799594bd1503b126e34
 AUX 4.0.0-gentoo-path.patch 1906 SHA256 4f01ad3317e62147346d6548e0d5cf51bb1b01c4e4d34e48eb57dbefdaa82140 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747 WHIRLPOOL 8e3b2d477a3db79874f679473032f83478bfbcce0d9df1d782f30fb5fcabeb2556efd7a1da85e7d8a0243dbf80ffbef96982d45252beb6c37fbce2ac23edc50e
-AUX 5.2.0-distutils-c++.patch 14234 SHA256 a07e65f2b7e8f8f52af45aec6a146e09390d30856118978d2e4b4d2c7e2967c9 SHA512 dfc404a71f0314988905b976d6beb1e9b8368006840cc199a94eae47a86ab7e2be92d86c53be349928fc0a8b12f3a78c60b07476bfc27cc0f7a383970a2e2e95 WHIRLPOOL 769bb355adaadb980cbb7c77faa8b47b356dc471a25cd1d1b3bc604f7eb84aba6b39e38100c9d1ad5e1dd06fc562a640437917b0c770d8e8ad02627bc309f6c1
-AUX 5.7.1-kill-flto.patch 919 SHA256 aed12afc66592ef9fe4bedd09c4275158fbfc30b4ec5003e9b092974ea020d73 SHA512 a8340c41e55e929521f649d64ee728a8b95e1be3008060a4fb2147e7f3914731640870503b4c06577a052deca00130ff3835b9477feeaf57fc0b8531abcc22c9 WHIRLPOOL 559115c01e6e027948e7cb55577be8d018661e811a3aff8db68a4e98de6f275673738199e928aa7ee17a0cc9b94ab1cc350067cb8a4fe003de8022eedbcbfbc0
-AUX 5.7.1_all_distutils_cxx.patch 15897 SHA256 cc6475551f74f416bd77eec58bab9ab48d6c5fe3f0c1595e197ffe1080bce44b SHA512 f82c4efb258a0ab029faaad35fbd85a9bf9aa98e12d9317920a7872f2f0db75668a37506fd69a3838286e7349948a60e158360b1f3f5d671e91b07a0e56af809 WHIRLPOOL 08c193c5a41ff85d14e6443aa1ba7c3141a7c9ebf15cc6ed99f7e705efe04916bfe3c305ec23f36448521a0d79d3121ab9363491458d7271144914fe6420efbf
 AUX 5.8.0_all_distutils_cxx.patch 15896 SHA256 cbedcf9e08280a99a5f2bf1a033e2b2e17bb0ee2bf00ce82b87b6f89df2718a6 SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3 WHIRLPOOL 5ee53a44e6f85f0ceb93843d35856ddfe7da56662836c7ff25e9698e1bed0d75d5d72e4b5c8ee12b7ce4286903be46a6384a243f7f40e4918cfeaaaeca8f9209
 AUX 5.9.0-shared-lib.patch 826 SHA256 109e73bca4a7f5395a6c196de795ea4e3f2cd453445b0303e26475df25abc7f4 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945 WHIRLPOOL 9cb0b967e264a1ab73181b586a75780c0c68bd347579958accdc426fde240ddbc87680243d44ff8443d9874433ec7b82110f4bf4e688093876e75ea4b322383c
 AUX python-3.5-distutils-OO-build.patch 3627 SHA256 9b0b86d8424304fe87a460bbf5ab503811d77ae4e557ad0c4081150a0af89a1f SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511 WHIRLPOOL 4730a9110662a3c45ab5f3e842ebc2f81ecfd98e4e844e71a0fe56d41baaa6bb01aafe313ec8dd12bea40c956ec01f1a68d6bca3d695bf65705a811f4afd0289
-DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
-DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
-DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
-EBUILD pypy3-5.5.0_alpha.ebuild 7540 SHA256 5fbd99e6e2e4d433850381f46ead25fb66bfc1350af64dffcd2e0dc663cfc414 SHA512 cfbad4a2036e33b6e155d4a1882e3ca20a52b427b8b67e4878d063f88e57286088b117de949a3dc5ca5aea1a7e5500e5e6db99f3910087747f87669b1ef479a0 WHIRLPOOL 989e4dac64a088b440dbba8cadace9bd8ead181a39a841fd7189bba9043114928e7a7019350988b5349a10559a9e2e2ceba26a09c0627aa8af8aeaf5ab005ee5
-EBUILD pypy3-5.7.1-r2.ebuild 6858 SHA256 2bdb8e207b87f9ea49b7f0bd2ba5196fd9792343e42f3299427c805dbba584ce SHA512 dcbb02eb791f2df753610fcc5deb561fa2aa10c1424d90738e3e740b9173e1c830484fc2222df799ff35514912381a9c6d5f0205b5544c32bc798e336a7e39fe WHIRLPOOL 979e4f779d61a645947706dd7686cca62bcd7b564061a8a3ad80e7d3b3c415f0bf394c9f675a5648b19062c538e01265e6bfeaae6bfb6b2679e60eeb5a5f4645
-EBUILD pypy3-5.8.0.ebuild 6825 SHA256 d849a0a7b9b7f13b6ce83abbace33d401e7981d435ab5fff8d9aabd1096e47e7 SHA512 6e5149ccc9fa44a0fb06ed2f33b3007f69aeb03f7c41f013d3416441848cd88865b70275221e0f36328bed2a0354e942508597e7d08c6702836debe7dfd8088c WHIRLPOOL aab3a62897fd262dbb8f394e64e71c1fdf8bf850a03968aaa82289d99c74c8f6a996ea8b92d3ebc3064ab67c6543aa28988dede1db6aa23b8d01139c03bc1ae1
-EBUILD pypy3-5.9.0.ebuild 6841 SHA256 311a8be96506f7b1d50f7ef852012c9b5bd47553fad2a9450af96fff33a9b8b1 SHA512 4bc3d031011d29c00c7e2a4bc29cb106cc9a245042649ee6a9898e0fe6f2b4e825e201ce7a7e6daee10cf6dc32b58285c62e1ed5c2a36e11ce04445aaf505f15 WHIRLPOOL 0c4cb3054a47df73fc63891340133d0411864d0d553dc6fba5b857637f5b5fcd06f02ff86cb3c7a388ba9d66850a007c0aa08ee8e71363c531b0b8f5b6dcbe5b
-EBUILD pypy3-9999.ebuild 7431 SHA256 c67e9b2010da051fcdf5c4f1a3df57aa1772479a3cd8204c8afea27d1e64494e SHA512 68ce955c84c25568f977ae1c5a36554c589d75e7fd25018321a9131c1cc17ccd7eb30e1256e056523ce68da64b1e477ea9f4d6c88f9e43ffc626cb03ed4e248f WHIRLPOOL 438c20f2c6594338760ca01b69decf8ec026577960016b5e2408bfaacda7e113bbf7281c2b906b3d938e6281585b4f2393c84fc3560737453d6358fc9c60055f
+EBUILD pypy3-5.8.0.ebuild 6832 SHA256 355980a2bb1518191b5d5b409095b331cad0704b92165a5d5868fa0e34dc0e7c SHA512 30b57bc1d62d7e30938243ac4d4970b29d41423d6bbf0ef8430e96d038a4c1ef7300294af1e83f6450f3e5fc0f1458dff25bd554aa82ab4de1f585a6d4185186 WHIRLPOOL 9a39782805102c41558015cbcb6a13d745af5191ac2fa8fedeca0d7d43ebab2d47ea0a88338b9f12f041ee576486e3a52198382e9d33399ae69d67e616b0e6c5
+EBUILD pypy3-5.9.0.ebuild 6848 SHA256 6e3ed87ce34b6ca76d2e4e227dd4df98bf4afd4f716348978c3bb553c10e94f7 SHA512 7fbc930711d56828349e8c9c9795866ba29ceffb63073edfbb639a1027e285457179ed9be7633e1403d93324a2421d9c84baf88c3ed5c6da1868cf6afb7fbdec WHIRLPOOL 83af86158f64d805a37b3e812a2309827d8fae57683be02341a5461d42512edb81064d462f599949334e8339ffd3bdaa4814cff24ef2e6bdaf9f3ec26851c597
+EBUILD pypy3-9999.ebuild 7438 SHA256 741fe59f7a8fe91c1f1234595d313adfb0c066fbdbf321b729630b5ce584c516 SHA512 fde56d70b45a548907f108854b78c67ef8a48b0701db6de225ac2cc8e78a11753d878600672dfce190669681cbaf1f8db49c71ce6542d9d81d0f8807cd2649c6 WHIRLPOOL 28129dd795c6ad670d36ef6fadfd80e670954baf6dd6a2b63743e0729067158495bc59f5a00e919cc2323438f0556b780ccc825454535a77cb2e7b0d75a1d9e4
 MISC ChangeLog 7714 SHA256 43954837f6d63a6ac2fa2e265b67bbda3937f9279620f08c62d8b6453ee63969 SHA512 6d51ee24600930fd9788432e3ace144e3699858fe1e3a6ddbb0076f7fff291b9792e581b6e2afc48e81868d43132bab96271a0397511afe03ce8a4c6bb54871c WHIRLPOOL 2c54a361b9007165f2b2ebd0e097fb040d539ceb27ee88b672654631070145645b445f697ee206463b1c80b85022ce52854e1d1f31941dc74a57051e72d401a6
 MISC ChangeLog-2015 1344 SHA256 7977d9be34ce1b3faffeb354d9a2acded00259e353af50632e071b43b026d8e4 SHA512 49ed62552780d9581a2cfe1b78a68d1a3ed4de603729fac05346148c00de9ccf66f4b2aaee38379f209a1ad8dba23b3a0fd773aa315a50e01258960f29796b28 WHIRLPOOL 95cf929498ad50c099b66f6c7b5f036d15ffc53b6c1a69fd60f0a529b104ec018ac2f676fd62b6b7cee4a7fa7fa99389437edc1cdd5efe3c2cbc4df957f6d4bf
-MISC metadata.xml 972 SHA256 b34455d5725b71634fff59851a70a936b8cb5bb200cf0c6e6b13cfa22fce3f62 SHA512 53ee36a6b6f7f1de332013f07829d7e412f0e6ce771f2a0a533e62d4bcd66039603ca7047e1918f9404cb3b2abb6e0701f65d9d643d5b1937c12f897c021f47b WHIRLPOOL 7889bbca3826ab27f80fa0ee6d32db96d6c7e76911610bf5f0bb717b86afa8af949addf186b9703edcc0a55a7e3c2211468acd1a614afdf678e271aa5f73b779
+MISC metadata.xml 636 SHA256 f73161c46ef3c8187a80d861f0c29e04816b04b2f5c7fbd56b8b7ff140459c9f SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 WHIRLPOOL 8eb2d191fcbb21aeb2e8bb10672a066165c809aedc45cbe4e7cbe00ed75db009cb95c16d57d7e87d80e6de5c3953e4742bd68a21a58367ae92f4efd9b8a8e794
diff --git a/dev-python/pypy3/files/5.2.0-distutils-c++.patch b/dev-python/pypy3/files/5.2.0-distutils-c++.patch
deleted file mode 100644
index 1251694107d8..000000000000
--- a/dev-python/pypy3/files/5.2.0-distutils-c++.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-From e3afe6721897c8de830055621313bc0659518415 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 9 Jun 2016 20:48:10 +0200
-Subject: [PATCH] distutils c++ fixes, python3.3 patch updated for pypy3.3
-
----
- lib-python/3/_osx_support.py                | 10 +++---
- lib-python/3/distutils/cygwinccompiler.py   | 21 +++++++++--
- lib-python/3/distutils/emxccompiler.py      | 14 ++++++--
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++++---
- lib-python/3/distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 83 insertions(+), 41 deletions(-)
-
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
-index 50b2d17..1d19599 100644
---- a/lib-python/3/_osx_support.py
-+++ b/lib-python/3/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # 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_'
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index e0074a1..1b383d3 100644
---- a/lib-python/3/distutils/cygwinccompiler.py
-+++ b/lib-python/3/distutils/cygwinccompiler.py
-@@ -124,8 +124,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -139,9 +141,13 @@ class CygwinCCompiler(UnixCCompiler):
-         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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -165,8 +171,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 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)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/lib-python/3/distutils/emxccompiler.py b/lib-python/3/distutils/emxccompiler.py
-index 3675f8d..17d2afa 100644
---- a/lib-python/3/distutils/emxccompiler.py
-+++ b/lib-python/3/distutils/emxccompiler.py
-@@ -63,8 +63,12 @@ class EMXCCompiler (UnixCCompiler):
-         # 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 @@ class EMXCCompiler (UnixCCompiler):
-                 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)
- 
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
-index b947988..3f19020 100644
---- a/lib-python/3/distutils/sysconfig_cpython.py
-+++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -191,9 +191,12 @@ def customize_compiler(compiler):
-                 _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 = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -208,19 +211,27 @@ def customize_compiler(compiler):
-             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:
-@@ -229,13 +240,17 @@ def customize_compiler(compiler):
-             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
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 6819d50..19345ee 100644
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # 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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -123,12 +126,19 @@ class UnixCCompiler(CCompiler):
- 
-     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)
- 
-@@ -186,22 +196,16 @@ class UnixCCompiler(CCompiler):
-                 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)
--- 
-2.8.4
-
diff --git a/dev-python/pypy3/files/5.7.1-kill-flto.patch b/dev-python/pypy3/files/5.7.1-kill-flto.patch
deleted file mode 100644
index 92395bdb6cab..000000000000
--- a/dev-python/pypy3/files/5.7.1-kill-flto.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:03:46 +0200
-Subject: [PATCH] Kill -flto
-
----
- rpython/translator/platform/posix.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
-index a8d4768..20a2934 100644
---- a/rpython/translator/platform/posix.py
-+++ b/rpython/translator/platform/posix.py
-@@ -130,10 +130,6 @@ class BasePosix(Platform):
-         else:
-             cflags = tuple(self.cflags) + tuple(self.standalone_only)
- 
--        # xxx check which compilers accept this option or not
--        if not config or config.translation.gcrootfinder != 'asmgcc':
--            cflags = ('-flto',) + cflags
--
-         m = GnuMakefile(path)
-         m.exe_name = path.join(exe_name.basename)
-         m.eci = eci
--- 
-2.12.2
-
diff --git a/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch
deleted file mode 100644
index 52a833f29d9e..000000000000
--- a/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-
-https://bugs.python.org/issue1222585
----
- _osx_support.py                | 10 +++---
- distutils/cygwinccompiler.py   | 21 +++++++++--
- distutils/sysconfig_cpython.py | 25 ++++++++++---
- distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
- distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index 13fcd8b..0525be1 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # 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_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index c879646..a6157fb 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         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_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 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)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 573724d..0a04f33 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
-                 _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 = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
-             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:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
-             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
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index a0a8dec..aa97c4e 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -72,6 +72,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "gcc -pthread -shared"
-+    g['LDCXXSHARED'] = "g++ -pthread -shared"
-     g['EXT_SUFFIX'] = so_ext
-     g['SHLIB_SUFFIX'] = so_ext
-     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
-@@ -156,36 +157,52 @@ def customize_compiler(compiler):
-                 _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 = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         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:
-@@ -194,13 +211,17 @@ def customize_compiler(compiler):
-             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
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index 254b22d..c9cacc1 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # 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' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   '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":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     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)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 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)
--- 
-2.12.2
-
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index e6215696bbbc..89f86a0b2bea 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alicef@gentoo.org</email>
-		<name>Alice Ferrazzi</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<use>
-		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
+		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint.
+			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
+			at the cost of lengthened build time.</flag>
 		<flag name="sandbox">Enable sandboxing functionality</flag>
-		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
 	<upstream>
 		<remote-id type="bitbucket">pypy/pypy</remote-id>
diff --git a/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild b/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild
deleted file mode 100644
index 3c4ac7df716f..000000000000
--- a/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-CPY_PATCHSET_VERSION="3.3.5-0"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v${PV/_/-}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# XX from pypy3-XX.so module suffix
-SLOT="0/55"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy:0 )
-	!low-memory? ( ${PYTHON_DEPS} )"
-#	doc? ( dev-python/sphinx )
-
-# Who would care about predictable directory names?
-S="${WORKDIR}/pypy3-v${PV%_*}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
-		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
-		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \
-		"${WORKDIR}"/patches/24_all_sqlite-3.8.4.patch
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	#use doc && emake -C pypy/doc html
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/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 ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-5.7.1-r2.ebuild b/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
deleted file mode 100644
index e0a8417672ea..000000000000
--- a/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# XX from pypy3-XX.so module suffix
-SLOT="0/57"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy:0 )
-	!low-memory? ( ${PYTHON_DEPS} )"
-#	doc? ( dev-python/sphinx )
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-	# disarm implicit -flto
-	eapply "${FILESDIR}"/5.7.1-kill-flto.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	#use doc && emake -C pypy/doc html
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/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 ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	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 modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild b/dev-python/pypy3/pypy3-5.8.0.ebuild
index e2f58d805be1..b286c989e72b 100644
--- a/dev-python/pypy3/pypy3-5.8.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.8.0.ebuild
@@ -41,23 +41,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
 	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
+		check_env
 
 		# unset to allow forcing pypy below :)
 		use low-memory && local EPYTHON=
diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild
index 1c93d21dd755..86dc37a6b60a 100644
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild
@@ -41,23 +41,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}-src"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
 	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
+		check_env
 
 		# unset to allow forcing pypy below :)
 		use low-memory && local EPYTHON=
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 1175a210c989..cb2f562dfff9 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -43,23 +43,25 @@ DEPEND="${RDEPEND}
 # Who would care about predictable directory names?
 S="${WORKDIR}/pypy3-v${PV%_*}-src"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
 	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
+		check_env
 
 		# unset to allow forcing pypy below :)
 		use low-memory && local EPYTHON=
diff --git a/dev-python/python-dsv/Manifest b/dev-python/python-dsv/Manifest
index 4551f8e76799..4f698b0801c3 100644
--- a/dev-python/python-dsv/Manifest
+++ b/dev-python/python-dsv/Manifest
@@ -1,9 +1,6 @@
-AUX python-dsv-1.4.1-env.patch 897 SHA256 1f8e9de931e2880c2d63613bb8d7e01e80a68db4a440e542e05761d702811720 SHA512 798498060977b51b733281a66eeb57ee0bedc21243dd4138e3d0ad7666b1c3581764866c7c721fbbaa49b2bf5579f2ab91de03427e65fef4ff00df4399677794 WHIRLPOOL 377d299fbf3298fa11ab082ffdc09a0a7d0272d5c631cee61d3e341b8a0ab8f48c066f5b1c506143ba76d0a53127e233ed57d953892b3e72ad67ddcbecadb51f
-AUX python-dsv-1.4.1-unicode.patch 880 SHA256 18b398023ba25aab1dbca63121815b88baaba5c883b3517ae9a5ea12628c2f77 SHA512 a4a4c1c912dcfbc3631f329b5a3e17b69d3c7e40c597691ce0b06ceaaa1829641a1474db3b66e39b414c9a55542cdb17633a390093226c91c9b20634c9f46b7d WHIRLPOOL 986823cd502d432e95ca29cbc8fa1de7431fc14fca5722d707d33e4974a35ce8f9d669965cd58b3f0fd3a6547d9c89fbefdb4bfff01f93a4c2afd2699ff716ac
-AUX python-dsv-1.4.1-wx-namespace.patch 21455 SHA256 4cc175ec1a1d84f640517257c132153494bfc33e73e22736a0a9b53d15315009 SHA512 ae7ab49b02775e98243a37198d8614c68dc1b94b935da035aa1d28227f8e1cfbf9865ffead8325a852bf01728e89fe4c0ccb92e07630983b9b5482a4b4a9094e WHIRLPOOL bc34aa933d5cf941d4d481bdee808700437210145e05a46e7ab1a8c6ad4ae7368c4d2f598bade1f472c8c4f59fcb32973215d31d0c8a6bf854de98744d01da9e
-AUX python-dsv-1.4.1-wxpython30.patch 688 SHA256 8a10ffb8bc658b6dc1c842fa4836c3dcd5c21a596e9e29c6ca8fdbb464397323 SHA512 96b9b013f04dd3acf72a94a8a77f1416831358a1fa79b69b8cef7fb10c99120d4f743a311b548df01817491b6a98e07bba92bbb23be1b6686e70d70557f0fe7a WHIRLPOOL 4c9f533ea87ea2fb466847672175e720191090500d87e586eed35d977f5031e0a747c350cff067c658492097978a77a759b20827b3b441a0d23b4e4c4af705d0
 DIST DSV-1.4.1.tar.gz 14682 SHA256 5d0ec99c45f8ea91ea920dcd2cdf2cdc9e721985551ea80718519ce70dc98f15 SHA512 c26df1efabff9e70b6dfd17f6ff928f022ad19cfa39af431ef7ac663687e8d80406b0ad471376e238eeb6fcbab31aa2a84eaeae2949173e22316eb92e51f7ada WHIRLPOOL 565ef07a5c87cc4090b8b75df0fb992561865563ac3a0a8adaac2d1bc893e664d0db4d66836d9f682b2e69f62b2fc1fb1c3cdb649d973672b87a731887ded97d
-EBUILD python-dsv-1.4.1-r2.ebuild 655 SHA256 ecc80de5d405e7b9202f5da543a130027916bce675012504396d82e27efcdac1 SHA512 6c1f87de9eb5ae0720936a66024b5ac06af2818f053a1ed703a83a8bdf76041adb0520986da62458927719162b37f1ab572936261b902514a04ca8557de1d777 WHIRLPOOL bd829c3611e12dab9fd0cfb0f570553d491cfa97d55e7cc8aa4db470be89aa4ddd8225fd1436ecc4ebbe515a32f703a6b14f385cf820eb54b324e2cdf9a74360
+DIST python-dsv-1.4.1-gentoo-patchset.tar.bz2 5259 SHA256 f4e55836c60ec24285460755238e1eaaa9ddb7d03083934326c36003183b937e SHA512 c36335e5a6e423c53a9edec9dd795054e77b81a638d774a445bf1b621119c703064892eaff7ec67f85ce7e693af1156c39b3e60faaa5a800c1eca28ea7544f98 WHIRLPOOL 08d8eb7c2b9f9b0ce5b9daed3954757e6c9797055ceff76d1eab921c6a2f37e3ece1e490831219574cc67f6f7dbbdc0a164318112f16abefec299c8afa7d8bd4
+EBUILD python-dsv-1.4.1-r2.ebuild 801 SHA256 24e202a2bfc5ad67a96bc3e52bcbbefb6e6936e81fb7a2183e390c2f8db13cfb SHA512 b258980d977cc4aa7892538d7b9cc4d99e60d8be0b863fad0eb313f80482299636e2782bc7178f67a2c127529e15a25c854225af29d4fe81ee0087289f417341 WHIRLPOOL ad44fec2183764d10f51077d5c357ecda06ad961f3a001db047845eabe2ef5b2118d771f900fc4fcbfd6e9c9ca6b407693fa6a0378cd3e2812ee978d32a5e543
 MISC ChangeLog 3162 SHA256 cb55320cd59ce4b9f1a22326e9e46613dea31b9a52dd981c75bf594497897717 SHA512 45bfb4db754e87ae84524fa3488002cda37b80b4ef1c0333ff6ae32346cc541c79ca8f4b8eb1132ac188d666bac2767d12006510b8f76b35b971defc0b1b8217 WHIRLPOOL 4838e7aaba3483571c2d70b7ac7355b095491c8555b0041608ee83caf1794f44ec0b09246f29e0920a57fea407e9fd1b97eb13d3098b22fc24513ddafc2468cc
 MISC ChangeLog-2015 1931 SHA256 2b35eabb604876093b861d326236d428a04d96e65384ed9c4d6048c8dde6aa69 SHA512 d239ad3d4b129b31051b66cf7c7f0f6d48078db98adc6096e971bb1010f6235cda045f848dc00b1a64833625be21d3267d83e14c6378194b3b893c180782bd5c WHIRLPOOL 6300a40f5b7324b41ca8269aa9457c0384b53d4cb5ec4044eb0ab72b90f19f2b624056b5e34fe4a6a6c49f4277ded320f46c990fd307fb29adbe0f3798c70beb
 MISC metadata.xml 501 SHA256 0301b218dbc7055ebd2f516b6c0638ad2cd33ad6dc8d7ad8f8af6924e0053293 SHA512 e8094c00b37097b8f255a6f2ab3461340fcec715bbe63957369f2ee4c60c4e246ba53f3dcf0edcb248937e70316ef9c4c2ff3c2609c2f79ccdd485ceb54918f1 WHIRLPOOL 5a77570278c0091bea89be3e31dbfdbf1d7c378d73e4a5463347d70020a4facde5a8111d29b707696d957bfd76157619a47b0ab02658d70d489a89caedc090aa
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-env.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-env.patch
deleted file mode 100644
index c2e7aee946dc..000000000000
--- a/dev-python/python-dsv/files/python-dsv-1.4.1-env.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: python-dsv-1.4.1/DSV/DSV.py
-===================================================================
---- python-dsv-1.4.1.orig/DSV/DSV.py	2003-08-09 06:37:32.000000000 -0400
-+++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:38:02.000000000 -0500
-@@ -127,11 +127,11 @@
- import copy
- import exceptions
- import string
--# RedHat 8.0 (or rather GTK2?) sets LANG = en_us.UTF-8 and apparently some
--# older apps (including wxGTK) can't handle this.  The fix is to set LANG=C
--# before running the app.  Thanks to Ahmad Baitalmal for supplying this info.
--import os
--os.putenv('LANG', 'C')
-+## RedHat 8.0 (or rather GTK2?) sets LANG = en_us.UTF-8 and apparently some
-+## older apps (including wxGTK) can't handle this.  The fix is to set LANG=C
-+## before running the app.  Thanks to Ahmad Baitalmal for supplying this info.
-+# import os
-+# os.putenv('LANG', 'C')
- 
- try:
-     from wxPython import wx, grid
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-unicode.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-unicode.patch
deleted file mode 100644
index 39faebe103b7..000000000000
--- a/dev-python/python-dsv/files/python-dsv-1.4.1-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: python-dsv-1.4.1/DSV/DSV.py
-===================================================================
---- python-dsv-1.4.1.orig/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
-+++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
-@@ -486,8 +486,14 @@
-       list of lists of data
-     """
-     if type(input) != type([]):
--        raise InvalidData, "expected list of lists of strings"  
--    if type(delimiter) != type('') or not delimiter:
-+        raise InvalidData, "expected list of lists of strings"
-+    # Try to convert Unicode delimiters back to ASCII (wxPython can be
-+    # overenthusiastic), but ultimately support either.
-+    try:
-+        delimiter = delimiter.encode()
-+    except:
-+        pass
-+    if (type(delimiter) != str and type(delimiter) != unicode) or not delimiter:
-         raise InvalidDelimiter, `delimiter`
- 
- ##    if textQualifier:
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-wx-namespace.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-wx-namespace.patch
deleted file mode 100644
index c4b819f6bb07..000000000000
--- a/dev-python/python-dsv/files/python-dsv-1.4.1-wx-namespace.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-Index: python-dsv-1.4.1/DSV/DSV.py
-===================================================================
---- python-dsv-1.4.1.orig/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
-+++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:37:59.000000000 -0500
-@@ -2,6 +2,9 @@
- DSV.py - Cliff Wells, 2002
-   Import/export DSV (delimiter separated values, a generalization of CSV).
- 
-+2007-01-09: Modified by Joe Pham <djpham@bitpim.org> to accommodate
-+            wxPython 2.8+
-+
- Basic use:
- 
-    from DSV import DSV
-@@ -133,8 +136,14 @@
- # import os
- # os.putenv('LANG', 'C')
- 
-+##try:
-+##    from wxPython import wx, grid
-+##except ImportError:
-+##    wx = None
-+
- try:
--    from wxPython import wx, grid
-+    import wx
-+    import wx.grid as gridlib
- except ImportError:
-     wx = None
- 
-@@ -625,19 +634,19 @@
- 
- if wx is not None:
-     # ------------------------------------------------------------------------------
--    class ImportWizardPanel_Delimiters(wx.wxPanel):
-+    class ImportWizardPanel_Delimiters(wx.Panel):
-         """
-         CLASS(SUPERCLASS):
--          ImportWizardPanel_Delimiters(wx.wxPanel)
-+          ImportWizardPanel_Delimiters(wx.Panel)
-         DESCRIPTION:
--          A wx.wxPanel that provides a basic interface for validating and changing the
-+          A wx.Panel that provides a basic interface for validating and changing the
-           parameters for importing a delimited text file. Similar to MS Excel's
-           CSV import wizard. Can be used in a series of wizards or embedded in an
-           application.
-         PROTOTYPE:
-           ImportWizardPanel_Delimiters(parent, id, file, data, isValidCallback = None,
--                                       pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
--                                       style = wx.wxTAB_TRAVERSAL, name = 'ImportWizardPanel')
-+                                       pos = wx.DefaultPosition, size = wx.DefaultSize,
-+                                       style = wx.TAB_TRAVERSAL, name = 'ImportWizardPanel')
-         ARGUMENTS:
-           - parent is the parent window
-           - id is the id of this wizard panel
-@@ -657,24 +666,24 @@
-         """
- 
-         def __init__(self, parent, id, file, data, isValidCallback = None,
--                     pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
--                     style = wx.wxTAB_TRAVERSAL, name = "ImportWizardPanel"):
--            wx.wxPanel.__init__(self, parent, id, pos, size, style, name)
--            self.SetAutoLayout(wx.true)
--            mainSizer = wx.wxFlexGridSizer(3, 1)
-+                     pos = wx.DefaultPosition, size = wx.DefaultSize,
-+                     style = wx.TAB_TRAVERSAL, name = "ImportWizardPanel"):
-+            wx.Panel.__init__(self, parent, id, pos, size, style, name)
-+            self.SetAutoLayout(True)
-+            mainSizer = wx.FlexGridSizer(3, 1)
-             self.SetSizer(mainSizer)
-             mainSizer.AddGrowableCol(0)
- 
--            self.initialized = wx.false
-+            self.initialized = False
-             self.data = data
-             self.isValidCallback = isValidCallback
-             self.Validate = (isValidCallback and self.Validate) or self.BuildPreview
- 
--            dlg = wx.wxProgressDialog("Import Wizard",
-+            dlg = wx.ProgressDialog("Import Wizard",
-                                    "Analyzing %s... Please wait." % file,
-                                    3,
-                                    parent,
--                                   wx.wxPD_APP_MODAL | wx.wxPD_AUTO_HIDE)
-+                                   wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
-             textQualifier = guessTextQualifier(data)
-             dlg.Update(1)
-             newdata = organizeIntoLines(data, textQualifier = textQualifier, limit = 100)
-@@ -686,13 +695,13 @@
-             # -------------
-             msg = ("This screen lets you set the delimiters your data contains.\n"
-                    "You can see how your data is affected in the preview below.")
--            message1 = wx.wxStaticText(self, -1, msg)
-+            message1 = wx.StaticText(self, -1, msg)
- 
-             # -------------
--            delimiterBox = wx.wxBoxSizer(wx.wxHORIZONTAL)
--            delimStaticBox = wx.wxStaticBox(self, -1, "Delimiters")
--            delimStaticSizer = wx.wxStaticBoxSizer(delimStaticBox, wx.wxVERTICAL)
--            delimGridSizer = wx.wxFlexGridSizer(2, 3)
-+            delimiterBox = wx.BoxSizer(wx.HORIZONTAL)
-+            delimStaticBox = wx.StaticBox(self, -1, "Delimiters")
-+            delimStaticSizer = wx.StaticBoxSizer(delimStaticBox, wx.VERTICAL)
-+            delimGridSizer = wx.FlexGridSizer(2, 3)
- 
-             delims = {
-                 'Tab':       '\t',
-@@ -704,36 +713,36 @@
-             self.delimChecks = {}
- 
-             for label, value in delims.items():
--                self.delimChecks[value] = wx.wxCheckBox(self, -1, label)
--                delimGridSizer.Add(self.delimChecks[value], 0, wx.wxALL, 3)
-+                self.delimChecks[value] = wx.CheckBox(self, -1, label)
-+                delimGridSizer.Add(self.delimChecks[value], 0, wx.ALL, 3)
-                 wx.EVT_CHECKBOX(self, self.delimChecks[value].GetId(), self.Validate)
- 
--            otherSizer = wx.wxBoxSizer(wx.wxHORIZONTAL)
-+            otherSizer = wx.BoxSizer(wx.HORIZONTAL)
- 
--            self.delimChecks['Other'] = wx.wxCheckBox(self, -1, 'Other:')
-+            self.delimChecks['Other'] = wx.CheckBox(self, -1, 'Other:')
-             wx.EVT_CHECKBOX(self, self.delimChecks['Other'].GetId(), self.Validate)
- 
--            self.otherDelim = wx.wxTextCtrl(self, -1, size = (20, -1))
-+            self.otherDelim = wx.TextCtrl(self, -1, size = (20, -1))
-             wx.EVT_TEXT(self, self.otherDelim.GetId(), self.OnCustomDelim)
- 
-             if self.delimChecks.has_key(delimiter):
--                self.delimChecks[delimiter].SetValue(wx.true)
-+                self.delimChecks[delimiter].SetValue(True)
-             elif delimiter is not None:
--                self.delimChecks['Other'].SetValue(wx.true)
-+                self.delimChecks['Other'].SetValue(True)
-                 self.otherDelim.SetValue(delimiter)
- 
-             otherSizer.AddMany([
--                (self.delimChecks['Other'], 0, wx.wxALL, 3),
--                (self.otherDelim, 0, wx.wxALIGN_CENTER),
-+                (self.delimChecks['Other'], 0, wx.ALL, 3),
-+                (self.otherDelim, 0, wx.ALIGN_CENTER),
-                 ])
-             
-             delimGridSizer.Add(otherSizer)
--            delimStaticSizer.Add(delimGridSizer, 1, wx.wxEXPAND)
--            delimOtherSizer = wx.wxBoxSizer(wx.wxVERTICAL)
--            self.consecutiveDelimsAs1 = wx.wxCheckBox(self, -1, "Treat consecutive delimiters as one")
--            self.consecutiveDelimsAs1.Enable(wx.false)
--            tqSizer = wx.wxBoxSizer(wx.wxHORIZONTAL)
--            self.textQualifierChoice = wx.wxChoice(self, -1, choices = ['"', "'", "{None}"])
-+            delimStaticSizer.Add(delimGridSizer, 1, wx.EXPAND)
-+            delimOtherSizer = wx.BoxSizer(wx.VERTICAL)
-+            self.consecutiveDelimsAs1 = wx.CheckBox(self, -1, "Treat consecutive delimiters as one")
-+            self.consecutiveDelimsAs1.Enable(False)
-+            tqSizer = wx.BoxSizer(wx.HORIZONTAL)
-+            self.textQualifierChoice = wx.Choice(self, -1, choices = ['"', "'", "{None}"])
-             wx.EVT_CHOICE(self, self.textQualifierChoice.GetId(), self.BuildPreview)
-             if textQualifier is not None:
-                 self.textQualifierChoice.SetStringSelection(textQualifier)
-@@ -741,52 +750,52 @@
-                 self.textQualifierChoice.SetStringSelection('{None}')
-                 
-             tqSizer.AddMany([
--                (wx.wxStaticText(self, -1, "Text qualifier:"), 0, wx.wxALIGN_RIGHT | wx.wxALIGN_CENTER_VERTICAL),
--                (self.textQualifierChoice, 0, wx.wxALL | wx.wxALIGN_LEFT | wx.wxALIGN_CENTER_VERTICAL, 5),
-+                (wx.StaticText(self, -1, "Text qualifier:"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
-+                (self.textQualifierChoice, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5),
-                 ])
-             
-             delimOtherSizer.AddMany([
--                (self.consecutiveDelimsAs1, 1, wx.wxEXPAND | wx.wxALL, 5),
--                (tqSizer, 1, wx.wxALL | wx.wxALIGN_CENTER, 5),
-+                (self.consecutiveDelimsAs1, 1, wx.EXPAND | wx.ALL, 5),
-+                (tqSizer, 1, wx.ALL | wx.ALIGN_CENTER, 5),
-                 ])
- 
-             delimiterBox.AddMany([
--                (delimStaticSizer, 0, wx.wxALIGN_CENTER),
--                (delimOtherSizer,  0, wx.wxALIGN_CENTER),
-+                (delimStaticSizer, 0, wx.ALIGN_CENTER),
-+                (delimOtherSizer,  0, wx.ALIGN_CENTER),
-                 ])
-             
-             delimStaticBox.Fit()
- 
-             # -------------
-             self.displayRows = 6
--            previewSettingsBox = wx.wxBoxSizer(wx.wxHORIZONTAL)
--            self.hasHeaderRow = wx.wxCheckBox(self, -1, "First row is header")
-+            previewSettingsBox = wx.BoxSizer(wx.HORIZONTAL)
-+            self.hasHeaderRow = wx.CheckBox(self, -1, "First row is header")
-             wx.EVT_CHECKBOX(self, self.hasHeaderRow.GetId(), self.BuildPreview)
- 
--            if wx.wxPlatform in ('__WX.WXGTK__', '__WX.WXMSW__'):
--                # wx.wxSpinCtrl causes seg fault under GTK when <enter> is hit in text - use wx.wxSpinButton instead
--                self.previewRowsText = wx.wxTextCtrl(self, -1, str(self.displayRows),
--                                                  size = (30, -1), style = wx.wxTE_PROCESS_ENTER)
-+            if wx.Platform in ('__WX.WXGTK__', '__WX.WXMSW__'):
-+                # wx.SpinCtrl causes seg fault under GTK when <enter> is hit in text - use wx.SpinButton instead
-+                self.previewRowsText = wx.TextCtrl(self, -1, str(self.displayRows),
-+                                                  size = (30, -1), style = wx.TE_PROCESS_ENTER)
-                 h = self.previewRowsText.GetSize().height
--                self.previewRows = wx.wxSpinButton(self, -1, size = (-1, h), style = wx.wxSP_VERTICAL)
-+                self.previewRows = wx.SpinButton(self, -1, size = (-1, h), style = wx.SP_VERTICAL)
-                 self.previewRows.SetRange(self.displayRows, 100)
-                 self.previewRows.SetValue(self.displayRows)
-                 wx.EVT_SPIN(self, self.previewRows.GetId(), self.OnSpinPreviewRows)
-                 wx.EVT_TEXT_ENTER(self, self.previewRowsText.GetId(), self.OnTextPreviewRows)
-             else:
--                self.previewRows = wx.wxSpinCtrl(self, -1, str(self.displayRows),
-+                self.previewRows = wx.SpinCtrl(self, -1, str(self.displayRows),
-                                               min = self.displayRows, max = 100, size = (50, -1))
-                 wx.EVT_SPINCTRL(self, self.previewRows.GetId(), self.BuildPreview)
- 
-             previewSettingsBox.AddMany([
--                (self.hasHeaderRow, 1, wx.wxALL | wx.wxEXPAND, 5),
--                (wx.wxStaticText(self, -1, "Preview"), 0, wx.wxWEST | wx.wxALIGN_RIGHT | wx.wxALIGN_CENTER_VERTICAL, 10),
-+                (self.hasHeaderRow, 1, wx.ALL | wx.EXPAND, 5),
-+                (wx.StaticText(self, -1, "Preview"), 0, wx.WEST | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 10),
-                 ])
--            if wx.wxPlatform in ('__WX.WXGTK__', '__WX.WXMSW__'):
--                previewSettingsBox.Add(self.previewRowsText, 0, wx.wxALIGN_CENTER | wx.wxALL, 3)
-+            if wx.Platform in ('__WX.WXGTK__', '__WX.WXMSW__'):
-+                previewSettingsBox.Add(self.previewRowsText, 0, wx.ALIGN_CENTER | wx.ALL, 3)
-             previewSettingsBox.AddMany([
--                (self.previewRows, 0, wx.wxALIGN_CENTER | wx.wxALL, 3),
--                (wx.wxStaticText(self, -1, "rows"), 0, wx.wxALIGN_RIGHT | wx.wxALIGN_CENTER_VERTICAL),
-+                (self.previewRows, 0, wx.ALIGN_CENTER | wx.ALL, 3),
-+                (wx.StaticText(self, -1, "rows"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
-                 ])
- 
-             # -------------
-@@ -804,28 +813,28 @@
-                 hasHeaders = 0
-                 cols = 1
- 
--            previewStaticBox = wx.wxStaticBox(self, -1, "Data Preview")
--            previewStaticSizer = wx.wxStaticBoxSizer(previewStaticBox, wx.wxVERTICAL)
--            self.preview = grid.wxGrid(self, -1)
-+            previewStaticBox = wx.StaticBox(self, -1, "Data Preview")
-+            previewStaticSizer = wx.StaticBoxSizer(previewStaticBox, wx.VERTICAL)
-+            self.preview = gridlib.Grid(self, -1)
-             self.preview.CreateGrid(self.displayRows, cols)
--            self.preview.SetDefaultRowSize(self.preview.GetCharHeight() + 4, wx.true)
--            self.preview.EnableEditing(wx.false)
-+            self.preview.SetDefaultRowSize(self.preview.GetCharHeight() + 4, True)
-+            self.preview.EnableEditing(False)
-             self.preview.SetColLabelSize(0)
-             self.preview.SetRowLabelSize(0)
-             self.preview.SetMargins(1, 0)
--            self.initialized = wx.true
-+            self.initialized = True
-             self.BuildPreview()
- 
-             rowheight = self.preview.GetRowSize(0) + 2
-             self.preview.SetSize((-1, rowheight * self.displayRows))
--            previewStaticSizer.Add(self.preview, 0, wx.wxALL | wx.wxEXPAND, 5)
-+            previewStaticSizer.Add(self.preview, 0, wx.ALL | wx.EXPAND, 5)
- 
-             # -------------
-             mainSizer.AddMany([
--                (message1,     0, wx.wxALL, 5),
--                (delimiterBox, 0, wx.wxALL, 5),
--                (previewSettingsBox, 0, wx.wxALL, 5),
--                (previewStaticSizer, 0, wx.wxALL | wx.wxEXPAND, 5),
-+                (message1,     0, wx.ALL, 5),
-+                (delimiterBox, 0, wx.ALL, 5),
-+                (previewSettingsBox, 0, wx.ALL, 5),
-+                (previewStaticSizer, 0, wx.ALL | wx.EXPAND, 5),
-                 ])
- 
-             self.Layout()
-@@ -855,9 +864,9 @@
-             if not self.initialized:
-                 return # got triggered before initialization was completed
- 
--            if wx.wxPlatform != '__WX.WXGTK__':
--                wx.wxBeginBusyCursor() # causes a spurious spin event under GTK
--            wx.wxYield() # allow controls to update first, in case of slow preview
-+            if wx.Platform != '__WX.WXGTK__':
-+                wx.BeginBusyCursor() # causes a spurious spin event under GTK
-+            wx.Yield() # allow controls to update first, in case of slow preview
-             self.preview.BeginBatch()
-             self.preview.DeleteCols(0, self.preview.GetNumberCols())
-             self.preview.DeleteRows(0, self.preview.GetNumberRows())
-@@ -892,7 +901,7 @@
-                 for col in range(cols):
-                     try:    self.preview.SetColLabelValue(col, str(previewData[0][col]))
-                     except: self.preview.SetColLabelValue(col, "")
--                # self.preview.AutoSizeColumns(wx.true) # size columns to headers
-+                # self.preview.AutoSizeColumns(True) # size columns to headers
-             else:
-                 self.preview.SetColLabelSize(0)
- 
-@@ -902,13 +911,13 @@
-                     except: pass
- 
-             # if not hasHeaders:
--            self.preview.AutoSizeColumns(wx.true) # size columns to data
-+            self.preview.AutoSizeColumns(True) # size columns to data
- 
-             rowheight = self.preview.GetRowSize(0)
-             self.preview.SetRowSize(0, rowheight)
-             self.preview.EndBatch()
--            if wx.wxPlatform != '__WX.WXGTK__':
--                wx.wxEndBusyCursor()
-+            if wx.Platform != '__WX.WXGTK__':
-+                wx.EndBusyCursor()
- 
-             self.delimiters = delimiter
-             self.textQualifier = textQualifier
-@@ -928,17 +937,17 @@
-             return self.hasHeaders
- 
-     # ------------------------------------------------------------------------------        
--    class ImportWizardDialog(wx.wxDialog):
-+    class ImportWizardDialog(wx.Dialog):
-         """
-         CLASS(SUPERCLASS):
--          ImportWizardDialog(wx.wxDialog)
-+          ImportWizardDialog(wx.Dialog)
-         DESCRIPTION:
-           A dialog allowing the user to preview and change the options for importing
-           a file.
-         PROTOTYPE:
-           ImportWizardDialog(parent, id, title, file,
--                             pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
--                             style = wx.wxDEFAULT_DIALOG_STYLE, name = 'ImportWizardDialog')
-+                             pos = wx.DefaultPosition, size = wx.DefaultSize,
-+                             style = wx.DEFAULT_DIALOG_STYLE, name = 'ImportWizardDialog')
-         ARGUMENTS:
-           - parent: the parent window
-           - id: the id of this window
-@@ -955,22 +964,22 @@
-         """
- 
-         def __init__(self, parent, id, title, file,
--                     pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
--                     style = wx.wxDEFAULT_DIALOG_STYLE, name = "ImportWizardDialog"):
--            wx.wxDialog.__init__(self, parent, id, title, pos, size, style, name)
--            self.SetAutoLayout(wx.true)
-+                     pos = wx.DefaultPosition, size = wx.DefaultSize,
-+                     style = wx.DEFAULT_DIALOG_STYLE, name = "ImportWizardDialog"):
-+            wx.Dialog.__init__(self, parent, id, title, pos, size, style, name)
-+            self.SetAutoLayout(True)
- 
-             self.file = file
-             f = open(file, 'r')
-             self.data = f.read()
-             f.close()
- 
--            sizer = wx.wxBoxSizer(wx.wxVERTICAL)
-+            sizer = wx.BoxSizer(wx.VERTICAL)
-             self.delimPanel = ImportWizardPanel_Delimiters(self, -1, file, self.data, self.ValidState)
-             buttonBox = self.ButtonBox()
-             sizer.AddMany([
--                (self.delimPanel, 0, wx.wxALL, 5),
--                (buttonBox, 0, wx.wxSOUTH | wx.wxALIGN_CENTER_HORIZONTAL | wx.wxALIGN_TOP, 0),
-+                (self.delimPanel, 0, wx.ALL, 5),
-+                (buttonBox, 0, wx.SOUTH | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_TOP, 0),
-                 ])
- 
-             self.SetSizer(sizer)
-@@ -980,15 +989,15 @@
-             self.Centre()
- 
-         def ButtonBox(self):
--            panel = wx.wxPanel(self, -1)
--            panel.SetAutoLayout(wx.true)
--            sizer = wx.wxBoxSizer(wx.wxHORIZONTAL)
-+            panel = wx.Panel(self, -1)
-+            panel.SetAutoLayout(True)
-+            sizer = wx.BoxSizer(wx.HORIZONTAL)
-             panel.SetSizer(sizer)
--            self.ok = wx.wxButton(panel, wx.wxID_OK, "Ok")
--            cancel = wx.wxButton(panel, wx.wxID_CANCEL, "Cancel")
-+            self.ok = wx.Button(panel, wx.ID_OK, "Ok")
-+            cancel = wx.Button(panel, wx.ID_CANCEL, "Cancel")
-             sizer.AddMany([
--                (self.ok, 0, wx.wxALIGN_TOP | wx.wxEAST | wx.wxSOUTH, 10),
--                (cancel, 0, wx.wxALIGN_TOP | wx.wxWEST | wx.wxSOUTH, 10),
-+                (self.ok, 0, wx.ALIGN_TOP | wx.EAST | wx.SOUTH, 10),
-+                (cancel, 0, wx.ALIGN_TOP | wx.WEST | wx.SOUTH, 10),
-                 ])
-             panel.Layout()
-             panel.Fit()
-@@ -1002,11 +1011,11 @@
-         def ImportData(self, errorHandler = skipRow):
-             delimiters, qualifier, hasHeaders = self.GetImportInfo()
-             self.data = organizeIntoLines(self.data, textQualifier = qualifier)
--            dlg = wx.wxProgressDialog("Import DSV File",
-+            dlg = wx.ProgressDialog("Import DSV File",
-                                    self.file,
-                                    100,
-                                    self,
--                                   wx.wxPD_CAN_ABORT | wx.wxPD_APP_MODAL | wx.wxPD_AUTO_HIDE)
-+                                   wx.PD_CAN_ABORT | wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
-             self.data = importDSV(self.data,
-                                   delimiter = delimiters,
-                                   textQualifier = qualifier,
-@@ -1034,12 +1043,12 @@
- 
- 
-     def demo():
--        class SampleApp(wx.wxApp):
-+        class SampleApp(wx.App):
-             def OnInit(self):
--                dlg = wx.wxFileDialog(None, "Choose a file", ".", "",
-+                dlg = wx.FileDialog(None, "Choose a file", ".", "",
-                                    "CSV files (*.csv)|*.csv|Text files (*.txt)|*.txt|All files (*.*)|*.*",
--                                   wx.wxOPEN)
--                if dlg.ShowModal() == wx.wxID_OK:
-+                                   wx.OPEN)
-+                if dlg.ShowModal() == wx.ID_OK:
-                     path = dlg.GetPath()
-                     dlg.Destroy()
- 
-@@ -1049,7 +1058,7 @@
-                         file.write("LINE %d: %s\n" % (linenumber, oldrow))
- 
-                     dlg = ImportWizardDialog(None, -1, 'CSV Import Wizard (v.%s)' % __version__, path)
--                    if dlg.ShowModal() == wx.wxID_OK:
-+                    if dlg.ShowModal() == wx.ID_OK:
-                         results = dlg.ImportData(errorHandler = logErrors)
-                         dlg.Destroy()
-                         errorLog.close()
-@@ -1074,7 +1083,7 @@
-                 else:
-                     dlg.Destroy()
- 
--                return wx.true
-+                return True
- 
-         app = SampleApp()
-         app.MainLoop()
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-wxpython30.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-wxpython30.patch
deleted file mode 100644
index c5ed57380843..000000000000
--- a/dev-python/python-dsv/files/python-dsv-1.4.1-wxpython30.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/DSV/DSV.py
-+++ b/DSV/DSV.py
-@@ -676,7 +676,7 @@ if wx is not None:
-                      style = wx.TAB_TRAVERSAL, name = "ImportWizardPanel"):
-             wx.Panel.__init__(self, parent, id, pos, size, style, name)
-             self.SetAutoLayout(True)
--            mainSizer = wx.FlexGridSizer(3, 1)
-+            mainSizer = wx.FlexGridSizer(4, 1)
-             self.SetSizer(mainSizer)
-             mainSizer.AddGrowableCol(0)
- 
-@@ -1089,7 +1089,8 @@ if __name__ == '__main__':
-                 else:
-                     dlg.Destroy()
- 
--                return True
-+                # return True
-+                sys.exit()
- 
-         app = SampleApp()
-         app.MainLoop()
diff --git a/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild b/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
index 5a4498fa70a6..b9159dd4d24f 100644
--- a/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
+++ b/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,8 @@ inherit distutils-r1
 
 DESCRIPTION="Python module for importing and exporting DSV files"
 HOMEPAGE="http://python-dsv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/DSV-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/DSV-${PV}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
 
 LICENSE="CNRI"
 SLOT="0"
@@ -22,8 +23,8 @@ S="${WORKDIR}/DSV-${PV}"
 
 PATCHES=(
 	# From Debian
-	"${FILESDIR}"/${P}-env.patch
-	"${FILESDIR}"/${P}-unicode.patch
-	"${FILESDIR}"/${P}-wx-namespace.patch
-	"${FILESDIR}"/${P}-wxpython30.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-env.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-unicode.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-wx-namespace.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-wxpython30.patch
 )
diff --git a/dev-python/www-authenticate/Manifest b/dev-python/www-authenticate/Manifest
new file mode 100644
index 000000000000..fa1399d4e5f5
--- /dev/null
+++ b/dev-python/www-authenticate/Manifest
@@ -0,0 +1,3 @@
+DIST www-authenticate-0.9.2.tar.gz 2480 SHA256 77697918c9b72974a0162f14472b48a7a02b15344a4df3092194c2afc54eb738 SHA512 5ee3ee733013d922bfef96981fd33b22947874c0a2a56c6d2dbfe11b0bc447a3ff6b6f294efaea2beaf2ff570cd3bf519a21bc71ce62fc0a8ce5edc5d68308f4 WHIRLPOOL 309fc6eb4007b38e8bc674ca336c31081e98f5c9706f4b65d8bd8fb1425e8cd15a52dce4b276fde6c6c8ca3591dbdf033fb4a893a91e772e875c0a55e0f4bb48
+EBUILD www-authenticate-0.9.2.ebuild 598 SHA256 dd7850606152465372ab18aab83259ce77a53f4e95da0f92a089c9fb53d81f51 SHA512 ea6b1a569d8d6d2298152ffccbb8ba9e88ff63dc6dad3491e07e07b0c1de8c074d7fc1ddcbec0a8e5aa595dee14cde472567de2d21282cb0e1e684ec26a3e2c2 WHIRLPOOL 0fe215f0e7238ae353c184ed5f5ff5c72e235f86550466879949a95310a53074d5d2e395f20ab38290694d22f815df762572c91652e5d14badc63dabc1fdba67
+MISC metadata.xml 387 SHA256 bd9ebc9151b4381256ea47bc8f86ca2ab97a6129e6ce81a2b968f84a9b19f0d5 SHA512 c6a7433f233618ec283e6ba0c0ed2730fb01d5f85a795e340bddc29435cea3c6399095d9fee2b1795cbe5b7949e8a79ecef5c979b502bed2162643426410273c WHIRLPOOL a41c6ed18a51aeb1c53c2d71f9394012ed1bbb308c647ba9c38496acbc98fb903904b35a8f84dfc60600516d326fca4f62b4ce145fb2c9a96371f7ba7150afbb
diff --git a/dev-python/www-authenticate/metadata.xml b/dev-python/www-authenticate/metadata.xml
new file mode 100644
index 000000000000..fe9656ede93f
--- /dev/null
+++ b/dev-python/www-authenticate/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">www-authenticate</remote-id>
+		<remote-id type="github">alexsdutton/www-authenticate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
new file mode 100644
index 000000000000..95e755f95e81
--- /dev/null
+++ b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -0,0 +1,25 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="WWW-Authenticate header parser"
+HOMEPAGE="https://github.com/alexsdutton/www-authenticate"
+SRC_URI="https://github.com/alexsdutton/www-authenticate/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests tests.py || die
+}