[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/

["Sam James" <sam@gentoo.org>]

commit:     c29ad1f88ddf276ab3fb5740ae32a5d0fe576b87
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 02:22:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 02:22:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29ad1f8

games-util/lutris: add 0.5.9_beta1 (unkeyworded)

Closes: https://bugs.gentoo.org/770880
Closes: https://bugs.gentoo.org/803236
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-util/lutris/Manifest                         |  1 +
 ...utris-9999.ebuild => lutris-0.5.9_beta1.ebuild} | 42 +++++++++++++---------
 games-util/lutris/lutris-9999.ebuild               | 42 +++++++++++++---------
 3 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 490e7ac933b..788ed8e296f 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1,3 @@
+DIST lutris-0.5.9_beta1.tar.gz 836915 BLAKE2B 53133b202e45a2e68e5aca273cd591055d469a2ada39d2b75db92d45da45a53cf3425b1d36fea1a7f241b9336895ada8b8e4577374cd0b1fd996cbd3f5108b1b SHA512 48b433fcf03795874e6c7f0b4d310f7a779c831ea67e754a0c9bb0b919f9f050311b002d63fa34150be753c4de452c306db16cb43c00fa91b08775c68169b7e6
 DIST lutris_0.5.8.3.tar.xz 942716 BLAKE2B f831c6ad6f67c3948f07e89f9caacd0d8aa3878b912fe987afea85eea549f41347044967255fa80e4e0c4544d148d9782dfe3c5bf08a123436e8a5ef7034901f SHA512 8f653d38a9a551298fa344cde67d53bf50cfd2a0a0667e344d04f6e17dda4ef358037755975d1a7f74ecd39824d58f9586e8a82b70dccc26619f22fee94d1144
 DIST lutris_0.5.8.4.tar.xz 957004 BLAKE2B f3acce5d9ea7368063a3135c1f503e0644c1cbc7676e966c262c8e04c5e0d23b4882793fe2df1beab265ab4128e8a90b5bb69401f8e567b0cceeea3008ff4fa7 SHA512 f79a9fd06788bc28e59ad6d2c403b83f8bdeaee0116ae7fbf765e80e4e08bf760a462c71f75a2ff46739e5757cb8609f5110a51d83266d3aba2f0c91524b6df9

diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-0.5.9_beta1.ebuild
similarity index 75%
copy from games-util/lutris/lutris-9999.ebuild
copy to games-util/lutris/lutris-0.5.9_beta1.ebuild
index b29f07d71d8..4ca63a7a2a1 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-0.5.9_beta1.ebuild
@@ -16,22 +16,20 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
 	inherit git-r3
 else
-	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
+	if [[ ${PV} == *_beta* ]] ; then
+		SRC_URI="https://github.com/lutris/lutris/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}"/${P/_/-}
+	else
+		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+		S="${WORKDIR}/${PN}"
+
+		KEYWORDS="~amd64 ~x86"
+	fi
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-		')
-	)
-"
+
 RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
@@ -56,16 +54,28 @@ RDEPEND="
 	x11-libs/libnotify[introspection]
 "
 
-python_install_all() {
-	local DOCS=( AUTHORS README.rst docs/installers.rst )
-	distutils-r1_python_install_all
-	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
+distutils_enable_tests nose
+
+src_prepare() {
+	default
+
+	# Avoid test failure:
+	# "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)"
+	sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die
+
+	distutils-r1_src_prepare
 }
 
 python_test() {
 	virtx nosetests -v
 }
 
+python_install_all() {
+	local DOCS=( AUTHORS README.rst docs/installers.rst )
+	distutils-r1_python_install_all
+	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 

diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index b29f07d71d8..4ca63a7a2a1 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -16,22 +16,20 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
 	inherit git-r3
 else
-	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
+	if [[ ${PV} == *_beta* ]] ; then
+		SRC_URI="https://github.com/lutris/lutris/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}"/${P/_/-}
+	else
+		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+		S="${WORKDIR}/${PN}"
+
+		KEYWORDS="~amd64 ~x86"
+	fi
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-		')
-	)
-"
+
 RDEPEND="
 	app-arch/cabextract
 	app-arch/p7zip
@@ -56,16 +54,28 @@ RDEPEND="
 	x11-libs/libnotify[introspection]
 "
 
-python_install_all() {
-	local DOCS=( AUTHORS README.rst docs/installers.rst )
-	distutils-r1_python_install_all
-	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
+distutils_enable_tests nose
+
+src_prepare() {
+	default
+
+	# Avoid test failure:
+	# "ERROR: Failure: OSError (data_path can't be found at : /usr/share/lutris)"
+	sed -i -e "s:sys.path\[0\]:\"${S}/share\":" lutris/util/datapath.py || die
+
+	distutils-r1_src_prepare
 }
 
 python_test() {
 	virtx nosetests -v
 }
 
+python_install_all() {
+	local DOCS=( AUTHORS README.rst docs/installers.rst )
+	distutils-r1_python_install_all
+	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst