gentoo resync : 11.05.2018

4 files changed, 12 insertions, 15 deletions

diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index a5096943500f..e1dd2def7baf 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,6 +1,6 @@
 AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d807531321cb15c71a52b7b039a3c7ad5cd06e9c919e6b6ef232fb16419f0480ce89e316770db523bcd3e02edc7c4f259803f4a3c93e2b0edbbe SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d
 DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
-EBUILD pyudev-0.20.0.ebuild 1678 BLAKE2B 9f4f5d0d8ffeb355df6fa24cce248c72131a34cfe4fd1d985f6c29b4ec3ab65757f13811e6522a0c82e707799428aaf646b354cb801275be15f6211ded5f4284 SHA512 7f715c572b3ddd83513092598b2e51db117bc47ce3917d92060fd6833156a74b4d499760e7ec27b4933ab58e1ca90894d6c6478e3d7d94235863b5131123f155
-EBUILD pyudev-0.21.0.ebuild 1542 BLAKE2B 2cd0edcb79396452d7d5498c7e45c15fa2daf8f0d7a1195f77fae3e7edd5998168a316b9b3ac41aa8d16a07bc450c3f32b9cba535fec75b49aa0198627e4615a SHA512 32d7f8aa6525a12d8d49028f968e555de112604d205460af3e31cdee7362d2734a722197a4f2eccbfddfd6f671a9f4a37d6a37dc1f418395862987317b28d62e
-MISC metadata.xml 754 BLAKE2B 2a6915fed8464e9c8d64d4ba8c4bb70201f4d06b1d442149476a212bc3fd94a9144f5a5f08ba01c8878004bbc752e4dd374000802c894f8d13138159457f97e1 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170
+EBUILD pyudev-0.20.0-r1.ebuild 1498 BLAKE2B ec887ed44b71a5e44d3a80780cc9f2cec7492dcfa727b69f5476485bc15ebff9def00e75cd0628b74118340ec3d82cbb2a23fd28e8269f9485da5bead7c84a36 SHA512 31295a078dd2b54f54c53eb65e919641cdd5dabb5f031f02ef6f47829c074e59e79e7e24e1cb8b51991463fe372802adfeb6469e4c6e15e96b29068cbd0711c3
+EBUILD pyudev-0.21.0.ebuild 1489 BLAKE2B 0cf74bb67cf5daa50575870b58ee1a9da43088a11005df2fd03280417bd3723874b68d4d3df2bd50bc5cbcbd6d3c92c91e014d8cb7a6b4a77b5c81a02264925d SHA512 d244247c8be059ce48af9043070d2a7318311e6f884d2d90ba127811784af4af53e94c4513470f62c7565dd6402b1eff905a159971cfbbc353bb87dcd7c35bf4
+MISC metadata.xml 652 BLAKE2B 15c561bbbbf2c96a44e6d0ff39e7d1cbef709b52800051d09add19b88318e7d4c9ceb09c0942e7b01ed3b836df1348ce7c84b0deb8db4dc6e5bcebe200ebc95e SHA512 bf46b85c588d646d7cc6179a059d9fb8143eebce038e64af50f3129056a71b65a63a3cd214924ca538e6793f48912dd0f824a7826b49abbfbb8b27a72214c89b
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index f42881a0924b..9c052c908df4 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -11,9 +11,7 @@
 	</longdescription>
 	<use>
 		<flag name="pygobject">Install PyGobject bindings</flag>
-		<flag name="qt4">Install PyQt4 bindings</flag>
 		<flag name="qt5">Install PyQt5 bindings</flag>
-		<flag name="pyside">Install PySide bindings</flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">pyudev</remote-id>
diff --git a/dev-python/pyudev/pyudev-0.20.0.ebuild b/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
index 381aee136f94..1bc6bf6e811a 100644
--- a/dev-python/pyudev/pyudev-0.20.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="pygobject qt4 pyside test"
+IUSE="pygobject test"
 
-RDEPEND="virtual/udev
+RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
-	pyside? ( dev-python/pyside[$(python_gen_usedep '!(python3_3)')] )"
+	virtual/udev
+	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -36,8 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
 )
 
-REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )
-	pyside? ( || ( $(python_gen_useflags '!(python3_3)') ) )"
+REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 python_prepare_all() {
 	if use test; then
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index 5c776f99aa59..03d8a9597aa7 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -13,14 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ~x86"
-IUSE="pygobject qt5 pyside test"
+IUSE="pygobject qt5 test"
 REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
-RDEPEND="virtual/udev
+RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
+	virtual/udev
 	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
 	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )"
+"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (