gentoo resync : 16.04.2022

7 files changed, 58 insertions, 129 deletions

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 4a61848a576b..bec76f673539 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,9 +1,6 @@
-AUX lutris-0.5.10_beta2-fix-install-requires.patch 313 BLAKE2B 2e0f5e4e88ff6271e3a9d329c7ec0fd53a955fd4249055b11c4c371321ef1a177111cf4769c7e617d7b1c027b04a815ac8268ec727768f6e5530f2bda6b574f6 SHA512 abb5d4ecb8b3501cd1a98897591e9a86080057eb5cb41b0ef395e965ccfdf5032cdf98f19ec570fe00e90772e891128aec14754e4c9a46700225bda4647bdca2
-AUX lutris-0.5.10_beta2-fix-launching-steam.patch 1004 BLAKE2B 8bd3e978724a22a12583f9ce8db97fe42e8997da10603f6e83daa14755ba56696d7bb75a65461ca73686f96c260bc7bd513ddaadcc09cfe81af172f675c3753f SHA512 658d001a5fd9a605ea5fc8637c4671d058278ae21c9a9bfd61cc36c8a1a65cd50cc6cb300abf5ff5c6f4c6456f89edc2220affeb15accd671483c01ea71a4545
+AUX lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch 1600 BLAKE2B 35e787a098778c65fc8dfa342a767f82fc70b49d99cc7570d69e028c0edbdef9da0ec4ec198b82de66c7326c4afccf9aa2d5e67c28dcab47cc276cc7f68e747f SHA512 41777ecce57dce2e1861a548381857d2fe28e031a682ac3188d0b12ba65b8b6f67390dc27b18197a8e650abc6f0f5fbddd2d3dec1185ea92264a5b09f6c2afaa
 AUX lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch 307 BLAKE2B fe4f822b99f1f76ab62a669e9108b0dd724503fdbf4b26fa8f67f63da8d8cbd17a56aca18b373053c87a93603f90c99c252e213c30f133789a11b2ef2d72dcdd SHA512 f97100f240165e28bd26a0fb68125252fd4d02a8d1e5d71875aa4ab8583c835dcd15eedaf60f5b0873013bd1dd3b71f46282a008e432fb56efde7049cfe587c3
