gentoo auto-resync : 02:09:2023 - 16:16:36

3 files changed, 44 insertions, 22 deletions

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 77e58a342e66..a4867501f2ff 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,7 +1,6 @@
 AUX lutris-0.5.13-find-eselected-wine.patch 886 BLAKE2B ce8474029a67398a63b40c4d16f7862073d53cb982b3485d1ffb19357055462e6f44eaefe536b7cbba89b49bc770166f34d8d9cc527c7350f9970d38c8526e99 SHA512 0de21c633e79287e0a31f9a8f2bb2dfcf5738370207250ce4f90569cf969f2f0889c22dd2ccdcacafc811a566161a63f8f099b1a811544d19f3a0315125c5b8f
-DIST lutris_0.5.12.tar.xz 2252220 BLAKE2B 511de660e32ab8961d951d5777ef21a343ab46736cc74f2202721f3280cfab39cac0a8a7003db4eaa48265f4af2d598c1011ce45988815624accda18663a2f00 SHA512 032f9b628bc829bfde347c8137cad80a28cad16651baf461a344045d23c0f19d860627a042225de16046d14d45e03e5ebf7a3a82010128c114e2a0f429a02bf9
 DIST lutris_0.5.13.tar.xz 1565824 BLAKE2B 5326f7d671f91cab9e2f21377b939f33383098778751d2855d319b6f84b349108dce9a92faecf804e292cb711dfe6dc40a1ede591847b13550d25d83f51a9c7f SHA512 8ca257de9647a21774c9aaa251178a5f5b4eb137985913e136e27959880a356f95bd0ba6ba75059b92f7d92fdeee7f410592a39c60d8ec72412a3106a1561a7b
-EBUILD lutris-0.5.12.ebuild 2173 BLAKE2B c3a091535f2f8c7b53a652f25e22ed1ca592c9aef0a200828f1e4a77d085a1d66112018a12195a69d4417e27519ec1703ad471b099e77816e8c90d5204fb185b SHA512 7354be6e5bd7ce057518498e77b807019a5c6bd6fb6865cf8d32363dbfbafc2e1a5310dc16b8e62cfc5cc50134c160ceb63d38d1c629d7779581733cea123640
 EBUILD lutris-0.5.13-r2.ebuild 2455 BLAKE2B 1085572f1d52722173c519c5c64faac3a4dae411a3c81de2d1ed36b4e8d51864b8013f73c20a44afc88830775860409b9539950d4a6339c89428ff3003ba3b37 SHA512 e826a1a8004ee1f807778f045964f8562951a1929ccf94c7761e32ee2e8c8c81063659da53b2683e8ea051bbb7eb50eff1ab86351c26a34629151b3888b456b6
-EBUILD lutris-9999.ebuild 2396 BLAKE2B 164d3c417ff162fc365504a65c6d69e6112743e4ee5638ca3259cd4db98c91605f42e5cff6e31f45cd956719e78faf130a5713d28a3c45d8afd4cf569b54bc86 SHA512 2d394f7ee8f98b11a49a2fc84ce3e6e51581d56128be34e766e31dd8eabf6301babbf9aab954da07e5ec54802ed9cd951bda5d4a87f947afc1fa6dc13085a348
+EBUILD lutris-0.5.13-r3.ebuild 2504 BLAKE2B 508a9bd6f4c94044b146605593142661114a1e182d0f85cc3debbc3fac6380abfd0b45587780b7ba1c2fa9f177ba0ffde35c332be11cd73d053065a33c85c81d SHA512 e31f5855626070424b5f41e3b6f03e15c2842f570330af4f80c5617c028131858bdf5d819e122bca8ecf7f74662f219b0ced851258288cffdde8d14b769267b0
+EBUILD lutris-9999.ebuild 2445 BLAKE2B 70fe9ebfbe5860bc0977b8dd073d8c4de2aa22990b6681e5be58da1f323a390f226b64d2383125e49379334770e120a626fd6e759e1e29f2f398b1916db6f211 SHA512 a623b77b592c120ba003e15b4c0e3d2de1e6dcf87471ffbfeabda12901f0cca2f3633e52c823bee8da970d054d6edb9f2cc2d3877fcc6a259055303dfd4f199f
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/lutris-0.5.12.ebuild b/games-util/lutris/lutris-0.5.13-r3.ebuild
index d56c1dd98cd0..602a81d8f9fa 100644
--- a/games-util/lutris/lutris-0.5.12.ebuild
+++ b/games-util/lutris/lutris-0.5.13-r3.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
 
-inherit distutils-r1 optfeature virtualx xdg
+inherit meson python-single-r1 optfeature virtualx xdg
 
 DESCRIPTION="An open source gaming platform for GNU/Linux"
 HOMEPAGE="https://lutris.net/"
@@ -28,8 +27,10 @@ fi
 
 LICENSE="GPL-3+ CC0-1.0"
 SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
@@ -39,14 +40,20 @@ RDEPEND="
 		dev-python/distro[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pypresence[${PYTHON_USEDEP}]
 		dev-python/python-evdev[${PYTHON_USEDEP}]
-		dev-python/python-magic[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/moddb[${PYTHON_USEDEP}]
 	')
 	media-sound/fluid-soundfont
-	net-libs/webkit-gtk:4.1[introspection]
+	|| (
+		net-libs/webkit-gtk:4[introspection]
+		net-libs/webkit-gtk:4.1[introspection]
+	)
+	sys-apps/xdg-desktop-portal
 	x11-apps/mesa-progs
 	x11-apps/xgamma
 	x11-apps/xrandr
@@ -54,23 +61,33 @@ RDEPEND="
 	x11-libs/gdk-pixbuf[jpeg]
 "
 
-distutils_enable_tests pytest
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
-python_test() {
+PATCHES=(
+	"${FILESDIR}/${P}-find-eselected-wine.patch"
+)
+
+src_test() {
 	virtx epytest
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_install() {
+	meson_src_install
 	python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
 }
 
 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
+	optfeature "running MS Windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" "media-libs/vulkan-loader dev-util/vulkan-tools"
 
 	# Quote README.rst
 	elog ""
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 62930e73e736..175f3cb7cc7e 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,12 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1 optfeature virtualx xdg
+inherit meson python-single-r1 optfeature virtualx xdg
 
 DESCRIPTION="An open source gaming platform for GNU/Linux"
 HOMEPAGE="https://lutris.net/"
@@ -29,8 +27,10 @@ fi
 
 LICENSE="GPL-3+ CC0-1.0"
 SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	app-arch/cabextract
 	app-arch/p7zip
 	app-arch/unzip
@@ -61,16 +61,22 @@ RDEPEND="
 	x11-libs/gdk-pixbuf[jpeg]
 "
 
-distutils_enable_tests pytest
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
-python_test() {
+src_test() {
 	virtx epytest
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_install() {
+	meson_src_install
 	python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
 }