gentoo resync : 16.09.2020

9 files changed, 78 insertions, 149 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 82d8164c528b..72764cb6a795 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 913445c59d8c..21b9b5aae3b6 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,9 +1,7 @@
-AUX lutris-0.5.4-gtk.patch 1259 BLAKE2B 32556fbb9ce674f783508c740f9cb9f06a0165286f42e5e080d668864d9a840c74765c8602c47e8b7a90d33374cb04d85d9f2498a0919171d146abb82ef7f31b SHA512 7028157b550c9d13a98e843d75c27bdb8c2cb2bf9591df5f102b412ebfefe693e95b847b0ba43c032ef9d84881b4143f2d2ecc32fd61e164bd49e5da5c5cd5a9
-DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438 SHA512 81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
-DIST lutris_0.5.6.tar.xz 1747440 BLAKE2B e39206d8245d99a0424537cd9d9ed860c4e0d9fd373afe61d7e19eb2672bee621d541060af74f1197242e49a846e70fe16eb28e0c57370d2e11634d7035ab1fe SHA512 3ac9f7095c30044990e42f671d6e1e5cac6cd921cdf93e175400335cb6e9ae5b1bf8101dc0805838f3c5bf9713b891c62960c80a1a20aef1e4f896a74af97a01
+AUX lutris-0.5.7-copy_paste_fix.patch 1178 BLAKE2B fcb28456fb0ced4e7f53156bbaed799d7673c57e02d8dd04261ffc99f2b585819b920870af48806ba461d9a5130cf9aa3696dfa2615c7f54d54871a3abacbf6b SHA512 5d42c46b159962e1a77ba7c21d4ea47a8507548e6d62b516228b45cdd4d36abd4dd56cf81079edaf32f61c2a849f6d1491f2dc5b0dd7c7a817ba822499104317
+DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89 SHA512 9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3
 DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1 SHA512 f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57
-EBUILD lutris-0.5.4-r1.ebuild 1733 BLAKE2B 422b817e46728f91d3f29d174805ab1f9b67507f01b212f4cd718693233442916b14601674a0a810198664dbb38b576a92d301aaadf5efdc595b0a51a6e7cdd8 SHA512 9ab2a5639c616eed52fcc6b4f4c44b21d636ee69f26b513bf5d8c00b1e76ca2ea5893fddfe0c52bdcc014e2c55e27807ef803fdee9264920fbdbd44da64de099
-EBUILD lutris-0.5.6.ebuild 1733 BLAKE2B e0f31609f27985611319f20a17e9682ad9d8e8a459a1ed8931c05d9b06edc0670c744495b466ad3ebbf30079714133145f19e565a5080ad89ee869d6663debc7 SHA512 0d680960e81565d3e4fe3a4117d236b0e528834fa3c9b21c596a66067bce7122fc9b7a1880b2a68b689abd4943ab0f9aaa87d0a1d7ede1dcfd0f2707f0308390
+EBUILD lutris-0.5.7.1.ebuild 1894 BLAKE2B 81f5eb0ba0b07676f2317fa52daabbed987707ab83921d797887834ded7b9a84187ee426ccab5c4baf7235424750844ecf4491e155542c78e2b14ad9bfa07ca6 SHA512 5845f01a0832c236b727af191f6ef55abf7ba08487d0b921b51a939001cd3245a0f5b9efdf235b7c59371b87c647ab61fa81380019a7faa916da3019f403222f
 EBUILD lutris-0.5.7.ebuild 1735 BLAKE2B 5143d74bf601ca931d6e0e10c58d3f17899d85d60507c31495d768d1c940672f2f33136a808d1576370665a27da1ade4a8bab3b7b297191309631ae568eb960e SHA512 28644fd969ec62347a1c61c8583911e3d1e30ef14f6306c8b336eeb0e6b00011e850c9a68290ef8cb9259a4c154109068e162bbfaa4afab6807a4bfea00cbe0e
-EBUILD lutris-9999.ebuild 1735 BLAKE2B 5143d74bf601ca931d6e0e10c58d3f17899d85d60507c31495d768d1c940672f2f33136a808d1576370665a27da1ade4a8bab3b7b297191309631ae568eb960e SHA512 28644fd969ec62347a1c61c8583911e3d1e30ef14f6306c8b336eeb0e6b00011e850c9a68290ef8cb9259a4c154109068e162bbfaa4afab6807a4bfea00cbe0e
+EBUILD lutris-9999.ebuild 1833 BLAKE2B b9130c739bdd68f87f29a2f95bfc9acf60196cbd9279d128be8d13c2736ed1a6355e765ce34e0edb0db1b4d50ee985acd7f25ea4865f5d2891bca96538bd5b7c SHA512 3d29f3b8dd92c94d177dfa7e3789d31d14dcb3d8c8cbebb6f76a374f8f4761dae779563703d4d49e4ee0ddd6616dfed93d6fa3cf395392d811ee59f5b1dcc3ad
 MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7
diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch b/games-util/lutris/files/lutris-0.5.4-gtk.patch
deleted file mode 100644
index a2c5d71d9982..000000000000
--- a/games-util/lutris/files/lutris-0.5.4-gtk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a97150b78954e176cb0f825f0c201f54d5da613e Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Tue, 31 Dec 2019 03:22:26 +0200
-Subject: [PATCH] Call the correct method for creating TreeModelSort (Closes
- #2554)
-
-Upstream-Status: Accepted
-[https://github.com/lutris/lutris/commit/a99b17f00dfc4cdab80c237752cc3167d64194eb]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- lutris/gui/views/store.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py
-index ba331313..4d5f372e 100644
---- a/lutris/gui/views/store.py
-+++ b/lutris/gui/views/store.py
-@@ -130,7 +130,7 @@ class GameStore(GObject.Object):
-         self.prevent_sort_update = False  # prevent recursion with signals
-         self.modelfilter = self.store.filter_new()
-         self.modelfilter.set_visible_func(self.filter_view)
--        self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
-+        self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter)
-         self.modelsort.connect("sort-column-changed", self.on_sort_column_changed)
-         self.modelsort.set_sort_func(sort_col, sort_func, sort_col)
-         self.sort_view(sort_key, sort_ascending)
--- 
-2.24.1
-
diff --git a/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
new file mode 100644
index 000000000000..3e278561aa3b
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
@@ -0,0 +1,38 @@
+From 9603da9d4eda1656219a4c79e1f9d1a958165151 Mon Sep 17 00:00:00 2001
+From: Austin Pua <pua.austin.anderson@gmail.com>
+Date: Wed, 1 Jul 2020 21:48:09 +0800
+Subject: [PATCH] Fix copy paste issue in auth webviews
+
+---
+ lutris/services/gog.py          | 3 ++-
+ lutris/services/humblebundle.py | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lutris/services/gog.py b/lutris/services/gog.py
+index 0eed7778c..099f9083d 100644
+--- a/lutris/services/gog.py
++++ b/lutris/services/gog.py
+@@ -279,7 +279,8 @@ def connect(parent=None):
+     """Connect to GOG"""
+     logger.debug("Connecting to GOG")
+     dialog = WebConnectDialog(SERVICE, parent)
+-    dialog.run()
++    dialog.set_modal(True)
++    dialog.show()
+ 
+ 
+ def disconnect():
+diff --git a/lutris/services/humblebundle.py b/lutris/services/humblebundle.py
+index 6dcfe6911..056ef9460 100644
+--- a/lutris/services/humblebundle.py
++++ b/lutris/services/humblebundle.py
+@@ -152,7 +152,8 @@ def is_connected():
+ def connect(parent=None):
+     """Connect to Humble Bundle"""
+     dialog = WebConnectDialog(SERVICE, parent)
+-    dialog.run()
++    dialog.set_modal(True)
++    dialog.show()
+ 
+ 
+ def disconnect():
diff --git a/games-util/lutris/lutris-0.5.6.ebuild b/games-util/lutris/lutris-0.5.6.ebuild
deleted file mode 100644
index ba12e0718246..000000000000
--- a/games-util/lutris/lutris-0.5.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="An open source gaming platform for GNU/Linux"
-HOMEPAGE="https://lutris.net/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
-	inherit git-r3
-else
-	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unrar
-	app-arch/unzip
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-desktop:3[introspection]
-	media-sound/fluid-soundfont
-	net-libs/libsoup
-	net-libs/webkit-gtk:4[introspection]
-	x11-apps/mesa-progs
-	x11-apps/xgamma
-	x11-apps/xrandr
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify
-"
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst docs/installers.rst )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	virtx nosetests -v
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Quote README.rst
-	elog "Lutris installations are fully automated through scripts, which can"
-	elog "be written in either JSON or YAML. The scripting syntax is described"
-	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
-	elog "available online at lutris.net."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-util/lutris/lutris-0.5.4-r1.ebuild b/games-util/lutris/lutris-0.5.7.1.ebuild
index c6f225494ee9..fb54a72d2b4d 100644
--- a/games-util/lutris/lutris-0.5.4-r1.ebuild
+++ b/games-util/lutris/lutris-0.5.7.1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
 
 inherit distutils-r1 virtualx xdg
 
@@ -26,18 +27,25 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+		')
+	)
 "
 RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unrar
 	app-arch/unzip
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
 	gnome-base/gnome-desktop:3[introspection]
 	media-sound/fluid-soundfont
 	net-libs/libsoup
@@ -49,21 +57,20 @@ RDEPEND="
 	x11-libs/libnotify
 "
 
-PATCHES=( "${FILESDIR}/${P}-gtk.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.7-copy_paste_fix.patch"
+)
 
 python_install_all() {
 	local DOCS=( AUTHORS README.rst docs/installers.rst )
 	distutils-r1_python_install_all
+	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
 }
 
 python_test() {
 	virtx nosetests -v
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -73,7 +80,3 @@ pkg_postinst() {
 	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
 	elog "available online at lutris.net."
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 11cbc20a4482..4052ada5d976 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
 
 inherit distutils-r1 virtualx xdg
 
@@ -26,19 +27,25 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+		')
+	)
 "
 RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unrar
 	app-arch/unzip
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
 	gnome-base/gnome-desktop:3[introspection]
 	media-sound/fluid-soundfont
 	net-libs/libsoup
@@ -53,16 +60,13 @@ RDEPEND="
 python_install_all() {
 	local DOCS=( AUTHORS README.rst docs/installers.rst )
 	distutils-r1_python_install_all
+	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
 }
 
 python_test() {
 	virtx nosetests -v
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -72,7 +76,3 @@ pkg_postinst() {
 	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
 	elog "available online at lutris.net."
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-util/pogo-manager-bin/Manifest b/games-util/pogo-manager-bin/Manifest
index 380102da8679..e6dab28d5eeb 100644
--- a/games-util/pogo-manager-bin/Manifest
+++ b/games-util/pogo-manager-bin/Manifest
@@ -3,4 +3,4 @@ DIST pogo-manager-bin-0.1.6.zip 7703380 BLAKE2B f50c8a96a3b93a1c0036918a24ae8b74
 DIST pogo-manager-bin-0.1.7.zip 7978366 BLAKE2B a9e9b9460a50adb7964ba887a89c427b7344745c84d70711dbf372c942fb6829437eddb093fbef9b2c8b2231f3c06689d163c6ec0418d3ca9a7d8f105d35306b SHA512 6d43626d0b7edb756d0a36b8114782ea78bd87fe1f4bdcd78c8d724961ad1635042ab8e0e7f489c5c5cf8b09fa14788c701a14eb5bdce1cf21ed95c3e97fa90a
 EBUILD pogo-manager-bin-0.1.6.ebuild 813 BLAKE2B 77348ed0188581e2a4702bc22630376d97fe11feb42bb471d0c96d161830dca8072825bfcb0e063eaf76dd9d9966add92bfdf9c432e1d1ac6884c47a212de905 SHA512 02e77126376f2b4877c48dee79177b71df2b0f1a18b2d93aa2f88dc28dd2612a2ba40c0929a6ed8398668ba61b641ca4efc6486aa28c777f3dabade49658355d
 EBUILD pogo-manager-bin-0.1.7.ebuild 814 BLAKE2B 9d45605e1fbc2b3ad46362800f16a1615b2865169af60737450139017981b437c549dcfb06df5f93d6ab06680aeb530b2d78eadd9fb64351e32b53a5f9b5f3ef SHA512 2c530bc42be1263c008a71c980947ea3460f473525b1175f559b4c1e60140e94243913249edbe9a6722f6507bc7544406f252c89c5a692dc1dfb7806d371f88c
-MISC metadata.xml 401 BLAKE2B 890c9dc987b28ac022f8a9eaad4de6ade8b431025e6de84d860705803b0fc65602bfe6de04a8e91fc0d1e2d2473ce891359799c121d6696e5e02b184c167e035 SHA512 e9a64f1085fe0992a173bc7513b3fad70f104b1bb7673218148e5391afe9f1a45e49eac56ad1c111652d479ce6c48eae17782e34df2f6840bfacafaef034ca28
+MISC metadata.xml 271 BLAKE2B 25e46262b713d28c9847ba4a11eb2a7c0a5f8b33e02dd292ca20229bc80a9af91084ef9e08848effc7fb94e597e72a5b68728d263df962acc206eebe4903c24a SHA512 e4a6b75929b3992b5ef2eb071a2391a8ca9e45f4b43bbbba30acc16bb63b21518b0ff7bb8048a9e3814f2fdd21c8b63ccd4d9d885e3ad366df46cdbea086c211
diff --git a/games-util/pogo-manager-bin/metadata.xml b/games-util/pogo-manager-bin/metadata.xml
index ac3c29274339..5dd0baafeab4 100644
--- a/games-util/pogo-manager-bin/metadata.xml
+++ b/games-util/pogo-manager-bin/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
- Utility to manage Pokemon Go accounts. Not sanctioned by Niantic, use at your own risk.
-  </longdescription>
   <upstream>
     <remote-id type="github">Wolfsblvt/BlossomsPokemonGoManager</remote-id>
   </upstream>