-DIST lutris-0.5.10_beta2.tar.gz 1006201 BLAKE2B 39a87735408639070ef21182adf23ae816a14aeb0d6acf6e36f67bc213ca21559374cc02f0ca696b65eda20b76f33240a7f15d74bca6c3852641d0827737e96c SHA512 0dd0896be70c8902aa09b8bb0e45e516c8631f82a5451e15b3eaf932a5881bccd1189b5564c4cc544fb4eb1ec902cbae887618f5edda0e13d23a19dd0b71dba7
-DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18 SHA512 a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7
-EBUILD lutris-0.5.10_beta2.ebuild 2202 BLAKE2B 1d8c7f42e3ea692b57db975c645fc9acbaa63c3ea7ca9cd7d5d5861d748097410e45c26121bdc0446bad75e2e85c21c9249cf4a23b31ca653b34fcc8bf1bdbec SHA512 b2565056aa693b5db3a6b40dcb9aed25c60a77c0c3ce5e0fc01fb14d455562b6a1fea4dc442f8310643c82ab0eea206a46635eae379f3941510fcfd20d90b170
-EBUILD lutris-0.5.9.1.ebuild 2038 BLAKE2B 65569dc4aeae25047d15e010958237e650a557c5fa93bc1a4e95f25c38c79e63b4ac00dbdab9255edc9f14a1925643ecf502ba41555f58a799544ec42326b69d SHA512 d32735d27fbc0a31ba3ed3ec0a89aec395be1fd7f9f3e6a184ad66713fa8606364eeeb995264d78b14aa3866907be2ca24a038e508cc19db5dab29186372bbbe
-EBUILD lutris-9999.ebuild 1961 BLAKE2B 85ecbd85696a6495560ba8b407d8ba858db3a16d8719db9a27b12ba60c6a1c5bd5b40f0b7c526659353d0eed94c13376dfa444bf9c30a3e77bd83d8516ad878f SHA512 a5884d53660bea34320d308399f267e054ed720ccde5bbe5d794e9ecabcdfb3d3550c30b5944e9760925725f23e692e598d2f5cec96a1e26d74f6b0b41ce2584
+DIST lutris_0.5.10.tar.xz 1225880 BLAKE2B bd46531695860c60a4b94c7bc1f4366bb6f5a9d4a098e0eff69f85e9edee0d551b6f55276a4ae48fb28e75a706da526dfaf7fbcf17af8ebbee6e809f6f39825f SHA512 cb77afe40f1ceb053edf8aaa4f97fd44f0c8ecc33450a16b83373408807891d99bd409cf26d98543a0789a5dc38475d584790de1d48e0e56762945a7b6ca63e3
+EBUILD lutris-0.5.10.ebuild 2342 BLAKE2B 51c13baa1ec2d586b9297cf1dca217c981c9d0a5a7b5e2fb24b645b51c3c65797371b70adef16956a6101f7830d4c5e52b5b75379a825084b30f3cb921b09500 SHA512 c2e107946fd8c2eeee0ad5f88d42051024ebb2e3c12f499670cb06abdddbd9e02cc79d2719660d7c3e460ea20dc40886009b2771862d122a99e09f6e98c27556
+EBUILD lutris-9999.ebuild 1960 BLAKE2B a47f2bfdb7364ce9c1d0ffe1236c6995b67cbb5d84ef472d7fa059302ad05c5063f0928f9accd05608819ef3d668ec35f2742a2a9c269a8bfd33da78f904aef3 SHA512 cf9576152e735e5fc28cb26dadd0da4e970cee4fbaa6404982e373382fd3a2cb8dcfb0ed9da05fccbee16edf765e5f0aa4d7ff6802c1641500d1a1ec3041243c
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch b/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
deleted file mode 100644
index 8a61d987cece..000000000000
--- a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0388119..51bc8e1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -57,7 +57,7 @@ setup(
-         'evdev',
-         'requests',
-         'python-magic',
--        "distro>=1.7.0;platform_system='Linux'",
-+        'distro>=1.7.0',
-         'lxml'
-     ],
-     url='https://lutris.net',
diff --git a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch b/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
deleted file mode 100644
index 2edd6569ce75..000000000000
--- a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 072e72a4aefd91101b79dd05d8ce9f100a4b6b0c Mon Sep 17 00:00:00 2001
-From: Mathieu Comandon <strycore@gmail.com>
-Date: Fri, 25 Feb 2022 14:02:12 -0800
-Subject: [PATCH] contentstatsid key might not be present
-
----
- lutris/util/steam/config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lutris/util/steam/config.py b/lutris/util/steam/config.py
-index 237cb36f24..bae2ec22da 100644
---- a/lutris/util/steam/config.py
-+++ b/lutris/util/steam/config.py
-@@ -158,7 +158,7 @@ def get_entry_case_insensitive(library_dict, path):
-     with open(library_filename, "r", encoding='utf-8') as steam_library_file:
-         library = vdf_parse(steam_library_file, {})
-         # The contentstatsid key is unused and causes problems when looking for library paths.
--        library["libraryfolders"].pop("contentstatsid")
-+        library["libraryfolders"].pop("contentstatsid", None)
-     try:
-         return get_entry_case_insensitive(library, ["libraryfolders"])
-     except KeyError as ex:
diff --git a/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
new file mode 100644
index 000000000000..5ff491486d5a
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
@@ -0,0 +1,46 @@
+diff --git a/lutris/sysoptions.py b/lutris/sysoptions.py
+index 8896b7d..565bbab 100644
+--- a/lutris/sysoptions.py
++++ b/lutris/sysoptions.py
+@@ -82,6 +82,7 @@ def get_vk_icd_choices():
+     amdradv = []
+     nvidia = []
+     amdvlk = []
++    amdvlkpro = []
+     choices = [(_("Auto: WARNING -- No Vulkan Loader detected!"), "")]
+     icd_files = defaultdict(list)
+     # Add loaders
+@@ -96,13 +97,17 @@ def get_vk_icd_choices():
+                 amdradv.append(loader)
+             elif "nvidia" in loader:
+                 nvidia.append(loader)
+-            elif "amd_icd" in loader:
+-                amdvlk.append(loader)
++            elif "amd" in loader:
++                if "pro" in loader:
++                    amdvlkpro.append(loader)
++                else:
++                    amdvlk.append(loader)
+ 
+     intel_files = ":".join(intel)
+     amdradv_files = ":".join(amdradv)
+     nvidia_files = ":".join(nvidia)
+     amdvlk_files = ":".join(amdvlk)
++    amdvlkpro_files = ":".join(amdvlkpro)
+ 
+     glxinfocmd = get_gpu_vendor_cmd(0)
+     if nvidia_files:
+@@ -125,7 +130,12 @@ def get_vk_icd_choices():
+     if nvidia_files:
+         choices.append(("Nvidia Proprietary", nvidia_files))
+     if amdvlk_files:
+-        choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
++        if not amdvlkpro_files:
++            choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
++        else:
++            choices.append(("AMDVLK Open source", amdvlk_files))
++    if amdvlkpro_files:
++        choices.append(("AMDGPU-PRO Proprietary", amdvlkpro_files))
+     return choices
+ 
+ 
diff --git a/games-util/lutris/lutris-0.5.10_beta2.ebuild b/games-util/lutris/lutris-0.5.10.ebuild
index aea04d0dd550..ba883a7fe92a 100644
--- a/games-util/lutris/lutris-0.5.10_beta2.ebuild
+++ b/games-util/lutris/lutris-0.5.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
-inherit distutils-r1 virtualx xdg
+inherit distutils-r1 optfeature virtualx xdg
 
 DESCRIPTION="An open source gaming platform for GNU/Linux"
 HOMEPAGE="https://lutris.net/"
