From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 11 Aug 2021 07:02:28 +0100
Subject: gentoo resync : 11.08.2021

---
 games-util/Manifest.gz                      | Bin 7908 -> 7904 bytes
 games-util/catcodec/Manifest                |   2 +-
 games-util/catcodec/catcodec-1.0.5.ebuild   |   2 +-
 games-util/joystick/Manifest                |   4 +-
 games-util/joystick/joystick-1.6.1.ebuild   |  42 --------------
 games-util/joystick/joystick-1.7.1.ebuild   |  46 +++++++++++++++
 games-util/lutris/Manifest                  |   8 ++-
 games-util/lutris/lutris-0.5.8.1.ebuild     |  78 -------------------------
 games-util/lutris/lutris-0.5.8.4.ebuild     |  77 ++++++++++++++++++++++++
 games-util/lutris/lutris-0.5.9_beta1.ebuild |  87 ++++++++++++++++++++++++++++
 games-util/lutris/lutris-9999.ebuild        |  47 ++++++++-------
 games-util/xpadneo/Manifest                 |   4 +-
 games-util/xpadneo/xpadneo-0.9.1.ebuild     |   2 +-
 games-util/xpadneo/xpadneo-9999.ebuild      |   2 +-
 14 files changed, 250 insertions(+), 151 deletions(-)
 delete mode 100644 games-util/joystick/joystick-1.6.1.ebuild
 create mode 100644 games-util/joystick/joystick-1.7.1.ebuild
 delete mode 100644 games-util/lutris/lutris-0.5.8.1.ebuild
 create mode 100644 games-util/lutris/lutris-0.5.8.4.ebuild
 create mode 100644 games-util/lutris/lutris-0.5.9_beta1.ebuild

(limited to 'games-util')

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index bdd4c202e308..82116b6b8fb0 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/catcodec/Manifest b/games-util/catcodec/Manifest
index bc521e62a54c..11df61cb0e10 100644
--- a/games-util/catcodec/Manifest
+++ b/games-util/catcodec/Manifest
@@ -1,3 +1,3 @@
 DIST catcodec-1.0.5-source.tar.xz 17952 BLAKE2B e828e52426b26c0021365bb961d16028a52a8c8cedac06db6b825947562e6eb513d0c9f7b455710f05dc20b88a86b0cdab3123ede38c2f785709c1b76964e1b4 SHA512 e6e17da17f2449ff5d3a18c34ba3125d475a481ef1dc73ba03dac32fc8523a8929d2cbdfda5f647a0226aa007a217fc90c85ec4cc46937f75e15a596277e0db5
-EBUILD catcodec-1.0.5.ebuild 572 BLAKE2B 880eab61e98947f24f05df8341c2c573808e60cc29606eccf8cbb8def74ec68e0f9d0be007d71646c48d155138ee74f705b83908a1701d93785b3af5f041d09c SHA512 39ea56e632ecc50137a55beaca6498daa157d60da503c2b53c74091294e6cbaf3e5c108821665c1690392c025ab8b5c7b3a93c398febee25005b1ff722ed8d32
+EBUILD catcodec-1.0.5.ebuild 579 BLAKE2B 3c0766c592497ee50584d27988365514602930a0a788cbc72113740a50f63d363874fd39cf193e89c87b309b60d57fdad2d18469a65e1dfdd62451e6679ff78b SHA512 7897f8f328ec5237ffc5521621c62e3379f1b962d1f0a7c647b2b52573f360851bff57fa1c1f94081a67785d1a703468b047fdaa851b0006b0cdc27795c66293
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/catcodec/catcodec-1.0.5.ebuild b/games-util/catcodec/catcodec-1.0.5.ebuild
index 9fd03ab1e074..f951d8d9f712 100644
--- a/games-util/catcodec/catcodec-1.0.5.ebuild
+++ b/games-util/catcodec/catcodec-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://binaries.openttd.org/extra/catcodec/${PV}/${P}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 src_prepare() {
 	default
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index b98a626f45be..ea1dea51c224 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,6 +1,6 @@
 AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064
-DIST linuxconsoletools-1.6.1.tar.bz2 50854 BLAKE2B 0614e72226c575499ae5976011a0fca146a1981e2d355f7554f105b184bdd4f1090bf5374377e89f3881c5476e3c3a362b70f86cfd83440264066ea50a8c6a4b SHA512 b520c0a2d55986204619e3a5a00fb8b1e26453ac6df4f51c8c87495661a68bb6fe5a1947a3e079a53a537bf06d23c73c404a4d7e4d4dd18c0f7f69c1985a77be
 DIST linuxconsoletools-1.7.0.tar.bz2 52960 BLAKE2B 438e69e7aa220ea3fc92a9a72bda081c7877663c451f3101bc30e344a7a0f0f20b1c2f4ecd78c0db501b6442e2cd20e9f288c9c331118e8c666a61c3ac4b6851 SHA512 260667e167281dd6f4de0904c2852a5bf3d9d0fe9d603135d4849c5a6610997306c9b476f64e4015d17a4dc8e4a8d36e96e01b9b63664fc7b493201fe12b4f56
