diff --git a/dev-python/intersect/intersect-1.2.ebuild b/dev-python/intersect/intersect-1.2.ebuild
index fd6563112807105cacada52d6f65ac02ca97df9f..eb646a3e376d252acd5939d99795aa654ed32a44 100644
--- a/dev-python/intersect/intersect-1.2.ebuild
+++ b/dev-python/intersect/intersect-1.2.ebuild
@@ -14,7 +14,9 @@ HOMEPAGE="
 	https://pypi.org/project/intersect/
 	https://github.com/sukhbinder/intersection
 "
+
 SRC_URI="https://github.com/sukhbinder/intersection/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/intersection-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,8 +30,6 @@ RDEPEND="
 
 DOCS=( readme.md )
 
-S="${WORKDIR}/intersection-${MY_COMMIT}"
-
 src_prepare() {
 	sed -i -e "s:packages=find_packages(),:packages=find_packages(exclude=('tests',)),:" setup.py || die
 	default
diff --git a/gnome-extra/gnome-pass-search-provider/gnome-pass-search-provider-1.0.0_p20221104.ebuild b/gnome-extra/gnome-pass-search-provider/gnome-pass-search-provider-1.0.0_p20221104.ebuild
index 4c732703303a656313d1f2c78169e93ed6a43526..e5b6aeb7e061702679b42c4974fb5809504ec724 100644
--- a/gnome-extra/gnome-pass-search-provider/gnome-pass-search-provider-1.0.0_p20221104.ebuild
+++ b/gnome-extra/gnome-pass-search-provider/gnome-pass-search-provider-1.0.0_p20221104.ebuild
@@ -11,7 +11,9 @@ COMMIT="6789843eeb77821d6050e58b436ebbc81d13f890"
 
 DESCRIPTION="Pass password manager search provider for gnome-shell"
 HOMEPAGE="https://github.com/jle64/gnome-pass-search-provider"
+
 SRC_URI="https://github.com/jle64/gnome-pass-search-provider/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${COMMIT}
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -27,8 +29,6 @@ RDEPEND="${DEPEND}
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')"
 
-S=${WORKDIR}/${PN}-${COMMIT}
-
 src_install() {
 	python_scriptinto /usr/lib/gnome-pass-search-provider
 	python_doscript gnome-pass-search-provider.py
diff --git a/sci-biology/systole-minimal/systole-minimal-0.2.4.ebuild b/sci-biology/systole-minimal/systole-minimal-0.2.4.ebuild
index 8cd80a61ce4874a05019af23d5b0c8f182642b73..84a63499499ebd362a29c54891321054627ad69e 100644
--- a/sci-biology/systole-minimal/systole-minimal-0.2.4.ebuild
+++ b/sci-biology/systole-minimal/systole-minimal-0.2.4.ebuild
@@ -13,7 +13,9 @@ HOMEPAGE="
 	https://github.com/embodied-computation-group/systole/
 	https://pypi.org/project/systole/
 	"
+
 SRC_URI="https://github.com/embodied-computation-group/systole/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${P/-minimal/}
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -27,8 +29,6 @@ RDEPEND="
 	dev-python/pandas[${PYTHON_USEDEP}]
 	"
 
-S=${WORKDIR}/${P/-minimal/}
-
 PATCHES=( "${FILESDIR}/remove-numba-sleepecg.patch" )
 
 src_prepare() {
diff --git a/sys-firmware/edk2-efishell-bin/edk2-efishell-bin-202005.ebuild b/sys-firmware/edk2-efishell-bin/edk2-efishell-bin-202005.ebuild
index ee2e1f91f25c7b9472e8ff8d6fb0cb746c52cad0..e3abbf2df0bd966f06dc9008179a56b64848cd64 100644
--- a/sys-firmware/edk2-efishell-bin/edk2-efishell-bin-202005.ebuild
+++ b/sys-firmware/edk2-efishell-bin/edk2-efishell-bin-202005.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="EFI-Shell - provides native UDK implemenations of a UEFI Shell 2.0"
 HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
+
 SRC_URI="https://github.com/tianocore/edk2/releases/download/edk2-stable201911/ShellBinPkg.zip -> ${P}.zip"
+S="${WORKDIR}/ShellBinPkg"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,8 +22,6 @@ src_install() {
 	dodoc UefiShell/UefiShell.inf
 }
 
-S="${WORKDIR}/ShellBinPkg"
-
 pkg_postinst() {
 	elog "To support your motherboards \"Launch EFI Shell from filesystem device\""
 	elog "funcitonality, copie /usr/share/${PN}/shellx64.efi to "