*/*: fix variable order

Manually went through some entries for `pkgcheck scan -c VariableOrderCheck`. Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
2025-04-04 01:18:33 -04:00 · 2024-04-26 16:46:35 +02:00 · 2024-04-26 16:46:35 +02:00 · f2be215fb9
commit f2be215fb9
parent 7d1147ff43
147 changed files with 453 additions and 464 deletions
--- a/app-accessibility/rhvoice-core/rhvoice-core-1.14.0-r1.ebuild
+++ b/app-accessibility/rhvoice-core/rhvoice-core-1.14.0-r1.ebuild
@ -19,9 +19,9 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz ->
 S="${WORKDIR}/${MY_P}"

 LICENSE="BSD GPL-2+ GPL-3+ LGPL-2.1+"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ao dbus portaudio +pulseaudio +speech-dispatcher"
-SLOT="0"
 REQUIRED_USE="|| ( ao portaudio pulseaudio )"

 COMMON_DEPEND="
--- a/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild
@ -30,9 +30,9 @@ LICENSE="BSD GPL-2 GPL-3+ LGPL-2.1+
 	$(printf 'l10n_%s? ( CC-BY-NC-ND-4.0 )\n' "${CC_NC_LANGS[@]}")
 	$(printf 'l10n_%s? ( free-noncomm )\n' "${NC_LANGS[@]}")
 "
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="$(printf 'l10n_%s ' ${LANGS[@]}) ao cli portaudio +pulseaudio +server +speech-dispatcher"
-SLOT="0"
 REQUIRED_USE="|| ( ao portaudio pulseaudio )"

 DEPEND="
--- a/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild
+++ b/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild
@ -7,17 +7,19 @@ inherit cmake

 DESCRIPTION="Ananicy rewritten in C++ for much lower CPU and memory usage"
 HOMEPAGE="https://gitlab.com/ananicy-cpp/ananicy-cpp"
+SRC_URI="https://gitlab.com/ananicy-cpp/ananicy-cpp/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="bpf clang systemd"
 REQUIRED_USE="
 	bpf? ( clang )
 "

-SRC_URI="https://gitlab.com/ananicy-cpp/ananicy-cpp/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-S="${WORKDIR}/${PN}-v${PV}"
-
 RDEPEND="
 	!app-admin/ananicy
 	>=dev-cpp/nlohmann_json-3.9
--- a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
+++ b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
@ -8,13 +8,13 @@ DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gent
 HOMEPAGE="https://sourceforge.net/projects/customrescuecd/"
 SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"

+S=${WORKDIR}
+
 LICENSE="GPL-3"
 SLOT="${PV}"
 KEYWORDS="~x86"
 RESTRICT="bindist mirror"

-S=${WORKDIR}
-
 src_unpack() { :; }

 src_install() {
--- a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.7.ebuild
+++ b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.7.ebuild
@ -8,13 +8,13 @@ DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gent
 HOMEPAGE="https://sourceforge.net/projects/customrescuecd/"
 SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"

+S=${WORKDIR}
+
 LICENSE="GPL-3"
 SLOT="${PV}"
 KEYWORDS="~amd64"
 RESTRICT="bindist mirror"

-S=${WORKDIR}
-
 src_unpack() { :; }

 src_install() {
--- a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.8.ebuild
+++ b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.8.ebuild
@ -8,13 +8,13 @@ DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gent
 HOMEPAGE="https://sourceforge.net/projects/customrescuecd/"
 SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"

+S=${WORKDIR}
+
 LICENSE="GPL-3"
 SLOT="${PV}"
 KEYWORDS="~amd64"
 RESTRICT="bindist mirror"

-S=${WORKDIR}
-
 src_unpack() { :; }

 src_install() {
--- a/app-admin/enpass-desktop-bin/enpass-desktop-bin-6.7.4.933.ebuild
+++ b/app-admin/enpass-desktop-bin/enpass-desktop-bin-6.7.4.933.ebuild
@ -9,6 +9,8 @@ DESCRIPTION="A cross-platform, complete password management solution"
 HOMEPAGE="https://enpass.io/"
 SRC_URI="https://apt.enpass.io/pool/main/e/enpass/enpass_${PV}_amd64.deb"

+S="${WORKDIR}"
+
 LICENSE="Enpass-EULA"
 SLOT="0"
 KEYWORDS="~amd64"
@ -21,8 +23,6 @@ RDEPEND="
 	x11-libs/libxkbcommon
 "

-S="${WORKDIR}"
-
 QA_PREBUILT="/opt/enpass/*"

 src_unpack() {
--- a/app-arch/libarchive-qt/libarchive-qt-2.0.6-r1.ebuild
+++ b/app-arch/libarchive-qt/libarchive-qt-2.0.6-r1.ebuild
@ -17,10 +17,10 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi

-RESTRICT="test"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="static-libs"
+RESTRICT="test"

 DEPEND="
 	app-arch/libarchive[lzma,bzip2,zlib(+)]
--- a/app-arch/libarchive-qt/libarchive-qt-2.0.7.ebuild
+++ b/app-arch/libarchive-qt/libarchive-qt-2.0.7.ebuild
@ -17,10 +17,10 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi

-RESTRICT="test"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="static-libs"
+RESTRICT="test"

 DEPEND="
 	app-arch/libarchive[lzma,bzip2,zlib(+)]
--- a/app-arch/libarchive-qt/libarchive-qt-9999.ebuild
+++ b/app-arch/libarchive-qt/libarchive-qt-9999.ebuild
@ -13,14 +13,14 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/marcusbritanicus/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/marcusbritanicus/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
 fi

-RESTRICT="test"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="static-libs"
+RESTRICT="test"

 DEPEND="
 	app-arch/libarchive[lzma,bzip2,zlib(+)]
--- a/app-arch/microtar/microtar-0.1.0.ebuild
+++ b/app-arch/microtar/microtar-0.1.0.ebuild
@ -8,10 +8,10 @@ inherit toolchain-funcs
 DESCRIPTION="A lightweight tar library written in ANSI C"
 HOMEPAGE="https://github.com/rxi/microtar"
 SRC_URI="https://github.com/rxi/microtar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"

 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"

 src_compile() {
 	tc-export CC
--- a/app-arch/zarchive/zarchive-0.1.2.ebuild
+++ b/app-arch/zarchive/zarchive-0.1.2.ebuild
@ -9,11 +9,11 @@ DESCRIPTION="Library for creating and reading zstd-compressed file archives (.za
 HOMEPAGE="https://github.com/Exzap/ZArchive"
 SRC_URI="https://github.com/Exzap/ZArchive/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/ZArchive-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"

 DEPEND="app-arch/zstd"
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ZArchive-${PV}"
--- a/app-backup/kopia-ui-bin/kopia-ui-bin-0.15.0-r1.ebuild
+++ b/app-backup/kopia-ui-bin/kopia-ui-bin-0.15.0-r1.ebuild
@ -14,6 +14,8 @@ SRC_URI="
 	arm64? ( https://github.com/kopia/kopia/releases/download/v${PV}/kopia-ui_${PV}_arm64.deb -> ${P}-arm64.deb )
 "

+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64"
@ -48,7 +50,6 @@ RDEPEND="
 "

 QA_PREBUILT="opt/KopiaUI/*"
-S="${WORKDIR}"

 src_install() {
 	mv "${S}"/* "${ED}" || die
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-9999.ebuild
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-9999.ebuild
@ -5,19 +5,16 @@

 EAPI=8

-inherit bash-completion-r1 xdg-utils
+inherit bash-completion-r1 git-r3 xdg-utils

 DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
 HOMEPAGE="http://www.phoronix-test-suite.com"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+EGIT3_STORE_DIR="${T}"

 LICENSE="GPL-3"
 SLOT="0"

-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-EGIT3_STORE_DIR="${T}"
-inherit git-r3
-SRC_URI=""
-
 IUSE="sdl"

 RDEPEND="${DEPEND}
--- a/app-crypt/autofirma/autofirma-1.8.2.ebuild
+++ b/app-crypt/autofirma/autofirma-1.8.2.ebuild
@ -14,6 +14,8 @@ HOMEPAGE="
 SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${P}.zip
 	https://distfiles.chuso.net/distfiles/${P}.zip"

+S=${WORKDIR}
+
 LICENSE="|| ( GPL-2 EUPL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64"
@ -21,8 +23,6 @@ KEYWORDS="~amd64"
 RDEPEND="virtual/jre:1.8"
 BDEPEND="app-arch/unzip"

-S=${WORKDIR}
-
 src_unpack() {
 	default
 	rpm_unpack "./${P}-1.noarch_FEDORA.rpm"
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.10.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.10.0.ebuild
@ -11,6 +11,11 @@ inherit distutils-r1
 PARENT_PN="${PN%-dns-rfc2136}"
 PARENT_P="${PARENT_PN}-${PV}"

+DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3

@ -25,17 +30,11 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi

-DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
+S="${WORKDIR}/${PARENT_P}/${PN}"

 LICENSE="Apache-2.0"
 SLOT="0"

-S="${WORKDIR}/${PARENT_P}/${PN}"
-
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.8.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.8.0.ebuild
@ -11,6 +11,11 @@ inherit distutils-r1
 PARENT_PN="${PN%-dns-rfc2136}"
 PARENT_P="${PARENT_PN}-${PV}"

+DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3

@ -25,17 +30,11 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi

-DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
+S="${WORKDIR}/${PARENT_P}/${PN}"

 LICENSE="Apache-2.0"
 SLOT="0"

-S="${WORKDIR}/${PARENT_P}/${PN}"
-
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.9.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.9.0.ebuild
@ -11,6 +11,11 @@ inherit distutils-r1
 PARENT_PN="${PN%-dns-rfc2136}"
 PARENT_P="${PARENT_PN}-${PV}"

+DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3

@ -25,17 +30,11 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi

-DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
+S="${WORKDIR}/${PARENT_P}/${PN}"

 LICENSE="Apache-2.0"
 SLOT="0"

-S="${WORKDIR}/${PARENT_P}/${PN}"
-
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
@ -11,6 +11,11 @@ inherit distutils-r1
 PARENT_PN="${PN%-dns-rfc2136}"
 PARENT_P="${PARENT_PN}-${PV}"

+DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3

@ -25,17 +30,11 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi

-DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
+S="${WORKDIR}/${PARENT_P}/${PN}"

 LICENSE="Apache-2.0"
 SLOT="0"

-S="${WORKDIR}/${PARENT_P}/${PN}"
-
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
--- a/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild
+++ b/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild
@ -9,6 +9,8 @@ DESCRIPTION="Spanish government certificate request generator"
 HOMEPAGE="https://www.cert.fnmt.es/"
 SRC_URI="https://descargas.cert.fnmt.es/Linux/configuradorfnmt-1.0.1-0.x86_64.rpm"

+S=${WORKDIR}
+
 LICENSE="FNMT-RCM"
 SLOT="0"
 KEYWORDS="~amd64"
@ -16,8 +18,6 @@ KEYWORDS="~amd64"
 RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"

-S=${WORKDIR}/
-
 src_install() {
 	java-pkg_dojar "usr/lib64/${PN}/${PN}.jar"
 	java-pkg_dolauncher
--- a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r1.ebuild
+++ b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r1.ebuild
@ -10,8 +10,8 @@ HOMEPAGE="https://launchpad.net/gencfsm"
 SRC_URI="https://launchpad.net/gencfsm/trunk/${PV}/+download/${PN}_${PV}.tar.xz -> ${P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="+appindicator"

 DEPEND="
--- a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r2.ebuild
+++ b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r2.ebuild
@ -10,8 +10,8 @@ HOMEPAGE="https://launchpad.net/gencfsm"
 SRC_URI="https://launchpad.net/gencfsm/trunk/${PV}/+download/${PN}_${PV}.tar.xz -> ${P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="+appindicator"

 DEPEND="
--- a/app-crypt/uacme/uacme-1.7.1.ebuild
+++ b/app-crypt/uacme/uacme-1.7.1.ebuild
@ -8,10 +8,10 @@ HOMEPAGE="https://github.com/ndilieto/uacme"
 SRC_URI="https://github.com/ndilieto/uacme/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/uacme-upstream-${PV}"

+LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64"

-SLOT="0"
-LICENSE="GPL-3"
 IUSE="gnutls mbedtls +ualpn +man"
 REQUIRED_USE="gnutls? ( !mbedtls )"

--- a/app-dicts/dictd-moby-thesaurus/dictd-moby-thesaurus-1.0.ebuild
+++ b/app-dicts/dictd-moby-thesaurus/dictd-moby-thesaurus-1.0.ebuild
@ -11,8 +11,8 @@ HOMEPAGE="https://tracker.debian.org/pkg/dict-moby-thesaurus"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${DEB}"
 S="${WORKDIR}"

-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64"

 DEPEND=">=app-text/dictd-1.13.0-r3"
--- a/app-editors/mined/mined-2015.25.ebuild
+++ b/app-editors/mined/mined-2015.25.ebuild
@ -6,12 +6,15 @@ inherit toolchain-funcs
 DESCRIPTION="A powerful text editor with extensive Unicode and CJK support"
 HOMEPAGE="http://towo.net/mined/"
 SRC_URI="https://downloads.sourceforge.net/project/mined/mined/mined%20${PV}/${P}.tar.gz?ts=gAAAAABhfF-EKWvxGfwH7tpfR0NI8LV87Muimvh4jUigxZZZAD1fN8xgcbBPJc1TQ3f8djMFDbHXXz6rQZI4_qwwEsqakvBpqg%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fmined%2Ffiles%2Fmined%2Fmined%2520${PV}%2Fmined-${P}.tar.gz%2Fdownload -> ${P}.tar.gz"
+
+S="${S}"/src
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 RESTRICT="test"
 DEPEND="${RDEPEND}"
-S=${S}/src
 src_configure() {
 	tc-export CC
 	sed -in 's/OBJDIR=..\/bin\/sh/OBJDIR=bin\/sh/' mkmined
--- a/app-editors/typora-bin/typora-bin-1.8.10.ebuild
+++ b/app-editors/typora-bin/typora-bin-1.8.10.ebuild
@ -12,6 +12,8 @@ SRC_URI="
 	arm64? ( https://typora.io/linux/typora_${PV}_arm64.deb )
 "

+S="${WORKDIR}"
+
 LICENSE="Typora-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm64"
@ -43,7 +45,6 @@ RDEPEND="
 	${DEPEND}"

 QA_PREBUILT="*"
-S="${WORKDIR}"

 src_install() {
 	mv "${S}"/* "${ED}" || die
--- a/app-emacs/prop-menu/prop-menu-0.1.2.ebuild
+++ b/app-emacs/prop-menu/prop-menu-0.1.2.ebuild
@ -9,12 +9,12 @@ DESCRIPTION="Compute pop-up menus from text and overlay properties "
 HOMEPAGE="https://github.com/david-christiansen/prop-menu-el"
 SRC_URI="https://github.com/david-christiansen/prop-menu-el/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/prop-menu-el-${PV}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"

-S="${WORKDIR}/prop-menu-el-${PV}"
-
 SITEFILE="50${PN}-gentoo.el"

 src_prepare() {
--- a/app-emulation/arnold/arnold-20170513.ebuild
+++ b/app-emulation/arnold/arnold-20170513.ebuild
@ -11,6 +11,8 @@ DESCRIPTION="Amstrad CPC emulator"
 HOMEPAGE="http://www.cpctech.org.uk"
 SRC_URI="http://cpctech.cpc-live.com/arnsrc.zip -> ${P}.zip"

+S=${WORKDIR}/src
+
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@ -24,8 +26,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"

-S=${WORKDIR}/src
-
 src_prepare() {
 	setup-wxwidgets
 	sed -i "4421s:=.*$:=wxT(\"/usr/share/${PN}/\");:" arngui/arnguiApp.cpp || die
--- a/app-emulation/rars/rars-1.6.ebuild
+++ b/app-emulation/rars/rars-1.6.ebuild
@ -18,14 +18,9 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-S="${WORKDIR}/${P}"

-CP_DEPEND=""
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CP_DEPEND}"
-DEPEND=">=virtual/jdk-1.8:*
-	${CP_DEPEND}"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"

 src_unpack() {
 	default
--- a/app-eselect/eselect-autostart/eselect-autostart-1.0.0.ebuild
+++ b/app-eselect/eselect-autostart/eselect-autostart-1.0.0.ebuild
@ -3,18 +3,20 @@

 EAPI=8

-SRC_URI="https://codeberg.org/mmatous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="Manage symlinks in \$XDG_CONFIG_HOME/autostart"
 HOMEPAGE="https://codeberg.org/mmatous/eselect-autostart"
+SRC_URI="https://codeberg.org/mmatous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="mirror"

 RDEPEND="app-admin/eselect"

-S="${WORKDIR}/${PN}"
-
 src_install() {
 	default
 	insinto /usr/share/eselect/modules
--- a/app-eselect/eselect-ld/eselect-ld-1.0.0.ebuild
+++ b/app-eselect/eselect-ld/eselect-ld-1.0.0.ebuild
@ -3,18 +3,20 @@

 EAPI=8

-SRC_URI="https://codeberg.org/mmatous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="Manage the ld symlink"
 HOMEPAGE="https://codeberg.org/mmatous/eselect-ld"
+SRC_URI="https://codeberg.org/mmatous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="mirror"

 RDEPEND="app-admin/eselect"

-S="${WORKDIR}/${PN}"
-
 src_install() {
 	default
 	insinto /usr/share/eselect/modules
--- a/app-eselect/eselect-vala/eselect-vala-1.0.0.ebuild
+++ b/app-eselect/eselect-vala/eselect-vala-1.0.0.ebuild
@ -3,18 +3,18 @@

 EAPI=8

-SRC_URI="https://github.com/coldnew/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Manage the valac symlink"
 HOMEPAGE="https://github.com/coldnew/eselect-vala"
+SRC_URI="https://github.com/coldnew/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
 RESTRICT="mirror"

 RDEPEND="app-admin/eselect"

-S="${WORKDIR}/${P}"
-
 src_install() {
 	default
 	insinto /usr/share/eselect/modules
--- a/app-forensics/mvt/mvt-2.4.1.ebuild
+++ b/app-forensics/mvt/mvt-2.4.1.ebuild
@ -7,14 +7,14 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_11 )

 inherit distutils-r1
-SRC_URI="https://github.com/mvt-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"

 DESCRIPTION="Forensic traces to identify a potential compromise of Android and iOS devices"
 HOMEPAGE="https://github.com/mvt-project/mvt"
+SRC_URI="https://github.com/mvt-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"

 RDEPEND="
 	dev-python/adb-shell[${PYTHON_USEDEP}]
--- a/app-misc/anki-bin/anki-bin-23.12.1.ebuild
+++ b/app-misc/anki-bin/anki-bin-23.12.1.ebuild
@ -23,6 +23,8 @@ SRC_URI="
 	https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.xpm -> ${P}.xpm
 "

+S="${WORKDIR}"
+
 # The program itself is licensed under AGPL-3+ with contributed portions licensed
 # under BSD-3.
 # The translation files are licensed under BSD-3 and public-domain.
@ -100,8 +102,6 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"

-S="${WORKDIR}"
-
 DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either switch
 to ${CATEGORY}/${PN}[-qt6], or temporarily set an environment variable
 ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code.
--- a/app-misc/anki-bin/anki-bin-24.04.ebuild
+++ b/app-misc/anki-bin/anki-bin-24.04.ebuild
@ -23,6 +23,8 @@ SRC_URI="
 	https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.xpm -> ${P}.xpm
 "

+S="${WORKDIR}"
+
 # The program itself is licensed under AGPL-3+ with contributed portions licensed
 # under BSD-3.
 # The translation files are licensed under BSD-3 and public-domain.
@ -101,8 +103,6 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"

-S="${WORKDIR}"
-
 DOC_CONTENTS="Users with add-ons that still rely on Anki's Qt5 GUI can either switch
 to ${CATEGORY}/${PN}[-qt6], or temporarily set an environment variable
 ENABLE_QT5_COMPAT to 1 to have Anki install the previous compatibility code.
--- a/app-misc/apidb/apidb-5.11.0_beta.ebuild
+++ b/app-misc/apidb/apidb-5.11.0_beta.ebuild
@ -23,6 +23,8 @@ else
 	KEYWORDS="~amd64"
 fi

+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"

@ -44,8 +46,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 "

-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
 	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
--- a/app-misc/apidb/apidb-5.13.1_beta.ebuild
+++ b/app-misc/apidb/apidb-5.13.1_beta.ebuild
@ -23,6 +23,8 @@ else
 	KEYWORDS="~amd64"
 fi

+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"

@ -44,8 +46,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 "

-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
 	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
--- a/app-misc/apidb/apidb-5.13.4_beta.ebuild
+++ b/app-misc/apidb/apidb-5.13.4_beta.ebuild
@ -23,6 +23,8 @@ else
 	KEYWORDS="~amd64"
 fi

+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"

@ -44,8 +46,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 "

-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
 	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
--- a/app-misc/apidb/apidb-5.13.6_beta.ebuild
+++ b/app-misc/apidb/apidb-5.13.6_beta.ebuild
@ -23,6 +23,8 @@ else
 	KEYWORDS="~amd64"
 fi

+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"

@ -44,8 +46,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 "

-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
 	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
--- a/app-misc/apidb/apidb-5.8.0_beta.ebuild
+++ b/app-misc/apidb/apidb-5.8.0_beta.ebuild
@ -17,6 +17,8 @@ DESCRIPTION="API Generator for Database access"
 HOMEPAGE="https://github.com/azaeldevel/apidb"
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"

+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@ -39,8 +41,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 "

-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
 	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
--- a/app-misc/aw-client/aw-client-0.11.0.ebuild
+++ b/app-misc/aw-client/aw-client-0.11.0.ebuild
@ -8,20 +8,21 @@ PYTHON_COMPAT=( python3_10)

 inherit distutils-r1

+COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
+
 DESCRIPTION="Client library for ActivityWatch"
 HOMEPAGE="https://activitywatch.net"
-LICENSE="MPL-2.0"
-
-COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
 SRC_URI="https://github.com/ActivityWatch/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MPL-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
+
 # Test tries to connect to aw-server
 RESTRICT="test"

-S="${WORKDIR}/${PN}-${COMMIT}"
-
 RDEPEND="
 	app-misc/aw-core[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
@ -31,6 +32,4 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 "

-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
--- a/app-misc/aw-core/aw-core-0.11.0.ebuild
+++ b/app-misc/aw-core/aw-core-0.11.0.ebuild
@ -8,19 +8,19 @@ PYTHON_COMPAT=( python3_10 )

 inherit distutils-r1

+COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
+
 DESCRIPTION="Core library for ActivityWatch"
 HOMEPAGE="https://activitywatch.net"
-LICENSE="MPL-2.0"
-
-COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
 SRC_URI="https://github.com/ActivityWatch/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
 S="${WORKDIR}/${PN}-${COMMIT}"

+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/deprecation[${PYTHON_USEDEP}]
--- a/app-misc/brightness-control/brightness-control-2.4.ebuild
+++ b/app-misc/brightness-control/brightness-control-2.4.ebuild
@ -15,9 +15,9 @@ HOMEPAGE="https://github.com/lordamit/Brightness"
 SRC_URI="https://github.com/lordamit/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}/brightness-controller-linux"

-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"

 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/QtPy[${PYTHON_USEDEP},gui,network,pyqt5,widgets]'
--- a/app-misc/brightnessctl/brightnessctl-0.5.1.ebuild
+++ b/app-misc/brightnessctl/brightnessctl-0.5.1.ebuild
@ -9,9 +9,9 @@ DESCRIPTION="A program to read and control device brightness"
 HOMEPAGE="https://github.com/Hummer12007/brightnessctl"
 SRC_URI="https://github.com/Hummer12007/brightnessctl/archive/${PV}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64 ~arm64"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64"
 IUSE="systemd udev"

 DEPEND="
--- a/app-misc/chayang/chayang-0.1.0.ebuild
+++ b/app-misc/chayang/chayang-0.1.0.ebuild
@ -8,12 +8,13 @@ inherit meson
 DESCRIPTION="Gradually dim the screen."
 HOMEPAGE="https://git.sr.ht/~emersion/chayang"
 SRC_URI="https://git.sr.ht/~emersion/chayang/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-LICENSE="MIT"

+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"

-S="${WORKDIR}/${PN}-v${PV}"
 RESTRICT="mirror"

 RDEPEND="dev-libs/wayland"
--- a/app-misc/clipboard/clipboard-0.9.0.1.ebuild
+++ b/app-misc/clipboard/clipboard-0.9.0.1.ebuild
@ -11,6 +11,8 @@ DESCRIPTION="Cut, copy, and paste anything in your terminal"
 HOMEPAGE="https://getclipboard.app/ https://github.com/Slackadays/Clipboard"
 SRC_URI="https://github.com/Slackadays/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@ -26,7 +28,6 @@ RDEPEND="X? (
 		)
 		media-libs/alsa-lib
 "
-S="${WORKDIR}/${MY_P}"

 src_configure() {
 	local mycmakeargs=(
--- a/app-misc/dbf/dbf-0.9.0.ebuild
+++ b/app-misc/dbf/dbf-0.9.0.ebuild
@ -12,6 +12,8 @@ DESCRIPTION="Command line tool to read the content of dBASE III, IV, and 5.0 fil
 HOMEPAGE="https://github.com/rollinhand/dbf-core"
 SRC_URI="https://github.com/rollinhand/dbf-core/archive/${MY_COMMIT}.tar.gz -> ${P}.tgz"

+S="${WORKDIR}/${PN}-core-${MY_COMMIT}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@ -23,8 +25,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/docbook-sgml-utils )
 	virtual/pkgconfig"

-S="${WORKDIR}/${PN}-core-${MY_COMMIT}"
-
 src_prepare() {
 	default
 	if use doc; then
--- a/app-misc/dragon/dragon-1.1.1.ebuild
+++ b/app-misc/dragon/dragon-1.1.1.ebuild
@ -7,9 +7,9 @@ DESCRIPTION="Simple drag-and-drop source/sink for X and Wayland"
 HOMEPAGE="https://github.com/mwh/dragon"
 SRC_URI="https://github.com/mwh/dragon/archive/v${PV}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"

 DEPEND=">=x11-libs/gtk+-3"
 RDEPEND="${DEPEND}"
--- a/app-misc/dragon/dragon-1.1.1_p20210820.ebuild
+++ b/app-misc/dragon/dragon-1.1.1_p20210820.ebuild
@ -4,19 +4,20 @@
 EAPI=7

 COMMIT="c0ddf8d4f0a57b984570ceacb1f3e587639d8bda"
+
 DESCRIPTION="Simple drag-and-drop source/sink for X and Wayland"
 HOMEPAGE="https://github.com/mwh/dragon"
 SRC_URI="https://github.com/mwh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"

 DEPEND=">=x11-libs/gtk+-3"
 RDEPEND="${DEPEND}"

-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_prepare() {
 	default
 	sed -e 's/\(`pkg-config --cflags .*`\) \(`pkg-config --libs .*`\)/\1 $(CFLAGS) \2 $(LDFLAGS)/' \
--- a/app-misc/dragon/dragon-1.2.0.ebuild
+++ b/app-misc/dragon/dragon-1.2.0.ebuild
@ -7,9 +7,9 @@ DESCRIPTION="Simple drag-and-drop source/sink for X and Wayland"
 HOMEPAGE="https://github.com/mwh/dragon"
 SRC_URI="https://github.com/mwh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"

 DEPEND=">=x11-libs/gtk+-3"
 RDEPEND="${DEPEND}"
--- a/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r1.ebuild
+++ b/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r1.ebuild
@ -16,9 +16,10 @@ SRC_URI="

 S="${WORKDIR}/${PN}-${MY_COMMIT}/client_generic"

-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
 IUSE="video_cards_nvidia"

 DEPEND="dev-lang/lua:5.1
@ -38,7 +39,6 @@ DEPEND="dev-lang/lua:5.1
 	x11-libs/wxGTK:${WX_GTK_VER}
 	virtual/opengl"
 RDEPEND="${DEPEND}"
-# BDEPEND="app-arch/unzip"

 PATCHES=(
 	"${FILESDIR}/electricsheep-glext-prototypes.patch" # is included in the boost181 patch
--- a/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild
+++ b/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild
@ -19,10 +19,11 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi

-IUSE="video_cards_nvidia"
 LICENSE="GPL-2"
 SLOT="0"

+IUSE="video_cards_nvidia"
+
 DEPEND="dev-lang/lua:5.1
 	dev-libs/boost
 	dev-libs/expat
@ -40,7 +41,6 @@ DEPEND="dev-lang/lua:5.1
 	x11-libs/wxGTK:${WX_GTK_VER}
 	virtual/opengl"
 RDEPEND="${DEPEND}"
-# BDEPEND="app-arch/unzip"

 PATCHES=(
 	"${FILESDIR}/electricsheep-glext-prototypes.patch"
--- a/app-misc/gentodo/gentodo-0.2.1.ebuild
+++ b/app-misc/gentodo/gentodo-0.2.1.ebuild
@ -8,6 +8,8 @@ PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 bash-completion-r1

+DESCRIPTION="Todo program to help enhance your Gentoo workflow"
+HOMEPAGE="https://github.com/csfore/gentodo"
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/csfore/gentodo.git"
@ -16,14 +18,10 @@ else
 	KEYWORDS="~amd64"
 fi

-HOMEPAGE="https://github.com/csfore/gentodo"
-DESCRIPTION="Todo program to help enhance your Gentoo workflow"
-
 LICENSE="GPL-3"
 SLOT="0"

 IUSE="bash-completion"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 BDEPENDS="
--- a/app-misc/github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild
+++ b/app-misc/github-desktop-bin/github-desktop-bin-3.3.1_rc1.ebuild
@ -16,13 +16,13 @@ HOMEPAGE="https://github.com/shiftkey/desktop"
 SRC_URI="https://github.com/shiftkey/desktop/releases/download/release-${PV%_rc*}-linux${PV#*_rc}/GitHubDesktop-linux-x86_64-${PV%_rc*}-linux${PV#*_rc}.rpm"
 S="${WORKDIR}"

-KEYWORDS="-* ~amd64"
 # 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"
 RESTRICT="bindist mirror"

 RDEPEND="
--- a/app-misc/gopsuinfo/gopsuinfo-0.1.5.ebuild
+++ b/app-misc/gopsuinfo/gopsuinfo-0.1.5.ebuild
@ -29,15 +29,14 @@ EGO_SUM=(
 	)
 go-module_set_globals

-SRC_URI="https://github.com/nwg-piotr/gopsuinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-KEYWORDS="~amd64"
-
 DESCRIPTION="A gopsutil-based command to display system usage info as text"
 HOMEPAGE="https://github.com/nwg-piotr/gopsuinfo"
-LICENSE="MIT"
+SRC_URI="https://github.com/nwg-piotr/gopsuinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"

+LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"

 DEPEND=">=dev-lang/go-1.20"

--- a/app-misc/kloak/kloak-0.2.30.ebuild
+++ b/app-misc/kloak/kloak-0.2.30.ebuild
@ -7,11 +7,12 @@ DESCRIPTION="A privacy tool that makes keystroke biometrics less effective"
 HOMEPAGE="https://github.com/Whonix/kloak"
 SRC_URI="https://gitlab.com/whonix/kloak/-/archive/0.2.30-2/${P}-2.tar.gz"

+S="${WORKDIR}/${P}-2"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"

-S="${WORKDIR}/${P}-2"
 RDEPEND="${DEPEND}"
 CONFIG_CHECK="~UINPUT"
 PATCHES=(
--- a/app-misc/ledger-live/ledger-live-2.68.1.ebuild
+++ b/app-misc/ledger-live/ledger-live-2.68.1.ebuild
@ -7,6 +7,8 @@ DESCRIPTION="Manager for the Ledger hardware wallet"
 HOMEPAGE="https://www.ledger.com/"
 SRC_URI="https://download.live.ledger.com/ledger-live-desktop-${PV}-linux-x86_64.AppImage -> ${P}.AppImage"

+S="${DISTDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@ -18,7 +20,6 @@ RDEPEND="${DEPEND}
 "

 QA_PREBUILT="*"
-S="${DISTDIR}"

 src_install() {
 	newbin ${P}.AppImage ledger-live
--- a/app-misc/ledger-live/ledger-live-2.71.1.ebuild
+++ b/app-misc/ledger-live/ledger-live-2.71.1.ebuild
@ -7,6 +7,8 @@ DESCRIPTION="Manager for the Ledger hardware wallet"
 HOMEPAGE="https://www.ledger.com/"
 SRC_URI="https://download.live.ledger.com/ledger-live-desktop-${PV}-linux-x86_64.AppImage"

+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@ -15,7 +17,6 @@ RESTRICT="strip"
 RDEPEND="sys-fs/fuse:0"

 QA_PREBUILT="*"
-S="${WORKDIR}"

 src_install() {
 	cp "${DISTDIR}/ledger-live-desktop-${PV}-linux-x86_64.AppImage" ledger-live || die
--- a/app-misc/ledger-live/ledger-live-2.73.0.ebuild
+++ b/app-misc/ledger-live/ledger-live-2.73.0.ebuild
@ -7,6 +7,8 @@ DESCRIPTION="Manager for the Ledger hardware wallet"
 HOMEPAGE="https://www.ledger.com/"
 SRC_URI="https://download.live.ledger.com/ledger-live-desktop-${PV}-linux-x86_64.AppImage"

+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@ -15,7 +17,6 @@ RESTRICT="strip"
 RDEPEND="sys-fs/fuse:0"

 QA_PREBUILT="*"
-S="${WORKDIR}"

 src_install() {
 	cp "${DISTDIR}/ledger-live-desktop-${PV}-linux-x86_64.AppImage" ledger-live || die
--- a/app-misc/ledger-live/ledger-live-2.73.1.ebuild
+++ b/app-misc/ledger-live/ledger-live-2.73.1.ebuild
@ -7,6 +7,8 @@ DESCRIPTION="Manager for the Ledger hardware wallet"
 HOMEPAGE="https://www.ledger.com/"
 SRC_URI="https://download.live.ledger.com/ledger-live-desktop-${PV}-linux-x86_64.AppImage"

+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@ -15,7 +17,6 @@ RESTRICT="strip"
 RDEPEND="sys-fs/fuse:0"

 QA_PREBUILT="*"
-S="${WORKDIR}"

 src_install() {
 	cp "${DISTDIR}/ledger-live-desktop-${PV}-linux-x86_64.AppImage" ledger-live || die
--- a/app-misc/ledger-live/ledger-live-2.75.0.ebuild
+++ b/app-misc/ledger-live/ledger-live-2.75.0.ebuild
@ -7,6 +7,8 @@ DESCRIPTION="Manager for the Ledger hardware wallet"
 HOMEPAGE="https://www.ledger.com/"
 SRC_URI="https://download.live.ledger.com/ledger-live-desktop-${PV}-linux-x86_64.AppImage"

+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64"
@ -15,7 +17,6 @@ RESTRICT="strip"
 RDEPEND="sys-fs/fuse:0"

 QA_PREBUILT="*"
-S="${WORKDIR}"

 src_install() {
 	cp "${DISTDIR}/ledger-live-desktop-${PV}-linux-x86_64.AppImage" ledger-live || die
--- a/app-misc/lf/lf-27.ebuild
+++ b/app-misc/lf/lf-27.ebuild
@ -5,19 +5,19 @@ EAPI=7

 inherit go-module bash-completion-r1 desktop xdg

-SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"
-
 DESCRIPTION="Terminal file manager"
 HOMEPAGE="https://github.com/gokcehan/lf"
-IUSE="+static"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-LICENSE="MIT"
-SLOT="0"
+SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"

 S="${WORKDIR}/${PN}-r${PV}"

+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+static"
+
 src_compile() {
 	local ldflags="-s -w -X main.gVersion=r${PV}"
 	use static && {
--- a/app-misc/lf/lf-28-r1.ebuild
+++ b/app-misc/lf/lf-28-r1.ebuild
@ -5,19 +5,19 @@ EAPI=8

 inherit go-module desktop shell-completion xdg

-SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"
-
 DESCRIPTION="Terminal file manager"
 HOMEPAGE="https://github.com/gokcehan/lf"
-IUSE="+static"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-LICENSE="MIT"
-SLOT="0"
+SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"

 S="${WORKDIR}/${PN}-r${PV}"

+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+static"
+
 src_compile() {
 	local ldflags="-s -w -X main.gVersion=r${PV}"
 	use static && {
--- a/app-misc/lf/lf-29.ebuild
+++ b/app-misc/lf/lf-29.ebuild
@ -5,19 +5,19 @@ EAPI=7

 inherit go-module bash-completion-r1 desktop xdg

-SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"
-
 DESCRIPTION="Terminal file manager"
 HOMEPAGE="https://github.com/gokcehan/lf"
-IUSE="+static"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-LICENSE="MIT"
-SLOT="0"
+SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"

 S="${WORKDIR}/${PN}-r${PV}"

+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+static"
+
 src_compile() {
 	local ldflags="-s -w -X main.gVersion=r${PV}"
 	use static && {
--- a/app-misc/lf/lf-30.ebuild
+++ b/app-misc/lf/lf-30.ebuild
@ -5,19 +5,19 @@ EAPI=7

 inherit go-module bash-completion-r1 desktop xdg

-SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"
-
 DESCRIPTION="Terminal file manager"
 HOMEPAGE="https://github.com/gokcehan/lf"
-IUSE="+static"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-LICENSE="MIT"
-SLOT="0"
+SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"

 S="${WORKDIR}/${PN}-r${PV}"

+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+static"
+
 src_compile() {
 	local ldflags="-s -w -X main.gVersion=r${PV}"
 	use static && {
--- a/app-misc/lf/lf-31.ebuild
+++ b/app-misc/lf/lf-31.ebuild
@ -5,19 +5,19 @@ EAPI=8

 inherit go-module shell-completion desktop xdg

-SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"
-
 DESCRIPTION="Terminal file manager"
 HOMEPAGE="https://github.com/gokcehan/lf"
-IUSE="+static"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-LICENSE="MIT"
-SLOT="0"
+SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ephemer4l/gentoo-lf/raw/main/${P}-deps.tar.xz"

 S="${WORKDIR}/${PN}-r${PV}"

+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+static"
+
 src_compile() {
 	local ldflags="-s -w -X main.gVersion=r${PV}"
 	use static && {
--- a/app-misc/macchina/macchina-6.1.8-r1.ebuild
+++ b/app-misc/macchina/macchina-6.1.8-r1.ebuild
@ -204,13 +204,13 @@ CRATES="

 inherit cargo xdg-utils

+DESCRIPTION="A system information fetcher, with an (unhealthy) emphasis on performance."
+HOMEPAGE="https://github.com/Macchina-CLI/macchina"
 SRC_URI="
 	https://github.com/Macchina-CLI/macchina/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	${CARGO_CRATE_URIS}
 "

-DESCRIPTION="A system information fetcher, with an (unhealthy) emphasis on performance."
-HOMEPAGE="https://github.com/Macchina-CLI/macchina"
 LICENSE="
 	BSD
 	MIT
--- a/app-misc/macchina/macchina-6.1.8.ebuild
+++ b/app-misc/macchina/macchina-6.1.8.ebuild
@ -204,13 +204,13 @@ CRATES="

 inherit cargo xdg-utils

+DESCRIPTION="A system information fetcher, with an (unhealthy) emphasis on performance."
+HOMEPAGE="https://github.com/Macchina-CLI/macchina"
 SRC_URI="
 	https://github.com/Macchina-CLI/macchina/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	${CARGO_CRATE_URIS}
 "

-DESCRIPTION="A system information fetcher, with an (unhealthy) emphasis on performance."
-HOMEPAGE="https://github.com/Macchina-CLI/macchina"
 LICENSE="
 	BSD
 	MIT
--- a/app-misc/metadata-cleaner/metadata-cleaner-2.5.4.ebuild
+++ b/app-misc/metadata-cleaner/metadata-cleaner-2.5.4.ebuild
@ -10,6 +10,8 @@ DESCRIPTION="Python GTK application to view and clean metadata in files, using m
 HOMEPAGE="https://metadatacleaner.romainvigier.fr https://gitlab.com/rmnvgr/metadata-cleaner"
 SRC_URI="https://gitlab.com/rmnvgr/metadata-cleaner/-/archive/v${PV}/metadata-cleaner-v${PV}.tar.bz2"

+S=${WORKDIR}/metadata-cleaner-v${PV}
+
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64"
@ -29,8 +31,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="${DEPEND}"

-S=${WORKDIR}/metadata-cleaner-v${PV}
-
 src_configure() {
 	python_setup
 	meson_src_configure
--- a/app-misc/minder/minder-1.16.2.ebuild
+++ b/app-misc/minder/minder-1.16.2.ebuild
@ -9,9 +9,11 @@ DESCRIPTION="Mind-mapping application for Elementary OS."
 HOMEPAGE="https://github.com/phase1geo/Minder"
 SRC_URI="https://github.com/phase1geo/Minder/archive/${PV}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
+S="${WORKDIR}/Minder-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"

 RDEPEND="
 	app-text/discount
@ -27,8 +29,6 @@ DEPEND="
 	app-text/discount
 "

-S="${WORKDIR}/Minder-${PV}"
-
 src_prepare() {
 	default
 	vala_setup
--- a/app-misc/minder/minder-1.16.3.ebuild
+++ b/app-misc/minder/minder-1.16.3.ebuild
@ -9,9 +9,11 @@ DESCRIPTION="Mind-mapping application for Elementary OS."
 HOMEPAGE="https://github.com/phase1geo/Minder"
 SRC_URI="https://github.com/phase1geo/Minder/archive/${PV}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64"
+S="${WORKDIR}/Minder-${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"

 RDEPEND="
 	app-text/discount
@ -27,8 +29,6 @@ DEPEND="
 	app-text/discount
 "

-S="${WORKDIR}/Minder-${PV}"
-
 src_prepare() {
 	default
 	vala_setup
--- a/app-misc/mobile-datovka/mobile-datovka-1.10.0.ebuild
+++ b/app-misc/mobile-datovka/mobile-datovka-1.10.0.ebuild
@ -8,6 +8,9 @@ inherit qmake-utils xdg
 DESCRIPTION="Mobile optimized GUI to access the Czech data box e-government system"
 HOMEPAGE="https://www.datovka.cz/"
 SRC_URI="https://gitlab.labs.nic.cz/datovka/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@ -34,8 +37,6 @@ DEPEND="
 	virtual/pkgconfig
 "

-S="${WORKDIR}/${PN}-v${PV}"
-
 src_configure() {
 	lrelease ${PN}.pro || die
 	eqmake5 PREFIX="/usr" TEXT_FILES_INST_DIR="/usr/share/${PN}/"
--- a/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.3.ebuild
+++ b/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.3.ebuild
@ -3,13 +3,13 @@

 EAPI=8

-SRC_URI="https://github.com/nwg-piotr/nwg-shell-wallpapers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
 DESCRIPTION="Selection of wallpapers contributed to the nwg-shell project"
 HOMEPAGE="https://github.com/nwg-piotr/nwg-shell-wallpapers"
+SRC_URI="https://github.com/nwg-piotr/nwg-shell-wallpapers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"

 src_install() {
 	insinto /usr/share/backgrounds/nwg-shell
--- a/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.4.ebuild
+++ b/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.4.ebuild
@ -3,13 +3,13 @@

 EAPI=8

-SRC_URI="https://github.com/nwg-piotr/nwg-shell-wallpapers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
 DESCRIPTION="Selection of wallpapers contributed to the nwg-shell project"
 HOMEPAGE="https://github.com/nwg-piotr/nwg-shell-wallpapers"
+SRC_URI="https://github.com/nwg-piotr/nwg-shell-wallpapers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"

 src_install() {
 	insinto /usr/share/backgrounds/nwg-shell
--- a/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.5.ebuild
+++ b/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.5.ebuild
@ -3,13 +3,13 @@

 EAPI=8

-SRC_URI="https://github.com/nwg-piotr/nwg-shell-wallpapers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
 DESCRIPTION="Selection of wallpapers contributed to the nwg-shell project"
 HOMEPAGE="https://github.com/nwg-piotr/nwg-shell-wallpapers"
+SRC_URI="https://github.com/nwg-piotr/nwg-shell-wallpapers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"

 src_install() {
 	insinto /usr/share/backgrounds/nwg-shell
--- a/app-misc/pfetch/pfetch-0.6.0.ebuild
+++ b/app-misc/pfetch/pfetch-0.6.0.ebuild
@ -5,12 +5,11 @@ EAPI=7

 DESCRIPTION="A pretty system information tool written in POSIX sh"
 HOMEPAGE="https://github.com/dylanaraps/pfetch"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
 SRC_URI="https://github.com/dylanaraps/pfetch/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"

 src_install() {
 	dobin "${PN}"
--- a/app-misc/tty-share-bin/tty-share-bin-2.4.0.ebuild
+++ b/app-misc/tty-share-bin/tty-share-bin-2.4.0.ebuild
@ -5,13 +5,14 @@ EAPI=8

 DESCRIPTION="Screen sharing for terminal: ASCII in browser or terminal, without pixels moving"
 HOMEPAGE="https://github.com/elisescu/tty-share"
-
 SRC_URI="https://github.com/elisescu/tty-share/releases/download/v${PV}/tty-share_linux-amd64"
+
 S="${WORKDIR}"
-KEYWORDS="~amd64"

 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"

 QA_PREBUILT="usr/bin/${PN}"
--- a/app-misc/wcal/wcal-0.1-r1.ebuild
+++ b/app-misc/wcal/wcal-0.1-r1.ebuild
@ -6,10 +6,10 @@ EAPI=8
 DESCRIPTION="ISO weekly calendar"
 HOMEPAGE="https://github.com/leahneukirchen/wcal"
 SRC_URI="https://github.com/leahneukirchen/wcal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"

 LICENSE="CC0-1.0"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"

 # check target in Makefile but no test cases
 RESTRICT="test"
--- a/app-misc/wego/wego-2.2.ebuild
+++ b/app-misc/wego/wego-2.2.ebuild
@ -6,9 +6,10 @@ EAPI=8
 inherit go-module

 DESCRIPTION="Wego is a weather client for the terminal"
-SRC_URI="https://github.com/schachmat/wego/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"
 HOMEPAGE="https://github.com/schachmat/wego"
+SRC_URI="https://github.com/schachmat/wego/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"
+
 LICENSE="BSD ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
--- a/app-mobilephone/flashlight/flashlight-0.1.1-r2.ebuild
+++ b/app-mobilephone/flashlight/flashlight-0.1.1-r2.ebuild
@ -11,6 +11,8 @@ DESCRIPTION="It's a flashlight, what do you expect?"
 HOMEPAGE="https://gitlab.com/a-wai/flashlight.git"
 SRC_URI="https://gitlab.com/a-wai/flashlight/-/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
@ -18,8 +20,6 @@ KEYWORDS="~amd64 ~arm64"
 RDEPEND="x11-libs/gtk+"
 BDEPEND="dev-lang/python-exec[native-symlinks]"

-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
 src_install() {
 	meson_src_install
 	udev_dorules "${FILESDIR}/60-flashlight.rules"
--- a/app-mobilephone/pinephone-modem-scripts/pinephone-modem-scripts-0.20.8.ebuild
+++ b/app-mobilephone/pinephone-modem-scripts/pinephone-modem-scripts-0.20.8.ebuild
@ -12,6 +12,8 @@ HOMEPAGE="https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/pineph
 EGIT_REPO_URI="https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/pinephone-modem-scripts/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 EGIT_BRANCH=eg25-manager

+S="${WORKDIR}/${PN}-${COMMIT}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~arm64"
@ -21,8 +23,6 @@ RDEPEND="
 	sci-geosciences/gpsd
 "

-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_install() {
 	udev_dorules "${S}"/90-modem-eg25.rules
 	systemd_dounit "${S}"/pinephone-modem-scripts.pinephone-modem-setup.service
--- a/app-mobilephone/usb-tethering/usb-tethering-0.3.ebuild
+++ b/app-mobilephone/usb-tethering/usb-tethering-0.3.ebuild
@ -8,6 +8,8 @@ inherit systemd
 DESCRIPTION="USB tethering on Pine64/ConfigFS systems"
 HOMEPAGE="https://github.com/dreemurrs-embedded/Pine64-Arch"

+S="${WORKDIR}"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~arm64"
@ -18,8 +20,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

-S="${WORKDIR}"
-
 src_install() {
 	exeinto "/usr/lib/danctnix"
 	doexe "${FILESDIR}/usb-tethering"
--- a/app-office/jameica-bin/jameica-bin-2.10.4.ebuild
+++ b/app-office/jameica-bin/jameica-bin-2.10.4.ebuild
@ -11,6 +11,8 @@ DESCRIPTION="Local platform for home banking"
 HOMEPAGE="https://willuhn.de/"
 SRC_URI="https://willuhn.de/products/jameica/releases/current/jameica/jameica-linux64-${PV}.zip"

+S="${WORKDIR}/jameica"
+
 # Jameica: GPL-2
 # lib/apache_xmlrpc, lib/jakarta_commons, lib/velocity: Apache-2.0
 # lib/swt: CPL-1.0 LGPL-2 MPL-1.1
@ -31,8 +33,6 @@ BDEPEND="
 	app-arch/unzip
 "

-S="${WORKDIR}/jameica"
-
 JAMEICA_INSFILES=( jameica-icon.png jameica{,-linux64}.jar lib plugin.xml )
 JAMEICA_EXEFILES=( jameicaserver.sh jameica.sh rcjameica-systemd )

--- a/app-office/nixnote-bin/nixnote-bin-2.1.10.ebuild
+++ b/app-office/nixnote-bin/nixnote-bin-2.1.10.ebuild
@ -5,18 +5,18 @@ EAPI=8

 DESCRIPTION="Free and open source note taking app, compatible with Evernote sync server"
 HOMEPAGE="https://github.com/robert7/nixnote2"
-
 SRC_URI="https://github.com/robert7/nixnote2/releases/download/v${PV}/NixNote2-x86_64.AppImage"
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"

 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"

 RDEPEND="sys-fs/fuse:0"

-S="${WORKDIR}"
-
 QA_PREBUILT="*"

 src_install() {
--- a/app-office/nixnote-bin/nixnote-bin-9999.ebuild
+++ b/app-office/nixnote-bin/nixnote-bin-9999.ebuild
@ -5,9 +5,10 @@ EAPI=8

 DESCRIPTION="Free and open source note taking app, compatible with Evernote sync server"
 HOMEPAGE="https://github.com/robert7/nixnote2"
-
 SRC_URI="https://github.com/robert7/nixnote2/releases/download/continuous-develop/NixNote2-x86_64.AppImage"

+S="${WORKDIR}"
+
 LICENSE="GPL-3"
 SLOT="0"
 PROPERTIES="live"
@ -15,8 +16,6 @@ RESTRICT="strip"

 RDEPEND="sys-fs/fuse:0"

-S="${WORKDIR}"
-
 QA_PREBUILT="*"

 src_install() {
--- a/app-office/notesnook-bin/notesnook-bin-2.6.12.ebuild
+++ b/app-office/notesnook-bin/notesnook-bin-2.6.12.ebuild
@ -5,18 +5,18 @@ EAPI=8

 DESCRIPTION="End-to-end encrypted note taking alternative to Evernote"
 HOMEPAGE="https://notesnook.com/"
-
 SRC_URI="https://github.com/streetwriters/notesnook/releases/download/v${PV}/notesnook_linux_x86_64.AppImage"
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"

 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"

 RDEPEND="sys-fs/fuse:0"

-S="${WORKDIR}"
-
 QA_PREBUILT="*"

 src_install() {
--- a/app-office/openoffice-bin/openoffice-bin-4.1.15.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.15.ebuild
@ -5,8 +5,6 @@ EAPI="8"

 inherit desktop pax-utils prefix rpm xdg

-IUSE="gnome java"
-
 BUILDID="9813"
 BVER="${PV/_rc*/}-${BUILDID}"
 BVER2=${PV}-${BUILDID}
