gentoo auto-resync : 28:01:2023 - 14:51:38

6 files changed, 35 insertions, 7 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ff70f332695c..f33af2fe256a 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/basis_universal/Manifest b/games-util/basis_universal/Manifest
index a68a52bf284f..f98dbe9790b5 100644
--- a/games-util/basis_universal/Manifest
+++ b/games-util/basis_universal/Manifest
@@ -1,5 +1,5 @@
 AUX basis_universal-1.16.3-fix-RPATH.patch 332 BLAKE2B 46349fb09343dfd28dfb383a7d21a5abbb64245f4ba85012f3bc97084740bb8dcbbbb2432902f27863c5a80cc04e3f2b3569dc13ee97b498932fd75182c7a6a2 SHA512 0ab6e03146c5e924644112200b6c0b6cce3f9ab5797be4a052994ee553814c128b74a1e91f66f248af21c496a4407267d0b27c46bc6c29bb1554a66581da3f58
 AUX basis_universal-1.16.3-respect-CFLAGS.patch 556 BLAKE2B b9e099ddcca8a5902da78faf293b953f231c2d05c746f6ff105a0db5dcab07009276c76f8a034a22aa42ac063850fbfaba905ce1c5022aff4e0889b9f2546123 SHA512 5eaa8339b853fb14fd5efd2596ae7221c648203fb253678c0791d7b6278e3ea55ab3d275ee28c2c9a704a5d23dc52e7f54e825c2d8de86874f79ecaced37e3be
 DIST basis_universal-1.16.3.tar.gz 29151155 BLAKE2B e3ef3ead6223aa73012bd74e51dae269746cfcf2720c524be8096ce8643777723888f98a140d2e28c881ed60ab54b7ea6fef4205b72757d72e766f85806b4484 SHA512 3dca02ad6c14e74df7a89d3b2a59b970635cf5e268b96eb91b10033e2b8e635c83aca6b8e9b34a1b689ed5ffe7c8348d15b8524385f6d07a51cc34a46246a0b7
-EBUILD basis_universal-1.16.3.ebuild 1049 BLAKE2B b9cc79ffff04195f5c2cb66bbbf70565e4be2537bce3780cdcf2e4ab0d58bf41d29d7c2af8af1927a9cabae3ec29e6e9e927aed9b2a19c977b32ba83ff8c7bd9 SHA512 b80b6cfdab06d9c94d909fdf8a761f480cab07883c7aeb92dbba37e7741666668fcb74d038bf28ca599d8c22d910e84ac475c3eca8f491a2295cf706b26331a5
+EBUILD basis_universal-1.16.3.ebuild 1054 BLAKE2B 01e96f18229d358ceaa35429dd43453d4ea17def4b14836067e9a77416ad384f518c16208b090dad6162996fe21f3276aa3f3567e216559175bc29131b6b8a81 SHA512 17779d73995ceba80ca92c1a71f7ec0e655ad1cc1aed81648bd3a854c2ff13629fd1592fe987038797ed8afe3b07dfa1a08740da2a53c7bebd009de0ddd4a52b
 MISC metadata.xml 412 BLAKE2B 00c914af265ebe97107ee3ed185ae7693348de4902d557beb6590efae0b1ec351baed1fd02facb6605b390fff36ddc40aa49ff1786472ccd5376d16abd522540 SHA512 1a971517dc0b642e254f2acab248d9364b510b16b80fe095c320d552869f6e8909343fd6e62a1896c344d57d7f4624e10f193c3b4f3b7689eb5b669b85517998
