gentoo auto-resync : 29:07:2023 - 22:40:34

6 files changed, 30 insertions, 3 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 97ee31a216ab..74b0b1cde4d8 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/cartridges/Manifest b/games-util/cartridges/Manifest
index fd518f690899..29ec98a160fd 100644
--- a/games-util/cartridges/Manifest
+++ b/games-util/cartridges/Manifest
@@ -1,8 +1,8 @@
 AUX cartridges-1.5.4-dont-validate-appstream.patch 304 BLAKE2B bc6f26ccc39f2029a0d09a767843139b219692159e1b3036e40845a14db2bf43f4510ab29b626cc9acfa140123a841b36536b767187b792ce545737914bebd1e SHA512 2a5b2a8a4dbd0614f7fdabb487e2df5c63c0718b11320fefa8894c1dd166438d7238e1d4703c9e9aeac2bf540ecaa4c0cbf6e5a64343d8bce80d5e1033a6dd14
 DIST cartridges-1.5.6.tar.gz 1305623 BLAKE2B 20d95f2153e090db3ffee36361e8595ea3cca37a7f5971f945a41bec40df3fa9663449ed10a8d6349738838d592746372d2e3091589538266ef3bd4aed3edd6c SHA512 4e4a94ed31fc416accfa1b5f06580f3a5180665d931bee933b8ed29f4069f8939a60b2947740e7223e570be2116a55b1e3698e40f4529cf4c974636af6384456
 DIST cartridges-2.0.4.tar.gz 1332584 BLAKE2B 07cd5f19ad74c169cd1a98136920fc8f10fda001f1cde93f26fd0a77e556f0406995efc07b54722571f468983b9af53d7db2ce95e434d91f7e10a7b5855d1b46 SHA512 892be1a587aa7ad4baed457069fdf7019472bcf0d7acf301e8aca96719ebe259f59989fc966cb32376326273406ac688a51e95bd395b5de7b63c85c031dcf15a
-DIST cartridges-2.1.tar.gz 1336661 BLAKE2B 9edf5c1a22959f46250dd621b5f1641b3b0119fb47fcf2ca8230209739eca2a7775eee911e5ee9c67c5408bc2c3135688a2ee66fc160ffefc2923c8a4695295d SHA512 74e3a4d29c136f83ca91cb7d19d311a96353b254a4b753e69f58da219895dabd6e1c5dbf8561bb0536d840b9d8b151ecb112c96f4b4cfd0d6cd85f4fc27cf092
+DIST cartridges-2.1.1.tar.gz 1337163 BLAKE2B 6d4a67d8d6ecc035e6b3b12a7d5c9160de2af46423264c670bb7e448d00393a6dc7742ab30047eaa888689d9ad0eb5baf9657523164761cff3b71d4b23a9d551 SHA512 0963e2e5183a8cbb8c1de1fbbf9f67beda65eb7396aaf644fcc30ed79a3dd8136e5e78d3a5b065c9b6f2a4cba4e3c715e412f1cc651a555195d9af5cc6f1e22b
 EBUILD cartridges-1.5.6.ebuild 1210 BLAKE2B 601e7149b337cb55f4cb287db1fed12e8b991d9383fb45f9fa841818e3b62cdda70770d94350aadd6070a97a4fae2922da322c7d2f69788cdbf733b864929d3f SHA512 dc76fee26ca7c5a6e27c641fed1172af916b4901a98b3930246f12cb5a11cb7edbbfc2d1e2abdaeebb8f7a6341c7446636c6a1875cae8f6d5b1ea09fb6b95456
 EBUILD cartridges-2.0.4.ebuild 1211 BLAKE2B 0e60e0ea4c9e0648cf1a7ef8b19984297119434aa842b306eca685420fb52e42c9722386104c6157ec02e6833e30375564162d0575f7790047558f27c60a9cae SHA512 42c13c130ea48ceb33eeab935d66c74a3943fa742c2a3d8e562cd33810836d4038174724a296117758386abc43819d7f50eb15c30173d44d6907e3259ed61bef