-EBUILD joystick-1.6.1.ebuild 869 BLAKE2B cd9a4cd4bf04633cb1f0dd12a9be7b86c2c24b2e419ba9a0af7625830c3a533c3f482d701fc4d8b52022546255e448fecf2c6af3bf3b1dc56b9ee0152686ed1d SHA512 eb2d7b1511cb42dbefb13bd320b4510670e999ee53b33cf4693b177d4144794a002a4663f7036ac46f6ebc7fd769a9de7a33fbfc9c93554c3a12894276e0326d
+DIST linuxconsoletools-1.7.1.tar.bz2 53153 BLAKE2B e05d04454fefdd4009d0c75f1caf2e6675a8e5f494f6f2f491f4de3c57101a6323b4de5795fccb9fd6a557a1e7bf4befa312661b022ed0503da83ac4dd3ab7c5 SHA512 2ba97e6c5b57aa5d6b08369bae050256f4d039f5b8479ad03cef4a7c43bf772db312de54d9e70a8a92c9ed7933b524715f1ce5448ccf508e6ffe8646a9dbd349
 EBUILD joystick-1.7.0.ebuild 872 BLAKE2B 3d08dc3fb669b9e23b7a21623244242ed883f41c38a0f3bda97e90e7f6dfc5ddb0148c2f73ec4d14a7ec28dc5b850a078032b76dd873dcf13fcd6c51d81cf086 SHA512 ddeac2a9eb45be7d5199f885b44363c17da17163ed2e62534318967158927e0e754f568d3472166a3653d602630e3c42e1e03b48aec9e1fab59e8fcf311f0063
+EBUILD joystick-1.7.1.ebuild 870 BLAKE2B c26d1ee35834da9a7261ebf7c5cbbe4cbf40f529f82260a2f6b0a70a1d32185387e1d316e34fb0f00499a4e2068ff25a41ac3b61bd6e605476be61a1bf637d84 SHA512 22433c957fef2dcf7b5ba89f7030cd18fe282151ead4ee366f70097f27ed9b22bf36bb6f0413fd65d4de7db28d497f5b9b90ef640fe5d0f7415e112373019c44
 MISC metadata.xml 335 BLAKE2B e83ffecd1afda0861555f62d9bad50f99c8e1bebb296f303bbdb8624ea283eb04d30d76a74d9970f519e303e851991ae33b232f74c9d2fdacce16b59fccdf9f5 SHA512 6440a6652a98c7439b22df51f22089ddd867be3e07e6c04001aa15b1fc01fd84dc8d3244f106abe4ae89caf7561aa45fe2526f2f9e8e8844a5e44f9f8a51df41
diff --git a/games-util/joystick/joystick-1.6.1.ebuild b/games-util/joystick/joystick-1.6.1.ebuild
deleted file mode 100644
index d4156cace763..000000000000
--- a/games-util/joystick/joystick-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_P="linuxconsoletools-${PV}"
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="sdl udev"
-
-DEPEND="sdl? ( media-libs/libsdl:0[video] )
-	!<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}
-	udev? ( virtual/udev )"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-build.patch
-)
-
-src_prepare() {
-	default
-
-	export PREFIX=/usr
-	tc-export CC PKG_CONFIG
-	export USE_SDL=$(usex sdl)
-}
-
-src_install() {
-	default
-	if ! use udev ; then
-		rm "${ED}"/usr/bin/jscal-{re,}store || die
-	fi
-}
diff --git a/games-util/joystick/joystick-1.7.1.ebuild b/games-util/joystick/joystick-1.7.1.ebuild
new file mode 100644
index 000000000000..2f1e8014e508
--- /dev/null
+++ b/games-util/joystick/joystick-1.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="linuxconsoletools-${PV}"
+
+DESCRIPTION="Joystick testing utilities"
+HOMEPAGE="https://sourceforge.net/projects/linuxconsole/"
+SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="sdl udev"
+
+DEPEND="sdl? ( media-libs/libsdl2[video] )"
+RDEPEND="
+	${DEPEND}
+	udev? ( virtual/udev )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-build.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	export PREFIX="${EPREFIX}"/usr
+	export USE_SDL=$(usex sdl)
+}
+
+src_install() {
+	default
+
+	if ! use udev; then
+		rm "${ED}"/usr/bin/jscal-{re,}store || die
+	fi
+
+	if [[ ${EPREFIX} ]]; then
+		mv {"${D}","${ED}"}/lib || die
+	fi
+}
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.1.ebuild
deleted file mode 100644
index b736e6971688..000000000000
--- a/games-util/lutris/lutris-0.5.8.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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
-	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
-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/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]
-"
-
-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
-}
-
-python_test() {
-	virtx nosetests -v
-}
-
-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-0.5.8.4.ebuild b/games-util/lutris/lutris-0.5.8.4.ebuild
new file mode 100644
index 000000000000..b29f07d71d87
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.8.4.ebuild
@@ -0,0 +1,77 @@
+# 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
+	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}"
+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/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]
+"
+
+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
+}
+
+python_test() {
+	virtx nosetests -v
+}
+
+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-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
 
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index ee32d59d24ed..ebf09f356e7b 100644
--- a/games-util/xpadneo/Manifest
+++ b/games-util/xpadneo/Manifest
@@ -1,4 +1,4 @@
 DIST xpadneo-0.9.1.tar.gz 1353080 BLAKE2B fc2207e005cae629da50048330cbaa7d27183b0bbb083d35c3c144e91470273b8c7006c4b62d10b947dbe4fd003ca39623630923e477aa4eff3c243405d876bd SHA512 51063d104f165018b8430e26d2ab5a622c214efaaba3f7706cc99892b2054f57667b419672de5c2696189d389401b07024658c36a88343d980de9802789bcb10
