gentoo resync : 11.08.2021

4 files changed, 121 insertions, 26 deletions

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 1a3481fa6244..7e8efebe956e 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,8 @@
-DIST lutris_0.5.8.1.tar.xz 893328 BLAKE2B 67c66b59c3fa78af46f953b6e27fb3dd77d0e4cb0746f490716c7c074e81afa4f9c4e8c10dc6d4dab3e2b37d03254bae5eda0b777da72bc17f18dda5fd1f990a SHA512 da3b5ebf3e5dcc5011351197c5a80e8547e54df4555ea9124a8404877c5b75225cfae970819a171c55454fef73afdd927dafbf427301b71618c33660a1c8c022
+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
-EBUILD lutris-0.5.8.1.ebuild 1875 BLAKE2B d5dc302137dedfad59d8e34104d8fd74d6f1ae075e14bb29755327e6146d7dab64f247fb232f6d3604c96c5e054fe620ba6cc8887e8770a04026823f2c9d1079 SHA512 be64891a7086e29a5e1f953d6e52144eb9957a36c3c86351cc7c4e4f0d954a16475cdee4439f347071ef4de261b1b0a2b330f8024f0b790ce2fb60909bb91474
+DIST lutris_0.5.8.4.tar.xz 957004 BLAKE2B f3acce5d9ea7368063a3135c1f503e0644c1cbc7676e966c262c8e04c5e0d23b4882793fe2df1beab265ab4128e8a90b5bb69401f8e567b0cceeea3008ff4fa7 SHA512 f79a9fd06788bc28e59ad6d2c403b83f8bdeaee0116ae7fbf765e80e4e08bf760a462c71f75a2ff46739e5757cb8609f5110a51d83266d3aba2f0c91524b6df9
 EBUILD lutris-0.5.8.3.ebuild 1875 BLAKE2B 43424d94156e801cc59e7b22a17e0f3c5225ff9e0a3a3e1f9fbb7b1cea73f22ab9bda452d4b4ca767b9f3563c71e6d82c45e3bee8672003cc72e93de564da8fb SHA512 ad5f73983e9cc5899daf8c49b78999b62659c7d946c9dc72d1435f685fafdc220bfaf0b7981c865b0c59941e7881f35164d7d90a3a64739a53dc9fe0fff9b053
-EBUILD lutris-9999.ebuild 1938 BLAKE2B 4ec5b61c23c15cafb2b6559f315e01ac6b22857b0d7cff9767cd6b153ff5b2ec89e035bfff17170beadfc89239448e7fa66bdb56e559ffdc2b11cfcf632808fc SHA512 15d4784b157b4aae47071ed7613aafa64db437e8853aad6909ce726a3615f72f5f99ff81afaf87aef48d367712867ec9e477f6b83d19366e88b3fec95d5efd40
+EBUILD lutris-0.5.8.4.ebuild 1874 BLAKE2B 7f5d0fde126ff51cfb149a8cb12c668cf07a883849c3934e117eeda9abc7acc5c385aca9830abf3036a3d544d6f97e968b07474bb7afef0ef04ad38fca51e1a8 SHA512 72c941a3fd1e17dcc6bef9e05b6e01abfe90bad6eea1641a717fd4a371e7e8597e2ab986725ceabefadfb41eef240129396b94150b3e65eb1c746fdf3f81890e
+EBUILD lutris-0.5.9_beta1.ebuild 2188 BLAKE2B aebbcfb847cade9429f909ae87566cb15eedb105cc8d4cded4fdd6de0a63246c93533b1f38b5acbd187e7d61cbe0a45f4f300ca1d874382111feaa1a2dce27d8 SHA512 3c8633236757528ed6e3cd2ce729e74d3363f95db24c07f085b2b8eecc66767a504085d7e2d0539cf273e0766abec3d21be24c055393248e486b9df4f50ec416
+EBUILD lutris-9999.ebuild 2188 BLAKE2B aebbcfb847cade9429f909ae87566cb15eedb105cc8d4cded4fdd6de0a63246c93533b1f38b5acbd187e7d61cbe0a45f4f300ca1d874382111feaa1a2dce27d8 SHA512 3c8633236757528ed6e3cd2ce729e74d3363f95db24c07f085b2b8eecc66767a504085d7e2d0539cf273e0766abec3d21be24c055393248e486b9df4f50ec416
 MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7
diff --git a/games-util/lutris/lutris-0.5.8.1.ebuild b/games-util/lutris/lutris-0.5.8.4.ebuild
index b736e6971688..b29f07d71d87 100644
--- a/games-util/lutris/lutris-0.5.8.1.ebuild
+++ b/games-util/lutris/lutris-0.5.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
@@ -23,7 +23,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-
 RESTRICT="!test? ( test )"
 
 BDEPEND="
diff --git a/games-util/lutris/lutris-0.5.9_beta1.ebuild b/games-util/lutris/lutris-0.5.9_beta1.ebuild
new file mode 100644
index 000000000000..4ca63a7a2a1f
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.9_beta1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
+	inherit git-r3
+else
+	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"
+
+RDEPEND="
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	gnome-base/gnome-desktop:3[introspection]
+	media-sound/fluid-soundfont
+	net-libs/libsoup
+	net-libs/webkit-gtk:4[introspection]
+	x11-apps/mesa-progs
+	x11-apps/xgamma
+	x11-apps/xrandr
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+"
+
+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
+
+	# Quote README.rst
+	elog "Lutris installations are fully automated through scripts, which can"
+	elog "be written in either JSON or YAML. The scripting syntax is described"
+	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
+	elog "available online at lutris.net."
+}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index da0698d5ca9e..4ca63a7a2a1f 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
@@ -16,30 +16,26 @@ 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
 	app-arch/unzip
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/python-evdev[${PYTHON_USEDEP}]
@@ -54,21 +50,32 @@ RDEPEND="
 	x11-apps/mesa-progs
 	x11-apps/xgamma
 	x11-apps/xrandr
-	x11-libs/libnotify[introspection]
 	x11-libs/gtk+:3[introspection]
-	x11-libs/gdk-pixbuf[jpeg]
+	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