gentoo resync : 30.10.2021

5 files changed, 30 insertions, 32 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index f4abeec885ec..624b26374196 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 3afce85ce0ba..6bfda66d34b0 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,8 +1,9 @@
-DIST lutris-0.5.9_beta1.tar.gz 836915 BLAKE2B 53133b202e45a2e68e5aca273cd591055d469a2ada39d2b75db92d45da45a53cf3425b1d36fea1a7f241b9336895ada8b8e4577374cd0b1fd996cbd3f5108b1b SHA512 48b433fcf03795874e6c7f0b4d310f7a779c831ea67e754a0c9bb0b919f9f050311b002d63fa34150be753c4de452c306db16cb43c00fa91b08775c68169b7e6
+AUX lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch 307 BLAKE2B fe4f822b99f1f76ab62a669e9108b0dd724503fdbf4b26fa8f67f63da8d8cbd17a56aca18b373053c87a93603f90c99c252e213c30f133789a11b2ef2d72dcdd SHA512 f97100f240165e28bd26a0fb68125252fd4d02a8d1e5d71875aa4ab8583c835dcd15eedaf60f5b0873013bd1dd3b71f46282a008e432fb56efde7049cfe587c3
 DIST lutris_0.5.8.3.tar.xz 942716 BLAKE2B f831c6ad6f67c3948f07e89f9caacd0d8aa3878b912fe987afea85eea549f41347044967255fa80e4e0c4544d148d9782dfe3c5bf08a123436e8a5ef7034901f SHA512 8f653d38a9a551298fa344cde67d53bf50cfd2a0a0667e344d04f6e17dda4ef358037755975d1a7f74ecd39824d58f9586e8a82b70dccc26619f22fee94d1144
 DIST lutris_0.5.8.4.tar.xz 957004 BLAKE2B f3acce5d9ea7368063a3135c1f503e0644c1cbc7676e966c262c8e04c5e0d23b4882793fe2df1beab265ab4128e8a90b5bb69401f8e567b0cceeea3008ff4fa7 SHA512 f79a9fd06788bc28e59ad6d2c403b83f8bdeaee0116ae7fbf765e80e4e08bf760a462c71f75a2ff46739e5757cb8609f5110a51d83266d3aba2f0c91524b6df9
+DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18 SHA512 a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7
 EBUILD lutris-0.5.8.3.ebuild 1875 BLAKE2B 43424d94156e801cc59e7b22a17e0f3c5225ff9e0a3a3e1f9fbb7b1cea73f22ab9bda452d4b4ca767b9f3563c71e6d82c45e3bee8672003cc72e93de564da8fb SHA512 ad5f73983e9cc5899daf8c49b78999b62659c7d946c9dc72d1435f685fafdc220bfaf0b7981c865b0c59941e7881f35164d7d90a3a64739a53dc9fe0fff9b053
 EBUILD lutris-0.5.8.4.ebuild 1874 BLAKE2B 7f5d0fde126ff51cfb149a8cb12c668cf07a883849c3934e117eeda9abc7acc5c385aca9830abf3036a3d544d6f97e968b07474bb7afef0ef04ad38fca51e1a8 SHA512 72c941a3fd1e17dcc6bef9e05b6e01abfe90bad6eea1641a717fd4a371e7e8597e2ab986725ceabefadfb41eef240129396b94150b3e65eb1c746fdf3f81890e
-EBUILD lutris-0.5.9_beta1.ebuild 2188 BLAKE2B aebbcfb847cade9429f909ae87566cb15eedb105cc8d4cded4fdd6de0a63246c93533b1f38b5acbd187e7d61cbe0a45f4f300ca1d874382111feaa1a2dce27d8 SHA512 3c8633236757528ed6e3cd2ce729e74d3363f95db24c07f085b2b8eecc66767a504085d7e2d0539cf273e0766abec3d21be24c055393248e486b9df4f50ec416
-EBUILD lutris-9999.ebuild 2188 BLAKE2B aebbcfb847cade9429f909ae87566cb15eedb105cc8d4cded4fdd6de0a63246c93533b1f38b5acbd187e7d61cbe0a45f4f300ca1d874382111feaa1a2dce27d8 SHA512 3c8633236757528ed6e3cd2ce729e74d3363f95db24c07f085b2b8eecc66767a504085d7e2d0539cf273e0766abec3d21be24c055393248e486b9df4f50ec416
+EBUILD lutris-0.5.9.1.ebuild 2038 BLAKE2B 65569dc4aeae25047d15e010958237e650a557c5fa93bc1a4e95f25c38c79e63b4ac00dbdab9255edc9f14a1925643ecf502ba41555f58a799544ec42326b69d SHA512 d32735d27fbc0a31ba3ed3ec0a89aec395be1fd7f9f3e6a184ad66713fa8606364eeeb995264d78b14aa3866907be2ca24a038e508cc19db5dab29186372bbbe
+EBUILD lutris-9999.ebuild 1961 BLAKE2B 85ecbd85696a6495560ba8b407d8ba858db3a16d8719db9a27b12ba60c6a1c5bd5b40f0b7c526659353d0eed94c13376dfa444bf9c30a3e77bd83d8516ad878f SHA512 a5884d53660bea34320d308399f267e054ed720ccde5bbe5d794e9ecabcdfb3d3550c30b5944e9760925725f23e692e598d2f5cec96a1e26d74f6b0b41ce2584
 MISC metadata.xml 662 BLAKE2B 8abb7777ddfa43be8e9b039941611e9e9acc6381a0ab7c237685839ae16513df5315eb40f93391762534be56808a47694166bab8b18b9bfd7124377bde3e6e49 SHA512 74d676fa1baeb7e21a1b0466b3e67fe70f196e55a4305ca390747597ecdf60b5a8b9ffe821ce84b8a95de18c583899a6a4a513fa28a393745a5d547ea22ccf7b
diff --git a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
new file mode 100644
index 000000000000..8c0d366926b7
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
@@ -0,0 +1,13 @@
+diff --git a/lutris/util/test_config.py b/lutris/util/test_config.py
+index b3feb87..01b9294 100644
+--- a/lutris/util/test_config.py
++++ b/lutris/util/test_config.py
+@@ -1,5 +1,8 @@
+ import os
+ 
++import gi
++gi.require_version('Gtk', '3.0')
++
+ from lutris import startup
+ from lutris.database import schema
+ 
diff --git a/games-util/lutris/lutris-0.5.9_beta1.ebuild b/games-util/lutris/lutris-0.5.9.1.ebuild
index 4ca63a7a2a1f..683abd5de58b 100644
--- a/games-util/lutris/lutris-0.5.9_beta1.ebuild
+++ b/games-util/lutris/lutris-0.5.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
@@ -54,26 +54,19 @@ RDEPEND="
 	x11-libs/libnotify[introspection]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
-src_prepare() {
-	default
+DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
-	# Avoid test failure:
-	# "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)"
-	sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die
-
-	distutils-r1_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch" )
 
 python_test() {
-	virtx nosetests -v
+	virtx epytest
 }
 
 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_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
 }
 
 pkg_postinst() {
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 4ca63a7a2a1f..fa2c19860a63 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
@@ -54,26 +54,17 @@ RDEPEND="
 	x11-libs/libnotify[introspection]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
-src_prepare() {
-	default
-
-	# Avoid test failure:
-	# "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)"
-	sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die
-
-	distutils-r1_src_prepare
-}
+DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
 python_test() {
-	virtx nosetests -v
+	virtx epytest
 }
 
 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_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
 }
 
 pkg_postinst() {