@@ -22,11 +22,11 @@ else
 	else
 		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
 		S="${WORKDIR}/${PN}"
+		KEYWORDS="~amd64 ~x86"
 	fi
-	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+ CC0-1.0"
 SLOT="0"
 
 RDEPEND="
@@ -61,8 +61,7 @@ DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch"
-	"${FILESDIR}/${P}-fix-install-requires.patch"
-	"${FILESDIR}/${P}-fix-launching-steam.patch"
+	"${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
 )
 
 python_test() {
@@ -77,7 +76,10 @@ python_install_all() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
+	optfeature "running windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
+
 	# Quote README.rst
+	elog ""
 	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"
diff --git a/games-util/lutris/lutris-0.5.9.1.ebuild b/games-util/lutris/lutris-0.5.9.1.ebuild
deleted file mode 100644
index 683abd5de58b..000000000000
--- a/games-util/lutris/lutris-0.5.9.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
-
-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
-	if [[ ${PV} == *_beta* ]] ; then
-		SRC_URI="https://github.com/lutris/lutris/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}"/${P/_/-}
-	else
-		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-		S="${WORKDIR}/${PN}"
-
-		KEYWORDS="~amd64 ~x86"
-	fi
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	$(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/python-magic[${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[introspection]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
-
-PATCHES=( "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch" )
-
-python_test() {
-	virtx epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
-}
-
-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."
-}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index fa2c19860a63..1b9e6fc4d1db 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,6 @@ else
 	else
 		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
 		S="${WORKDIR}/${PN}"
-
 		KEYWORDS="~amd64 ~x86"
 	fi
 fi