-EBUILD xpadneo-0.9.1.ebuild 2423 BLAKE2B c1cb53c426940bc3b079c21cb54f5e33a67094bc36dd83ce14063ca1c20f804ebe32640b8670f0542c234d1dea3330c530ae817da12a99482dbb236002e9efe4 SHA512 09792a7fc3eea09162f9facfe85821855840001339ffe366032c988d6a45e6e1dfc837a59b8b8018b4056edf2894bec0978f1bcf92946e81bcc4ac0117c8bc76
-EBUILD xpadneo-9999.ebuild 2253 BLAKE2B 217187d9a9dbde2bff73d2115da5e7057f60bdfc9569cab7f37bce0f6dad3e643e34d8d00fa01a380e4383dafdd6fda53fa3bf7cc3ba3b2345ac975386dae218 SHA512 4e55be1b24232651d10bbf89a523081d1ce79521a58ffc83c95435577dbc79dc52671b1354fcaf663ceff0cdb305aa8c24caf04128f26bde1c06ea415fd3409b
+EBUILD xpadneo-0.9.1.ebuild 2437 BLAKE2B 46da79ebde76fab53f2073a3d4b124ab427b3a631e1a17efc1e0e80d2ff0d9a0c3cdfdb3b431c37ea3928b747f84260aa0094288e783a37416bff82dff8b9911 SHA512 505eba995377dae23d0a63f80f238e957f9b6abe0f6415e7b599ce6458526988e46049afcc8dda5b839f2641ece29f90b7054705012fba615713bb6cb6aa7a91
+EBUILD xpadneo-9999.ebuild 2267 BLAKE2B 94673e0d5a977f5e5c0155db550095f0a09c7cc4d94b2d4b4bc0d45e2c6df257ad0e9049960db2ff658a5dc316a82f3c708aed960a62b154f35db549cffce012 SHA512 99d6b3341053df80ea46c73f9f2da80f6a3b20fe5cae9b60a9468e6b86bb165b6836195347e81bb6265805e899f8f974d16ad7d498de5c4c6445fe369db83c6b
 MISC metadata.xml 327 BLAKE2B 06f5fa399f550899bb9fea383b90d9058863dd461aef5981165d2de44ef90082adc5ad2a5096f11c8b451bf72b917e18612b650c518159749ec7275de44c920f SHA512 b7a1cbdb9566d8dfd920c966ecb7709931c5c7ed8dec594f1c13c2164e3ab3bf00a3dc7f5db16af27b66752d7456fb1d6a4f35cf087b5f3a16470243585fd5dd
diff --git a/games-util/xpadneo/xpadneo-0.9.1.ebuild b/games-util/xpadneo/xpadneo-0.9.1.ebuild
index bf7685af800c..f97c7ef760e4 100644
--- a/games-util/xpadneo/xpadneo-0.9.1.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://atar-axis.github.io/xpadneo/"
 LICENSE="GPL-3"
 SLOT="0"
 
-S+="/hid-${PN}"
+S="${WORKDIR}/${P}/hid-${PN}"
 MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
 BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KV_OUT_DIR}"'
 BUILD_TARGETS="modules"
diff --git a/games-util/xpadneo/xpadneo-9999.ebuild b/games-util/xpadneo/xpadneo-9999.ebuild
index 6ee1277444a5..3e4b4f05d40a 100644
--- a/games-util/xpadneo/xpadneo-9999.ebuild
+++ b/games-util/xpadneo/xpadneo-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://atar-axis.github.io/xpadneo/"
 LICENSE="GPL-3"
 SLOT="0"
 
-S+="/hid-${PN}"
+S="${WORKDIR}/${P}/hid-${PN}"
 MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
 BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KV_OUT_DIR}"'
 BUILD_TARGETS="modules"
-- 
cgit v1.2.3