gentoo resync : 11.05.2018

6 files changed, 67 insertions, 101 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 179c9769e92a..656c6771aee4 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -2,6 +2,6 @@ DIST QtPy-1.2.1.tar.gz 29210 BLAKE2B a0b091902c7c7ccde1dbe8cc7e235de2340f3b2d9bf
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
 EBUILD QtPy-1.2.1.ebuild 944 BLAKE2B cde02e5cb515e0be44f0354ffbc802a629dba6625c17dae30c7417e9e1c6141a1a32f402e385467b0abf127d202da1b638795a7f5de936fc4f887dbaf9242b3a SHA512 c10bc35984b7db63d6dd2f5875a6d11aff9b4da13f415ad908e7351bb1a707d82565132f51ebe54d11655e3d138087c6decb5a7a39442f3edfd8ef81319433de
-EBUILD QtPy-1.3.1.ebuild 1359 BLAKE2B 3a5b50c793fa3fef2f76828a6bc847576cb73d391fc74c8f31a49fb76005d8b4b9302407596846ba92e72d7650fa255c933abb2715b16077cfc2d7e80621e595 SHA512 3f310737a2de023840906e7aad9c66c8df32b104c19d4a31b71f1d07bdb583a0e619d14875e96ff80ee8a7bdc1c044362769c3a56e8abb57d8e207191e32a71b
-EBUILD QtPy-1.4.0.ebuild 1380 BLAKE2B 14ff548f5ae0f9a2ca4bda569debf8cad1c6f2d62ef336cdfb442f19b7a5719329288aad70514c42b4660e13e192c75200770e81964fe28f3e24ef25f6824ea0 SHA512 6c1cd326adcffa66a2f1832f07df02289129da8ce6e53c9487eff41658232889dca3c513167598d5f9b945a2a88afd2cb8c14b6a208709d1158756240ed2ef4d
-MISC metadata.xml 1494 BLAKE2B 8744d5701e82a8cebbbf27394cc458e3b3906674b3388e3cf31b168019d2081b82b4a7a5466606a7ea3d423d31ae9e4372680abecdb69ae874aed81b3cd195d5 SHA512 b0ff953afb99e6ce972c8e7e58ab99c885381c0531731b8669e4a0b299d89cc6e33bcc4fc9658afd994a1f3979e0b623610a55856ead44c0a766f2fe74824ca5
+EBUILD QtPy-1.3.1-r1.ebuild 959 BLAKE2B bfec246e5c256da5777fc01244413a28802b600a371dd71826ddee440f973c6f621741325ad62c94c0322672495ffcec8616b704bc1c14ea2c58d5d46bd38792 SHA512 43cbf817d76fccc1fcde055c37918260045d060ed568b7e6594f0f40c2ee438a33afb43ca3ace169dfcb20a995c0f12c0f8c87ebfe1faddca7934faf38258d17
+EBUILD QtPy-1.4.0-r1.ebuild 980 BLAKE2B 8e44bc8639e870b349f81f0ccb5a11439e5f897645da1f0c99e6ce110ca412ec10072895c723920e2cfacc72a6015392f0020cde7c23783c8ce100536ea63f1f SHA512 fa31c3ab20096a44d6f7c367e2858757e9a66b77a7e991002104dd566e678cf9e3e753d8a52411be89bca7e3acb886f935c750743a33e7267220f689e7c28510
+MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..7987c23cfe1d
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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="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 svg testlib webkit"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
deleted file mode 100644
index de40764e990a..000000000000
--- a/dev-python/QtPy/QtPy-1.3.1.ebuild
+++ /dev/null
@@ -1,48 +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} )
-
-inherit distutils-r1
-
-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 +pyqt5 pyside svg testlib webkit"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
-	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?]
-		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	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
-	fi
-
-	if ! use pyside; then
-		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..0ec5a63afb85
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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="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 svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/QtPy/QtPy-1.4.0.ebuild b/dev-python/QtPy/QtPy-1.4.0.ebuild
deleted file mode 100644
index 67ff013c69fe..000000000000
--- a/dev-python/QtPy/QtPy-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 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="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 +pyqt5 pyside svg testlib webkit webengine"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
-		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	)
-	pyside? (
-		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
-		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	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
-	fi
-
-	if ! use pyside; then
-		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index f7b2b130bc4a..e1b8d6e3aa72 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,8 +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="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>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>