diff --git a/media-libs/alvr/alvr-16.0.0.ebuild b/media-libs/alvr/alvr-16.0.0.ebuild
index 3129df0a0f..41a52cd833 100644
--- a/media-libs/alvr/alvr-16.0.0.ebuild
+++ b/media-libs/alvr/alvr-16.0.0.ebuild
@@ -521,12 +521,12 @@ HOMEPAGE="https://github.com/alvr-org/ALVR"
 SRC_URI="https://github.com/alvr-org/ALVR/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 SRC_URI+=" ${CARGO_CRATE_URIS} "
 
+S="${WORKDIR}/${P^^}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${P^^}"
-
 IUSE="+client +server vaapi vulkan x264 x265"
 
 RDEPEND="
diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild b/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild
index 740c1759ae..d066b4d614 100644
--- a/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild
@@ -11,14 +11,17 @@ HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
 MY_PV="${PV/'.'/'.Q'}"
 FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download"
 SRC_URI="${FETCH_URI}/v-${MY_PV}/amdvlk-${MY_PV}.x86_64.rpm -> ${P}-amd64.rpm
-${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb"
-RESTRICT="test"
-REQUIRED_USE="abi_x86_64"
+	${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb"
+
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="legacy-si"
 KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore
 
+REQUIRED_USE="abi_x86_64"
+RESTRICT="test"
+
 RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	app-arch/zstd[${MULTILIB_USEDEP}]
@@ -31,9 +34,7 @@ RDEPEND="
 	!media-libs/amdvlk-bin:0
 	!media-libs/amdvlk-bin:legacy-polaris
 	"
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/sed"
 QA_PREBUILT="
 	usr/lib/*
@@ -43,8 +44,6 @@ QA_PREBUILT="
 # I don't know why the current value is not working
 QA_SONAME="usr/*"
 
-S=${WORKDIR}
-
 pkg_pretend(){
 	ewarn "This is extremely old version which supports AMD's legacy GPUs such as:"
 	ewarn "Radeon™ R5/R7/R9 200/300 Series"
diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild b/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild
index 3e53e100a5..4fec2e140e 100644
--- a/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild
@@ -11,14 +11,17 @@ HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
 MY_PV="${PV/'.'/'.Q'}"
 FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download"
 SRC_URI="${FETCH_URI}/v-${MY_PV}/amdvlk-${MY_PV}.x86_64.rpm -> ${P}-amd64.rpm
-${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb"
-RESTRICT="test"
-REQUIRED_USE="abi_x86_64"
+	${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb"
+
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="legacy-polaris"
 KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore
 
+REQUIRED_USE="abi_x86_64"
+RESTRICT="test"
+
 RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	app-arch/zstd[${MULTILIB_USEDEP}]
@@ -31,9 +34,7 @@ RDEPEND="
 	!media-libs/amdvlk-bin:0
 	!media-libs/amdvlk-bin:legacy-si
 	"
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/sed"
 QA_PREBUILT="
 	usr/lib/*
@@ -43,8 +44,6 @@ QA_PREBUILT="
 # I don't know why the current value is not working
 QA_SONAME="usr/lib/*"
 
-S=${WORKDIR}
-
 pkg_pretend(){
 	elog "This is last version which supports AMD's legacy graphics cards such as:"
 	elog "Radeon™ RX Vega Series"
diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild
index b709d1f79d..5b73208cdb 100644
--- a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild
@@ -12,14 +12,17 @@ HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
 MY_PV="${PV/'.'/'.Q'}"
 FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download"
 SRC_URI="${FETCH_URI}/v-${MY_PV}/amdvlk-${MY_PV}.x86_64.rpm -> ${P}-amd64.rpm
-${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb"
-RESTRICT="test"
-REQUIRED_USE="abi_x86_64"
+	${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb"
+
+S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore
 
+REQUIRED_USE="abi_x86_64"
+RESTRICT="test"
+
 RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	app-arch/zstd[${MULTILIB_USEDEP}]
@@ -32,9 +35,7 @@ RDEPEND="
 	!media-libs/amdvlk-bin:legacy-polaris
 	!media-libs/amdvlk-bin:legacy-si
 	"
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/sed"
 QA_PREBUILT="
 	usr/lib/*
@@ -44,8 +45,6 @@ QA_PREBUILT="
 # I don't know why the current value is not working
 QA_SONAME="usr/lib/*"
 
-S=${WORKDIR}
-
 pkg_pretend(){
 	ewarn "Mainline AMDVLK drops support for pre-NAVI graphics cards"
 	ewarn "Such as Radeon™ RX 400/500 Series"
diff --git a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
index 2083a930e5..02d04f50ff 100644
--- a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
+++ b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
@@ -10,34 +10,6 @@ inherit check-reqs python-any-r1 cmake-multilib
 
 DESCRIPTION="AMD Open Source Driver for Vulkan"
 HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
-DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	${BUNDLED_LLVM_DEPEND}
-	>=dev-util/vulkan-headers-1.3.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-S="${WORKDIR}"
-CMAKE_USE_DIR="${S}/xgl"
 
 ### SOURCE CODE PER_VERSION VARIABLES
 FETCH_URI="https://github.com/GPUOpen-Drivers"
@@ -66,6 +38,36 @@ ${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${
 ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
 ${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
 
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wayland +raytracing"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
+DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	${BUNDLED_LLVM_DEPEND}
+	>=dev-util/vulkan-headers-1.3.224
+	raytracing? ( dev-util/DirectXShaderCompiler )
+	dev-util/glslang[${MULTILIB_USEDEP}]"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	${PYTHON_DEPS}
+	virtual/linux-sources"
+RDEPEND=" ${DEPEND}
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
+	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+	dev-util/glslang[${MULTILIB_USEDEP}]
+	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
+
+CHECKREQS_MEMORY="7G"
+CHECKREQS_DISK_BUILD="4G"
+CMAKE_USE_DIR="${S}/xgl"
+
 PATCHES=(
 	"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
 	"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
diff --git a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
index 5ae8851868..aa0f0cd910 100644
--- a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
+++ b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild
@@ -10,34 +10,6 @@ inherit check-reqs python-any-r1 cmake-multilib
 
 DESCRIPTION="AMD Open Source Driver for Vulkan"
 HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
-DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	${BUNDLED_LLVM_DEPEND}
-	>=dev-util/vulkan-headers-1.3.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-S="${WORKDIR}"
-CMAKE_USE_DIR="${S}/xgl"
 
 ### SOURCE CODE PER_VERSION VARIABLES
 FETCH_URI="https://github.com/GPUOpen-Drivers"
@@ -66,6 +38,36 @@ ${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${
 ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
 ${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
 
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wayland +raytracing"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
+DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	${BUNDLED_LLVM_DEPEND}
+	>=dev-util/vulkan-headers-1.3.224
+	raytracing? ( dev-util/DirectXShaderCompiler )
+	dev-util/glslang[${MULTILIB_USEDEP}]"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	${PYTHON_DEPS}
+	virtual/linux-sources"
+RDEPEND=" ${DEPEND}
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
+	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+	dev-util/glslang[${MULTILIB_USEDEP}]
+	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
+
+CHECKREQS_MEMORY="7G"
+CHECKREQS_DISK_BUILD="4G"
+CMAKE_USE_DIR="${S}/xgl"
+
 PATCHES=(
 	"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
 	"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
diff --git a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild b/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
index 815d180e2e..192387df27 100644
--- a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
+++ b/media-libs/amdvlk/amdvlk-2023.1.3.ebuild
@@ -10,35 +10,6 @@ inherit check-reqs python-any-r1 cmake-multilib
 
 DESCRIPTION="AMD Open Source Driver for Vulkan"
 HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wayland +raytracing"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
-DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	${BUNDLED_LLVM_DEPEND}
-	>=dev-util/vulkan-headers-1.3.224
-	raytracing? ( dev-util/DirectXShaderCompiler )
-	dev-util/glslang[${MULTILIB_USEDEP}]"
-BDEPEND="${BUNDLED_LLVM_DEPEND}
-	${PYTHON_DEPS}
-	virtual/linux-sources"
-RDEPEND=" ${DEPEND}
-	x11-libs/libdrm[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
-	dev-util/glslang[${MULTILIB_USEDEP}]
-	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
-
-CHECKREQS_MEMORY="7G"
-CHECKREQS_DISK_BUILD="4G"
-S="${WORKDIR}"
-CMAKE_USE_DIR="${S}/xgl"
-CMAKE_MAKEFILE_GENERATOR=ninja
 
 ### SOURCE CODE PER_VERSION VARIABLES
 FETCH_URI="https://github.com/GPUOpen-Drivers"
@@ -67,6 +38,37 @@ ${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${
 ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
 ${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
 
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wayland +raytracing"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
+DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	${BUNDLED_LLVM_DEPEND}
+	>=dev-util/vulkan-headers-1.3.224
+	raytracing? ( dev-util/DirectXShaderCompiler )
+	dev-util/glslang[${MULTILIB_USEDEP}]"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	${PYTHON_DEPS}
+	virtual/linux-sources"
+RDEPEND=" ${DEPEND}
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
+	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+	dev-util/glslang[${MULTILIB_USEDEP}]
+	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
+
+CHECKREQS_MEMORY="7G"
+CHECKREQS_DISK_BUILD="4G"
+CMAKE_USE_DIR="${S}/xgl"
+CMAKE_MAKEFILE_GENERATOR=ninja
+
 PATCHES=(
 	"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
 	"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
diff --git a/media-libs/dr_flac/dr_flac-0.12.42.ebuild b/media-libs/dr_flac/dr_flac-0.12.42.ebuild
index dc4b83ad0e..ce7acda477 100644
--- a/media-libs/dr_flac/dr_flac-0.12.42.ebuild
+++ b/media-libs/dr_flac/dr_flac-0.12.42.ebuild
@@ -5,16 +5,19 @@ EAPI=8
 
 inherit edo toolchain-funcs
 
-DESCRIPTION="Single-header FLAC audio decoder library"
-HOMEPAGE="https://github.com/mackron/dr_libs/"
 declare -A COMMITS=(
 	[dr_flac]="39ce69188eab79a913aa23423eef9da5f3dcd142"
 	[testbench]="aa7b0c6cf32994c106ae517a08134c28a96ff5b2"
 )
+
+DESCRIPTION="Single-header FLAC audio decoder library"
+HOMEPAGE="https://github.com/mackron/dr_libs/"
 SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMITS[dr_flac]}.tar.gz -> ${P}.gh.tar.gz
 test? ( https://github.com/ietf-wg-cellar/flac-test-files/archive/${COMMITS[testbench]}.tar.gz
 		-> ${P}-testbench.gh.tar.gz )"
 
+S="${WORKDIR}/dr_libs-${COMMITS[dr_flac]}"
+
 LICENSE="|| ( MIT-0 public-domain )"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -29,8 +32,6 @@ TESTCASES=(
 	dr_flac_{decoding,test_0}.{c,cpp}
 )
 
-S="${WORKDIR}/dr_libs-${COMMITS[dr_flac]}"
-
 src_prepare() {
 	if use test; then
 		# Sanitize testbench and move to expected location
diff --git a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild
index a5fb0851c4..7f0db96c46 100644
--- a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild
+++ b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 inherit edo toolchain-funcs
 
+COMMIT="da35f9d6c7374a95353fd1df1d394d44ab66cf01"
+
 DESCRIPTION="Single-header MP3 audio decoder library"
 HOMEPAGE="https://github.com/mackron/dr_libs/"
-COMMIT="da35f9d6c7374a95353fd1df1d394d44ab66cf01"
 SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/dr_libs-${COMMIT}"
+
 LICENSE="|| ( MIT-0 public-domain )"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -16,8 +20,6 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/dr_libs-${COMMIT}"
-
 # Unfortunately, the only other test is interactive.
 TESTCASES=(
 	dr_mp3_test_0.c
diff --git a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
index 274907ba47..579593823b 100644
--- a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
+++ b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
@@ -5,11 +5,14 @@ EAPI=8
 
 inherit edo toolchain-funcs
 
+COMMIT="4ec70a37c4450b021a6653f0813f1b9ceaae65fb"
+
 DESCRIPTION="Single-header WAV audio loader and writer library"
 HOMEPAGE="https://github.com/mackron/dr_libs/"
-COMMIT="4ec70a37c4450b021a6653f0813f1b9ceaae65fb"
 SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
 
+S="${WORKDIR}/dr_libs-${COMMIT}"
+
 LICENSE="|| ( MIT-0 public-domain )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
@@ -24,8 +27,6 @@ TESTCASES=(
 	dr_wav_{decoding,test_0}.{c,cpp}
 )
 
-S="${WORKDIR}/dr_libs-${COMMIT}"
-
 src_prepare() {
 	if use test; then
 		# Unbundle library with incorrect include path.
diff --git a/media-libs/glee/glee-5.4.0-r1.ebuild b/media-libs/glee/glee-5.4.0-r1.ebuild
index 93b296c4db..147b807d26 100644
--- a/media-libs/glee/glee-5.4.0-r1.ebuild
+++ b/media-libs/glee/glee-5.4.0-r1.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="OpenGL Easy Extension library"
 HOMEPAGE="https://elf-stone.com/glee.php"
 SRC_URI="https://elf-stone.com/downloads/GLee/GLee-${PV}-src.tar.gz"
 
+S="${WORKDIR}"
+
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -17,7 +19,6 @@ IUSE="static-libs"
 RDEPEND="virtual/opengl"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
 src_prepare() {
 	default
 	eapply -p0 "${FILESDIR}/${PN}-autotools.patch"
diff --git a/media-libs/glee/glee-5.4.0.ebuild b/media-libs/glee/glee-5.4.0.ebuild
index 23907cd28f..2fe6944a47 100644
--- a/media-libs/glee/glee-5.4.0.ebuild
+++ b/media-libs/glee/glee-5.4.0.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="OpenGL Easy Extension library"
 HOMEPAGE="https://elf-stone.com/glee.php"
 SRC_URI="https://elf-stone.com/downloads/GLee/GLee-${PV}-src.tar.gz"
 
+S="${WORKDIR}"
+
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -17,7 +19,6 @@ IUSE="static-libs"
 RDEPEND="virtual/opengl"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
 src_prepare() {
 	default
 	eapply -p0 "${FILESDIR}/${PN}-autotools.patch"
diff --git a/media-libs/wivrn/wivrn-0.13.ebuild b/media-libs/wivrn/wivrn-0.13.ebuild
index a6e984eabb..af71a45638 100644
--- a/media-libs/wivrn/wivrn-0.13.ebuild
+++ b/media-libs/wivrn/wivrn-0.13.ebuild
@@ -1,15 +1,15 @@
 EAPI=7
 
+inherit cmake
+
 DESCRIPTION="WiVRn OpenXR streaming"
 HOMEPAGE="https://github.com/meumeu/WiVRn"
-SLOT="0"
-LICENSE="GPL-3 Apache-2.0 MIT"
 
+LICENSE="GPL-3 Apache-2.0 MIT"
+SLOT="0"
 IUSE="nvenc pipewire pulseaudio systemd vaapi wireshark-plugins x264"
 REQUIRED_USE="|| ( nvenc vaapi x264 )"
 
-inherit cmake
-
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Meumeu/WiVRn.git"
@@ -99,7 +99,7 @@ src_configure() {
 		-DWIVRN_USE_SYSTEMD=$(usex systemd)
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-		-DFETCHCONTENT_BASE_DIR=${WORKDIR}
+		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
 		-DENABLE_COLOURED_OUTPUT=OFF
 	)
 
diff --git a/media-libs/wivrn/wivrn-0.14.1.ebuild b/media-libs/wivrn/wivrn-0.14.1.ebuild
index 0c9ffea662..de3b4b6fd7 100644
--- a/media-libs/wivrn/wivrn-0.14.1.ebuild
+++ b/media-libs/wivrn/wivrn-0.14.1.ebuild
@@ -1,15 +1,15 @@
 EAPI=7
 
+inherit cmake
+
 DESCRIPTION="WiVRn OpenXR streaming"
 HOMEPAGE="https://github.com/meumeu/WiVRn"
-SLOT="0"
-LICENSE="GPL-3 Apache-2.0 MIT"
 
+LICENSE="GPL-3 Apache-2.0 MIT"
+SLOT="0"
 IUSE="nvenc +pipewire -pulseaudio systemd vaapi wireshark-plugins x264"
 REQUIRED_USE="|| ( nvenc vaapi x264 )"
 
-inherit cmake
-
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Meumeu/WiVRn.git"
@@ -93,7 +93,7 @@ src_configure() {
 		-DWIVRN_USE_SYSTEMD=$(usex systemd)
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-		-DFETCHCONTENT_BASE_DIR=${WORKDIR}
+		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
 		-DENABLE_COLOURED_OUTPUT=OFF
 	)
 
diff --git a/media-libs/wivrn/wivrn-9999.ebuild b/media-libs/wivrn/wivrn-9999.ebuild
index 0c9ffea662..de3b4b6fd7 100644
--- a/media-libs/wivrn/wivrn-9999.ebuild
+++ b/media-libs/wivrn/wivrn-9999.ebuild
@@ -1,15 +1,15 @@
 EAPI=7
 
+inherit cmake
+
 DESCRIPTION="WiVRn OpenXR streaming"
 HOMEPAGE="https://github.com/meumeu/WiVRn"
-SLOT="0"
-LICENSE="GPL-3 Apache-2.0 MIT"
 
+LICENSE="GPL-3 Apache-2.0 MIT"
+SLOT="0"
 IUSE="nvenc +pipewire -pulseaudio systemd vaapi wireshark-plugins x264"
 REQUIRED_USE="|| ( nvenc vaapi x264 )"
 
-inherit cmake
-
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Meumeu/WiVRn.git"
@@ -93,7 +93,7 @@ src_configure() {
 		-DWIVRN_USE_SYSTEMD=$(usex systemd)
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-		-DFETCHCONTENT_BASE_DIR=${WORKDIR}
+		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
 		-DENABLE_COLOURED_OUTPUT=OFF
 	)
 
diff --git a/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild b/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild
index bfd917be35..e6b19cf3e3 100644
--- a/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild
+++ b/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild
@@ -5,14 +5,15 @@ EAPI="7"
 
 DESCRIPTION="Argotlunar is a sound granulator. Binary Linux VST"
 HOMEPAGE="https://mourednik.github.io/argotlunar/"
+#It's impossible to obtain package directly from DROPBOX, so I've just uploaded it to my own webserver
+SRC_URI="https://www.dropbox.com/s/fwtg6jfkzakj7is/argotlunar-2.06-linux_64.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/argotlunar-${PV}-linux_64"
+
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-QA_PRESTRIPPED="/usr/lib64/vst/${PN}/argotlunar.so"
-SRC_URI="https://www.dropbox.com/s/fwtg6jfkzakj7is/argotlunar-2.06-linux_64.tar.gz -> ${P}.tar.gz"
-#It's impossible to obtain package directly from DROPBOX, so I've just uploaded it to my own webserver
-LICENSE="GPL-2"
-
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libbsd
@@ -28,7 +29,9 @@ RDEPEND="
 	x11-libs/libxcb
 "
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/argotlunar-${PV}-linux_64"
+
+QA_PRESTRIPPED="/usr/lib64/vst/${PN}/argotlunar.so"
+
 src_install(){
 	into "/usr/$(get_libdir)/vst/${PN}"
 	dolib.so argotlunar.so
diff --git a/media-plugins/whysynth/whysynth-20170701_p20180323.ebuild b/media-plugins/whysynth/whysynth-20170701_p20180323.ebuild
index 181fdab7a6..62a8ae8403 100644
--- a/media-plugins/whysynth/whysynth-20170701_p20180323.ebuild
+++ b/media-plugins/whysynth/whysynth-20170701_p20180323.ebuild
@@ -10,6 +10,8 @@ HOMEPAGE="http://smbolton.com/whysynth.html https://github.com/smbolton/whysynth
 WHYSYNTH_COMMIT="32e4bc73baa554bb1844b3165e657911f43f3568"
 SRC_URI="https://github.com/smbolton/${PN}/archive/${WHYSYNTH_COMMIT}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-${WHYSYNTH_COMMIT}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -23,8 +25,6 @@ DEPEND="media-libs/dssi
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${WHYSYNTH_COMMIT}"
-
 src_prepare() {
 	./autogen.sh
 	default
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() {
diff --git a/media-video/lossless-cut/lossless-cut-3.54.0-r1.ebuild b/media-video/lossless-cut/lossless-cut-3.54.0-r1.ebuild
index 340d48af95..26e04abc65 100644
--- a/media-video/lossless-cut/lossless-cut-3.54.0-r1.ebuild
+++ b/media-video/lossless-cut/lossless-cut-3.54.0-r1.ebuild
@@ -8,24 +8,23 @@ inherit desktop xdg
 DESCRIPTION="Lossless video/audio editing: export media without reencoding, powered by ffmpeg"
 HOMEPAGE="https://mifi.no/losslesscut/
 https://github.com/mifi/lossless-cut"
-
 SRC_URI="https://github.com/mifi/lossless-cut/releases/download/v${PV}/LosslessCut-linux-x86_64.AppImage
 	-> ${P}.AppImage
 https://raw.githubusercontent.com/mifi/lossless-cut/v${PV}/no.mifi.losslesscut.appdata.xml
 -> ${P}-metainfo.xml
 "
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64"
 RESTRICT="strip"
 
 RDEPEND="sys-fs/fuse:0
 sys-libs/zlib:=
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/bin/losslesscut-bin"
 
 src_install() {
diff --git a/media-video/lossless-cut/lossless-cut-3.56.0.ebuild b/media-video/lossless-cut/lossless-cut-3.56.0.ebuild
index 340d48af95..26e04abc65 100644
--- a/media-video/lossless-cut/lossless-cut-3.56.0.ebuild
+++ b/media-video/lossless-cut/lossless-cut-3.56.0.ebuild
@@ -8,24 +8,23 @@ inherit desktop xdg
 DESCRIPTION="Lossless video/audio editing: export media without reencoding, powered by ffmpeg"
 HOMEPAGE="https://mifi.no/losslesscut/
 https://github.com/mifi/lossless-cut"
-
 SRC_URI="https://github.com/mifi/lossless-cut/releases/download/v${PV}/LosslessCut-linux-x86_64.AppImage
 	-> ${P}.AppImage
 https://raw.githubusercontent.com/mifi/lossless-cut/v${PV}/no.mifi.losslesscut.appdata.xml
 -> ${P}-metainfo.xml
 "
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64"
 RESTRICT="strip"
 
 RDEPEND="sys-fs/fuse:0
 sys-libs/zlib:=
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/bin/losslesscut-bin"
 
 src_install() {
diff --git a/media-video/lossless-cut/lossless-cut-3.59.1.ebuild b/media-video/lossless-cut/lossless-cut-3.59.1.ebuild
index 340d48af95..26e04abc65 100644
--- a/media-video/lossless-cut/lossless-cut-3.59.1.ebuild
+++ b/media-video/lossless-cut/lossless-cut-3.59.1.ebuild
@@ -8,24 +8,23 @@ inherit desktop xdg
 DESCRIPTION="Lossless video/audio editing: export media without reencoding, powered by ffmpeg"
 HOMEPAGE="https://mifi.no/losslesscut/
 https://github.com/mifi/lossless-cut"
-
 SRC_URI="https://github.com/mifi/lossless-cut/releases/download/v${PV}/LosslessCut-linux-x86_64.AppImage
 	-> ${P}.AppImage
 https://raw.githubusercontent.com/mifi/lossless-cut/v${PV}/no.mifi.losslesscut.appdata.xml
 -> ${P}-metainfo.xml
 "
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64"
 RESTRICT="strip"
 
 RDEPEND="sys-fs/fuse:0
 sys-libs/zlib:=
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/bin/losslesscut-bin"
 
 src_install() {
diff --git a/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0.ebuild b/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0.ebuild
index 45c08489b0..7f585deaae 100644
--- a/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0.ebuild
+++ b/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0.ebuild
@@ -480,10 +480,10 @@ DESCRIPTION="Tool for rendering OSDs over Walksnail DVR recordings"
 HOMEPAGE="https://github.com/avsaase/walksnail-osd-tool"
 SRC_URI="https://github.com/avsaase/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	${CARGO_CRATE_URIS}"
-KEYWORDS="~amd64"
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 GPL-3 ISC UbuntuFontLicense-1.0 MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016 Unlicense XC ZLIB"
 SLOT="0"
+KEYWORDS="~amd64"
 
 RDEPEND="${DEPEND}
 	media-video/ffmpeg"
diff --git a/mpv-plugin/SmartCopyPaste/SmartCopyPaste-3.1.ebuild b/mpv-plugin/SmartCopyPaste/SmartCopyPaste-3.1.ebuild
index a202719ec5..08b062d5cd 100644
--- a/mpv-plugin/SmartCopyPaste/SmartCopyPaste-3.1.ebuild
+++ b/mpv-plugin/SmartCopyPaste/SmartCopyPaste-3.1.ebuild
@@ -11,9 +11,10 @@ MY_PN="mpv-scripts"
 
 DESCRIPTION="Gives mpv the capability to copy and paste while being smart and customizable"
 HOMEPAGE="https://github.com/Eisa01/mpv-scripts"
-
 SRC_URI="https://github.com/Eisa01/${MY_PN}/archive/refs/tags/2.2.1.tar.gz -> Eisa01-${MY_PN}-2.2.1.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-2.2.1/scripts"
+
 LICENSE="BSD-2"
 KEYWORDS="~amd64"
 
@@ -24,6 +25,4 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/${MY_PN}-2.2.1/scripts"
-
 MPV_PLUGIN_FILES=( ${PN}.lua )
diff --git a/mpv-plugin/kdialog-open-files/kdialog-open-files-20221015.ebuild b/mpv-plugin/kdialog-open-files/kdialog-open-files-20221015.ebuild
index 55246298c5..456cebbac1 100644
--- a/mpv-plugin/kdialog-open-files/kdialog-open-files-20221015.ebuild
+++ b/mpv-plugin/kdialog-open-files/kdialog-open-files-20221015.ebuild
@@ -13,9 +13,10 @@ MY_P="${PN}-${COMMIT}"
 
 DESCRIPTION="Use KDialog to add files to playlist, subtitles to playing video or open URLs"
 HOMEPAGE="https://gist.github.com/ntasos/d1d846abd7d25e4e83a78d22ee067a22"
-
 SRC_URI="https://gist.github.com/ntasos/${HASH}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${HASH}-${COMMIT}"
+
 LICENSE="Unlicense"
 KEYWORDS="~amd64"
 
@@ -24,6 +25,4 @@ RDEPEND="
 	x11-misc/xdotool
 "
 
-S="${WORKDIR}/${HASH}-${COMMIT}"
-
 MPV_PLUGIN_FILES=( ${PN}.lua )
diff --git a/mpv-plugin/mpv-autosub/mpv-autosub-20210629.ebuild b/mpv-plugin/mpv-autosub/mpv-autosub-20210629.ebuild
index b8a8fecc38..fea3ec9ee0 100644
--- a/mpv-plugin/mpv-autosub/mpv-autosub-20210629.ebuild
+++ b/mpv-plugin/mpv-autosub/mpv-autosub-20210629.ebuild
@@ -12,9 +12,10 @@ MY_P="${PN}-${COMMIT}"
 
 DESCRIPTION="Fully automatic subtitle downloading for the MPV media player"
 HOMEPAGE="https://github.com/davidde/mpv-autosub"
-
 SRC_URI="https://github.com/davidde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 KEYWORDS="~amd64"
 
@@ -22,6 +23,4 @@ RDEPEND="
 	media-video/subliminal
 "
 
-S="${WORKDIR}/${MY_P}"
-
 MPV_PLUGIN_FILES=( autosub.lua )
diff --git a/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.1.ebuild b/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.1.ebuild
index 2c01fc18ef..d2f8c9d761 100644
--- a/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.1.ebuild
+++ b/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.1.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Set the display refresh rate that best approximates the content fps
 HOMEPAGE="https://gitlab.com/smaniottonicola/mpv-kscreen-doctor"
 SRC_URI="https://gitlab.com/smaniottonicola/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -20,6 +22,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 MPV_PLUGIN_FILES=( ${PN}.lua )
diff --git a/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.2.ebuild b/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.2.ebuild
index 27000ed945..9fb41155c4 100644
--- a/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.2.ebuild
+++ b/mpv-plugin/mpv-kscreen-doctor/mpv-kscreen-doctor-0.2.2.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Set the display refresh rate that best approximates the content fps
 HOMEPAGE="https://gitlab.com/smaniottonicola/mpv-kscreen-doctor"
 SRC_URI="https://gitlab.com/smaniottonicola/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -20,6 +22,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 MPV_PLUGIN_FILES=( ${PN}.lua )
diff --git a/mpv-plugin/mpv-plugin-xrandr/mpv-plugin-xrandr-2023.06.19.ebuild b/mpv-plugin/mpv-plugin-xrandr/mpv-plugin-xrandr-2023.06.19.ebuild
index 269a59a1b5..c82527591d 100644
--- a/mpv-plugin/mpv-plugin-xrandr/mpv-plugin-xrandr-2023.06.19.ebuild
+++ b/mpv-plugin/mpv-plugin-xrandr/mpv-plugin-xrandr-2023.06.19.ebuild
@@ -11,9 +11,10 @@ MY_PV="r${PV//./_}"
 
 DESCRIPTION="Automatically invoke the xrandr to set the parameters for the display output"
 HOMEPAGE="https://gitlab.com/lvml/mpv-plugin-xrandr"
-
 SRC_URI="https://gitlab.com/lvml/mpv-plugin-xrandr/-/archive/tags/${MY_PV}/mpv-plugin-xrandr-tags-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 
+S="${WORKDIR}/${PN}-tags-${MY_PV}"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
@@ -21,6 +22,4 @@ RDEPEND="
 	x11-apps/xrandr
 "
 
-S="${WORKDIR}/${PN}-tags-${MY_PV}"
-
 MPV_PLUGIN_FILES=( xrandr.lua )
diff --git a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild
index 9ba745d26f..188acb8dc8 100644
--- a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild
+++ b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20221230.ebuild
@@ -12,12 +12,11 @@ MY_P="${PN}-${COMMIT}"
 
 DESCRIPTION="A userscript that allows you to play \"up next\"/recommended youtube videos"
 HOMEPAGE="https://github.com/cvzi/mpv-youtube-upnext"
-
 SRC_URI="https://github.com/cvzi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 MPV_PLUGIN_FILES=( youtube-upnext.lua )
diff --git a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild
index d70204f8fe..68cd58e5e2 100644
--- a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild
+++ b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230409.ebuild
@@ -12,12 +12,11 @@ MY_P="${PN}-${COMMIT}"
 
 DESCRIPTION="A userscript that allows you to play \"up next\"/recommended youtube videos"
 HOMEPAGE="https://github.com/cvzi/mpv-youtube-upnext"
-
 SRC_URI="https://github.com/cvzi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 MPV_PLUGIN_FILES=( youtube-upnext.lua )
diff --git a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild
index 0a029dae7b..11094f42aa 100644
--- a/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild
+++ b/mpv-plugin/mpv-youtube-upnext/mpv-youtube-upnext-20230709.ebuild
@@ -12,12 +12,11 @@ MY_P="${PN}-${COMMIT}"
 
 DESCRIPTION="A userscript that allows you to play \"up next\"/recommended youtube videos"
 HOMEPAGE="https://github.com/cvzi/mpv-youtube-upnext"
-
 SRC_URI="https://github.com/cvzi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="MIT"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${MY_P}"
-
 MPV_PLUGIN_FILES=( youtube-upnext.lua )
diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
index 11e3b63e06..16c46b236f 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2021.04.27.ebuild
@@ -7,16 +7,16 @@ inherit toolchain-funcs
 
 COMMIT="c31cb283fe9d38ae0367fcd9a8aef6be14bcb927"
 
-SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="user contributed stuff related to munin"
 HOMEPAGE="https://github.com/munin-monitoring/contrib"
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/contrib-${COMMIT}"
 LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="examples +plugins templates tools"
 RDEPEND="net-analyzer/munin"
 
-S="${WORKDIR}/contrib-${COMMIT}"
 README_PLUGINS=(
 	plugins/README.md
 	plugins/apache/apache_byprojects/README.md
diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
index 30f4601514..fec941412a 100644
--- a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04.ebuild
@@ -7,16 +7,16 @@ inherit toolchain-funcs
 
 COMMIT="83f4e970c4a7378540057318a5083653ee2f138b"
 
-SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="user contributed stuff related to munin"
 HOMEPAGE="https://github.com/munin-monitoring/contrib"
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/contrib-${COMMIT}"
 LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="examples +plugins templates tools"
 RDEPEND="net-analyzer/munin"
 
-S="${WORKDIR}/contrib-${COMMIT}"
 README_PLUGINS=(
 	plugins/README.md
 	plugins/apache/apache_byprojects/README.md
diff --git a/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild b/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild
index d2aa39413a..7a69e5b887 100644
--- a/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild
+++ b/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild
@@ -16,12 +16,12 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="test"
 LICENSE="GPL-3"
 SLOT="0"
 # Doc generation fails
 # uses app-text/doxygen[dot]
 # IUSE="doc"
+RESTRICT="test"
 
 DEPEND="
 	dev-libs/expat
diff --git a/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild b/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild
index 94d4fde6cd..58f802ec3d 100644
--- a/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild
+++ b/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild
@@ -8,9 +8,9 @@ inherit flag-o-matic
 DESCRIPTION="Support for mounting HubiC drive in GNU/Linux"
 HOMEPAGE="https://github.com/TurboGit/hubicfuse"
 SRC_URI="https://github.com/TurboGit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
 
 LICENSE="LGPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 
 DEPEND="
diff --git a/net-im/Quaternion/Quaternion-0.0.95.1.ebuild b/net-im/Quaternion/Quaternion-0.0.95.1.ebuild
index 64e5ed4388..33d2f89705 100644
--- a/net-im/Quaternion/Quaternion-0.0.95.1.ebuild
+++ b/net-im/Quaternion/Quaternion-0.0.95.1.ebuild
@@ -9,8 +9,8 @@ DESCRIPTION="A Qt-based IM client for Matrix"
 HOMEPAGE="https://github.com/quotient-im/Quaternion https://matrix.org/docs/projects/client/quaternion.html"
 SRC_URI="https://github.com/quotient-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+keychain"
 
diff --git a/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild b/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild
index 8ae63b5ed3..70381f9fbc 100644
--- a/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild
+++ b/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild
@@ -10,13 +10,13 @@ HOMEPAGE="https://github.com/quotient-im/Quaternion https://matrix.org/ecosystem
 GITHUB_PV=${PV//_/-}
 SRC_URI="https://github.com/quotient-im/${PN}/archive/refs/tags/${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
+S="${WORKDIR}/${PN}-${GITHUB_PV}"
+
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64"
 IUSE="qt6"
 
-S="${WORKDIR}/${PN}-${GITHUB_PV}"
-
 RDEPEND="
 	qt6? (
 		dev-qt/qtbase:6[widgets,network,gui]
diff --git a/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild b/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild
index e402b1eed8..8568d52ceb 100644
--- a/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild
+++ b/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="All-in-one voice and text chat"
 HOMEPAGE="https://discordapp.com/"
 SRC_URI="https://dl-ptb.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -49,8 +51,6 @@ RDEPEND="
 	x11-libs/pango
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	opt/discord-ptb/${MY_BIN}
 	opt/discord-ptb/chrome-sandbox
diff --git a/net-im/gajim-plugins/gajim-plugins-9999.ebuild b/net-im/gajim-plugins/gajim-plugins-9999.ebuild
index f91cae101b..84807e8572 100644
--- a/net-im/gajim-plugins/gajim-plugins-9999.ebuild
+++ b/net-im/gajim-plugins/gajim-plugins-9999.ebuild
@@ -5,20 +5,20 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit python-single-r1
+inherit git-r3 python-single-r1
 
 DESCRIPTION="Plugins developed fro Gajim XMPP client"
 HOMEPAGE="https://dev.gajim.org/gajim/gajim-plugins/"
-
-inherit git-r3
 EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim-plugins.git"
 
-MY_PLUGINS="acronyms_expander anti_spam clients_icons length_notifier message_box_size now_listen omemo openpgp pgp plugins_translations quick_replies triggers"
+S="${WORKDIR}/${P%_p2}"
 
 LICENSE="GPL-3"
 SLOT="0"
+MY_PLUGINS="acronyms_expander anti_spam clients_icons length_notifier
+	message_box_size now_listen omemo openpgp pgp plugins_translations
+	quick_replies triggers"
 IUSE="$(printf '+%s ' ${MY_PLUGINS[@]})"
-S="${WORKDIR}/${P%_p2}"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/net-im/gomuks/gomuks-0.3.0.ebuild b/net-im/gomuks/gomuks-0.3.0.ebuild
index 1f9d940023..a8d2ed8ce4 100644
--- a/net-im/gomuks/gomuks-0.3.0.ebuild
+++ b/net-im/gomuks/gomuks-0.3.0.ebuild
@@ -3,12 +3,6 @@
 
 EAPI=8
 
-DESCRIPTION="A terminal based Matrix client written in Go"
-HOMEPAGE="https://github.com/tulir/gomuks"
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
 inherit go-module
 EGO_SUM=(
 	"github.com/alecthomas/chroma v0.10.0"
@@ -143,11 +137,18 @@ EGO_SUM=(
 )
 go-module_set_globals
 
+DESCRIPTION="A terminal based Matrix client written in Go"
+HOMEPAGE="https://github.com/tulir/gomuks"
 EGIT_COMMIT="09a927955810f6f0c6d3f4809d9b01eda365fd39"
 SRC_URI="https://github.com/tulir/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz ${EGO_SUM_SRC_URI}"
+
 S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
 IUSE="+encryption"
+
 DEPEND="encryption? ( >=dev-libs/olm-3 )"
 RDEPEND="${DEPEND}"
 
diff --git a/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild b/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild
index 1f9c0e91f9..d318fc63e4 100644
--- a/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild
+++ b/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild
@@ -328,6 +328,8 @@ MY_PV="0.0.16-1"
 SRC_URI="https://github.com/diamondburned/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_SUM_SRC_URI}"
 
+S="${WORKDIR}"/${PN}-${MY_PV}
+
 LICENSE="Apache-2.0 BSD BSD-2 GPL-3 ISC MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -345,7 +347,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}-${MY_PV}
 src_compile() {
 	ego build
 }
diff --git a/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild b/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild
index cabbb5efa3..4b437c38f5 100644
--- a/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild
+++ b/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="Drop Discord, get Guilded"
 HOMEPAGE="https://www.guilded.gg"
 SRC_URI="https://www.guilded.gg/downloads/${MY_BIN}-Linux.deb -> ${P}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -34,8 +36,6 @@ RDEPEND="
 	dev-libs/nss
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	opt/${MY_BIN}/${MY_PN}
 	opt/${MY_BIN}/chrome-sandbox
diff --git a/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild b/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild
index f681fd0e00..a9ea8a41b3 100644
--- a/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild
+++ b/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild
@@ -12,15 +12,19 @@ DESCRIPTION="Desktop application for Jitsi Meet built with Electron"
 HOMEPAGE="https://github.com/jitsi/jitsi-meet-electron"
 SRC_URI="https://github.com/jitsi/jitsi-meet-electron/releases/download/v${PV}/jitsi-meet-amd64.deb -> ${P}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
 
 IUSE="swiftshader"
 
 RESTRICT="bindist mirror splitdebug test"
 
-QA_PREBUILT="*"
 #Depends: libgtk-3-0, libnss3, libxtst6, xdg-utils, libatspi2.0-0, libuuid1
+#	sys-libs/libuuid seems to be included in sys-apps/util-linux
+#	sys-fs/fuse
 RDEPEND="
 	x11-libs/gtk+:3
 	dev-libs/nss
@@ -28,11 +32,8 @@ RDEPEND="
 	app-accessibility/at-spi2-core:2
 	app-accessibility/at-spi2-atk:2
 "
-#	sys-libs/libuuid seems to be included in sys-apps/util-linux
-#	sys-fs/fuse
 
-KEYWORDS="~amd64"
-S=$WORKDIR
+QA_PREBUILT="*"
 
 src_install() {
 	rm "opt/Jitsi Meet/chrome-sandbox" || die
diff --git a/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild
index dde0a90c16..dbdbfd8702 100644
--- a/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild
+++ b/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Terminal based Mattermost client"
 HOMEPAGE="https://github.com/matterhorn-chat/matterhorn"
 SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -23,8 +25,6 @@ RDEPEND="
 
 QA_PREBUILT="*"
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	default
 
diff --git a/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild
index 3bb8a42079..548ad7db08 100644
--- a/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild
+++ b/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Terminal based Mattermost client"
 HOMEPAGE="https://github.com/matterhorn-chat/matterhorn"
 SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -23,8 +25,6 @@ RDEPEND="
 
 QA_PREBUILT="*"
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	default
 
diff --git a/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild
index c0f94a03a6..178617c2eb 100644
--- a/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild
+++ b/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Terminal based Mattermost client"
 HOMEPAGE="https://github.com/matterhorn-chat/matterhorn"
 SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -23,8 +25,6 @@ RDEPEND="
 
 QA_PREBUILT="*"
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	default
 
diff --git a/net-im/pop/pop-8.0.21.ebuild b/net-im/pop/pop-8.0.21.ebuild
index 75493db46b..dde9794fa3 100644
--- a/net-im/pop/pop-8.0.21.ebuild
+++ b/net-im/pop/pop-8.0.21.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="Screen sharing with multiplayer control, with voice"
 HOMEPAGE="https://pop.com/home"
 SRC_URI="https://download.pop.com/desktop-app/linux/${PV}/${PN}_${PV}_amd64.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT=0
-RESTRICT="strip"
 KEYWORDS="~amd64"
-QA_PREBUILT="*"
+RESTRICT="strip"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -34,7 +35,7 @@ RDEPEND="
 	x11-libs/pango
 "
 
-S="${WORKDIR}"
+QA_PREBUILT="*"
 
 src_unpack() {
 	unpack_deb ${A}
diff --git a/net-im/ruqola/ruqola-1.3.1.ebuild b/net-im/ruqola/ruqola-1.3.1.ebuild
index 7c9721d868..c6ee64c762 100644
--- a/net-im/ruqola/ruqola-1.3.1.ebuild
+++ b/net-im/ruqola/ruqola-1.3.1.ebuild
@@ -14,9 +14,9 @@ DESCRIPTION="Rocket.Chat client for the KDE desktop"
 HOMEPAGE="https://invent.kde.org/network/ruqola"
 SRC_URI="https://invent.kde.org/network/ruqola/-/archive/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~amd64"
 
 IUSE="speech telemetry"
 
diff --git a/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild b/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild
index 6bb396c7b9..120cbdb622 100644
--- a/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild
+++ b/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild
@@ -17,6 +17,8 @@ DESCRIPTION="Session Desktop - Onion routing based messenger"
 HOMEPAGE="https://getsession.org/ https://github.com/oxen-io/session-desktop"
 SRC_URI="https://github.com/oxen-io/session-desktop/releases/download/v${PV}/session-desktop-linux-amd64-${PV}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -66,7 +68,6 @@ QA_PREBUILT="
 "
 
 CONFIG_CHECK="~USER_NS"
-S="${WORKDIR}"
 
 pkg_pretend(){
 	chromium_suid_sandbox_check_kernel_config
diff --git a/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild b/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild
index fdb913d9cc..26a74f3d87 100644
--- a/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild
+++ b/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild
@@ -20,13 +20,13 @@ SRC_URI="
 "
 S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
 	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild b/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild
index fdb913d9cc..26a74f3d87 100644
--- a/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild
+++ b/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild
@@ -20,13 +20,13 @@ SRC_URI="
 "
 S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
 	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild
index bf1e3a51ba..0716a1f887 100644
--- a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild
+++ b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="An unofficial WhatsApp desktop application for Linux"
 HOMEPAGE="https://github.com/eneshecan/whatsapp-for-linux"
 SRC_URI="https://github.com/eneshecan/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
 
 LANGUAGES="en es it ka nl pt-BR ru tr"
 for lang in ${LANGUAGES}; do
diff --git a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild
index bf1e3a51ba..0716a1f887 100644
--- a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild
+++ b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="An unofficial WhatsApp desktop application for Linux"
 HOMEPAGE="https://github.com/eneshecan/whatsapp-for-linux"
 SRC_URI="https://github.com/eneshecan/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
 
 LANGUAGES="en es it ka nl pt-BR ru tr"
 for lang in ${LANGUAGES}; do
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
index 59e6c393f9..d0675734a4 100644
--- a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
+++ b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
@@ -11,10 +11,13 @@ DESCRIPTION="C++ websocket client and server library"
 HOMEPAGE="https://github.com/machinezone/IXWebSocket"
 SRC_URI="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0/11.3.2"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ssl test zlib ws"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	ssl? (
@@ -39,10 +42,6 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
 PATCHES=(
 	# Some tests require network connectivity
 	"${FILESDIR}/${P}-remove-network-tests.patch"
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
index 5642e8bc64..95c00d6ff9 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="FORT validator is an open source RPKI validator"
 HOMEPAGE="https://fortproject.net/validator?2"
 SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -32,8 +34,6 @@ BDEPEND="
 	dev-build/automake
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_prepare() {
 	default
 	# Don't strip CFLAGS
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
index 4b1ba919b3..3d59fe3055 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="FORT validator is an open source RPKI validator"
 HOMEPAGE="https://fortproject.net/validator?2"
 SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -32,8 +34,6 @@ BDEPEND="
 	dev-build/automake
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_prepare() {
 	default
 	# Don't strip CFLAGS
diff --git a/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild b/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild
index 07234104bf..1b4ab8b7d5 100644
--- a/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild
+++ b/net-misc/eg25-manager/eg25-manager-0.4.2.ebuild
@@ -11,9 +11,11 @@ DESCRIPTION="Daemon for managing the Quectel EG25 modem"
 HOMEPAGE="https://gitlab.com/mobian1/devices/eg25-manager"
 SRC_URI="https://gitlab.com/mobian1/devices/eg25-manager/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~arm64"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~arm64"
 
 RDEPEND="
 	dev-libs/libgpiod
@@ -21,8 +23,6 @@ RDEPEND="
 	net-misc/modemmanager
 "
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_install() {
 	meson_src_install
 	systemd_dounit "${FILESDIR}"/eg25-manager.service
diff --git a/net-misc/gemserv/gemserv-0.6.5.ebuild b/net-misc/gemserv/gemserv-0.6.5.ebuild
index d88f401b33..118f42bb49 100644
--- a/net-misc/gemserv/gemserv-0.6.5.ebuild
+++ b/net-misc/gemserv/gemserv-0.6.5.ebuild
@@ -115,6 +115,8 @@ SRC_URI="
 	$(cargo_crate_uris ${CRATES})
 "
 
+S="${WORKDIR}/${PN}-v${PV}"
+
 # openssl and SSLeay come from the “ring” crate.
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0 openssl SSLeay ZLIB"
 SLOT="0"
@@ -125,8 +127,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings.
 QA_FLAGS_IGNORED="usr/bin/gemserv"
 
diff --git a/net-misc/gemserv/gemserv-0.6.6.ebuild b/net-misc/gemserv/gemserv-0.6.6.ebuild
index 738a467df1..2ad3af58b9 100644
--- a/net-misc/gemserv/gemserv-0.6.6.ebuild
+++ b/net-misc/gemserv/gemserv-0.6.6.ebuild
@@ -118,6 +118,8 @@ SRC_URI="
 	$(cargo_crate_uris ${CRATES})
 "
 
+S="${WORKDIR}/${PN}-v${PV}"
+
 # openssl and SSLeay come from the “ring” crate.
 LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0 openssl SSLeay ZLIB"
 SLOT="0"
@@ -128,8 +130,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings.
 QA_FLAGS_IGNORED="usr/bin/gemserv"
 
diff --git a/net-misc/openbgpd/openbgpd-6.9_p0.ebuild b/net-misc/openbgpd/openbgpd-6.9_p0.ebuild
index e7ce495b5c..346d1f7bbc 100644
--- a/net-misc/openbgpd/openbgpd-6.9_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-6.9_p0.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
 HOMEPAGE="http://www.openbgpd.org/index.html"
 SRC_URI="mirror://openbsd/OpenBGPD/${MY_P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -26,8 +28,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	default
 
diff --git a/net-misc/openbgpd/openbgpd-8.0.ebuild b/net-misc/openbgpd/openbgpd-8.0.ebuild
index 9f7921ac09..480afe2ae0 100644
--- a/net-misc/openbgpd/openbgpd-8.0.ebuild
+++ b/net-misc/openbgpd/openbgpd-8.0.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
 HOMEPAGE="http://www.openbgpd.org/index.html"
 SRC_URI="mirror://openbsd/OpenBGPD/${PN}-${MY_PV}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -26,8 +28,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	default
 
diff --git a/net-misc/rpki-client/rpki-client-8.0.ebuild b/net-misc/rpki-client/rpki-client-8.0.ebuild
index e9459f77f3..1fac52ea0d 100644
--- a/net-misc/rpki-client/rpki-client-8.0.ebuild
+++ b/net-misc/rpki-client/rpki-client-8.0.ebuild
@@ -11,6 +11,8 @@ HOMEPAGE="https://rpki-client.org/"
 SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz
 https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -26,7 +28,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local myeconfargs=(
 		--with-rsync=rsync
diff --git a/net-misc/rpki-client/rpki-client-8.4.ebuild b/net-misc/rpki-client/rpki-client-8.4.ebuild
index e9459f77f3..1fac52ea0d 100644
--- a/net-misc/rpki-client/rpki-client-8.4.ebuild
+++ b/net-misc/rpki-client/rpki-client-8.4.ebuild
@@ -11,6 +11,8 @@ HOMEPAGE="https://rpki-client.org/"
 SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz
 https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -26,7 +28,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local myeconfargs=(
 		--with-rsync=rsync
diff --git a/net-misc/rpki-client/rpki-client-8.8.ebuild b/net-misc/rpki-client/rpki-client-8.8.ebuild
index 452a51417a..d89b3a724d 100644
--- a/net-misc/rpki-client/rpki-client-8.8.ebuild
+++ b/net-misc/rpki-client/rpki-client-8.8.ebuild
@@ -11,6 +11,8 @@ HOMEPAGE="https://rpki-client.org/"
 SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz
 https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -28,7 +30,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local myeconfargs=(
 		--with-rsync=rsync
diff --git a/net-misc/smcroute/smcroute-2.5.6.ebuild b/net-misc/smcroute/smcroute-2.5.6.ebuild
index 3c9edd39d6..1c1482ef22 100644
--- a/net-misc/smcroute/smcroute-2.5.6.ebuild
+++ b/net-misc/smcroute/smcroute-2.5.6.ebuild
@@ -9,21 +9,17 @@ DESCRIPTION="A static multicast routing daemon"
 HOMEPAGE="https://troglobit.com/projects/smcroute/"
 SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="caps systemd"
 
-BDEPEND="
-	virtual/pkgconfig
-"
 RDEPEND="
 	caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:0= )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="
 	~IP_MROUTE
diff --git a/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild b/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild
index eea52196e8..873035534d 100644
--- a/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild
+++ b/net-misc/xkcd-handler/xkcd-handler-1.1.4.ebuild
@@ -9,14 +9,14 @@ DESCRIPTION="A handler for XKCD urls"
 HOMEPAGE="https://github.com/mazunki/xkcd"
 SRC_URI="https://github.com/mazunki/xkcd/archive/refs/tags/v${PV}.tar.gz -> xkcd-${PV}.tar.gz"
 
+S="${WORKDIR}/xkcd-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-misc/xdg-utils"
 
-S="${WORKDIR}/xkcd-${PV}"
-
 src_install() {
 	dobin xkcd
 	domenu xkcd.desktop
diff --git a/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild b/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild
index 828e71adeb..983aa72112 100644
--- a/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild
+++ b/net-misc/xmrig-mo/xmrig-mo-6.21.2.ebuild
@@ -9,10 +9,13 @@ MO_PV="mo1"
 DESCRIPTION="MoneroOcean fork of xmrig that supports algo switching"
 HOMEPAGE="https://github.com/MoneroOcean/xmrig"
 SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
-KEYWORDS="~amd64 ~arm64"
+
+S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
 IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
@@ -32,8 +35,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.21.2-fix-length-error.patch
 )
 
-S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
-
 src_prepare() {
 	if ! use donate ; then
 		sed -i 's/1;/0;/g' src/donate.h || die
diff --git a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
index 12214f85c0..31b1370933 100644
--- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
+++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="YaCy - p2p based distributed web-search engine"
 HOMEPAGE="https://www.yacy.net/"
 SRC_URI="https://www.yacy.net/release/yacy_v${MAJOR_PV}_${REL_PV}_${SVN_PV}.tar.gz"
 
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -25,8 +27,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 EANT_BUILD_TARGET="all"
 UNINSTALL_IGNORE="/usr/share/yacy/DATA"
 
diff --git a/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild b/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild
index b65b75a8f1..02741e7341 100644
--- a/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild
+++ b/net-misc/yt-dlg/yt-dlg-2023.08.16.ebuild
@@ -15,11 +15,13 @@ HOMEPAGE="https://yt-dlg.github.io/yt-dlg/"
 SHA="692e5c5deee95c721a4ad92ecae7ca86de8bef35"
 SRC_URI="https://github.com/yt-dlg/yt-dlg/archive/${SHA}.tar.gz -> ${P}.gh.tar.gz"
 
+S="${WORKDIR}/${PN}-${SHA}"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="ffmpeg test"
+IUSE="ffmpeg"
 
 # net-misc/youtube-dl isn't available in gentoo anymore but I kept it as a dependency option just in case someone still
 # use it or yt-dlp gets merged to youtube-dl.
@@ -34,6 +36,11 @@ DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}"
 
+# I don't know how to enable the test phase.
+distutils_enable_tests pytest
+
+DOCS=( README.md )
+
 python_test() {
 	local tests=( ditem dlist parsers utils widgets )
 	local current_test
@@ -42,13 +49,6 @@ python_test() {
 	done
 }
 
-# I don't know how to enable the test phase.
-distutils_enable_tests pytest
-
-S="${WORKDIR}/${PN}-${SHA}"
-
-DOCS=( README.md )
-
 src_install() {
 	distutils-r1_src_install
 	domenu yt-dlg.desktop
diff --git a/net-p2p/bisq-bin/bisq-bin-1.9.14.ebuild b/net-p2p/bisq-bin/bisq-bin-1.9.14.ebuild
index 532472d2bd..02e4800172 100644
--- a/net-p2p/bisq-bin/bisq-bin-1.9.14.ebuild
+++ b/net-p2p/bisq-bin/bisq-bin-1.9.14.ebuild
@@ -9,24 +9,23 @@ DESCRIPTION="The decentralized bitcoin exchange (non-atomic, with arbitration)"
 HOMEPAGE="https://bisq.network/ https://github.com/bisq-network/exchange/"
 SRC_URI="https://bisq.network/downloads/v${PV}/Bisq-64bit-${PV}.deb"
 
+S="${WORKDIR}"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RESTRICT="mirror strip"
+
 DEPEND="
 	dev-java/openjfx
 	net-libs/libnet
 	virtual/jre:*
 	x11-libs/gtk+:3"
 
-RESTRICT="mirror strip"
-
 # Bundled java, and seems to mostly work without an old ffmpeg
 QA_PREBUILT="opt/Bisq/Bisq opt/Bisq/libpackager.so opt/Bisq/runtime/*"
 REQUIRES_EXCLUDE="libgstreamer-lite.so libavplugin-53.so libavplugin-54.so libavplugin-55.so libavplugin-56.so libavplugin-57.so libavplugin-ffmpeg-56.so libavplugin-ffmpeg-57.so"
 
-S="${WORKDIR}"
-
 src_compile() {
 	:
 }
diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
index 5eb4043566..e47ff9e1ca 100644
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
@@ -8,6 +8,9 @@ DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB.
 HOMEPAGE="https://github.com/dogecoin"
 SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
 
+WORKDIR_="${WORKDIR}/dogecoin-${PV}"
+S="${WORKDIR_}"
+
 LICENSE="MIT"
 SLOT="0"
 DB_VER="5.3"
@@ -48,9 +51,6 @@ PATCHES=(
 	"${FILESDIR}"/gcc13.patch
 )
 
-WORKDIR_="${WORKDIR}/dogecoin-${PV}"
-S=${WORKDIR_}
-
 pkg_pretend() {
 
 	if use cpu_flags_x86_avx2 && [[ ! -e "${ROOT}"/etc/portage/patches/app-crypt/intel-ipsec-mb/remove_digest_init.patch ]]; then
diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild
index e78d3224bd..6b3ad9f774 100644
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild
@@ -7,9 +7,13 @@ inherit autotools desktop xdg-utils flag-o-matic
 DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure."
 HOMEPAGE="https://github.com/dogecoin"
 SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-KEYWORDS="~amd64 ~arm64"
+
+WORKDIR_="${WORKDIR}/dogecoin-${PV}"
+S="${WORKDIR_}"
+
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64"
 DB_VER="5.3"
 IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse2 intel-avx2 dogecoind experimental +pie +prune scrypt-sse2 +ssp tests utils +wallet zmq"
 REQUIRED_USE="dogecoind? ( utils ) intel-avx2?  ( experimental ) scrypt-sse2? ( experimental )  experimental? ( || ( intel-avx2 scrypt-sse2 ) )"
@@ -44,9 +48,6 @@ BDEPEND="
 	dev-build/automake
 "
 
-WORKDIR_="${WORKDIR}/dogecoin-${PV}"
-S=${WORKDIR_}
-
 pkg_pretend() {
 
 		if use intel-avx2 && [[ ! -e "${ROOT}"/etc/portage/patches/app-crypt/intel-ipsec-mb/remove_digest_init.patch ]]; then
diff --git a/net-p2p/p2pool/p2pool-3.10.ebuild b/net-p2p/p2pool/p2pool-3.10.ebuild
index 470ecec653..6631d1ee3c 100644
--- a/net-p2p/p2pool/p2pool-3.10.ebuild
+++ b/net-p2p/p2pool/p2pool-3.10.ebuild
@@ -7,12 +7,11 @@ inherit cmake
 
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
-
 SRC_URI=" https://github.com/SChernykh/p2pool/releases/download/v${PV}/p2pool_source.tar.xz -> ${P}.tar.xz"
-KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libsodium
diff --git a/net-p2p/p2pool/p2pool-3.5.ebuild b/net-p2p/p2pool/p2pool-3.5.ebuild
index ab2b6bb2ac..be4821ed9d 100644
--- a/net-p2p/p2pool/p2pool-3.5.ebuild
+++ b/net-p2p/p2pool/p2pool-3.5.ebuild
@@ -35,10 +35,9 @@ ${P}-robin-hood-hashing.tar.gz
 	https://github.com/SChernykh/miniupnp/archive/${MINIUPNP_DIST_COMMIT}.tar.gz -> \
 ${P}-miniupnp.tar.gz
 "
-KEYWORDS="~amd64 ~arm64 ~x86"
-
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libsodium
diff --git a/net-p2p/p2pool/p2pool-3.6.2.ebuild b/net-p2p/p2pool/p2pool-3.6.2.ebuild
index 470ecec653..6631d1ee3c 100644
--- a/net-p2p/p2pool/p2pool-3.6.2.ebuild
+++ b/net-p2p/p2pool/p2pool-3.6.2.ebuild
@@ -7,12 +7,11 @@ inherit cmake
 
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
-
 SRC_URI=" https://github.com/SChernykh/p2pool/releases/download/v${PV}/p2pool_source.tar.xz -> ${P}.tar.xz"
-KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libsodium
diff --git a/net-p2p/p2pool/p2pool-3.7.ebuild b/net-p2p/p2pool/p2pool-3.7.ebuild
index 470ecec653..6631d1ee3c 100644
--- a/net-p2p/p2pool/p2pool-3.7.ebuild
+++ b/net-p2p/p2pool/p2pool-3.7.ebuild
@@ -7,12 +7,11 @@ inherit cmake
 
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
-
 SRC_URI=" https://github.com/SChernykh/p2pool/releases/download/v${PV}/p2pool_source.tar.xz -> ${P}.tar.xz"
-KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libsodium
diff --git a/net-p2p/p2pool/p2pool-3.8.ebuild b/net-p2p/p2pool/p2pool-3.8.ebuild
index 470ecec653..6631d1ee3c 100644
--- a/net-p2p/p2pool/p2pool-3.8.ebuild
+++ b/net-p2p/p2pool/p2pool-3.8.ebuild
@@ -7,12 +7,11 @@ inherit cmake
 
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
-
 SRC_URI=" https://github.com/SChernykh/p2pool/releases/download/v${PV}/p2pool_source.tar.xz -> ${P}.tar.xz"
-KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libsodium
diff --git a/net-p2p/p2pool/p2pool-3.9.ebuild b/net-p2p/p2pool/p2pool-3.9.ebuild
index 470ecec653..6631d1ee3c 100644
--- a/net-p2p/p2pool/p2pool-3.9.ebuild
+++ b/net-p2p/p2pool/p2pool-3.9.ebuild
@@ -7,12 +7,11 @@ inherit cmake
 
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
-
 SRC_URI=" https://github.com/SChernykh/p2pool/releases/download/v${PV}/p2pool_source.tar.xz -> ${P}.tar.xz"
-KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	dev-libs/libsodium
diff --git a/net-p2p/p2pool/p2pool-9999.ebuild b/net-p2p/p2pool/p2pool-9999.ebuild
index d0ce001691..431adbea28 100644
--- a/net-p2p/p2pool/p2pool-9999.ebuild
+++ b/net-p2p/p2pool/p2pool-9999.ebuild
@@ -7,8 +7,6 @@ inherit cmake git-r3
 
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
-
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/SChernykh/p2pool.git"
 
 LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
diff --git a/net-vpn/cloudflare-warp/cloudflare-warp-2023.3.470.ebuild b/net-vpn/cloudflare-warp/cloudflare-warp-2023.3.470.ebuild
index 09cb06d9f9..b19e9b416a 100644
--- a/net-vpn/cloudflare-warp/cloudflare-warp-2023.3.470.ebuild
+++ b/net-vpn/cloudflare-warp/cloudflare-warp-2023.3.470.ebuild
@@ -9,16 +9,16 @@ DESCRIPTION="Cloudflare Warp Client"
 HOMEPAGE="https://1.1.1.1"
 SRC_URI="https://pkg.cloudflareclient.com/rpm/x86_64/${P}-1.x86_64.rpm"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
-RESTRICT="bindist mirror"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="systemd +systray"
+RESTRICT="bindist mirror"
 
 QA_PREBUILT="/bin/warp-cli /bin/warp-diag /bin/warp-svc /bin/warp-taskbar"
 
-S="${WORKDIR}"
-
 src_install() {
 	into /
 	dobin bin/warp-cli
diff --git a/net-vpn/cloudflare-warp/cloudflare-warp-2023.7.40.ebuild b/net-vpn/cloudflare-warp/cloudflare-warp-2023.7.40.ebuild
index 09cb06d9f9..b19e9b416a 100644
--- a/net-vpn/cloudflare-warp/cloudflare-warp-2023.7.40.ebuild
+++ b/net-vpn/cloudflare-warp/cloudflare-warp-2023.7.40.ebuild
@@ -9,16 +9,16 @@ DESCRIPTION="Cloudflare Warp Client"
 HOMEPAGE="https://1.1.1.1"
 SRC_URI="https://pkg.cloudflareclient.com/rpm/x86_64/${P}-1.x86_64.rpm"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
-RESTRICT="bindist mirror"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="systemd +systray"
+RESTRICT="bindist mirror"
 
 QA_PREBUILT="/bin/warp-cli /bin/warp-diag /bin/warp-svc /bin/warp-taskbar"
 
-S="${WORKDIR}"
-
 src_install() {
 	into /
 	dobin bin/warp-cli
diff --git a/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild b/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild
index 049e2cdce2..18187a2301 100644
--- a/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild
+++ b/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild
@@ -9,19 +9,19 @@ DESCRIPTION="Cloudflare Warp Client"
 HOMEPAGE="https://1.1.1.1"
 SRC_URI="https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_${PV}-1_amd64.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
-RESTRICT="bindist mirror"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="systemd +systray dex"
+RESTRICT="bindist mirror"
 RDEPEND="net-firewall/nftables
 	dex? ( net-libs/libpcap )
 "
 
 QA_PREBUILT="/bin/warp-cli /bin/warp-dex /bin/warp-diag /bin/warp-svc /bin/warp-taskbar"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack_deb ${A}
 }
diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild
index 82564fd652..9322d4ed8f 100644
--- a/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild
+++ b/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..13} )
+
 inherit distutils-r1
 
 DESCRIPTION="Create Windows installer USB from ISO (rewrite of WoeUSB)"
 HOMEPAGE="https://github.com/WoeUSB/WoeUSB-ng"
 SRC_URI="https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/WoeUSB-ng-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
+
 DEPEND="
-dev-python/wxpython
+	dev-python/wxpython
 "
 RDEPEND="
-app-arch/p7zip
-sys-boot/grub[grub_platforms_pc]
+	app-arch/p7zip
+	sys-boot/grub[grub_platforms_pc]
 "
diff --git a/x11-apps/lightdm-gtk-greeter-settings/lightdm-gtk-greeter-settings-1.2.2-r2.ebuild b/x11-apps/lightdm-gtk-greeter-settings/lightdm-gtk-greeter-settings-1.2.2-r2.ebuild
index 1c9e3637a0..ddb72e6635 100644
--- a/x11-apps/lightdm-gtk-greeter-settings/lightdm-gtk-greeter-settings-1.2.2-r2.ebuild
+++ b/x11-apps/lightdm-gtk-greeter-settings/lightdm-gtk-greeter-settings-1.2.2-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 xdg