gentoo resync : 19.07.2019

4 files changed, 2 insertions, 70 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 02887c54fda2..2c6520fb5be6 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,7 +1,3 @@
-DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
-DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
 DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
-EBUILD QtPy-1.3.1-r1.ebuild 952 BLAKE2B 345d0a1329e3b3a265203d9d8503511c8cbccaecb7af6904c9655ff19d57956bd281c6b55c53ef3b305b1e581b1380c5769bda97f12659c88e20589df2f70468 SHA512 324d41c1c14fd3720a4f900b86c5c77a0266333a261375799dc8e95903d0403e137d0af14b92ef74b2598fb0d031bcf8dde3fbcdfaf4fe9c921ede7243d8e9b5
-EBUILD QtPy-1.4.0-r1.ebuild 975 BLAKE2B 933495d5cc66dc1282eb2b0b2640b479bdde3ba3d465d400877236defbe57466ee199d27f7beb715a5b5a9612cbf5930b97fae3a2507d9f2463839cb62b9fc02 SHA512 79a4c1fb59c6c2e937a82967196c58a6b0da65034406c94d0353fff848b034b7878d8ecc6e9a2a43bd6358bc158c6e2b958bff323ddf3d38148c181e28aab487
-EBUILD QtPy-1.4.2.ebuild 1065 BLAKE2B 57f8210658e5eb067aa5debb9fc54a36434a748be9dfbfcc048efc57a09a76a2eea075afce16a5e999b843c00e97089f26875368675aeeaea0456ecb123bd591 SHA512 2dd04914793896145b647b16536c12c9c60f9613a000541ef3d66e737fe9a242ad6d255457b37f08091ab34a4f37bc888dc9b403788fca0bf4fa4b609bf32180
+EBUILD QtPy-1.4.2.ebuild 1063 BLAKE2B 8caf6f72e1da759c30a963a4e5f74d46ca09c7f70e86bebcd15ae9d16e8499242e1e75538a972e7b27a0a07e1e421962109c715ff34c9899d9ee3b2e45225a90 SHA512 abedccd9814fd3c1b7ab1ce873df111e2feb5d4cae0ef011fbd66222a822f317128f97272b44e192cf3793b7bf49741c8906c87f3969134f7cb79e9f0563b793
 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
deleted file mode 100644
index 346853542581..000000000000
--- a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{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.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
deleted file mode 100644
index 3108385eeb5d..000000000000
--- a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{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.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index 2675e70c03d5..08987abc73d5 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit webengine"
 
 RDEPEND="