commit: 362740388ae05b23a50d785ffc37513674a0e7db Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sat Jul 29 21:02:38 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Jul 29 21:02:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36274038
games-util/lutris: fix use of system wine Bug: https://bugs.gentoo.org/911245 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../files/lutris-0.5.13-find-eselected-wine.patch | 22 ++++++++++++++++++++++ ...is-0.5.13-r1.ebuild => lutris-0.5.13-r2.ebuild} | 4 ++++ 2 files changed, 26 insertions(+) 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 similarity index 97% rename from games-util/lutris/lutris-0.5.13-r1.ebuild rename to 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 }
