gentoo resync : 10.02.2020

7 files changed, 60 insertions, 48 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index c1dfa6cca67e..f8e3adb9da25 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 3290166f0762..987881ff309e 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -3,7 +3,7 @@ AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
 DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517 SHA512 d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140
 DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b SHA512 2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b
-EBUILD pyfa-2.14.1.ebuild 2657 BLAKE2B a5df3021d46db87e386fd609bbc31de973d724995a8aa0493ed8960670a6b3e92704d9a5a7b1691cf95228d062bdd6638385fb2295c3b8e224a95574c1356599 SHA512 74a1637f9c86bacda4713e1ed1cced990f05a6d7aa0d34d62ee153ce197490d6f73c936a551ca68bc19ce4fe9b25fd32e4f7cc3239deaa734179190e96f707b2
-EBUILD pyfa-2.15.1.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
-EBUILD pyfa-9999.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
+EBUILD pyfa-2.14.1.ebuild 2807 BLAKE2B 0ac7d54fa394babc6ce843b428786c76952f2ede30e38f691d33a6b60aeb2a20f1e1ef79b8de5e299db5f8761b6b8628044ab71cbbc330feb2a78e4b2d95305d SHA512 5fe53304f63f11edaab725003a8cf61e1143b7a15894f438b27ee129e5fae553a39c797d38ecde201143fb774aff5fb8ea40d0791fb293f4a6a6d8c1b720be63
+EBUILD pyfa-2.15.1-r1.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4
+EBUILD pyfa-9999.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4
 MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild
index e3c4bc186500..51e160ed66cc 100644
--- a/games-util/pyfa/pyfa-2.14.1.ebuild
+++ b/games-util/pyfa/pyfa-2.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
 DEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${DEPEND}
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	graph? (
-		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		graph? (
+			>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+	')
 	${PYTHON_DEPS}"
 BDEPEND="app-arch/zip"
 
diff --git a/games-util/pyfa/pyfa-2.15.1.ebuild b/games-util/pyfa/pyfa-2.15.1-r1.ebuild
index 68be8d9f02ce..5c6b262d499b 100644
--- a/games-util/pyfa/pyfa-2.15.1.ebuild
+++ b/games-util/pyfa/pyfa-2.15.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
 DEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')"
 BDEPEND="app-arch/zip"
 
 PATCHES=(
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 68be8d9f02ce..5c6b262d499b 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
 DEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')"
 BDEPEND="app-arch/zip"
 
 PATCHES=(
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index e08e72e89586..be714d76c2af 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -4,5 +4,5 @@ AUX xboxdrv.initd 446 BLAKE2B f78cf4af5cca703efc0a480c2ba34b0189d2b86a64aa89533e
 AUX xboxdrv.service 371 BLAKE2B afd5f5397f4ae15af69d8e12865201fe159691ba2a36c00fe207304afe5126814fafd0394e7618e9f4d27611bd2c0dd7371717c7a07a57d27c3a4ab8e6e40140 SHA512 80e7657edae9c771740628ef5f9752b79d50288ead33afe97e71ffc6e7d7c24343eeb213668cdc823b28742976e2e56f4defdcd823716897f3262be1fc7832e9
 AUX xboxdrv.udev-rules 251 BLAKE2B 5a3af6d378b2d6ad5bb2da0dfa356c6939a274b194f075281bbfc3dcaee1c5b9fc63740bbfec2ecd0c8245065262a0449c47fad6c522e4773ef2e193018dc95f SHA512 131c90bee6ac4da5e3d51c7212abb362a540092db97af56332cdfe14e836c84c97727823462ea378da6e5544fda2fb4d36fbe00b6210e5663316f914eaa3f4ad
 DIST xboxdrv-0.8.8_p20190118.tar.gz 322541 BLAKE2B ffa1021f974414ab9efebccf89e8be9137647ba7e1adf3bc9dad3b17b362b340f087fdac42c9b91a29a4cfe13295df6d3861fe953d9f96e80df08d4a6b1ce754 SHA512 ede650090c67642dc4729acc37630ae807f354d76f9bf31e23357668b6ae2b8d0261d2cf6e33090ab2120083b0664332dab22f1ed682bcdcbf1cac88b97e67af
-EBUILD xboxdrv-0.8.8_p20190118.ebuild 1546 BLAKE2B fa8c64ad76fa5c7a3cd18e838cd83218081b9634de79734366901d820d6852881bccca3aed61cd903b5a425ab4a18d66063669a5dc8378b30ec85934266c4235 SHA512 84db65950e20c70d2ec7a0bdc412910aaf581aa340738ffeb3ca00d611117a95ec0978cdae14559c0cfbcbadcf3658d0a72a71a423a544eff70828508aad64b1
+EBUILD xboxdrv-0.8.8_p20190118.ebuild 1536 BLAKE2B 576d869b1d5b9c5d3ab18545895c241fa7df76e3326a7bfdbc9c2f74683b70e931564c29e4067c6158d93f9c61003bb873b313014f7b3fe6e5c0ab6733806b41 SHA512 28931e15330eaae86c73c39d72530a193ac074a7f2ab5512437cce2435d52b836f57dfdea087ef2765ee791ffd3316580aea79c83831e1cff4a763622e1ef83c
 MISC metadata.xml 494 BLAKE2B 365b4d5cc3a91765b96e4e206c9beb261e318798e90437e39ae7c2c437f1df07100233f0458acca702e1efadd092a4f788c81ddcdc40b8997cc91a1041047997 SHA512 dec2bdb2eb9d7cab3cb481d9694a805175a4004f0be5956b6711acb833732d7bc8ec3dc9b2c61d00b724bc7986ec186e7b36aa0327337bdab9241d45ee5f1f0e
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
index 1508c02753da..76f9f0a91fc9 100644
--- a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1 scons-utils toolchain-funcs systemd udev