commit:     d6ae7d0c076c6f3e25baddcc28d31b6e7b05f5cc
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sat Apr 27 23:18:34 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon May 13 22:18:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d6ae7d0c

games-*/*: fix variable order

I manually went through some entries for `pkgcheck scan -c
VariableOrderCheck`.

Misc updates:
UnusedEclassesCheck
RESTRICT+=" .." -> RESTRICT=".."

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 games-action/ATLauncher/ATLauncher-3.4.27.0.ebuild |  7 +++--
 games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild  |  7 +++--
 games-action/blackvoxel/blackvoxel-2.50.ebuild     |  4 +--
 games-action/ddnet/ddnet-18.2.ebuild               |  3 ++-
 games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild  |  4 +--
 games-action/netrek-cow/netrek-cow-3.3.2.ebuild    |  4 +--
 .../technic-launcher/technic-launcher-4.625.ebuild |  8 +++---
 .../technic-launcher/technic-launcher-4.768.ebuild |  8 +++---
 .../technic-launcher/technic-launcher-4.822.ebuild |  8 +++---
 .../SpaceCadetPinball-2.0.1.ebuild                 |  4 +--
 .../SpaceCadetPinball/SpaceCadetPinball-2.0.ebuild |  4 +--
 .../SpaceCadetPinball-2.1.0.ebuild                 |  4 +--
 .../fairy-stockfish/fairy-stockfish-14.0.1.ebuild  |  4 +--
 games-emulation/conty/conty-1.25.1.ebuild          | 12 ++++-----
 games-emulation/conty/conty-1.25.2.ebuild          | 14 +++++-----
 .../duckstation/duckstation-9999.ebuild            |  4 +--
 games-emulation/np2kai/np2kai-22.ebuild            |  5 ++--
 games-emulation/np2kai/np2kai-22_p20210211.ebuild  |  5 ++--
 games-engines/fs2_open/fs2_open-23.0.0.ebuild      |  9 +++----
 games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild   |  9 +++----
 games-engines/luxtorpeda/luxtorpeda-25.0.0.ebuild  | 12 ++++-----
 .../nxengine-evo/nxengine-evo-2.6.4.ebuild         |  2 +-
 .../nxengine-evo/nxengine-evo-2.6.5_p1.ebuild      |  7 ++---
 games-fps/crispy-doom/crispy-doom-5.12.0.ebuild    |  4 +--
 games-fps/crispy-doom/crispy-doom-6.0.ebuild       |  4 +--
 games-fps/etlegacy/etlegacy-2.81.0.ebuild          | 10 +++----
 games-fps/etlegacy/etlegacy-2.82.0.ebuild          | 10 +++----
 .../the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild  |  5 ++--
 games-puzzle/blockout/blockout-2.5.ebuild          |  6 ++---
 games-rpg/sacred-demo/sacred-demo-1.0.0.ebuild     |  7 ++---
 games-rpg/snoot-game/snoot-game-1.9.1.ebuild       | 10 ++++---
 games-strategy/general/general-4.6.ebuild          |  4 +--
 .../ground-control/ground-control-1011.ebuild      |  4 +--
 .../massive-assault-network-ii-2.0.270.ebuild      |  4 +--
 games-strategy/swine/swine-1.ebuild                |  6 ++---
 .../NotEnoughProduction-0.0.4.ebuild               |  7 ++---
 games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild    |  9 +++----
 games-util/gamehub/gamehub-0.16.0.1.ebuild         |  9 +++----
 games-util/gamehub/gamehub-0.16.3.2.ebuild         |  9 +++----
 games-util/itch-bin/itch-bin-25.5.1-r2.ebuild      |  7 ++---
 games-util/protonup/protonup-0.1.5.ebuild          |  4 +--
 games-util/r2modman-bin/r2modman-bin-3.1.48.ebuild | 12 ++++-----
 games-util/roll/roll-2.6.1.ebuild                  |  6 ++---
 games-util/xivlauncher/xivlauncher-1.0.8.ebuild    | 31 ++++++++++------------
 44 files changed, 151 insertions(+), 165 deletions(-)

diff --git a/games-action/ATLauncher/ATLauncher-3.4.27.0.ebuild 
b/games-action/ATLauncher/ATLauncher-3.4.27.0.ebuild
index 030e21842f..d762e61254 100644
--- a/games-action/ATLauncher/ATLauncher-3.4.27.0.ebuild
+++ b/games-action/ATLauncher/ATLauncher-3.4.27.0.ebuild
@@ -11,16 +11,15 @@ HOMEPAGE="https://atlauncher.com
 
SRC_URI="https://github.com/ATLauncher/ATLauncher/releases/download/v${PV}/${P}.jar
        
https://raw.githubusercontent.com/ATLauncher/ATLauncher/master/src/main/resources/assets/image/icon.ico
 -> ${PN}.ico"
 
-KEYWORDS="~amd64"
+S="${WORKDIR}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
 
 BDEPEND="media-gfx/imagemagick[png]"
-
 RDEPEND="virtual/jre:1.8"
 
-S="${WORKDIR}"
-
 src_unpack() {
        # do not unpack jar file
        cp "${DISTDIR}/${PN}.ico" "${S}" || die

diff --git a/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild 
b/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild
index b3fc84d8c9..2a67cb469c 100644
--- a/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild
+++ b/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild
@@ -11,16 +11,15 @@ HOMEPAGE="https://atlauncher.com
 
SRC_URI="https://github.com/ATLauncher/ATLauncher/releases/download/v${PV}/${P}.jar
        
https://raw.githubusercontent.com/ATLauncher/ATLauncher/master/src/main/resources/assets/image/icon.ico
 -> ${PN}.ico"
 
-KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="media-gfx/imagemagick[png]"
-
 RDEPEND="virtual/jre:1.8"
 
-S="${WORKDIR}"
-
 src_unpack() {
        # do not unpack jar file
        cp "${DISTDIR}/${PN}.ico" "${S}" || die

diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild 
b/games-action/blackvoxel/blackvoxel-2.50.ebuild
index be6600c225..4cb5b62ec3 100644
--- a/games-action/blackvoxel/blackvoxel-2.50.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Blackvoxel Video Game"
 HOMEPAGE="https://www.blackvoxel.com/";
 SRC_URI="https://www.blackvoxel.com/dm_download.php?file=170&key=1 -> 
${P}.tar.bz2"
 
+S="${WORKDIR}/${PN}_source_${PV//./_}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -23,8 +25,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}_source_${PV//./_}"
-
 PATCHES=(
        "${FILESDIR}"/${P}-makefile.patch
        "${FILESDIR}"/${P}-savedir.patch

diff --git a/games-action/ddnet/ddnet-18.2.ebuild 
b/games-action/ddnet/ddnet-18.2.ebuild
index 1a01f07c87..c540968071 100644
--- a/games-action/ddnet/ddnet-18.2.ebuild
+++ b/games-action/ddnet/ddnet-18.2.ebuild
@@ -27,9 +27,10 @@ ${CARGO_CRATE_URIS}"
 
 LICENSE="CC-BY-SA-3.0 OFL-1.1 BSD"
 SLOT="0"
-IUSE="antibot autoupdate +client download-gtest headless-client +inform-update 
+server +tools upnp +videorecorder vulkan websockets"
 KEYWORDS="~amd64"
 
+IUSE="antibot autoupdate +client download-gtest headless-client +inform-update 
+server +tools upnp +videorecorder vulkan websockets"
+
 DEPEND="
        client? (
                media-libs/freetype

diff --git a/games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild 
b/games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild
index 3780612af0..fcfb01658d 100644
--- a/games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild
+++ b/games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild
@@ -8,12 +8,12 @@ DESCRIPTION="brmh client for netrek"
 HOMEPAGE="https://netrek.org";
 SRC_URI="https://github.com/bgloyer/netrek-client-brmh/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
+S="${WORKDIR}/netrek-client-brmh-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/netrek-client-brmh-${PV}"
-
 RDEPEND="
        x11-base/xorg-proto
        x11-libs/libX11

diff --git a/games-action/netrek-cow/netrek-cow-3.3.2.ebuild 
b/games-action/netrek-cow/netrek-cow-3.3.2.ebuild
index b5f04f1f73..f5e252233a 100644
--- a/games-action/netrek-cow/netrek-cow-3.3.2.ebuild
+++ b/games-action/netrek-cow/netrek-cow-3.3.2.ebuild
@@ -8,12 +8,12 @@ DESCRIPTION="cow client for netrek"
 HOMEPAGE="https://netrek.org";
 SRC_URI="https://github.com/quozl/netrek-client-cow/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/netrek-client-cow-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/netrek-client-cow-${PV}"
-
 # upstream has a file named check that is unrelated to tests
 RESTRICT="test"
 

diff --git a/games-action/technic-launcher/technic-launcher-4.625.ebuild 
b/games-action/technic-launcher/technic-launcher-4.625.ebuild
index bcc2c29c35..71de6b58bc 100644
--- a/games-action/technic-launcher/technic-launcher-4.625.ebuild
+++ b/games-action/technic-launcher/technic-launcher-4.625.ebuild
@@ -12,18 +12,16 @@ SRC_URI="
        https://www.technicpack.net/favicon.ico -> ${PN}.ico
 "
 
-KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}"
+
 LICENSE="technic"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RESTRICT="bindist mirror"
-
 BDEPEND="media-gfx/imagemagick[png]"
-
 RDEPEND="virtual/jre:1.8"
 
-S="${WORKDIR}"
-
 src_unpack() {
        # do not unpack jar file
        cp "${DISTDIR}/${PN}.ico" "${S}" || die

diff --git a/games-action/technic-launcher/technic-launcher-4.768.ebuild 
b/games-action/technic-launcher/technic-launcher-4.768.ebuild
index cacf1614ef..d0edf91a6e 100644
--- a/games-action/technic-launcher/technic-launcher-4.768.ebuild
+++ b/games-action/technic-launcher/technic-launcher-4.768.ebuild
@@ -12,18 +12,16 @@ SRC_URI="
        https://www.technicpack.net/favicon.ico -> ${PN}.ico
 "
 
-KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}"
+
 LICENSE="technic"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RESTRICT="bindist mirror"
-
 BDEPEND="media-gfx/imagemagick[png]"
-
 RDEPEND="virtual/jre:1.8"
 
-S="${WORKDIR}"
-
 src_unpack() {
        # do not unpack jar file
        cp "${DISTDIR}/${PN}.ico" "${S}" || die

diff --git a/games-action/technic-launcher/technic-launcher-4.822.ebuild 
b/games-action/technic-launcher/technic-launcher-4.822.ebuild
index cacf1614ef..d0edf91a6e 100644
--- a/games-action/technic-launcher/technic-launcher-4.822.ebuild
+++ b/games-action/technic-launcher/technic-launcher-4.822.ebuild
@@ -12,18 +12,16 @@ SRC_URI="
        https://www.technicpack.net/favicon.ico -> ${PN}.ico
 "
 
-KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}"
+
 LICENSE="technic"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RESTRICT="bindist mirror"
-
 BDEPEND="media-gfx/imagemagick[png]"
-
 RDEPEND="virtual/jre:1.8"
 
-S="${WORKDIR}"
-
 src_unpack() {
        # do not unpack jar file
        cp "${DISTDIR}/${PN}.ico" "${S}" || die

diff --git a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.1.ebuild 
b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.1.ebuild
index 0042136359..6389c6c7a1 100644
--- a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.1.ebuild
+++ b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.1.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Decompilation of 3D Pinball for Windows - Space 
Cadet"
 HOMEPAGE="https://github.com/k4zmu2a/SpaceCadetPinball";
 
SRC_URI="https://github.com/k4zmu2a/${PN}/archive/refs/tags/Release_${PV}.tar.gz
 -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-Release_${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -19,8 +21,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-Release_${PV}"
-
 src_prepare(){
        # the paths should be relative
        sed -i "s|/Platform|Platform|g" CMakeLists.txt || die

diff --git a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.ebuild 
b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.ebuild
index af9bc3d8d5..bc491b1cb0 100644
--- a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.ebuild
+++ b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.0.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Decompilation of 3D Pinball for Windows - Space 
Cadet"
 HOMEPAGE="https://github.com/k4zmu2a/SpaceCadetPinball";
 
SRC_URI="https://github.com/k4zmu2a/${PN}/archive/refs/tags/Release_${PV}.tar.gz
 -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-Release_${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -23,8 +25,6 @@ PATCHES=(
        "${FILESDIR}"/"${P}"-respect-XDG_DATA_HOME.patch
 )
 
-S="${WORKDIR}/${PN}-Release_${PV}"
-
 src_install(){
        dobin "${S}/bin/${PN}"
 }

diff --git a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild 
b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild
index 673101364d..658120473b 100644
--- a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild
+++ b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Decompilation of 3D Pinball for Windows - Space 
Cadet"
 HOMEPAGE="https://github.com/k4zmu2a/SpaceCadetPinball";
 
SRC_URI="https://github.com/k4zmu2a/${PN}/archive/refs/tags/Release_${PV}.tar.gz
 -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-Release_${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
@@ -19,8 +21,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-Release_${PV}"
-
 pkg_postinst(){
        ewarn "This game is distributed without the data files."
        ewarn "To play, copy the original DAT and SOUND files from a Windows or"

diff --git a/games-board/fairy-stockfish/fairy-stockfish-14.0.1.ebuild 
b/games-board/fairy-stockfish/fairy-stockfish-14.0.1.ebuild
index e89a9c0ca7..7b0448bcbd 100644
--- a/games-board/fairy-stockfish/fairy-stockfish-14.0.1.ebuild
+++ b/games-board/fairy-stockfish/fairy-stockfish-14.0.1.ebuild
@@ -18,6 +18,8 @@ SRC_URI="
        )
 "
 
+S="${WORKDIR}/Fairy-Stockfish-fairy_sf_${MY_PV}_xq/src"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -33,8 +35,6 @@ DEPEND="
        test? ( dev-tcltk/expect )
 "
 
-S="${WORKDIR}/Fairy-Stockfish-fairy_sf_${MY_PV}_xq/src"
-
 src_unpack() {
        unpack ${P}.tar.gz
        if use nnue ; then

diff --git a/games-emulation/conty/conty-1.25.1.ebuild 
b/games-emulation/conty/conty-1.25.1.ebuild
index 00680ba83f..5d149b89e2 100644
--- a/games-emulation/conty/conty-1.25.1.ebuild
+++ b/games-emulation/conty/conty-1.25.1.ebuild
@@ -3,24 +3,24 @@
 
 EAPI=8
 
-DESCRIPTION="Easy to use unprivileged Linux container packed in a single 
portable executable"
-HOMEPAGE="https://github.com/Kron4ek/Conty";
-
 inherit linux-info
 
 NAME="${PN}_lite_dwarfs.sh"
 
+DESCRIPTION="Easy to use unprivileged Linux container packed in a single 
portable executable"
+HOMEPAGE="https://github.com/Kron4ek/Conty";
 SRC_URI="https://github.com/Kron4ek/Conty/releases/download/${PV}/${NAME} -> 
$P"
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"
 
 RDEPEND="sys-fs/fuse:0"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="*"
 
 CONFIG_CHECK="

diff --git a/games-emulation/conty/conty-1.25.2.ebuild 
b/games-emulation/conty/conty-1.25.2.ebuild
index 00680ba83f..413c3f99c3 100644
--- a/games-emulation/conty/conty-1.25.2.ebuild
+++ b/games-emulation/conty/conty-1.25.2.ebuild
@@ -3,24 +3,24 @@
 
 EAPI=8
 
-DESCRIPTION="Easy to use unprivileged Linux container packed in a single 
portable executable"
-HOMEPAGE="https://github.com/Kron4ek/Conty";
-
 inherit linux-info
 
 NAME="${PN}_lite_dwarfs.sh"
 
-SRC_URI="https://github.com/Kron4ek/Conty/releases/download/${PV}/${NAME} -> 
$P"
-KEYWORDS="~amd64"
+DESCRIPTION="Easy to use unprivileged Linux container packed in a single 
portable executable"
+HOMEPAGE="https://github.com/Kron4ek/Conty";
+SRC_URI="https://github.com/Kron4ek/Conty/releases/download/${PV}/${NAME} -> 
${P}"
+
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"
 
 RDEPEND="sys-fs/fuse:0"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="*"
 
 CONFIG_CHECK="

diff --git a/games-emulation/duckstation/duckstation-9999.ebuild 
b/games-emulation/duckstation/duckstation-9999.ebuild
index 8e8cd4d1d3..f5f6e53d8e 100644
--- a/games-emulation/duckstation/duckstation-9999.ebuild
+++ b/games-emulation/duckstation/duckstation-9999.ebuild
@@ -11,6 +11,8 @@ EGIT_REPO_URI="https://github.com/stenzek/duckstation.git";
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 EGIT_SUBMODULES=()
 
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+dbus discord +egl +evdev fbdev +gamepad gbm +nogui qt6 
retroachievements wayland X"
@@ -44,8 +46,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 src_configure() {
        local mycmakeargs=(
                -DENABLE_CUBEB=ON

diff --git a/games-emulation/np2kai/np2kai-22.ebuild 
b/games-emulation/np2kai/np2kai-22.ebuild
index cf91d20a70..92817c60bd 100644
--- a/games-emulation/np2kai/np2kai-22.ebuild
+++ b/games-emulation/np2kai/np2kai-22.ebuild
@@ -7,9 +7,12 @@ DESCRIPTION="NP2kai is an emulator for the japanese PC-98 
series of computers"
 HOMEPAGE="https://domisan.sakura.ne.jp/article/np2kai/np2kai.html";
 SRC_URI="https://github.com/AZO234/NP2kai/archive/refs/tags/rev.${PV}.tar.gz 
-> ${P}.tar.gz"
 
+S="${WORKDIR}/NP2kai-rev.${PV}/x11"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="sdl +sdl2 +i286 ia32 haxm"
 REQUIRED_USE="^^ ( sdl sdl2 )"
 
@@ -33,8 +36,6 @@ DEPEND="media-libs/libsdl
 RDEPEND="${DEPEND}"
 BDEPEND="dev-build/automake"
 
-S="${WORKDIR}/NP2kai-rev.${PV}/x11"
-
 PATCHES=(
        "${FILESDIR}/${P}-autogen.patch"
 )

diff --git a/games-emulation/np2kai/np2kai-22_p20210211.ebuild 
b/games-emulation/np2kai/np2kai-22_p20210211.ebuild
index 15ccd8f3dc..e08fafd79a 100644
--- a/games-emulation/np2kai/np2kai-22_p20210211.ebuild
+++ b/games-emulation/np2kai/np2kai-22_p20210211.ebuild
@@ -16,9 +16,12 @@ SRC_URI="
                -> sdl2-cmake-modules-${MY_SDL2_CMAKE_MODULES_REV}.tar.gz
 "
 
+S="${WORKDIR}/NP2kai-${MY_REV}"
+
 LICENSE="MIT BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="+i286 ia32 haxm +sdl2 +X"
 REQUIRED_USE="|| ( X sdl2 ) ^^ ( i286 ia32 )"
 
@@ -46,8 +49,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/NP2kai-${MY_REV}"
-
 src_prepare() {
        sed -i '+s/CONFIGURATIONS Release/CONFIGURATIONS Gentoo/g' 
CMakeLists.txt || die
        mv "${WORKDIR}"/sdl2-cmake-modules-${MY_SDL2_CMAKE_MODULES_REV}/* \

diff --git a/games-engines/fs2_open/fs2_open-23.0.0.ebuild 
b/games-engines/fs2_open/fs2_open-23.0.0.ebuild
index 582e2abab5..35e94af61f 100644
--- a/games-engines/fs2_open/fs2_open-23.0.0.ebuild
+++ b/games-engines/fs2_open/fs2_open-23.0.0.ebuild
@@ -5,9 +5,6 @@ EAPI=8
 
 inherit cmake
 
-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/";
-
 # Replace "." with "_" in version
 _PV=${PV//./_}
 
@@ -15,12 +12,16 @@ _PV=${PV//./_}
 HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
 HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
 
+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/";
 SRC_URI="
        
https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz
 -> ${P}.tar.gz
        https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz 
-> ${P}-ext_libRocket.tar.gz
        
https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz 
-> ${P}-ext_rpavlik-cmake-modules.tar.gz
 "
 
+S="${WORKDIR}/fs2open.github.com-release_${_PV}"
+
 LICENSE="Unlicense MIT Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -50,8 +51,6 @@ PATCHES=(
 
 CMAKE_BUILD_TYPE=Release
 
-S="${WORKDIR}/fs2open.github.com-release_${_PV}"
-
 src_unpack() {
        unpack ${A}
        mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die

diff --git a/games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild 
b/games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild
index 4b10b96983..0b437cf5b1 100644
--- a/games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild
+++ b/games-engines/fs2_open/fs2_open-23.2.1-r1.ebuild
@@ -5,9 +5,6 @@ EAPI=8
 
 inherit cmake
 
-DESCRIPTION="FreeSpace2 Source Code Project game engine"
-HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/";
-
 # Replace "." with "_" in version
 _PV=${PV//./_}
 
@@ -15,12 +12,16 @@ _PV=${PV//./_}
 HASH_LIBROCKET="ecd648a43aff8a9f3daf064d75ca5725237d5b38"
 HASH_CMAKE_MODULES="7cef9577d6fc35057ea57f46b4986a8a28aeff50"
 
+DESCRIPTION="FreeSpace2 Source Code Project game engine"
+HOMEPAGE="https://github.com/scp-fs2open/fs2open.github.com/";
 SRC_URI="
        
https://github.com/scp-fs2open/fs2open.github.com/archive/refs/tags/release_${_PV}.tar.gz
 -> ${P}.tar.gz
        https://github.com/asarium/libRocket/archive/${HASH_LIBROCKET}.tar.gz 
-> ${P}-ext_libRocket.tar.gz
        
https://github.com/asarium/cmake-modules/archive/${HASH_CMAKE_MODULES}.tar.gz 
-> ${P}-ext_rpavlik-cmake-modules.tar.gz
 "
 
+S="${WORKDIR}/fs2open.github.com-release_${_PV}"
+
 LICENSE="Unlicense MIT Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -51,8 +52,6 @@ PATCHES=(
 
 CMAKE_BUILD_TYPE=Release
 
-S="${WORKDIR}/fs2open.github.com-release_${_PV}"
-
 src_unpack() {
        unpack ${A}
        mv libRocket-${HASH_LIBROCKET}/* "${S}/lib/libRocket/" || die

diff --git a/games-engines/luxtorpeda/luxtorpeda-25.0.0.ebuild 
b/games-engines/luxtorpeda/luxtorpeda-25.0.0.ebuild
index 76840c8e86..d492da17a8 100644
--- a/games-engines/luxtorpeda/luxtorpeda-25.0.0.ebuild
+++ b/games-engines/luxtorpeda/luxtorpeda-25.0.0.ebuild
@@ -199,26 +199,26 @@ zip-0.5.6
 
 inherit cargo
 
-DESCRIPTION="Steam Play compatibility tool to run games using native Linux 
engines"
-HOMEPAGE="https://luxtorpeda.gitlab.io";
-
 MY_PV=$(ver_cut 1)
 MY_P="${PN}-${MY_PV}"
 
+DESCRIPTION="Steam Play compatibility tool to run games using native Linux 
engines"
+HOMEPAGE="https://luxtorpeda.gitlab.io";
 SRC_URI="
        https://github.com/luxtorpeda-dev/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz
        $(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 BSD Apache-2.0 BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RESTRICT="mirror"
+
 BEPEND=">=dev-libs/openssl-1.1.1g"
 RDEPEND="${BDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare(){
        default
        sed "s/%name%/${PN}/; s/%display_name%/${PN}/" 
compatibilitytool.template \

diff --git a/games-engines/nxengine-evo/nxengine-evo-2.6.4.ebuild 
b/games-engines/nxengine-evo/nxengine-evo-2.6.4.ebuild
index 0018a9e626..d5786e1ab0 100644
--- a/games-engines/nxengine-evo/nxengine-evo-2.6.4.ebuild
+++ b/games-engines/nxengine-evo/nxengine-evo-2.6.4.ebuild
@@ -11,8 +11,8 @@ SRC_URI="
        https://github.com/nxengine/nxengine-evo/archive/v${PV}.tar.gz -> 
${P}.tar.gz
        https://www.cavestory.org/downloads/cavestoryen.zip
 "
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="

diff --git a/games-engines/nxengine-evo/nxengine-evo-2.6.5_p1.ebuild 
b/games-engines/nxengine-evo/nxengine-evo-2.6.5_p1.ebuild
index 428137e713..b92d95978f 100644
--- a/games-engines/nxengine-evo/nxengine-evo-2.6.5_p1.ebuild
+++ b/games-engines/nxengine-evo/nxengine-evo-2.6.5_p1.ebuild
@@ -5,18 +5,19 @@ EAPI=8
 
 inherit xdg cmake
 
+MY_PV="${PV/_p/-}"
+
 DESCRIPTION="rewrite of the jump-and-run platformer Doukutsu Monogatari(Cave 
Story)"
 HOMEPAGE="https://github.com/nxengine/nxengine-evo 
http://nxengine.sourceforge.net/";
-
-MY_PV="${PV/_p/-}"
 SRC_URI="
        https://github.com/nxengine/nxengine-evo/archive/v${MY_PV}.tar.gz -> 
${PN}-${MY_PV}.tar.gz
        https://www.cavestory.org/downloads/cavestoryen.zip
 "
+
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-SLOT="0"
 LICENSE="GPL-3 freedist"
+SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="

diff --git a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild 
b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
index f84058dfe7..d5d62b6326 100644
--- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="A limit-removing enhanced-resolution Doom source 
port based on Choc
 HOMEPAGE="https://github.com/fabiangreffrath/crispy-doom";
 SRC_URI="https://github.com/fabiangreffrath/${PN}/archive/${P}.tar.gz";
 
+S="${WORKDIR}"/${PN}-${P}
+
 LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -29,8 +31,6 @@ BDEPEND="
        ${PYTHON_DEPS}
        doc? ( ${PYTHON_DEPS} )"
 
-S="${WORKDIR}"/${PN}-${P}
-
 DOCS=(
        "AUTHORS"
        "ChangeLog"

diff --git a/games-fps/crispy-doom/crispy-doom-6.0.ebuild 
b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
index 1afc599e7d..f132f01132 100644
--- a/games-fps/crispy-doom/crispy-doom-6.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="A limit-removing enhanced-resolution Doom source 
port based on Choc
 HOMEPAGE="https://github.com/fabiangreffrath/crispy-doom";
 SRC_URI="https://github.com/fabiangreffrath/${PN}/archive/${P}.tar.gz";
 
+S="${WORKDIR}"/${PN}-${P}
+
 LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -30,8 +32,6 @@ BDEPEND="
        ${PYTHON_DEPS}
        doc? ( ${PYTHON_DEPS} )"
 
-S="${WORKDIR}"/${PN}-${P}
-
 DOCS=(
        "AUTHORS"
        "ChangeLog"

diff --git a/games-fps/etlegacy/etlegacy-2.81.0.ebuild 
b/games-fps/etlegacy/etlegacy-2.81.0.ebuild
index c45ba5c5bf..26671fb6db 100644
--- a/games-fps/etlegacy/etlegacy-2.81.0.ebuild
+++ b/games-fps/etlegacy/etlegacy-2.81.0.ebuild
@@ -5,13 +5,15 @@ EAPI=8
 
 inherit cmake unpacker xdg
 
-DESCRIPTION="Wolfenstein: Enemy Territory 2.60b compatible client/server"
-HOMEPAGE="https://www.etlegacy.com/";
-
 # We need the game files from the original enemy-territory release
 ET_RELEASE="et260b"
+
+DESCRIPTION="Wolfenstein: Enemy Territory 2.60b compatible client/server"
+HOMEPAGE="https://www.etlegacy.com/";
 
SRC_URI="https://cdn.splashdamage.com/downloads/games/wet/${ET_RELEASE}.x86_full.zip";
 
+S="${WORKDIR}/${P/_rc/rc}"
+
 if [[ ${PV} = "9999" ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
@@ -66,8 +68,6 @@ BDEPEND="$(unpacker_src_uri_depends)"
 
 #QA_TEXTRELS="usr/share/games/etlegacy/legacy/omni-bot/omnibot_et.so"
 
-S="${WORKDIR}/${P/_rc/rc}"
-
 src_unpack() {
        if [[ "${PV}" = 9999 ]] ; then
                git-r3_src_unpack

diff --git a/games-fps/etlegacy/etlegacy-2.82.0.ebuild 
b/games-fps/etlegacy/etlegacy-2.82.0.ebuild
index c45ba5c5bf..26671fb6db 100644
--- a/games-fps/etlegacy/etlegacy-2.82.0.ebuild
+++ b/games-fps/etlegacy/etlegacy-2.82.0.ebuild
@@ -5,13 +5,15 @@ EAPI=8
 
 inherit cmake unpacker xdg
 
-DESCRIPTION="Wolfenstein: Enemy Territory 2.60b compatible client/server"
-HOMEPAGE="https://www.etlegacy.com/";
-
 # We need the game files from the original enemy-territory release
 ET_RELEASE="et260b"
+
+DESCRIPTION="Wolfenstein: Enemy Territory 2.60b compatible client/server"
+HOMEPAGE="https://www.etlegacy.com/";
 
SRC_URI="https://cdn.splashdamage.com/downloads/games/wet/${ET_RELEASE}.x86_full.zip";
 
+S="${WORKDIR}/${P/_rc/rc}"
+
 if [[ ${PV} = "9999" ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
@@ -66,8 +68,6 @@ BDEPEND="$(unpacker_src_uri_depends)"
 
 #QA_TEXTRELS="usr/share/games/etlegacy/legacy/omni-bot/omnibot_et.so"
 
-S="${WORKDIR}/${P/_rc/rc}"
-
 src_unpack() {
        if [[ "${PV}" = 9999 ]] ; then
                git-r3_src_unpack

diff --git a/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild 
b/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild
index 07b2ac44a9..b4eee6a12f 100644
--- a/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild
+++ b/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild
@@ -10,19 +10,18 @@ HOMEPAGE="
 "
 SRC_URI="https://archive.org/download/the-dark-mod/the-dark-mod-$PV.tar.xz";
 
+S="${WORKDIR}/the-dark-mod"
+
 LICENSE="
        GPL-3
        CC-BY-NC-ND-3.0
 "
-
 SLOT="0"
 KEYWORDS="~amd64"
 
 QA_PREBUILT="*"
 RESTRICT="strip"
 
-S="${WORKDIR}/the-dark-mod"
-
 src_install() {
        dodir /opt
        dodir /usr/bin/

diff --git a/games-puzzle/blockout/blockout-2.5.ebuild 
b/games-puzzle/blockout/blockout-2.5.ebuild
index 254f38d604..2b644921de 100644
--- a/games-puzzle/blockout/blockout-2.5.ebuild
+++ b/games-puzzle/blockout/blockout-2.5.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 inherit desktop
 
 DESCRIPTION="BlockOut II is an adaptation of the original Blockout DOS game"
-
 HOMEPAGE="http://www.blockout.net/blockout2";
 SRC_URI="
        https://downloads.sourceforge.net/blockout/bl25-src.tar.gz
        https://downloads.sourceforge.net/blockout/bl25-linux-x86.tar.gz";
 
+S="${WORKDIR}"/BL_SRC
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -21,9 +22,8 @@ RDEPEND="
        media-libs/sdl-mixer
        virtual/glu
        virtual/opengl"
-
 DEPEND="${RDEPEND}"
-S="${WORKDIR}"/BL_SRC
+
 PATCHES="${FILESDIR}"/${P}-datadir.patch
 
 src_compile() {

diff --git a/games-rpg/sacred-demo/sacred-demo-1.0.0.ebuild 
b/games-rpg/sacred-demo/sacred-demo-1.0.0.ebuild
index 63681e906d..21d7f9fb64 100644
--- a/games-rpg/sacred-demo/sacred-demo-1.0.0.ebuild
+++ b/games-rpg/sacred-demo/sacred-demo-1.0.0.ebuild
@@ -3,18 +3,15 @@
 
 EAPI=8
 
-inherit wrapper
-
 DESCRIPTION="Like Diablo, isometric view, good rating, about a two hours of 
the gameplay"
 HOMEPAGE="https://en.wikipedia.org/wiki/Sacred_(video_game)"
+SRC_URI="https://archive.org/download/${PN}.tar/${PN}.tar.xz";
 
-SRC_URI="https://archive.org/download/$PN.tar/$PN.tar.xz";
-
-KEYWORDS="~amd64"
 S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
+KEYWORDS="~amd64"
 RESTRICT="strip"
 
 RDEPEND="

diff --git a/games-rpg/snoot-game/snoot-game-1.9.1.ebuild 
b/games-rpg/snoot-game/snoot-game-1.9.1.ebuild
index 92b4115187..8585897b58 100644
--- a/games-rpg/snoot-game/snoot-game-1.9.1.ebuild
+++ b/games-rpg/snoot-game/snoot-game-1.9.1.ebuild
@@ -6,23 +6,25 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10,11,12} )
 inherit python-single-r1 desktop wrapper
 
+MY_PV="Patch8_NewYears"
+
 DESCRIPTION="Visual novel parody of Goodbye Volcano High"
-MY_PV="Patch9.1-RoastedLaika"
 HOMEPAGE="https://snootgame.xyz/";
 SRC_URI="https://snootgame.xyz/bin/SnootGame-${MY_PV}-linux.tar.bz2";
 
+S="${WORKDIR}/SnootGame-${MY_PV}-linux/"
+
 LICENSE="AGPL-3 CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="strip"
 
 RDEPEND="${PYTHON_DEPS} virtual/opengl"
 BDEPEND="${RDEPEND}"
 
-S="${WORKDIR}/SnootGame-${MY_PV}-linux/"
-
 QA_PREBUILT="*"
-RESTRICT+=" strip"
 
 src_install() {
        local dir=/opt/${PN}

diff --git a/games-strategy/general/general-4.6.ebuild 
b/games-strategy/general/general-4.6.ebuild
index 1f6506ee82..6005169ed6 100644
--- a/games-strategy/general/general-4.6.ebuild
+++ b/games-strategy/general/general-4.6.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 DESCRIPTION="Turn-based, old style with minimum graphic, full game, 5 MB size"
 HOMEPAGE="http://akasoft.genliga.ru/index_e.php";
-
 SRC_URI="https://archive.org/download/general.tar.xz/$P.tar.xz";
 
-KEYWORDS="~amd64"
 S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"
 
 RDEPEND="

diff --git a/games-strategy/ground-control/ground-control-1011.ebuild 
b/games-strategy/ground-control/ground-control-1011.ebuild
index 03ed885842..b7aa446b83 100644
--- a/games-strategy/ground-control/ground-control-1011.ebuild
+++ b/games-strategy/ground-control/ground-control-1011.ebuild
@@ -7,14 +7,14 @@ inherit wrapper
 
 DESCRIPTION="RTS from 2000 by Massive Entertainment, without resources and 
buildings"
 HOMEPAGE="https://en.wikipedia.org/wiki/Ground_Control_(video_game)"
-
 SRC_URI="https://archive.org/download/$PN.tar.xz/$PN.tar.xz";
 
-KEYWORDS="~amd64"
 S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"
 
 RDEPEND="

diff --git 
a/games-strategy/massive-assault-network-ii/massive-assault-network-ii-2.0.270.ebuild
 
b/games-strategy/massive-assault-network-ii/massive-assault-network-ii-2.0.270.ebuild
index 93818193d7..28e9ff2757 100644
--- 
a/games-strategy/massive-assault-network-ii/massive-assault-network-ii-2.0.270.ebuild
+++ 
b/games-strategy/massive-assault-network-ii/massive-assault-network-ii-2.0.270.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 DESCRIPTION="Turn-based, sci-fi, like a chess, from 2006, any screen 
resolution, good rating"
 HOMEPAGE="http://www.massiveassaultnetwork.com/man2/";
-
 
SRC_URI="https://archive.org/download/massive-assault-network-2.tar.xz/massive-assault-network-2.tar.xz";
 
-KEYWORDS="~amd64"
 S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"
 
 RDEPEND="

diff --git a/games-strategy/swine/swine-1.ebuild 
b/games-strategy/swine/swine-1.ebuild
index e9f26cc2a4..efebb33000 100644
--- a/games-strategy/swine/swine-1.ebuild
+++ b/games-strategy/swine/swine-1.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=8
 
-inherit wrapper
-
 DESCRIPTION="Fun RTS from 2001 by Hungarian developer StormRegion, similar to 
Ground Control"
 HOMEPAGE="https://en.wikipedia.org/wiki/S.W.I.N.E.";
-
 SRC_URI="https://archive.org/download/$PN.tar.xz/$PN.tar.xz";
 
-KEYWORDS="~amd64"
 S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"
 
 RDEPEND="

diff --git a/games-util/NotEnoughProduction/NotEnoughProduction-0.0.4.ebuild 
b/games-util/NotEnoughProduction/NotEnoughProduction-0.0.4.ebuild
index 77d044161c..0e7afef93b 100644
--- a/games-util/NotEnoughProduction/NotEnoughProduction-0.0.4.ebuild
+++ b/games-util/NotEnoughProduction/NotEnoughProduction-0.0.4.ebuild
@@ -14,15 +14,16 @@ SRC_URI="
        
https://raw.githubusercontent.com/bigbass1997/${PN}/master/lwjgl3/src/main/resources/libgdx32.png
 -> ${PN}-32.png
        
https://raw.githubusercontent.com/bigbass1997/${PN}/master/lwjgl3/src/main/resources/libgdx16.png
 -> ${PN}-16.png
 "
-KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+
 LICENSE="CC-BY-NC-SA-4.0"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="virtual/jre:1.8"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_unpack() {
        default
        cp "${DISTDIR}/${PN}"-{16,32,64,128}.png "${S}" || die

diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild 
b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild
index 25bbae4633..3e3d668643 100644
--- a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild
+++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-_app_id=net.davidotek.pupgui2
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=(python3_{9..12})
@@ -11,12 +10,15 @@ EPYTHON=python3
 
 inherit distutils-r1 desktop xdg-utils
 
-SRC_URI="https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz"
+_app_id=net.davidotek.pupgui2
+
 DESCRIPTION="Install and manage GE-Proton, Luxtorpeda & more for Steam Lutris 
and Heroic."
 HOMEPAGE="https://davidotek.github.io/protonup-qt";
+SRC_URI="https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
 
 RDEPEND="dev-python/steam
        dev-python/requests
@@ -26,14 +28,11 @@ RDEPEND="dev-python/steam
        dev-python/pyaml
        dev-python/zstandard
 "
-
 DEPEND="${RDEPEND}
        dev-util/desktop-file-utils
        dev-libs/appstream-glib
 "
 
-KEYWORDS="~amd64"
-
 src_compile() {
        appstream-util validate-relax --nonet 
"share/metainfo/$_app_id.appdata.xml"
        desktop-file-validate "share/applications/$_app_id.desktop"

diff --git a/games-util/gamehub/gamehub-0.16.0.1.ebuild 
b/games-util/gamehub/gamehub-0.16.0.1.ebuild
index f5061b3696..665cea4027 100644
--- a/games-util/gamehub/gamehub-0.16.0.1.ebuild
+++ b/games-util/gamehub/gamehub-0.16.0.1.ebuild
@@ -7,15 +7,16 @@ VALA_MIN_API_VERSION="0.44"
 
 inherit gnome2-utils meson vala xdg
 
-DESCRIPTION="GameHub is a unified library for all your games"
-HOMEPAGE="https://tkashkin.tk/projects/gamehub";
-
 MY_PN="GameHub"
 MY_PV="$(ver_rs 3 '-')-master"
 MY_P="${MY_PN}-${MY_PV}"
 
+DESCRIPTION="GameHub is a unified library for all your games"
+HOMEPAGE="https://tkashkin.tk/projects/gamehub";
 SRC_URI="https://github.com/tkashkin/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -37,8 +38,6 @@ BDEPEND="
        ${RDEPEND}
        $(vala_depend)"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
        default
        vala_src_prepare

diff --git a/games-util/gamehub/gamehub-0.16.3.2.ebuild 
b/games-util/gamehub/gamehub-0.16.3.2.ebuild
index 4b07e2e73f..acabc671ce 100644
--- a/games-util/gamehub/gamehub-0.16.3.2.ebuild
+++ b/games-util/gamehub/gamehub-0.16.3.2.ebuild
@@ -5,15 +5,16 @@ EAPI=8
 
 inherit gnome2-utils meson vala xdg
 
-DESCRIPTION="GameHub is a unified library for all your games"
-HOMEPAGE="https://tkashkin.github.io/projects/gamehub 
https://github.com/tkashkin/gamehub";
-
 MY_PN="GameHub"
 MY_PV="$(ver_rs 3 '-')-master"
 MY_P="${MY_PN}-${MY_PV}"
 
+DESCRIPTION="GameHub is a unified library for all your games"
+HOMEPAGE="https://tkashkin.github.io/projects/gamehub 
https://github.com/tkashkin/gamehub";
 SRC_URI="https://github.com/tkashkin/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -35,8 +36,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="$(vala_depend)"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
        default
        vala_setup

diff --git a/games-util/itch-bin/itch-bin-25.5.1-r2.ebuild 
b/games-util/itch-bin/itch-bin-25.5.1-r2.ebuild
index e81890c241..3dabe9b286 100644
--- a/games-util/itch-bin/itch-bin-25.5.1-r2.ebuild
+++ b/games-util/itch-bin/itch-bin-25.5.1-r2.ebuild
@@ -9,9 +9,12 @@ DESCRIPTION="itch.io game browser, installer and launcher"
 HOMEPAGE="https://itch.io/";
 SRC_URI="https://broth.itch.ovh/itch/linux-amd64/${PV}/archive/default -> 
${P}.zip"
 
-KEYWORDS="~amd64"
+S="${WORKDIR}"
+
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
+
 IUSE="system-ffmpeg"
 
 BDEPEND="app-arch/unzip"
@@ -39,8 +42,6 @@ QA_PREBUILT="
        !system-ffmpeg? ( opt/itch-bin/libffmpeg.so )
 "
 
-S="${WORKDIR}"
-
 src_install() {
        local destdir="${EPREFIX}/opt/${PN}"
        insinto "${destdir}"

diff --git a/games-util/protonup/protonup-0.1.5.ebuild 
b/games-util/protonup/protonup-0.1.5.ebuild
index 37f6612d29..dfc0b51feb 100644
--- a/games-util/protonup/protonup-0.1.5.ebuild
+++ b/games-util/protonup/protonup-0.1.5.ebuild
@@ -9,13 +9,13 @@ PYTHON_COMPAT=( python3_{9..12} )
 EPYTHON=python3
 
 inherit distutils-r1
-SRC_URI="https://github.com/AUNaseef/protonup/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
+
 DESCRIPTION="Install and Update Proton-GE"
 HOMEPAGE="https://github.com/AUNaseef/protonup";
+SRC_URI="https://github.com/AUNaseef/protonup/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 
 src_compile() {

diff --git a/games-util/r2modman-bin/r2modman-bin-3.1.48.ebuild 
b/games-util/r2modman-bin/r2modman-bin-3.1.48.ebuild
index e2a6b4e7c4..ebd671ece4 100644
--- a/games-util/r2modman-bin/r2modman-bin-3.1.48.ebuild
+++ b/games-util/r2modman-bin/r2modman-bin-3.1.48.ebuild
@@ -6,6 +6,9 @@ EAPI=8
 M_PN=r2modman
 
 inherit desktop xdg
+
+DESCRIPTION="A simple and easy to use mod manager for several games using 
Thunderstore"
+HOMEPAGE="https://github.com/ebkr/r2modmanPlus";
 SRC_URI="
        
https://github.com/ebkr/${M_PN}Plus/releases/download/v${PV}/${M_PN}-${PV}.tar.gz
 -> ${P}.tar.gz
        
https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/16x16.png
 -> ${P}-16x16.png
@@ -17,11 +20,12 @@ SRC_URI="
        
https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/192x192.png
 -> ${P}-192x192.png
        
https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/256x256.png
 -> ${P}-256x256.png
 "
-DESCRIPTION="A simple and easy to use mod manager for several games using 
Thunderstore"
-HOMEPAGE="https://github.com/ebkr/r2modmanPlus";
+
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
        net-dns/c-ares
@@ -41,10 +45,6 @@ RDEPEND="
        app-arch/snappy
 "
 
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"
-
 QA_PREBUILT="
        /opt/r2modman/chrome-sandbox
        /opt/r2modman/libEGL.so

diff --git a/games-util/roll/roll-2.6.1.ebuild 
b/games-util/roll/roll-2.6.1.ebuild
index e6e254d320..c55540cd54 100644
--- a/games-util/roll/roll-2.6.1.ebuild
+++ b/games-util/roll/roll-2.6.1.ebuild
@@ -8,10 +8,10 @@ HOMEPAGE="http://matteocorti.github.io/roll/";
 
SRC_URI="https://github.com/matteocorti/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
-IUSE="test"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="${DEPEND}"
-
+IUSE="test"
 RESTRICT="!test? ( test )"
+
+RDEPEND="${DEPEND}"

diff --git a/games-util/xivlauncher/xivlauncher-1.0.8.ebuild 
b/games-util/xivlauncher/xivlauncher-1.0.8.ebuild
index 70e7097fe6..7da3e93c04 100644
--- a/games-util/xivlauncher/xivlauncher-1.0.8.ebuild
+++ b/games-util/xivlauncher/xivlauncher-1.0.8.ebuild
@@ -234,9 +234,22 @@ [email protected]
 
 inherit dotnet-pkg desktop xdg
 
-DESCRIPTION="Custom Launcher for Final Fantasy XIV Online (Crossplatform 
rewrite)"
+XIVQL_COMMIT="020dde9d504f879a56b08fde570bcb4b5772ed3e"
 
+DESCRIPTION="Custom Launcher for Final Fantasy XIV Online (Crossplatform 
rewrite)"
 HOMEPAGE="https://github.com/goatcorp/XIVLauncher.Core/";
+SRC_URI="
+       
https://github.com/goatcorp/XIVLauncher.Core/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+       
https://github.com/goatcorp/FFXIVQuickLauncher/archive/${XIVQL_COMMIT}.tar.gz
+               -> FFXIVQuickLauncher-${XIVQL_COMMIT}.tar.gz
+       ${NUGET_URIS}
+"
+
+S="${WORKDIR}/XIVLauncher.Core-${PV}/src"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
 
 IUSE="+aria2 +libsecret"
 
@@ -259,24 +272,8 @@ RDEPEND="
        x11-libs/libSM
 "
 
-XIVQL_COMMIT="020dde9d504f879a56b08fde570bcb4b5772ed3e"
-
-SRC_URI="
-       
https://github.com/goatcorp/XIVLauncher.Core/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-       
https://github.com/goatcorp/FFXIVQuickLauncher/archive/${XIVQL_COMMIT}.tar.gz
-               -> FFXIVQuickLauncher-${XIVQL_COMMIT}.tar.gz
-       ${NUGET_URIS}
-"
-
-S="${WORKDIR}/XIVLauncher.Core-${PV}/src"
-
 DOTNET_PKG_PROJECTS=( "${S}/XIVLauncher.Core/XIVLauncher.Core.csproj" )
 
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64"
-
 src_prepare() {
        rmdir "${WORKDIR}/XIVLauncher.Core-${PV}/lib/FFXIVQuickLauncher" || die
        mv "${WORKDIR}/FFXIVQuickLauncher-${XIVQL_COMMIT}" \

Reply via email to