commit: 7a660b7a2ae435ffe7ec7f505b509648a2ab041b Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sat Sep 2 14:16:52 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Sep 2 14:18:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a660b7a
games-util/lutris: build with meson instead of distutils This is recommended upstream and ensures localization is installed Closes: https://bugs.gentoo.org/913507 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> ...{lutris-9999.ebuild => lutris-0.5.13-r3.ebuild} | 26 +++++++++++++++------- games-util/lutris/lutris-9999.ebuild | 22 +++++++++++------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-0.5.13-r3.ebuild similarity index 86% copy from games-util/lutris/lutris-9999.ebuild copy to games-util/lutris/lutris-0.5.13-r3.ebuild index 62930e73e736..602a81d8f9fa 100644 --- a/games-util/lutris/lutris-9999.ebuild +++ b/games-util/lutris/lutris-0.5.13-r3.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,26 @@ 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 } 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 }