diff --git a/games-util/basis_universal/basis_universal-1.16.3.ebuild b/games-util/basis_universal/basis_universal-1.16.3.ebuild
index d89b78821f60..298c8ecdb705 100644
--- a/games-util/basis_universal/basis_universal-1.16.3.ebuild
+++ b/games-util/basis_universal/basis_universal-1.16.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BinomialLLC/basis_universal/archive/refs/tags/${PV}.
 
 LICENSE="Apache-2.0 zstd? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse4_1 opencl zstd"
 
 # zstd is bundled, see https://github.com/BinomialLLC/basis_universal/pull/228
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 501d20e0b17d..3e36d5719909 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,7 @@
+AUX lutris-0.5.13-webkit-gtk-4-1.patch 537 BLAKE2B 17d233876bb859bebd34845845ee0668ebc0f41aaa53c9e1353a9a24f9ed5beb134249cf95e1ddf0dd25ce0114f2ce765959019c00ef4cd822035e215c1d5733 SHA512 e4b4b8cb31b0ba8ad1ed64581ae6194b5f1f5edc677f33d8fb48f63b0702e355ad4a6f782a44c74c4ebd3d20dd9494b520dbd852e98ac35d53331a5e5b59cbe1
 DIST lutris_0.5.11.tar.xz 1337572 BLAKE2B 9baeaa078483812c25754691cde80324155a69fde7edc1aec043df806ceb0cbe05e04c71c73d9ff355d2aaa2f21d9e53871a1752b02022ae8527b69ed31cf47c SHA512 16b06f6a3377bfa8db5c3b1e1b3872cbfbd5e7ff27975b51083142dce9931c90a9827f8da7b2d9ba7b21e65bc4ca1759f6a720c142a01f99532274e152cfde0a
 DIST lutris_0.5.12.tar.xz 2252220 BLAKE2B 511de660e32ab8961d951d5777ef21a343ab46736cc74f2202721f3280cfab39cac0a8a7003db4eaa48265f4af2d598c1011ce45988815624accda18663a2f00 SHA512 032f9b628bc829bfde347c8137cad80a28cad16651baf461a344045d23c0f19d860627a042225de16046d14d45e03e5ebf7a3a82010128c114e2a0f429a02bf9
 EBUILD lutris-0.5.11.ebuild 2210 BLAKE2B 42c05470a8f8942f9501312298db1d1df30215e9026e7df5216f9f2cf2546975257d56d224f731c9c5303f86f96235a174cd4eb0f6eba69bf7b7986f64fc3c75 SHA512 f1e1b5517ff5f33f139ed26992175b1db9e7a61214df9640aec47ebeb69d1951a3d570d9e3796ee8edc013a2462bce2886f37d10409716db127cad278ff2443b
 EBUILD lutris-0.5.12.ebuild 2173 BLAKE2B c3a091535f2f8c7b53a652f25e22ed1ca592c9aef0a200828f1e4a77d085a1d66112018a12195a69d4417e27519ec1703ad471b099e77816e8c90d5204fb185b SHA512 7354be6e5bd7ce057518498e77b807019a5c6bd6fb6865cf8d32363dbfbafc2e1a5310dc16b8e62cfc5cc50134c160ceb63d38d1c629d7779581733cea123640
-EBUILD lutris-9999.ebuild 2134 BLAKE2B 1bd15b681d00c718cf8d0b9c8b1797c4b10613e7c322a9650d53469ef7d3266df1820c044f95fd45110ddd9dc83b6b5eb519a6d823929534fac586a1e3b18626 SHA512 fc5eeaac06a3495391fb4b711bb4c224a2b8666c699a63b678802cc9a8e9d0f9b674bc49f179fdae614f0d092c87fc45a00b42e7f02ce99a2f897047cde6d8d9
+EBUILD lutris-9999.ebuild 2352 BLAKE2B 62b012bd649b4d976abcfe9f04993098a760d9e2f9c94774941f2603c19612b959ec81b30fac2b7be66aea7c049174e056ed3f030be70b5a1ff1c3bd74b3cca8 SHA512 1e85b4a8390600e059ec3890a5b3735e1051bed62fe4605a91c7c2abc5b7727a50b0f595ad19c4f9e11348a804f6d82ba2ad523f9a85172ed3236b72a827db9c
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
new file mode 100644
index 000000000000..9685a826878b
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
@@ -0,0 +1,17 @@
+diff --git a/lutris/gui/dialogs/webconnect_dialog.py b/lutris/gui/dialogs/webconnect_dialog.py
+index 12fbbdc..a6cd838 100644
+--- a/lutris/gui/dialogs/webconnect_dialog.py
++++ b/lutris/gui/dialogs/webconnect_dialog.py
+@@ -3,7 +3,11 @@ import os
+ from gettext import gettext as _
+ 
+ import gi
+-gi.require_version("WebKit2", "4.0")
++try:
++    gi.require_version("WebKit2", "4.1")
++except (ImportError, ValueError):
++    gi.require_version("WebKit2", "4.0")
++
+ from gi.repository import WebKit2
+ 
+ from lutris.gui.dialogs import ModalDialog
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index e1ea8bd1147a..0b268cfd6c78 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature virtualx xdg
 
@@ -34,18 +35,23 @@ RDEPEND="
 	app-arch/p7zip
 	app-arch/unzip
 	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${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/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]
+	)
 	x11-apps/mesa-progs
 	x11-apps/xgamma
 	x11-apps/xrandr
@@ -57,6 +63,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.13-webkit-gtk-4-1.patch"
+)
+
 python_test() {
 	virtx epytest
 }
@@ -69,7 +79,7 @@ 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
+	optfeature "running MS Windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
 
 	# Quote README.rst
 	elog ""