-EBUILD cartridges-2.1.ebuild 1211 BLAKE2B 0e60e0ea4c9e0648cf1a7ef8b19984297119434aa842b306eca685420fb52e42c9722386104c6157ec02e6833e30375564162d0575f7790047558f27c60a9cae SHA512 42c13c130ea48ceb33eeab935d66c74a3943fa742c2a3d8e562cd33810836d4038174724a296117758386abc43819d7f50eb15c30173d44d6907e3259ed61bef
+EBUILD cartridges-2.1.1.ebuild 1211 BLAKE2B 0e60e0ea4c9e0648cf1a7ef8b19984297119434aa842b306eca685420fb52e42c9722386104c6157ec02e6833e30375564162d0575f7790047558f27c60a9cae SHA512 42c13c130ea48ceb33eeab935d66c74a3943fa742c2a3d8e562cd33810836d4038174724a296117758386abc43819d7f50eb15c30173d44d6907e3259ed61bef
 MISC metadata.xml 760 BLAKE2B f57df1306fd66ac7c1275d2c77ced58a333f3e47a7f02ae643d8fe4bceb7f28dfc796e3898fb28eef7f6e4ee250e762ca208c662be94a12e89a098ec45d5b482 SHA512 e70a9f88c0cdb41276783878ccaf24623f8c97fafc55d88ab564604cb534b4ea7426eb50d3c9ba9ee091e7adf5bea6d68e919c0c84a496be3d8c6497394cd2b7
diff --git a/games-util/cartridges/cartridges-2.1.ebuild b/games-util/cartridges/cartridges-2.1.1.ebuild
index 05c8ac27f772..05c8ac27f772 100644
--- a/games-util/cartridges/cartridges-2.1.ebuild
+++ b/games-util/cartridges/cartridges-2.1.1.ebuild
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 44f051aee853..77e58a342e66 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,7 @@
+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-r1.ebuild 2396 BLAKE2B 164d3c417ff162fc365504a65c6d69e6112743e4ee5638ca3259cd4db98c91605f42e5cff6e31f45cd956719e78faf130a5713d28a3c45d8afd4cf569b54bc86 SHA512 2d394f7ee8f98b11a49a2fc84ce3e6e51581d56128be34e766e31dd8eabf6301babbf9aab954da07e5ec54802ed9cd951bda5d4a87f947afc1fa6dc13085a348
+EBUILD lutris-0.5.13-r2.ebuild 2455 BLAKE2B 1085572f1d52722173c519c5c64faac3a4dae411a3c81de2d1ed36b4e8d51864b8013f73c20a44afc88830775860409b9539950d4a6339c89428ff3003ba3b37 SHA512 e826a1a8004ee1f807778f045964f8562951a1929ccf94c7761e32ee2e8c8c81063659da53b2683e8ea051bbb7eb50eff1ab86351c26a34629151b3888b456b6
 EBUILD lutris-9999.ebuild 2396 BLAKE2B 164d3c417ff162fc365504a65c6d69e6112743e4ee5638ca3259cd4db98c91605f42e5cff6e31f45cd956719e78faf130a5713d28a3c45d8afd4cf569b54bc86 SHA512 2d394f7ee8f98b11a49a2fc84ce3e6e51581d56128be34e766e31dd8eabf6301babbf9aab954da07e5ec54802ed9cd951bda5d4a87f947afc1fa6dc13085a348
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch b/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
new file mode 100644
index 000000000000..d048a807b08d
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
@@ -0,0 +1,22 @@
+diff --git a/lutris/util/wine/wine.py b/lutris/util/wine/wine.py
+index f84584b..fa36d0c 100644
+--- a/lutris/util/wine/wine.py
++++ b/lutris/util/wine/wine.py
+@@ -19,7 +19,7 @@ WINE_PATHS = {
+     "winehq-devel": "/opt/wine-devel/bin/wine",
+     "winehq-staging": "/opt/wine-staging/bin/wine",
+     "wine-development": "/usr/lib/wine-development/wine",
+-    "system": "wine",
++    "system": "/etc/eselect/wine/bin/wine",
+ }
+ 
+ ESYNC_LIMIT_CHECK = os.environ.get("ESYNC_LIMIT_CHECK", "").lower()
+@@ -273,7 +273,7 @@ def get_wine_version(wine_path="wine"):
+         return
+     if wine_path == "wine" and not system.find_executable("wine"):
+         return
+-    if os.path.isabs(wine_path):
++    if os.path.isabs(wine_path) and not os.path.islink(wine_path):
+         wine_stats = os.stat(wine_path)
+         if wine_stats.st_size < 2000:
+             # This version is a script, ignore it
diff --git a/games-util/lutris/lutris-0.5.13-r1.ebuild b/games-util/lutris/lutris-0.5.13-r2.ebuild
index 62930e73e736..6fea47bf5df8 100644
--- a/games-util/lutris/lutris-0.5.13-r1.ebuild
+++ b/games-util/lutris/lutris-0.5.13-r2.ebuild
@@ -65,6 +65,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
+PATCHES=(
+	"${FILESDIR}/${P}-find-eselected-wine.patch"
+)
+
 python_test() {
 	virtx epytest
 }