@ -31,6 +29,14 @@ SRC_URI="
 	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )
 "

+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gnome java"
+
 # TODO: supports ca_XR (Valencian RACV) locale too
 LANGS="ast eu bg ca ca-valencia zh-CN zh-TW cs da nl en-GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt-BR pt ru sr sk sl es sv ta th tr vi"

@ -41,10 +47,6 @@ for X in ${LANGS} ; do
 		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )"
 done

-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
 RDEPEND="
 	!prefix? ( sys-libs/glibc )
 	>=app-accessibility/at-spi2-core-2.46.0
@ -73,8 +75,6 @@ PDEPEND="java? ( || ( >=virtual/jre-1.8.0 dev-java/openjdk-jre-bin:11 dev-java/o

 RESTRICT="mirror strip"

-S="${WORKDIR}"
-
 pkg_setup() {
 	QA_PREBUILT="usr/$(get_libdir)/${NM}/program/*"
 	QA_TEXTRELS="usr/$(get_libdir)/${NM}/program/libvclplug_genli.so"
--- a/app-office/pyspread/pyspread-2.1.1.ebuild
+++ b/app-office/pyspread/pyspread-2.1.1.ebuild
@ -10,13 +10,13 @@ inherit xdg desktop distutils-r1

 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python"
 HOMEPAGE="https://pyspread.gitlab.io"
-
 SRC_URI="https://gitlab.com/pyspread/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-KEYWORDS="~amd64"
+
 S="${WORKDIR}/${PN}-v${PV}"

 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"

 RDEPEND="
 	>=dev-python/PyQt5-5.10.0[gui,printsupport,svg,widgets,${PYTHON_USEDEP}]
--- a/app-office/standartnotes-bin/standartnotes-bin-3.183.22.ebuild
+++ b/app-office/standartnotes-bin/standartnotes-bin-3.183.22.ebuild
@ -5,18 +5,18 @@ EAPI=8

 DESCRIPTION="End-to-end encrypted note-taking app, alternative to Evernote"
 HOMEPAGE="https://standardnotes.com"
-
 SRC_URI="https://github.com/standardnotes/app/releases/download/%40standardnotes%2Fdesktop%40${PV}/standard-notes-${PV}-linux-x86_64.AppImage"
-KEYWORDS="~amd64"
+
+S="${WORKDIR}"

 LICENSE="AGPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
+
 RESTRICT="strip"

 RDEPEND="sys-fs/fuse:0"

-S="${WORKDIR}"
-
 QA_PREBUILT="*"

 src_install() {
--- a/app-portage/showbuild/showbuild-0.9.1-r1.ebuild
+++ b/app-portage/showbuild/showbuild-0.9.1-r1.ebuild
@ -5,21 +5,19 @@ EAPI="7"

 DESCRIPTION="Script to follow log of running portage builds"
 HOMEPAGE="https://github.com/junghans/cj-overlay"
-SRC_URI=""
+
+S="${FILESDIR}"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-linux ~x64-macos"

-
 RDEPEND="
 	app-shells/bash
 	sys-apps/coreutils
 	sys-apps/portage
 "

-S="${FILESDIR}"
-
 src_install () {
 	newbin "${P}" "${PN}"
 }
--- a/app-portage/version/version-0.19.0_alpha.ebuild
+++ b/app-portage/version/version-0.19.0_alpha.ebuild
@ -11,16 +11,15 @@ DESCRIPTION="A command line function for package version  management."
 HOMEPAGE="https://github.com/azaeldevel/octetos-version"
 SRC_URI="https://github.com/azaeldevel/octetos-${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/octetos-${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"

-
 DEPEND="dev-libs/octetos-coreutils"
 RDEPEND="${DEPEND}"

-S="${WORKDIR}/octetos-${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
--- a/app-portage/version/version-0.20.1_alpha.ebuild
+++ b/app-portage/version/version-0.20.1_alpha.ebuild
@ -11,16 +11,15 @@ DESCRIPTION="A command line function for package version  management."
 HOMEPAGE="https://github.com/azaeldevel/octetos-version"
 SRC_URI="https://github.com/azaeldevel/octetos-${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/octetos-${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"

-
 DEPEND="dev-libs/octetos-coreutils"
 RDEPEND="${DEPEND}"

-S="${WORKDIR}/octetos-${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
--- a/app-portage/version/version-0.21.0_alpha.ebuild
+++ b/app-portage/version/version-0.21.0_alpha.ebuild
@ -11,16 +11,15 @@ DESCRIPTION="A command line function for package version  management."
 HOMEPAGE="https://github.com/azaeldevel/octetos-version"
 SRC_URI="https://github.com/azaeldevel/octetos-${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"

+S="${WORKDIR}/octetos-${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"

-
 DEPEND="dev-libs/octetos-coreutils"
 RDEPEND="${DEPEND}"

-S="${WORKDIR}/octetos-${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
--- a/app-shells/carapace/carapace-0.30.2.ebuild
+++ b/app-shells/carapace/carapace-0.30.2.ebuild
@ -7,11 +7,10 @@ inherit go-module

 DESCRIPTION="Multi-shell multi-command argument completer"
 HOMEPAGE="https://rsteube.github.io/carapace-bin/"
-SRC_URI="https://github.com/rsteube/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rsteube/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"

-# Using a dependency tarball as per https://devmanual.gentoo.org/eclass-reference/go-module.eclass/index.html
-DEPS_URI="https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"
-SRC_URI+=" ${DEPS_URI}"
+S="${WORKDIR}/${PN}-bin-${PV}"

 LICENSE="Apache-2.0"
 SLOT="0"
@ -24,8 +23,6 @@ HTML_DOCS=(
 	"docs/book/"
 )

-S="${WORKDIR}/${PN}-bin-${PV}"
-
 src_compile() {
 	pushd "cmd/${PN}"
 	ego generate ./...
--- a/app-shells/carapace/carapace-1.0.0.ebuild
+++ b/app-shells/carapace/carapace-1.0.0.ebuild
@ -7,11 +7,10 @@ inherit go-module

 DESCRIPTION="Multi-shell multi-command argument completer"
 HOMEPAGE="https://carapace.sh/"
-SRC_URI="https://github.com/${PN}-sh/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}-sh/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"

-# Using a dependency tarball as per https://devmanual.gentoo.org/eclass-reference/go-module.eclass/index.html
-DEPS_URI="https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"
-SRC_URI+=" ${DEPS_URI}"
+S="${WORKDIR}/${PN}-bin-${PV}"

 LICENSE="Apache-2.0"
 SLOT="0"
@ -24,8 +23,6 @@ HTML_DOCS=(
 	"docs/book/"
 )

-S="${WORKDIR}/${PN}-bin-${PV}"
-
 src_compile() {
 	pushd "cmd/${PN}"
 	ego generate ./...
--- a/app-shells/carapace/carapace-1.0.1.ebuild
+++ b/app-shells/carapace/carapace-1.0.1.ebuild
@ -7,11 +7,10 @@ inherit go-module

 DESCRIPTION="Multi-shell multi-command argument completer"
 HOMEPAGE="https://carapace.sh/"
-SRC_URI="https://github.com/${PN}-sh/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}-sh/${PN}-bin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"

-# Using a dependency tarball as per https://devmanual.gentoo.org/eclass-reference/go-module.eclass/index.html
-DEPS_URI="https://gitlab.com/freijon_gentoo/${CATEGORY}/${PN}/-/raw/main/${P}-deps.tar.xz"
-SRC_URI+=" ${DEPS_URI}"
+S="${WORKDIR}/${PN}-bin-${PV}"

 LICENSE="Apache-2.0"
 SLOT="0"
@ -24,8 +23,6 @@ HTML_DOCS=(
 	"docs/book/"
 )

-S="${WORKDIR}/${PN}-bin-${PV}"
-
 src_compile() {
 	pushd "cmd/${PN}"
 	ego generate ./...
--- a/app-text/lorien-bin/lorien-bin-0.6.0.ebuild
+++ b/app-text/lorien-bin/lorien-bin-0.6.0.ebuild
@ -4,17 +4,17 @@
 EAPI=8

 inherit desktop xdg
-SRC_URI="https://github.com/mbrlabs/Lorien/releases/download/v${PV}/Lorien_v${PV}_Linux.tar.xz -> ${P}.tar.xz"
+
 DESCRIPTION="Infinite canvas drawing/whiteboarding. Made with Godot."
 HOMEPAGE="https://github.com/mbrlabs/Lorien"
+SRC_URI="https://github.com/mbrlabs/Lorien/releases/download/v${PV}/Lorien_v${PV}_Linux.tar.xz -> ${P}.tar.xz"
+
+S="${WORKDIR}/Lorien_v${PV}_Linux"

 LICENSE="GPL-3"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"

-S="${WORKDIR}/Lorien_v${PV}_Linux"
-
 src_install() {
 	#Copy Manual & Make a copy of the folder
 	cp "${FILESDIR}/manual_v${PV}.md" "${S}/manual_v${PV}.md"
--- a/app-text/lsp/lsp-0.5.0_rc4.ebuild
+++ b/app-text/lsp/lsp-0.5.0_rc4.ebuild
@ -7,14 +7,17 @@ inherit meson

 MY_PV="${PV/_/-}"
 MY_P="lsp-${MY_PV}"
-S="${WORKDIR}/${MY_P}"

 DESCRIPTION="The least significant pager"
 HOMEPAGE="https://github.com/dgouders/lsp"
 SRC_URI="https://github.com/dgouders/lsp/archive/refs/tags/v${MY_PV}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+
 RDEPEND="
 	>=sys-apps/man-db-2.12.0
 	>=sys-libs/ncurses-6.4_p20230401
--- a/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0c-r1.ebuild
+++ b/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0c-r1.ebuild
@ -3,18 +3,14 @@
 EAPI=8

 DESCRIPTION="Pandoc filter for cross-references"
-
 HOMEPAGE="https://github.com/lierdakil/pandoc-crossref"
-
-
 SRC_URI="https://github.com/lierdakil/pandoc-crossref/releases/download/v${PV}/pandoc-crossref-Linux.tar.xz -> ${P}.tar.xz"

+S="${WORKDIR}"
+
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="-* ~amd64"
-S=${WORKDIR}

 RDEPEND="
 || ( =app-text/pandoc-bin-3.1.12.1 =app-text/pandoc-3.1.12.1 )
@ -23,6 +19,6 @@ RDEPEND="

 src_install() {
 	exeinto /usr/bin
-	newexe ${WORKDIR}/pandoc-crossref pandoc-crossref
-	newman ${WORKDIR}/pandoc-crossref.1 pandoc-crossref.1
+	newexe pandoc-crossref pandoc-crossref
+	newman pandoc-crossref.1 pandoc-crossref.1
 }
--- a/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0e.ebuild
+++ b/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0e.ebuild
@ -3,18 +3,14 @@
 EAPI=8

 DESCRIPTION="Pandoc filter for cross-references"
-
 HOMEPAGE="https://github.com/lierdakil/pandoc-crossref"
-
-
 SRC_URI="https://github.com/lierdakil/pandoc-crossref/releases/download/v${PV}/pandoc-crossref-Linux.tar.xz -> ${P}.tar.xz"

+S="${WORKDIR}"
+
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="-* ~amd64"
-S=${WORKDIR}

 RDEPEND="
 || ( =app-text/pandoc-bin-3.1.12.2 =app-text/pandoc-3.1.12.2 )
@ -23,6 +19,6 @@ RDEPEND="

 src_install() {
 	exeinto /usr/bin
-	newexe ${WORKDIR}/pandoc-crossref pandoc-crossref
-	newman ${WORKDIR}/pandoc-crossref.1 pandoc-crossref.1
+	newexe pandoc-crossref pandoc-crossref
+	newman pandoc-crossref.1
 }
--- a/Show More
+++ b/Show More