From fdef68f83f95670aba1de5a92bfeb2c0ed3723e6 Mon Sep 17 00:00:00 2001
From: Lucio Sauer <watermanpaint@posteo.net>
Date: Mon, 13 May 2024 22:29:52 +0200
Subject: [PATCH] media-sound/*: fix variable order

Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
Signed-off-by: Julien Roy <julien@jroy.ca>
---
 media-sound/6pm/6pm-0.9.ebuild                       | 12 +++++++-----
 media-sound/add64/add64-3.8.0.ebuild                 |  4 ++--
 media-sound/add64/add64-3.9.3.ebuild                 |  4 ++--
 media-sound/amberol/amberol-0.10.3.ebuild            |  2 +-
 media-sound/amberol/amberol-0.9.2.ebuild             |  2 +-
 media-sound/callaudiod/callaudiod-0.1.7.ebuild       |  2 +-
 media-sound/callaudiod/callaudiod-0.1.9.ebuild       |  2 +-
 media-sound/jriver/jriver-31.0.83.ebuild             |  6 +++---
 media-sound/mopidy/mopidy-3.4.2.ebuild               |  2 +-
 media-sound/mpd-mpris/mpd-mpris-0.3.1.ebuild         |  6 +++---
 media-sound/mpd-mpris/mpd-mpris-0.4.0.ebuild         |  6 +++---
 media-sound/mpd-mpris/mpd-mpris-0.4.1.ebuild         |  6 +++---
 media-sound/mpvc/mpvc-1.1.4.ebuild                   |  9 ++++++---
 media-sound/nuclear-bin/nuclear-bin-0.6.15.ebuild    |  4 ++--
 media-sound/nuclear-bin/nuclear-bin-0.6.17.ebuild    |  4 ++--
 .../opensoundmeter/opensoundmeter-1.2.1.ebuild       |  3 ++-
 .../opensoundmeter/opensoundmeter-1.2.2.ebuild       |  3 ++-
 .../opensoundmeter-1.2.2_p20230104.ebuild            |  3 ++-
 media-sound/pianobooster/pianobooster-1.0.0.ebuild   |  6 +++---
 .../tidal-hifi-bin/tidal-hifi-bin-5.10.0.ebuild      |  4 ++--
 .../tidal-hifi-bin/tidal-hifi-bin-5.9.0.ebuild       |  4 ++--
 media-sound/yewtube/yewtube-2.10.5.ebuild            | 12 ++++++------
 media-sound/yewtube/yewtube-9999.ebuild              | 12 ++++++------
 .../youtube-music-bin/youtube-music-bin-3.3.6.ebuild |  3 ++-
 .../zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild      |  8 ++++----
 media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild |  8 ++++----
 26 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/media-sound/6pm/6pm-0.9.ebuild b/media-sound/6pm/6pm-0.9.ebuild
index edfd84014f..7d8a8a880f 100644
--- a/media-sound/6pm/6pm-0.9.ebuild
+++ b/media-sound/6pm/6pm-0.9.ebuild
@@ -7,13 +7,17 @@ inherit qmake-utils
 
 DESCRIPTION="6PM is a polyphonic, touch-sensitive, realtime phase modulation synthesizer"
 HOMEPAGE="https://sourceforge.net/projects/mv-6pm/"
+MY_P="6PM_v${PV}"
+SRC_URI="https://downloads.sourceforge.net/project/mv-6pm/${MY_P}.tgz -> ${P}.tgz"
+
+S="${WORKDIR}/${MY_P}/src/"
+ADIR="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="+presets +midimaps +nls doc"
-MY_P="6PM_v${PV}"
-SRC_URI="https://downloads.sourceforge.net/project/mv-6pm/${MY_P}.tgz -> ${P}.tgz"
-LICENSE="GPL-3"
 
 DEPEND="
 	dev-qt/qtcore:5
@@ -24,8 +28,6 @@ DEPEND="
 	media-libs/alsa-lib
 "
 RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}/src/"
-ADIR="${WORKDIR}/${MY_P}"
 
 src_configure(){
 	eqmake5
diff --git a/media-sound/add64/add64-3.8.0.ebuild b/media-sound/add64/add64-3.8.0.ebuild
index 54b1f6b917..40db3ce4ee 100644
--- a/media-sound/add64/add64-3.8.0.ebuild
+++ b/media-sound/add64/add64-3.8.0.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Add64 is a realtime additive/subtractive-synthesis softsynth"
 HOMEPAGE="https://sourceforge.net/projects/add64/ http://linuxsynths.com/Add64PatchesDemos/add64.html"
 SRC_URI="https://downloads.sourceforge.net/project/add64/Add64-${PV}.tar.bz2"
 
+S="${WORKDIR}/Add64-${PV}/"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
@@ -25,8 +27,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/Add64-${PV}/"
-
 src_configure(){
 	eqmake5
 	default
diff --git a/media-sound/add64/add64-3.9.3.ebuild b/media-sound/add64/add64-3.9.3.ebuild
index 913ca8d09c..cdd1cbda27 100644
--- a/media-sound/add64/add64-3.9.3.ebuild
+++ b/media-sound/add64/add64-3.9.3.ebuild
@@ -12,6 +12,8 @@ HOMEPAGE="
 "
 SRC_URI="https://downloads.sourceforge.net/project/add64/Add64-${PV}.tar.bz2"
 
+S="${WORKDIR}/Add64-${PV}/"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
@@ -27,8 +29,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/Add64-${PV}/"
-
 src_compile() {
 	eqmake5
 	default
diff --git a/media-sound/amberol/amberol-0.10.3.ebuild b/media-sound/amberol/amberol-0.10.3.ebuild
index ecd64488c8..93d29eb9ba 100644
--- a/media-sound/amberol/amberol-0.10.3.ebuild
+++ b/media-sound/amberol/amberol-0.10.3.ebuild
@@ -244,8 +244,8 @@ CRATES="
 
 inherit cargo gnome2-utils meson xdg
 
-HOMEPAGE="https://gitlab.gnome.org/World/amberol"
 DESCRIPTION="Simple GUI Music Player"
+HOMEPAGE="https://gitlab.gnome.org/World/amberol"
 SRC_URI=" https://gitlab.gnome.org/World/${PN}/-/archive/${PV}/${P}.tar.bz2
 	$(cargo_crate_uris)"
 
diff --git a/media-sound/amberol/amberol-0.9.2.ebuild b/media-sound/amberol/amberol-0.9.2.ebuild
index 7c4fa23f31..782924a117 100644
--- a/media-sound/amberol/amberol-0.9.2.ebuild
+++ b/media-sound/amberol/amberol-0.9.2.ebuild
@@ -228,8 +228,8 @@ CRATES="
 
 inherit cargo gnome2-utils meson xdg
 
-HOMEPAGE="https://gitlab.gnome.org/World/amberol"
 DESCRIPTION="Simple GUI Music Player"
+HOMEPAGE="https://gitlab.gnome.org/World/amberol"
 SRC_URI=" https://gitlab.gnome.org/World/${PN}/-/archive/${PV}/${P}.tar.bz2
 	$(cargo_crate_uris)"
 
diff --git a/media-sound/callaudiod/callaudiod-0.1.7.ebuild b/media-sound/callaudiod/callaudiod-0.1.7.ebuild
index e5ebd79650..f66c095852 100644
--- a/media-sound/callaudiod/callaudiod-0.1.7.ebuild
+++ b/media-sound/callaudiod/callaudiod-0.1.7.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="Call audio routing daemon"
 HOMEPAGE="https://gitlab.com/mobian1/callaudiod"
 SRC_URI="https://gitlab.com/mobian1/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~arm64"
 LICENSE="LGPL-3+"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/media-sound/callaudiod/callaudiod-0.1.9.ebuild b/media-sound/callaudiod/callaudiod-0.1.9.ebuild
index e5ebd79650..f66c095852 100644
--- a/media-sound/callaudiod/callaudiod-0.1.9.ebuild
+++ b/media-sound/callaudiod/callaudiod-0.1.9.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="Call audio routing daemon"
 HOMEPAGE="https://gitlab.com/mobian1/callaudiod"
 SRC_URI="https://gitlab.com/mobian1/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~arm64"
 LICENSE="LGPL-3+"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/media-sound/jriver/jriver-31.0.83.ebuild b/media-sound/jriver/jriver-31.0.83.ebuild
index 1c868c9d47..58f5f7812e 100644
--- a/media-sound/jriver/jriver-31.0.83.ebuild
+++ b/media-sound/jriver/jriver-31.0.83.ebuild
@@ -11,13 +11,11 @@ SRC_URI="https://files.jriver-cdn.com/mediacenter/channels/v31/latest/MediaCente
 
 S="${WORKDIR}"
 
-SLOT="0"
-
 LICENSE="all-rights-reserved"
+SLOT="0"
 KEYWORDS="~amd64"
 
 RESTRICT="strip"
-QA_PREBUILT="*"
 REQUIRES_EXCLUDE="libcef.so" # Already inside
 
 # TODO soon brotli dep will be dropped
@@ -30,6 +28,8 @@ RDEPEND="
 	x11-libs/libXrandr
 "
 
+QA_PREBUILT="*"
+
 src_unpack() {
 	unpack_deb ${A}
 }
diff --git a/media-sound/mopidy/mopidy-3.4.2.ebuild b/media-sound/mopidy/mopidy-3.4.2.ebuild
index 153c095e85..b2db08df02 100644
--- a/media-sound/mopidy/mopidy-3.4.2.ebuild
+++ b/media-sound/mopidy/mopidy-3.4.2.ebuild
@@ -12,9 +12,9 @@ DESCRIPTION="An extensible music server written in Python."
 HOMEPAGE="https://mopidy.com/"
 SRC_URI="https://github.com/mopidy/mopidy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/gst-python[${PYTHON_USEDEP}]
diff --git a/media-sound/mpd-mpris/mpd-mpris-0.3.1.ebuild b/media-sound/mpd-mpris/mpd-mpris-0.3.1.ebuild
index 26a127dbb8..48ca55687e 100644
--- a/media-sound/mpd-mpris/mpd-mpris-0.3.1.ebuild
+++ b/media-sound/mpd-mpris/mpd-mpris-0.3.1.ebuild
@@ -7,6 +7,9 @@ inherit systemd go-module
 
 DESCRIPTION="An implementation of the MPRIS protocol for MPD."
 HOMEPAGE="https://github.com/natsukagami/mpd-mpris"
+SRC_URI="https://github.com/natsukagami/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://gitlab.com/Sevz17/go-deps/-/raw/main/${P}-deps.tar.xz"
+
 LICENSE="MIT BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -14,9 +17,6 @@ KEYWORDS="~amd64"
 RDEPEND="media-sound/mpd"
 DEPEND="${RDEPEND}"
 
-SRC_URI="https://github.com/natsukagami/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://gitlab.com/Sevz17/go-deps/-/raw/main/${P}-deps.tar.xz"
-
 src_compile() {
 	ego build -v -o "${PN}" cmd/mpd-mpris/*.go
 }
diff --git a/media-sound/mpd-mpris/mpd-mpris-0.4.0.ebuild b/media-sound/mpd-mpris/mpd-mpris-0.4.0.ebuild
index 5c85cc6010..1de050ecf9 100644
--- a/media-sound/mpd-mpris/mpd-mpris-0.4.0.ebuild
+++ b/media-sound/mpd-mpris/mpd-mpris-0.4.0.ebuild
@@ -7,6 +7,9 @@ inherit multiprocessing systemd go-module
 
 DESCRIPTION="An implementation of the MPRIS protocol for MPD."
 HOMEPAGE="https://github.com/natsukagami/mpd-mpris"
+SRC_URI="https://github.com/natsukagami/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://gitlab.com/sevz17/go-deps/-/raw/main/${P}-deps.tar.xz"
+
 LICENSE="MIT BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -14,9 +17,6 @@ KEYWORDS="~amd64"
 RDEPEND="media-sound/mpd"
 DEPEND="${RDEPEND}"
 
-SRC_URI="https://github.com/natsukagami/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://gitlab.com/sevz17/go-deps/-/raw/main/${P}-deps.tar.xz"
-
 src_compile() {
 	ego build -v -x -p "$(makeopts_jobs)" -o "${PN}" cmd/mpd-mpris/*.go
 }
diff --git a/media-sound/mpd-mpris/mpd-mpris-0.4.1.ebuild b/media-sound/mpd-mpris/mpd-mpris-0.4.1.ebuild
index ac735084dc..4b7ac14545 100644
--- a/media-sound/mpd-mpris/mpd-mpris-0.4.1.ebuild
+++ b/media-sound/mpd-mpris/mpd-mpris-0.4.1.ebuild
@@ -7,6 +7,9 @@ inherit desktop go-module multiprocessing systemd xdg
 
 DESCRIPTION="An implementation of the MPRIS protocol for MPD."
 HOMEPAGE="https://github.com/natsukagami/mpd-mpris"
+SRC_URI="https://github.com/natsukagami/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/sevz17/go-deps/releases/download/${P}/${P}-deps.tar.xz"
+
 LICENSE="MIT BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -14,9 +17,6 @@ KEYWORDS="~amd64"
 RDEPEND="media-sound/mpd"
 DEPEND="${RDEPEND}"
 
-SRC_URI="https://github.com/natsukagami/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/sevz17/go-deps/releases/download/${P}/${P}-deps.tar.xz"
-
 src_compile() {
 	ego build -v -x -p "$(makeopts_jobs)" -o "${PN}" cmd/mpd-mpris/*.go
 }
diff --git a/media-sound/mpvc/mpvc-1.1.4.ebuild b/media-sound/mpvc/mpvc-1.1.4.ebuild
index 972c6b7e19..c74dfdacba 100644
--- a/media-sound/mpvc/mpvc-1.1.4.ebuild
+++ b/media-sound/mpvc/mpvc-1.1.4.ebuild
@@ -58,7 +58,9 @@ SRC_URI="
 $(cargo_crate_uris ${CRATES})
 https://gitlab.com/mpv-ipc/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
 "
-RESTRICT="mirror"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="GPL-3+"
 LICENSE+="
 	GPL-3 MIT MPL-2.0
@@ -67,9 +69,10 @@ LICENSE+="
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${PN}-v${PV}"
-QA_FLAGS_IGNORED="usr/bin/mpvc"
+RESTRICT="mirror"
 
 DEPEND="media-video/mpv"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/rust"
+
+QA_FLAGS_IGNORED="usr/bin/mpvc"
diff --git a/media-sound/nuclear-bin/nuclear-bin-0.6.15.ebuild b/media-sound/nuclear-bin/nuclear-bin-0.6.15.ebuild
index 6def3ff1c2..33569e3c52 100644
--- a/media-sound/nuclear-bin/nuclear-bin-0.6.15.ebuild
+++ b/media-sound/nuclear-bin/nuclear-bin-0.6.15.ebuild
@@ -11,12 +11,12 @@ DESCRIPTION="Nuclear is a streaming program that pulls content from free sources
 HOMEPAGE="https://nuclear.js.org https://github.com/nukeop/nuclear"
 SRC_URI="https://github.com/nukeop/nuclear/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 DEPEND="
 	app-accessibility/at-spi2-atk
 	app-accessibility/at-spi2-core
diff --git a/media-sound/nuclear-bin/nuclear-bin-0.6.17.ebuild b/media-sound/nuclear-bin/nuclear-bin-0.6.17.ebuild
index 748abc5d0a..9145a485da 100644
--- a/media-sound/nuclear-bin/nuclear-bin-0.6.17.ebuild
+++ b/media-sound/nuclear-bin/nuclear-bin-0.6.17.ebuild
@@ -11,12 +11,12 @@ DESCRIPTION="Nuclear is a streaming program that pulls content from free sources
 HOMEPAGE="https://nuclear.js.org https://github.com/nukeop/nuclear"
 SRC_URI="https://github.com/nukeop/nuclear/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 DEPEND="
 	app-accessibility/at-spi2-atk
 	app-accessibility/at-spi2-core
diff --git a/media-sound/opensoundmeter/opensoundmeter-1.2.1.ebuild b/media-sound/opensoundmeter/opensoundmeter-1.2.1.ebuild
index 372bb74c41..6199a3549e 100644
--- a/media-sound/opensoundmeter/opensoundmeter-1.2.1.ebuild
+++ b/media-sound/opensoundmeter/opensoundmeter-1.2.1.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
 	https://github.com/psmokotnin/osm/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
 "
 
+S="${WORKDIR}/osm-${PV}"
+
 # GPL-3 for the codebase
 # N-Noise-EULA for the M-Noise noise generator
 LICENSE="GPL-3 M-Noise-EULA"
@@ -31,7 +33,6 @@ BDEPEND="
 	dev-qt/qtcore:5
 "
 
-S="${WORKDIR}/osm-${PV}"
 DOCS=( "README.md" )
 
 src_prepare() {
diff --git a/media-sound/opensoundmeter/opensoundmeter-1.2.2.ebuild b/media-sound/opensoundmeter/opensoundmeter-1.2.2.ebuild
index 372bb74c41..6199a3549e 100644
--- a/media-sound/opensoundmeter/opensoundmeter-1.2.2.ebuild
+++ b/media-sound/opensoundmeter/opensoundmeter-1.2.2.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
 	https://github.com/psmokotnin/osm/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
 "
 
+S="${WORKDIR}/osm-${PV}"
+
 # GPL-3 for the codebase
 # N-Noise-EULA for the M-Noise noise generator
 LICENSE="GPL-3 M-Noise-EULA"
@@ -31,7 +33,6 @@ BDEPEND="
 	dev-qt/qtcore:5
 "
 
-S="${WORKDIR}/osm-${PV}"
 DOCS=( "README.md" )
 
 src_prepare() {
diff --git a/media-sound/opensoundmeter/opensoundmeter-1.2.2_p20230104.ebuild b/media-sound/opensoundmeter/opensoundmeter-1.2.2_p20230104.ebuild
index a35275ceca..36bc9b4a38 100644
--- a/media-sound/opensoundmeter/opensoundmeter-1.2.2_p20230104.ebuild
+++ b/media-sound/opensoundmeter/opensoundmeter-1.2.2_p20230104.ebuild
@@ -13,6 +13,8 @@ SRC_URI="
 	https://github.com/psmokotnin/osm/archive/refs/tags/v${MY_PV}.tar.gz -> opensoundmeter-${MY_PV}.gh.tar.gz
 "
 
+S="${WORKDIR}/osm-${MY_PV}"
+
 # GPL-3 for the codebase
 # N-Noise-EULA for the M-Noise noise generator
 LICENSE="GPL-3 M-Noise-EULA"
@@ -44,7 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-deadlock-fix.patch"
 )
 
-S="${WORKDIR}/osm-${MY_PV}"
 DOCS=( "README.md" )
 
 src_prepare() {
diff --git a/media-sound/pianobooster/pianobooster-1.0.0.ebuild b/media-sound/pianobooster/pianobooster-1.0.0.ebuild
index 9ad1c50b2b..50cb8fd87f 100644
--- a/media-sound/pianobooster/pianobooster-1.0.0.ebuild
+++ b/media-sound/pianobooster/pianobooster-1.0.0.ebuild
@@ -9,11 +9,13 @@ DESCRIPTION="A MIDI player/game that displays notes and teaches you how to play
 HOMEPAGE="https://www.pianobooster.org"
 SRC_URI="https://github.com/pianobooster/PianoBooster/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/PianoBooster-${PV}"
+
 LICENSE="GPL-3+"
 SLOT="0"
-RESTRICT="mirror"
 KEYWORDS="~amd64 ~x86"
 IUSE="jack"
+RESTRICT="mirror"
 
 DEPEND="
 	dev-qt/qtcore:5
@@ -32,8 +34,6 @@ BDEPEND="
 	virtual/pkgconfig
 	dev-qt/linguist-tools:5"
 
-S="${WORKDIR}/PianoBooster-${PV}"
-
 src_prepare() {
 
 	# Substitute because debian-based distros use /usr/include/rtmidi/RtMidi.h
diff --git a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.10.0.ebuild b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.10.0.ebuild
index 92fe1d3483..69ff9bc2b1 100644
--- a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.10.0.ebuild
+++ b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.10.0.ebuild
@@ -17,6 +17,8 @@ DESCRIPTION="Web version of Tidal running in electron with Hi-Fi support thanks
 HOMEPAGE="https://github.com/Mastermindzh/tidal-hifi"
 SRC_URI="https://github.com/Mastermindzh/tidal-hifi/releases/download/${PV}/tidal-hifi-${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -58,8 +60,6 @@ QA_PREBUILT="*"
 
 CONFIG_CHECK="~USER_NS"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
 	default
 	chromium_suid_sandbox_check_kernel_config
diff --git a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.9.0.ebuild b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.9.0.ebuild
index 92fe1d3483..69ff9bc2b1 100644
--- a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.9.0.ebuild
+++ b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.9.0.ebuild
@@ -17,6 +17,8 @@ DESCRIPTION="Web version of Tidal running in electron with Hi-Fi support thanks
 HOMEPAGE="https://github.com/Mastermindzh/tidal-hifi"
 SRC_URI="https://github.com/Mastermindzh/tidal-hifi/releases/download/${PV}/tidal-hifi-${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -58,8 +60,6 @@ QA_PREBUILT="*"
 
 CONFIG_CHECK="~USER_NS"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
 	default
 	chromium_suid_sandbox_check_kernel_config
diff --git a/media-sound/yewtube/yewtube-2.10.5.ebuild b/media-sound/yewtube/yewtube-2.10.5.ebuild
index bff9510e97..33ccea9162 100644
--- a/media-sound/yewtube/yewtube-2.10.5.ebuild
+++ b/media-sound/yewtube/yewtube-2.10.5.ebuild
@@ -6,6 +6,9 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=(python3_{9..12})
 inherit distutils-r1
 
+DESCRIPTION="Terminal-based YouTube player and downloader"
+HOMEPAGE="https://github.com/mps-youtube/yewtube https://pypi.org/project/yewtube/"
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/mps-youtube/yewtube.git"
 	inherit git-r3
@@ -14,15 +17,12 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/yewtube https://pypi.org/project/yewtube/"
-
 LICENSE="GPL-3"
 SLOT="0"
 
+IUSE="test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	media-video/ffmpeg
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/media-sound/yewtube/yewtube-9999.ebuild b/media-sound/yewtube/yewtube-9999.ebuild
index bff9510e97..33ccea9162 100644
--- a/media-sound/yewtube/yewtube-9999.ebuild
+++ b/media-sound/yewtube/yewtube-9999.ebuild
@@ -6,6 +6,9 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=(python3_{9..12})
 inherit distutils-r1
 
+DESCRIPTION="Terminal-based YouTube player and downloader"
+HOMEPAGE="https://github.com/mps-youtube/yewtube https://pypi.org/project/yewtube/"
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/mps-youtube/yewtube.git"
 	inherit git-r3
@@ -14,15 +17,12 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/yewtube https://pypi.org/project/yewtube/"
-
 LICENSE="GPL-3"
 SLOT="0"
 
+IUSE="test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	media-video/ffmpeg
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/media-sound/youtube-music-bin/youtube-music-bin-3.3.6.ebuild b/media-sound/youtube-music-bin/youtube-music-bin-3.3.6.ebuild
index a0e0115a47..8c1b3810d2 100644
--- a/media-sound/youtube-music-bin/youtube-music-bin-3.3.6.ebuild
+++ b/media-sound/youtube-music-bin/youtube-music-bin-3.3.6.ebuild
@@ -11,10 +11,11 @@ DESCRIPTION="YouTube Music Desktop App bundled with custom plugins"
 HOMEPAGE="https://th-ch.github.io/youtube-music/"
 SRC_URI="https://github.com/th-ch/youtube-music/releases/download/v${PV}/${MY_PN}_${PV}_amd64.deb"
 
+S="${WORKDIR}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-S="${WORKDIR}"
 
 RDEPEND="
 	app-accessibility/at-spi2-core:2
diff --git a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild
index bb169ba6e4..0003c7b5e3 100644
--- a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild
+++ b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild
@@ -8,7 +8,10 @@ inherit toolchain-funcs
 DESCRIPTION="zita-a2j and zita-j2a - bridges between ALSA and JACK"
 HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
 SOURCE_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads"
-SRC_URI="${SOURCE_URI}/${PN}-${PV}.tar.bz2"
+SRC_URI="${SOURCE_URI}/${P}.tar.bz2"
+
+S="${WORKDIR}/${P}/source"
+ADIR="${WORKDIR}/${P}/"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,9 +24,6 @@ virtual/jack"
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/gzip"
 
-S="${WORKDIR}/${P}/source"
-ADIR="${WORKDIR}/${P}/"
-
 DOCS=( ${ADIR}/AUTHORS ${ADIR}/COPYING ${ADIR}/README )
 
 PATCHES=( "${FILESDIR}/zita-ajbridge-0.8.4_don-t-compress-and-install-manpages.patch" )
diff --git a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
index 5d95318527..49921c235d 100644
--- a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
+++ b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
@@ -8,7 +8,10 @@ inherit toolchain-funcs
 DESCRIPTION="zita-a2j and zita-j2a - bridges between ALSA and JACK"
 HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
 SOURCE_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads"
-SRC_URI="${SOURCE_URI}/${PN}-${PV}.tar.bz2"
+SRC_URI="${SOURCE_URI}/${P}.tar.bz2"
+
+S="${WORKDIR}/${P}/source"
+ADIR="${WORKDIR}/${P}/"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,9 +24,6 @@ virtual/jack"
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/gzip"
 
-S="${WORKDIR}/${P}/source"
-ADIR="${WORKDIR}/${P}/"
-
 DOCS=( ${ADIR}/AUTHORS ${ADIR}/COPYING ${ADIR}/README )
 
 src_prepare() {