commit:     f2be215fb991955a99bceb9ba10e5abecd2147ea
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Fri Apr 26 14:46:35 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Fri Apr 26 14:46:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f2be215f

*/*: fix variable order

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

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 .../rhvoice-core/rhvoice-core-1.14.0-r1.ebuild     |  2 +-
 app-accessibility/rhvoice/rhvoice-1.6.0.ebuild     |  2 +-
 app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild  |  8 +++++---
 .../customrescuecd-x86-0.4.1.ebuild                |  4 ++--
 .../customrescuecd-x86_64-0.12.7.ebuild            |  4 ++--
 .../customrescuecd-x86_64-0.12.8.ebuild            |  4 ++--
 .../enpass-desktop-bin-6.7.4.933.ebuild            |  4 ++--
 .../libarchive-qt/libarchive-qt-2.0.6-r1.ebuild    |  2 +-
 app-arch/libarchive-qt/libarchive-qt-2.0.7.ebuild  |  2 +-
 app-arch/libarchive-qt/libarchive-qt-9999.ebuild   |  4 ++--
 app-arch/microtar/microtar-0.1.0.ebuild            |  2 +-
 app-arch/zarchive/zarchive-0.1.2.ebuild            |  4 ++--
 .../kopia-ui-bin/kopia-ui-bin-0.15.0-r1.ebuild     |  3 ++-
 .../phoronix-test-suite-9999.ebuild                |  9 +++------
 app-crypt/autofirma/autofirma-1.8.2.ebuild         |  4 ++--
 .../certbot-dns-rfc2136-2.10.0.ebuild              | 13 ++++++------
 .../certbot-dns-rfc2136-2.8.0.ebuild               | 13 ++++++------
 .../certbot-dns-rfc2136-2.9.0.ebuild               | 13 ++++++------
 .../certbot-dns-rfc2136-9999.ebuild                | 13 ++++++------
 .../configuradorfnmt/configuradorfnmt-1.0.1.ebuild |  4 ++--
 .../gnome-encfs-manager-1.9-r1.ebuild              |  2 +-
 .../gnome-encfs-manager-1.9-r2.ebuild              |  2 +-
 app-crypt/uacme/uacme-1.7.1.ebuild                 |  4 ++--
 .../dictd-moby-thesaurus-1.0.ebuild                |  2 +-
 app-editors/mined/mined-2015.25.ebuild             |  5 ++++-
 app-editors/typora-bin/typora-bin-1.8.10.ebuild    |  3 ++-
 app-emacs/prop-menu/prop-menu-0.1.2.ebuild         |  4 ++--
 app-emulation/arnold/arnold-20170513.ebuild        |  4 ++--
 app-emulation/rars/rars-1.6.ebuild                 |  9 ++-------
 .../eselect-autostart-1.0.0.ebuild                 | 10 ++++++----
 app-eselect/eselect-ld/eselect-ld-1.0.0.ebuild     | 10 ++++++----
 app-eselect/eselect-vala/eselect-vala-1.0.0.ebuild |  8 ++++----
 app-forensics/mvt/mvt-2.4.1.ebuild                 |  4 ++--
 app-misc/anki-bin/anki-bin-23.12.1.ebuild          |  4 ++--
 app-misc/anki-bin/anki-bin-24.04.ebuild            |  4 ++--
 app-misc/apidb/apidb-5.11.0_beta.ebuild            |  4 ++--
 app-misc/apidb/apidb-5.13.1_beta.ebuild            |  4 ++--
 app-misc/apidb/apidb-5.13.4_beta.ebuild            |  4 ++--
 app-misc/apidb/apidb-5.13.6_beta.ebuild            |  4 ++--
 app-misc/apidb/apidb-5.8.0_beta.ebuild             |  4 ++--
 app-misc/aw-client/aw-client-0.11.0.ebuild         | 17 ++++++++--------
 app-misc/aw-core/aw-core-0.11.0.ebuild             | 12 +++++------
 .../brightness-control-2.4.ebuild                  |  2 +-
 app-misc/brightnessctl/brightnessctl-0.5.1.ebuild  |  2 +-
 app-misc/chayang/chayang-0.1.0.ebuild              |  5 +++--
 app-misc/clipboard/clipboard-0.9.0.1.ebuild        |  3 ++-
 app-misc/dbf/dbf-0.9.0.ebuild                      |  4 ++--
 app-misc/dragon/dragon-1.1.1.ebuild                |  2 +-
 app-misc/dragon/dragon-1.1.1_p20210820.ebuild      |  7 ++++---
 app-misc/dragon/dragon-1.2.0.ebuild                |  2 +-
 .../electricsheep-3.0.2_p20191005-r1.ebuild        |  4 ++--
 .../electricsheep-3.0.2_p20191005.ebuild           |  4 ++--
 app-misc/gentodo/gentodo-0.2.1.ebuild              |  6 ++----
 .../github-desktop-bin-3.3.1_rc1.ebuild            |  2 +-
 app-misc/gopsuinfo/gopsuinfo-0.1.5.ebuild          |  7 +++----
 app-misc/kloak/kloak-0.2.30.ebuild                 |  3 ++-
 app-misc/ledger-live/ledger-live-2.68.1.ebuild     |  3 ++-
 app-misc/ledger-live/ledger-live-2.71.1.ebuild     |  3 ++-
 app-misc/ledger-live/ledger-live-2.73.0.ebuild     |  3 ++-
 app-misc/ledger-live/ledger-live-2.73.1.ebuild     |  3 ++-
 app-misc/ledger-live/ledger-live-2.75.0.ebuild     |  3 ++-
 app-misc/lf/lf-27.ebuild                           | 12 +++++------
 app-misc/lf/lf-28-r1.ebuild                        | 12 +++++------
 app-misc/lf/lf-29.ebuild                           | 12 +++++------
 app-misc/lf/lf-30.ebuild                           | 12 +++++------
 app-misc/lf/lf-31.ebuild                           | 12 +++++------
 app-misc/macchina/macchina-6.1.8-r1.ebuild         |  4 ++--
 app-misc/macchina/macchina-6.1.8.ebuild            |  4 ++--
 .../metadata-cleaner/metadata-cleaner-2.5.4.ebuild |  4 ++--
 app-misc/minder/minder-1.16.2.ebuild               |  6 +++---
 app-misc/minder/minder-1.16.3.ebuild               |  6 +++---
 .../mobile-datovka/mobile-datovka-1.10.0.ebuild    |  5 +++--
 .../nwg-shell-wallpapers-1.3.ebuild                |  6 +++---
 .../nwg-shell-wallpapers-1.4.ebuild                |  6 +++---
 .../nwg-shell-wallpapers-1.5.ebuild                |  6 +++---
 app-misc/pfetch/pfetch-0.6.0.ebuild                |  3 +--
 app-misc/tty-share-bin/tty-share-bin-2.4.0.ebuild  |  5 +++--
 app-misc/wcal/wcal-0.1-r1.ebuild                   |  2 +-
 app-misc/wego/wego-2.2.ebuild                      |  5 +++--
 .../flashlight/flashlight-0.1.1-r2.ebuild          |  4 ++--
 .../pinephone-modem-scripts-0.20.8.ebuild          |  4 ++--
 .../usb-tethering/usb-tethering-0.3.ebuild         |  4 ++--
 app-office/jameica-bin/jameica-bin-2.10.4.ebuild   |  4 ++--
 app-office/nixnote-bin/nixnote-bin-2.1.10.ebuild   |  8 ++++----
 app-office/nixnote-bin/nixnote-bin-9999.ebuild     |  5 ++---
 .../notesnook-bin/notesnook-bin-2.6.12.ebuild      |  8 ++++----
 .../openoffice-bin/openoffice-bin-4.1.15.ebuild    | 16 +++++++--------
 app-office/pyspread/pyspread-2.1.1.ebuild          |  4 ++--
 .../standartnotes-bin-3.183.22.ebuild              |  8 ++++----
 app-portage/showbuild/showbuild-0.9.1-r1.ebuild    |  6 ++----
 app-portage/version/version-0.19.0_alpha.ebuild    |  5 ++---
 app-portage/version/version-0.20.1_alpha.ebuild    |  5 ++---
 app-portage/version/version-0.21.0_alpha.ebuild    |  5 ++---
 app-shells/carapace/carapace-0.30.2.ebuild         |  9 +++------
 app-shells/carapace/carapace-1.0.0.ebuild          |  9 +++------
 app-shells/carapace/carapace-1.0.1.ebuild          |  9 +++------
 app-text/lorien-bin/lorien-bin-0.6.0.ebuild        |  8 ++++----
 app-text/lsp/lsp-0.5.0_rc4.ebuild                  |  5 ++++-
 .../pandoc-crossref-bin-0.3.17.0c-r1.ebuild        | 12 ++++-------
 .../pandoc-crossref-bin-0.3.17.0e.ebuild           | 12 ++++-------
 .../pandoc-crossref-bin-0.3.17.0f.ebuild           | 12 ++++-------
 .../the-platinum-searcher-bin-2.2.0.ebuild         |  6 +++---
 app-vim/kotlin-vim/kotlin-vim-20220627.ebuild      |  9 +++++----
 dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild              |  3 +--
 dev-cpp/dpp/dpp-10.0.23.ebuild                     |  4 ++--
 dev-cpp/dpp/dpp-10.0.24.ebuild                     |  4 ++--
 dev-cpp/dpp/dpp-10.0.25.ebuild                     |  4 ++--
 dev-cpp/dpp/dpp-10.0.29.ebuild                     |  4 ++--
 dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild        |  8 ++++----
 dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild  |  8 ++++----
 dev-db/dbeaver-bin/dbeaver-bin-23.0.0.ebuild       | 12 +++++------
 dev-db/dbeaver-bin/dbeaver-bin-23.2.0.ebuild       | 12 +++++------
 dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild       | 12 +++++------
 dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild    | 12 ++++++-----
 dev-dotnet/gtk-sharp/gtk-sharp-3.22.2-r2.ebuild    |  2 +-
 dev-elixir/hex/hex-1.0.1-r1.ebuild                 |  3 ++-
 dev-embedded/esp-idf/esp-idf-5.1.2.ebuild          | 23 +++++++++++-----------
 dev-embedded/esp-idf/esp-idf-5.2.ebuild            | 19 +++++++++---------
 .../mv88e6xxx-dump-0.2.0_pre20210327.ebuild        |  5 ++---
 dev-embedded/rauc/rauc-1.11.3.ebuild               |  3 ++-
 .../squareline-studio-1.3.2.ebuild                 |  5 +++--
 dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild |  4 ++--
 dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild |  4 ++--
 dev-lang/gnu-apl/gnu-apl-1.8.ebuild                |  5 +++--
 dev-lang/opencilk-bin/opencilk-bin-1.1.ebuild      |  5 ++---
 dev-lang/opencilk-bin/opencilk-bin-2.1.ebuild      |  5 ++---
 dev-lang/opencilk/opencilk-1.1.ebuild              |  8 +++++---
 dev-lang/opencilk/opencilk-2.1.ebuild              |  8 +++++---
 .../feedbackd-device-themes-0.0.20220523.ebuild    |  4 +++-
 .../feedbackd-device-themes-0.1.0.ebuild           |  4 +++-
 dev-libs/feedbackd/feedbackd-0.2.0.ebuild          |  2 +-
 dev-libs/fsst/fsst-0_pre20200830-r1.ebuild         |  4 ++--
 dev-libs/ip2loc/ip2loc-8.1.4.ebuild                |  4 ++--
 dev-libs/libdbf/libdbf-0.0.1.ebuild                |  4 ++--
 dev-libs/libtypec/libtypec-0.5.0-r1.ebuild         |  4 ++--
 dev-libs/libtypec/libtypec-0.5.0.ebuild            |  4 ++--
 dev-libs/lsbcrypt/lsbcrypt-1.0.0-r1.ebuild         |  6 ++++--
 dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild         |  6 ++++--
 dev-libs/lsquic/lsquic-3.2.0-r1.ebuild             | 10 +++++-----
 dev-libs/lsquic/lsquic-3.2.0.ebuild                | 10 +++++-----
 dev-libs/monero-seed/monero-seed-0.1.0.ebuild      |  6 +++---
 .../octetos-biblion-0.1.1_alpha.ebuild             |  9 +++------
 .../octetos-coreutils-0.11.1_alpha.ebuild          |  5 ++---
 .../octetos-coreutils-0.13.0_alpha.ebuild          |  4 ++--
 .../octetos-coreutils-0.17.0_alpha.ebuild          |  4 ++--
 dev-libs/octetos-db/octetos-db-1.3.2_alpha.ebuild  |  5 ++---
 dev-libs/octetos-db/octetos-db-1.3.3_alpha.ebuild  |  5 ++---
 147 files changed, 438 insertions(+), 449 deletions(-)

diff --git a/app-accessibility/rhvoice-core/rhvoice-core-1.14.0-r1.ebuild 
b/app-accessibility/rhvoice-core/rhvoice-core-1.14.0-r1.ebuild
index 3361d95b06..f5bf646e85 100644
--- 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="

diff --git a/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild 
b/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild
index 5cf4395c76..5e3f8f2f96 100644
--- 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="

diff --git a/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild 
b/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild
index abefa9baaf..d7d09bf64c 100644
--- 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

diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild 
b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
index f10c459a01..e8ae3a1dcb 100644
--- 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() {

diff --git 
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
index 97ae9bab28..120d055cd6 100644
--- 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() {

diff --git 
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
index 97ae9bab28..120d055cd6 100644
--- 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() {

diff --git 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
index aa51ea3d47..ded8d34f8c 100644
--- 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() {

diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.6-r1.ebuild 
b/app-arch/libarchive-qt/libarchive-qt-2.0.6-r1.ebuild
index 2ad5a6dede..1d8b716317 100644
--- 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(+)]

diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.7.ebuild 
b/app-arch/libarchive-qt/libarchive-qt-2.0.7.ebuild
index 82202f1ed1..20cf3e5494 100644
--- 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(+)]

diff --git a/app-arch/libarchive-qt/libarchive-qt-9999.ebuild 
b/app-arch/libarchive-qt/libarchive-qt-9999.ebuild
index 82202f1ed1..0cef11e447 100644
--- 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(+)]

diff --git a/app-arch/microtar/microtar-0.1.0.ebuild 
b/app-arch/microtar/microtar-0.1.0.ebuild
index 3b81c09d46..e5ec790636 100644
--- 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

diff --git a/app-arch/zarchive/zarchive-0.1.2.ebuild 
b/app-arch/zarchive/zarchive-0.1.2.ebuild
index c5c2edbe6f..92b1fb7d1d 100644
--- 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}"

diff --git 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
index a1e69fac01..99f965beba 100644
--- 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

diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-9999.ebuild 
b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-9999.ebuild
index 134e18bc9a..fe20c2f17e 100644
--- 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}

diff --git a/app-crypt/autofirma/autofirma-1.8.2.ebuild 
b/app-crypt/autofirma/autofirma-1.8.2.ebuild
index a13f350832..3e1ae0b64c 100644
--- 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"

diff --git 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
index f0578cf4a9..ea2a9886f1 100644
--- 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}] )
 "

diff --git 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
index 425d68e1ae..31ab5103fb 100644
--- 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}] )
 "

diff --git 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
index 425d68e1ae..31ab5103fb 100644
--- 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}] )
 "

diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild 
b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-9999.ebuild
index f0578cf4a9..ea2a9886f1 100644
--- 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}] )
 "

diff --git a/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild 
b/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild
index 5925e8fb3d..ce5d62b7e5 100644
--- 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

diff --git 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
index 5cfcc62db5..9b7a17e611 100644
--- 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="

diff --git 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
index 2dc21af408..03650089eb 100644
--- 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="

diff --git a/app-crypt/uacme/uacme-1.7.1.ebuild 
b/app-crypt/uacme/uacme-1.7.1.ebuild
index 8624297481..4f0fd1d906 100644
--- 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 )"
 

diff --git a/app-dicts/dictd-moby-thesaurus/dictd-moby-thesaurus-1.0.ebuild 
b/app-dicts/dictd-moby-thesaurus/dictd-moby-thesaurus-1.0.ebuild
index 707bdb2472..2069eb9d84 100644
--- 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"

diff --git a/app-editors/mined/mined-2015.25.ebuild 
b/app-editors/mined/mined-2015.25.ebuild
index e48862e1c2..b79bb069e7 100644
--- 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

diff --git a/app-editors/typora-bin/typora-bin-1.8.10.ebuild 
b/app-editors/typora-bin/typora-bin-1.8.10.ebuild
index d2684f37e7..3e17e4729f 100644
--- 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

diff --git a/app-emacs/prop-menu/prop-menu-0.1.2.ebuild 
b/app-emacs/prop-menu/prop-menu-0.1.2.ebuild
index d1e7ebca2d..eda9d06f9c 100644
--- 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() {

diff --git a/app-emulation/arnold/arnold-20170513.ebuild 
b/app-emulation/arnold/arnold-20170513.ebuild
index 6704b1763d..17ad70b654 100644
--- 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

diff --git a/app-emulation/rars/rars-1.6.ebuild 
b/app-emulation/rars/rars-1.6.ebuild
index ca1429e680..9e563f4210 100644
--- 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

diff --git a/app-eselect/eselect-autostart/eselect-autostart-1.0.0.ebuild 
b/app-eselect/eselect-autostart/eselect-autostart-1.0.0.ebuild
index 0e4d2675aa..5d5c9bc198 100644
--- 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

diff --git a/app-eselect/eselect-ld/eselect-ld-1.0.0.ebuild 
b/app-eselect/eselect-ld/eselect-ld-1.0.0.ebuild
index 5c4cfb7fc5..92427237cc 100644
--- 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

diff --git a/app-eselect/eselect-vala/eselect-vala-1.0.0.ebuild 
b/app-eselect/eselect-vala/eselect-vala-1.0.0.ebuild
index dbf7f0a075..cfb7278a3b 100644
--- 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

diff --git a/app-forensics/mvt/mvt-2.4.1.ebuild 
b/app-forensics/mvt/mvt-2.4.1.ebuild
index 8ad7c7b70c..e85f256da7 100644
--- 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}]

diff --git a/app-misc/anki-bin/anki-bin-23.12.1.ebuild 
b/app-misc/anki-bin/anki-bin-23.12.1.ebuild
index 5c24611d9f..ba6ac59396 100644
--- 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.

diff --git a/app-misc/anki-bin/anki-bin-24.04.ebuild 
b/app-misc/anki-bin/anki-bin-24.04.ebuild
index 71e8ec20e2..43195331a3 100644
--- 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.

diff --git a/app-misc/apidb/apidb-5.11.0_beta.ebuild 
b/app-misc/apidb/apidb-5.11.0_beta.ebuild
index 7ca706863b..f068f7a672 100644
--- 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

diff --git a/app-misc/apidb/apidb-5.13.1_beta.ebuild 
b/app-misc/apidb/apidb-5.13.1_beta.ebuild
index 7ca706863b..f068f7a672 100644
--- 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

diff --git a/app-misc/apidb/apidb-5.13.4_beta.ebuild 
b/app-misc/apidb/apidb-5.13.4_beta.ebuild
index 7ca706863b..f068f7a672 100644
--- 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

diff --git a/app-misc/apidb/apidb-5.13.6_beta.ebuild 
b/app-misc/apidb/apidb-5.13.6_beta.ebuild
index 7ca706863b..f068f7a672 100644
--- 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

diff --git a/app-misc/apidb/apidb-5.8.0_beta.ebuild 
b/app-misc/apidb/apidb-5.8.0_beta.ebuild
index 7e58ba5661..193ef6e229 100644
--- 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

diff --git a/app-misc/aw-client/aw-client-0.11.0.ebuild 
b/app-misc/aw-client/aw-client-0.11.0.ebuild
index 8349a69f81..0dbe0b3a1d 100644
--- 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}"

diff --git a/app-misc/aw-core/aw-core-0.11.0.ebuild 
b/app-misc/aw-core/aw-core-0.11.0.ebuild
index d63e79d70a..017001ac42 100644
--- 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"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MPL-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="test"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 RDEPEND="
        dev-python/appdirs[${PYTHON_USEDEP}]
        dev-python/deprecation[${PYTHON_USEDEP}]

diff --git a/app-misc/brightness-control/brightness-control-2.4.ebuild 
b/app-misc/brightness-control/brightness-control-2.4.ebuild
index 693c6c1bb5..c438a5e0c2 100644
--- 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]'

diff --git a/app-misc/brightnessctl/brightnessctl-0.5.1.ebuild 
b/app-misc/brightnessctl/brightnessctl-0.5.1.ebuild
index c4d3745d6d..646cad9ac5 100644
--- 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="

diff --git a/app-misc/chayang/chayang-0.1.0.ebuild 
b/app-misc/chayang/chayang-0.1.0.ebuild
index 0ee1c2828c..354851611e 100644
--- 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"

diff --git a/app-misc/clipboard/clipboard-0.9.0.1.ebuild 
b/app-misc/clipboard/clipboard-0.9.0.1.ebuild
index a7f6b69332..acbaec3cba 100644
--- 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=(

diff --git a/app-misc/dbf/dbf-0.9.0.ebuild b/app-misc/dbf/dbf-0.9.0.ebuild
index 4c0b408ecb..924daba241 100644
--- 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

diff --git a/app-misc/dragon/dragon-1.1.1.ebuild 
b/app-misc/dragon/dragon-1.1.1.ebuild
index a0538967e9..64bf6f97f6 100644
--- 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}"

diff --git a/app-misc/dragon/dragon-1.1.1_p20210820.ebuild 
b/app-misc/dragon/dragon-1.1.1_p20210820.ebuild
index 275379c287..d327174b52 100644
--- 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)/' \

diff --git a/app-misc/dragon/dragon-1.2.0.ebuild 
b/app-misc/dragon/dragon-1.2.0.ebuild
index f13d58ec2b..18f11af4ae 100644
--- 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}"

diff --git a/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r1.ebuild 
b/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r1.ebuild
index 4bbf92a009..c39f6199af 100644
--- 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

diff --git a/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild 
b/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild
index 84500c29e7..fbe2e12e0e 100644
--- 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"

diff --git a/app-misc/gentodo/gentodo-0.2.1.ebuild 
b/app-misc/gentodo/gentodo-0.2.1.ebuild
index 6909891522..2719853f86 100644
--- 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="

diff --git 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
index 85edd95ce1..573ce939e7 100644
--- 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="

diff --git a/app-misc/gopsuinfo/gopsuinfo-0.1.5.ebuild 
b/app-misc/gopsuinfo/gopsuinfo-0.1.5.ebuild
index 242ffde570..f6cf1eab41 100644
--- 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
 
+DESCRIPTION="A gopsutil-based command to display system usage info as text"
+HOMEPAGE="https://github.com/nwg-piotr/gopsuinfo";
 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"
-
 SLOT="0"
+KEYWORDS="~amd64"
 
 DEPEND=">=dev-lang/go-1.20"
 

diff --git a/app-misc/kloak/kloak-0.2.30.ebuild 
b/app-misc/kloak/kloak-0.2.30.ebuild
index 5520eabdd9..ef5eb3575a 100644
--- 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=(

diff --git a/app-misc/ledger-live/ledger-live-2.68.1.ebuild 
b/app-misc/ledger-live/ledger-live-2.68.1.ebuild
index cf977711c8..dc6941e846 100644
--- 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

diff --git a/app-misc/ledger-live/ledger-live-2.71.1.ebuild 
b/app-misc/ledger-live/ledger-live-2.71.1.ebuild
index e5c511dd3f..c8f9082bb9 100644
--- 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

diff --git a/app-misc/ledger-live/ledger-live-2.73.0.ebuild 
b/app-misc/ledger-live/ledger-live-2.73.0.ebuild
index e5c511dd3f..c8f9082bb9 100644
--- 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

diff --git a/app-misc/ledger-live/ledger-live-2.73.1.ebuild 
b/app-misc/ledger-live/ledger-live-2.73.1.ebuild
index f2c7605466..2602e2cde0 100644
--- 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

diff --git a/app-misc/ledger-live/ledger-live-2.75.0.ebuild 
b/app-misc/ledger-live/ledger-live-2.75.0.ebuild
index f2c7605466..2602e2cde0 100644
--- 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

diff --git a/app-misc/lf/lf-27.ebuild b/app-misc/lf/lf-27.ebuild
index d027ff90ec..76dc822323 100644
--- a/app-misc/lf/lf-27.ebuild
+++ b/app-misc/lf/lf-27.ebuild
@@ -5,18 +5,18 @@ 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"
+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}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${PN}-r${PV}"
+IUSE="+static"
 
 src_compile() {
        local ldflags="-s -w -X main.gVersion=r${PV}"

diff --git a/app-misc/lf/lf-28-r1.ebuild b/app-misc/lf/lf-28-r1.ebuild
index 3a08167a53..8152b6738f 100644
--- a/app-misc/lf/lf-28-r1.ebuild
+++ b/app-misc/lf/lf-28-r1.ebuild
@@ -5,18 +5,18 @@ 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"
+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}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${PN}-r${PV}"
+IUSE="+static"
 
 src_compile() {
        local ldflags="-s -w -X main.gVersion=r${PV}"

diff --git a/app-misc/lf/lf-29.ebuild b/app-misc/lf/lf-29.ebuild
index d027ff90ec..76dc822323 100644
--- a/app-misc/lf/lf-29.ebuild
+++ b/app-misc/lf/lf-29.ebuild
@@ -5,18 +5,18 @@ 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"
+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}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${PN}-r${PV}"
+IUSE="+static"
 
 src_compile() {
        local ldflags="-s -w -X main.gVersion=r${PV}"

diff --git a/app-misc/lf/lf-30.ebuild b/app-misc/lf/lf-30.ebuild
index d027ff90ec..76dc822323 100644
--- a/app-misc/lf/lf-30.ebuild
+++ b/app-misc/lf/lf-30.ebuild
@@ -5,18 +5,18 @@ 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"
+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}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${PN}-r${PV}"
+IUSE="+static"
 
 src_compile() {
        local ldflags="-s -w -X main.gVersion=r${PV}"

diff --git a/app-misc/lf/lf-31.ebuild b/app-misc/lf/lf-31.ebuild
index b52e89d2ec..5c388fbe00 100644
--- a/app-misc/lf/lf-31.ebuild
+++ b/app-misc/lf/lf-31.ebuild
@@ -5,18 +5,18 @@ 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"
+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}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${PN}-r${PV}"
+IUSE="+static"
 
 src_compile() {
        local ldflags="-s -w -X main.gVersion=r${PV}"

diff --git a/app-misc/macchina/macchina-6.1.8-r1.ebuild 
b/app-misc/macchina/macchina-6.1.8-r1.ebuild
index fc2032246f..4d6106c06f 100644
--- 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

diff --git a/app-misc/macchina/macchina-6.1.8.ebuild 
b/app-misc/macchina/macchina-6.1.8.ebuild
index a6ac3a4d60..2202cacb5c 100644
--- 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

diff --git a/app-misc/metadata-cleaner/metadata-cleaner-2.5.4.ebuild 
b/app-misc/metadata-cleaner/metadata-cleaner-2.5.4.ebuild
index 5015bd4ab7..1088214071 100644
--- 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

diff --git a/app-misc/minder/minder-1.16.2.ebuild 
b/app-misc/minder/minder-1.16.2.ebuild
index 5be3279490..10038457ab 100644
--- 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

diff --git a/app-misc/minder/minder-1.16.3.ebuild 
b/app-misc/minder/minder-1.16.3.ebuild
index 5be3279490..10038457ab 100644
--- 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

diff --git a/app-misc/mobile-datovka/mobile-datovka-1.10.0.ebuild 
b/app-misc/mobile-datovka/mobile-datovka-1.10.0.ebuild
index 2675ae65de..510e70539a 100644
--- 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}/"

diff --git a/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.3.ebuild 
b/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.3.ebuild
index 4fe8a32242..25d375b86a 100644
--- 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

diff --git a/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.4.ebuild 
b/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.4.ebuild
index c105bedf54..fca381d8b0 100644
--- 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

diff --git a/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.5.ebuild 
b/app-misc/nwg-shell-wallpapers/nwg-shell-wallpapers-1.5.ebuild
index c105bedf54..fca381d8b0 100644
--- 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

diff --git a/app-misc/pfetch/pfetch-0.6.0.ebuild 
b/app-misc/pfetch/pfetch-0.6.0.ebuild
index b9c7582b9d..f9555724d7 100644
--- 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}"

diff --git 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
index 695866da06..320896c444 100644
--- 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}"

diff --git a/app-misc/wcal/wcal-0.1-r1.ebuild b/app-misc/wcal/wcal-0.1-r1.ebuild
index 21c1ab633c..b25a507ed5 100644
--- 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"

diff --git a/app-misc/wego/wego-2.2.ebuild b/app-misc/wego/wego-2.2.ebuild
index 80ef198858..e90fd97af3 100644
--- 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"

diff --git a/app-mobilephone/flashlight/flashlight-0.1.1-r2.ebuild 
b/app-mobilephone/flashlight/flashlight-0.1.1-r2.ebuild
index af04496309..cee63d180e 100644
--- 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"

diff --git 
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
index b65436de9c..2212278270 100644
--- 
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

diff --git a/app-mobilephone/usb-tethering/usb-tethering-0.3.ebuild 
b/app-mobilephone/usb-tethering/usb-tethering-0.3.ebuild
index 88de9b202e..55e49a6383 100644
--- 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"

diff --git a/app-office/jameica-bin/jameica-bin-2.10.4.ebuild 
b/app-office/jameica-bin/jameica-bin-2.10.4.ebuild
index 711aaf1703..31b8888ce2 100644
--- 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 )
 

diff --git a/app-office/nixnote-bin/nixnote-bin-2.1.10.ebuild 
b/app-office/nixnote-bin/nixnote-bin-2.1.10.ebuild
index d111e5a272..9b52d9290f 100644
--- 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() {

diff --git a/app-office/nixnote-bin/nixnote-bin-9999.ebuild 
b/app-office/nixnote-bin/nixnote-bin-9999.ebuild
index 8b3b261b10..f45ed69070 100644
--- 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() {

diff --git a/app-office/notesnook-bin/notesnook-bin-2.6.12.ebuild 
b/app-office/notesnook-bin/notesnook-bin-2.6.12.ebuild
index 1dc48b7745..63cc7c7017 100644
--- 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() {

diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.15.ebuild 
b/app-office/openoffice-bin/openoffice-bin-4.1.15.ebuild
index 74f411c170..55ff6f6e12 100644
--- 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"

diff --git a/app-office/pyspread/pyspread-2.1.1.ebuild 
b/app-office/pyspread/pyspread-2.1.1.ebuild
index e29c25f226..cd4aa7b3e0 100644
--- 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}]

diff --git a/app-office/standartnotes-bin/standartnotes-bin-3.183.22.ebuild 
b/app-office/standartnotes-bin/standartnotes-bin-3.183.22.ebuild
index 7c63d9818e..ba104fd5c1 100644
--- 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() {

diff --git a/app-portage/showbuild/showbuild-0.9.1-r1.ebuild 
b/app-portage/showbuild/showbuild-0.9.1-r1.ebuild
index a1658f5793..698635c599 100644
--- 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}"
 }

diff --git a/app-portage/version/version-0.19.0_alpha.ebuild 
b/app-portage/version/version-0.19.0_alpha.ebuild
index 1f97ec73f9..4d59f6f654 100644
--- 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

diff --git a/app-portage/version/version-0.20.1_alpha.ebuild 
b/app-portage/version/version-0.20.1_alpha.ebuild
index 1f97ec73f9..4d59f6f654 100644
--- 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

diff --git a/app-portage/version/version-0.21.0_alpha.ebuild 
b/app-portage/version/version-0.21.0_alpha.ebuild
index 1f97ec73f9..4d59f6f654 100644
--- 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

diff --git a/app-shells/carapace/carapace-0.30.2.ebuild 
b/app-shells/carapace/carapace-0.30.2.ebuild
index e8000b304a..02608e8736 100644
--- 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 ./...

diff --git a/app-shells/carapace/carapace-1.0.0.ebuild 
b/app-shells/carapace/carapace-1.0.0.ebuild
index 902c670811..97a0fd56e3 100644
--- 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 ./...

diff --git a/app-shells/carapace/carapace-1.0.1.ebuild 
b/app-shells/carapace/carapace-1.0.1.ebuild
index 902c670811..97a0fd56e3 100644
--- 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 ./...

diff --git a/app-text/lorien-bin/lorien-bin-0.6.0.ebuild 
b/app-text/lorien-bin/lorien-bin-0.6.0.ebuild
index 426b11c8a9..4e482e8b3b 100644
--- 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"

diff --git a/app-text/lsp/lsp-0.5.0_rc4.ebuild 
b/app-text/lsp/lsp-0.5.0_rc4.ebuild
index f4743a069d..4d65820d92 100644
--- 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

diff --git 
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
index 89b7c5250f..2d6b01fe16 100644
--- 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"
 
-LICENSE="GPL-2"
+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
 }

diff --git 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
index eabfc8fb52..63c6021e8e 100644
--- 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"
 
-LICENSE="GPL-2"
+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
 }

diff --git a/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0f.ebuild 
b/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0f.ebuild
index b5ff6700ca..340403bb27 100644
--- a/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0f.ebuild
+++ b/app-text/pandoc-crossref-bin/pandoc-crossref-bin-0.3.17.0f.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"
 
-LICENSE="GPL-2"
+S="${WORKDIR}"
 
+LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="-* ~amd64"
-S=${WORKDIR}
 
 RDEPEND="
 || ( =app-text/pandoc-bin-3.1.12.3 =app-text/pandoc-3.1.12.3 )
@@ -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
 }

diff --git 
a/app-text/the-platinum-searcher-bin/the-platinum-searcher-bin-2.2.0.ebuild 
b/app-text/the-platinum-searcher-bin/the-platinum-searcher-bin-2.2.0.ebuild
index a7092781ff..98819ddcd3 100644
--- a/app-text/the-platinum-searcher-bin/the-platinum-searcher-bin-2.2.0.ebuild
+++ b/app-text/the-platinum-searcher-bin/the-platinum-searcher-bin-2.2.0.ebuild
@@ -7,11 +7,11 @@ DESCRIPTION="Fast CLI search tool, faster than grep, ack, 
silver_searcher (ag)"
 HOMEPAGE="https://github.com/monochromegane/the_platinum_searcher";
 
SRC_URI="https://github.com/monochromegane/the_platinum_searcher/releases/download/v${PV}/pt_linux_amd64.tar.gz";
 
+S="${WORKDIR}/pt_linux_amd64"
+
 LICENSE="MIT"
-KEYWORDS="~amd64"
 SLOT="0"
-
-S="${WORKDIR}/pt_linux_amd64"
+KEYWORDS="~amd64"
 
 src_install() {
        dobin pt

diff --git a/app-vim/kotlin-vim/kotlin-vim-20220627.ebuild 
b/app-vim/kotlin-vim/kotlin-vim-20220627.ebuild
index 309c35bf0f..58d20948ac 100644
--- a/app-vim/kotlin-vim/kotlin-vim-20220627.ebuild
+++ b/app-vim/kotlin-vim/kotlin-vim-20220627.ebuild
@@ -6,15 +6,16 @@ EAPI=7
 #VIM_PLUGIN_VIM_VERSION="7.0"
 inherit vim-plugin
 
+SHA="1261f851e5fb2192b3a5e1691650597c71dfce2f"
+
 DESCRIPTION="Kotlin plugin for Vim."
 HOMEPAGE="https://github.com/udalov/kotlin-vim";
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-SHA="1261f851e5fb2192b3a5e1691650597c71dfce2f"
 SRC_URI="https://github.com/udalov/kotlin-vim/archive/${SHA}.tar.gz -> 
${P}.tar.gz"
 
 S="${WORKDIR}/${PN}-${SHA}"
 
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
 VIM_PLUGIN_HELPFILES="README.md"
 VIM_PLUGIN_HELPURI="https://github.com/udalov/kotlin-vim";

diff --git a/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild 
b/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild
index 81651f0b14..8b6fc6caa1 100644
--- a/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild
+++ b/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild
@@ -16,9 +16,8 @@ HOMEPAGE="https://github.com/szaghi/FoBiS";
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror"
-
 IUSE="graphviz"
+RESTRICT="mirror"
 
 RDEPEND="
        graphviz? ( dev-python/graphviz[${PYTHON_USEDEP}] )

diff --git a/dev-cpp/dpp/dpp-10.0.23.ebuild b/dev-cpp/dpp/dpp-10.0.23.ebuild
index d5cee490cc..04c8913832 100644
--- a/dev-cpp/dpp/dpp-10.0.23.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.23.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
        https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
        dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {

diff --git a/dev-cpp/dpp/dpp-10.0.24.ebuild b/dev-cpp/dpp/dpp-10.0.24.ebuild
index d5cee490cc..04c8913832 100644
--- a/dev-cpp/dpp/dpp-10.0.24.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.24.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
        https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
        dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {

diff --git a/dev-cpp/dpp/dpp-10.0.25.ebuild b/dev-cpp/dpp/dpp-10.0.25.ebuild
index d5cee490cc..04c8913832 100644
--- a/dev-cpp/dpp/dpp-10.0.25.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.25.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
        https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
        dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {

diff --git a/dev-cpp/dpp/dpp-10.0.29.ebuild b/dev-cpp/dpp/dpp-10.0.29.ebuild
index d5cee490cc..04c8913832 100644
--- a/dev-cpp/dpp/dpp-10.0.29.ebuild
+++ b/dev-cpp/dpp/dpp-10.0.29.ebuild
@@ -11,6 +11,8 @@ SRC_URI="
        https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz
 "
 
+S="${WORKDIR}/DPP-${PV}"
+
 LICENSE="Apache-2.0"
 # DPP is extremely ABI instable due to frequent changes in the Discord API
 # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157
@@ -33,8 +35,6 @@ DEPEND="
        dev-cpp/nlohmann_json
 "
 
-S="${WORKDIR}/DPP-${PV}"
-
 DOCS=( "README.md" "SECURITY.md" )
 
 src_configure() {

diff --git a/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild 
b/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
index 187eb5e624..67cf73b0e6 100644
--- a/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
+++ b/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
@@ -7,12 +7,12 @@ MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
 
 inherit build2
 
-SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz";
 DESCRIPTION="C++ utility library"
 HOMEPAGE="https://www.codesynthesis.com/projects/libcutl/";
+SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz";
+
+S="${WORKDIR}/${MY_P}"
 
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-
-S="${WORKDIR}/${MY_P}"

diff --git a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild 
b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
index f998177bcf..394244384b 100644
--- a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
+++ b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
@@ -7,12 +7,12 @@ MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
 
 inherit build2
 
-SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz";
 DESCRIPTION="Streaming XML pull parser/serializer for modern C++"
 HOMEPAGE="https://www.codesynthesis.com/projects/libstudxml/";
+SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz";
+
+S="${WORKDIR}/${MY_P}"
 
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-
-S="${WORKDIR}/${MY_P}"

diff --git a/dev-db/dbeaver-bin/dbeaver-bin-23.0.0.ebuild 
b/dev-db/dbeaver-bin/dbeaver-bin-23.0.0.ebuild
index b3f6ff6fee..9a6653bcc0 100644
--- a/dev-db/dbeaver-bin/dbeaver-bin-23.0.0.ebuild
+++ b/dev-db/dbeaver-bin/dbeaver-bin-23.0.0.ebuild
@@ -4,11 +4,14 @@
 EAPI=7
 inherit desktop wrapper xdg
 
+MY_PN="${PN%-bin*}"
+
 DESCRIPTION="Free universal database tool (community edition)."
 HOMEPAGE="https://dbeaver.io/";
-MY_PN="${PN%-bin*}-ce"
-SRC_URI="amd64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.x86_64-nojdk.tar.gz -> 
${P}-amd64.tar.gz )
-       arm64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.aarch64-nojdk.tar.gz  
-> ${P}-arm64.tar.gz )"
+SRC_URI="amd64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-ce-${PV}-linux.gtk.x86_64-nojdk.tar.gz 
-> ${P}-amd64.tar.gz )
+       arm64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-ce-${PV}-linux.gtk.aarch64-nojdk.tar.gz 
 -> ${P}-arm64.tar.gz )"
+
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="Apache-2.0 EPL-1.0 BSD"
 SLOT="0"
@@ -17,9 +20,6 @@ KEYWORDS="~amd64 ~arm64"
 RDEPEND="virtual/jre:17"
 DEPEND="${RDEPEND}"
 
-MY_PN="${PN%-bin*}"
-S="${WORKDIR}/${MY_PN}"
-
 src_prepare() {
        sed -e "s/^Icon=.*/Icon=${MY_PN}/" \
                -e 's:/usr/share/dbeaver:/opt/dbeaver:g' \

diff --git a/dev-db/dbeaver-bin/dbeaver-bin-23.2.0.ebuild 
b/dev-db/dbeaver-bin/dbeaver-bin-23.2.0.ebuild
index 41d57ee770..1eac76d656 100644
--- a/dev-db/dbeaver-bin/dbeaver-bin-23.2.0.ebuild
+++ b/dev-db/dbeaver-bin/dbeaver-bin-23.2.0.ebuild
@@ -5,11 +5,14 @@ EAPI=8
 
 inherit desktop wrapper xdg
 
+MY_PN="${PN%-bin*}"
+
 DESCRIPTION="Free universal database tool (community edition)."
 HOMEPAGE="https://dbeaver.io/";
-MY_PN="${PN%-bin*}-ce"
-SRC_URI="amd64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.x86_64-nojdk.tar.gz -> 
${P}-amd64.tar.gz )
-       arm64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.aarch64-nojdk.tar.gz  
-> ${P}-arm64.tar.gz )"
+SRC_URI="amd64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-ce-${PV}-linux.gtk.x86_64-nojdk.tar.gz 
-> ${P}-amd64.tar.gz )
+       arm64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-ce-${PV}-linux.gtk.aarch64-nojdk.tar.gz 
 -> ${P}-arm64.tar.gz )"
+
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="Apache-2.0 EPL-1.0 BSD"
 SLOT="0"
@@ -18,9 +21,6 @@ KEYWORDS="~amd64 ~arm64"
 RDEPEND="virtual/jre:17"
 DEPEND="${RDEPEND}"
 
-MY_PN="${PN%-bin*}"
-S="${WORKDIR}/${MY_PN}"
-
 src_prepare() {
        sed -e "s/^Icon=.*/Icon=${MY_PN}/" \
                -e 's:/usr/share/dbeaver:/opt/dbeaver:g' \

diff --git a/dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild 
b/dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild
index 41d57ee770..1eac76d656 100644
--- a/dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild
+++ b/dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild
@@ -5,11 +5,14 @@ EAPI=8
 
 inherit desktop wrapper xdg
 
+MY_PN="${PN%-bin*}"
+
 DESCRIPTION="Free universal database tool (community edition)."
 HOMEPAGE="https://dbeaver.io/";
-MY_PN="${PN%-bin*}-ce"
-SRC_URI="amd64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.x86_64-nojdk.tar.gz -> 
${P}-amd64.tar.gz )
-       arm64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.aarch64-nojdk.tar.gz  
-> ${P}-arm64.tar.gz )"
+SRC_URI="amd64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-ce-${PV}-linux.gtk.x86_64-nojdk.tar.gz 
-> ${P}-amd64.tar.gz )
+       arm64? ( 
https://dbeaver.io/files/${PV}/${MY_PN}-ce-${PV}-linux.gtk.aarch64-nojdk.tar.gz 
 -> ${P}-arm64.tar.gz )"
+
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="Apache-2.0 EPL-1.0 BSD"
 SLOT="0"
@@ -18,9 +21,6 @@ KEYWORDS="~amd64 ~arm64"
 RDEPEND="virtual/jre:17"
 DEPEND="${RDEPEND}"
 
-MY_PN="${PN%-bin*}"
-S="${WORKDIR}/${MY_PN}"
-
 src_prepare() {
        sed -e "s/^Icon=.*/Icon=${MY_PN}/" \
                -e 's:/usr/share/dbeaver:/opt/dbeaver:g' \

diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild 
b/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild
index a9c1f384ea..e3053ec8f2 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild
@@ -5,17 +5,19 @@ EAPI=7
 
 inherit dotnet autotools
 
-SLOT="3"
 DESCRIPTION="gtk bindings for mono"
-LICENSE="GPL-2"
 HOMEPAGE="https://www.mono-project.com/docs/gui/gtksharp/";
-KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="https://github.com/mono/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="debug"
-PATCHES=( "${FILESDIR}/${P}-fix-build.patch" )
 
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug"
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${P}-fix-build.patch" )
+
 RDEPEND="
        >=dev-lang/mono-3.0
        x11-libs/pango

diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-3.22.2-r2.ebuild 
b/dev-dotnet/gtk-sharp/gtk-sharp-3.22.2-r2.ebuild
index fddc5d6647..75a3643d39 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-3.22.2-r2.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-3.22.2-r2.ebuild
@@ -14,8 +14,8 @@ 
SRC_URI="https://github.com/GLibSharp/GtkSharp/archive/refs/tags/${PV}.tar.gz ->
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 SLOT="3"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 IUSE="+atk +cairo +gdk +gtk +pango"
 
 REQUIRED_USE="

diff --git a/dev-elixir/hex/hex-1.0.1-r1.ebuild 
b/dev-elixir/hex/hex-1.0.1-r1.ebuild
index dde66cd973..6fee6d8b52 100644
--- a/dev-elixir/hex/hex-1.0.1-r1.ebuild
+++ b/dev-elixir/hex/hex-1.0.1-r1.ebuild
@@ -7,9 +7,10 @@ inherit mix
 
 DESCRIPTION="Package manager for the Erlang VM"
 HOMEPAGE="https://github.com/hexpm/hex";
+SRC_URI="https://github.com/hexpm/hex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1-2)"
-SRC_URI="https://github.com/hexpm/hex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
 # TODO: tests (requires dependencies)

diff --git a/dev-embedded/esp-idf/esp-idf-5.1.2.ebuild 
b/dev-embedded/esp-idf/esp-idf-5.1.2.ebuild
index 6a0cd0a1de..83ca81f689 100644
--- a/dev-embedded/esp-idf/esp-idf-5.1.2.ebuild
+++ b/dev-embedded/esp-idf/esp-idf-5.1.2.ebuild
@@ -17,20 +17,23 @@ HOMEPAGE="https://www.espressif.com/";
 #      
https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz
 
SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip
 -> ${P}.zip
        
https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz
-       
https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20221002/xtensa-esp-elf-gdb-12.1_20221002-x86_64-linux-gnu.tar.gz";
-SRC_URI+=" esp32? ( 
${CROSSTOOL_URL}/xtensa-esp32-elf-${VER}-x86_64-linux-gnu.tar.xz )"
-SRC_URI+=" esp32s2? ( 
${CROSSTOOL_URL}/xtensa-esp32s2-elf-${VER}-x86_64-linux-gnu.tar.xz )"
-SRC_URI+=" esp32s3? ( 
${CROSSTOOL_URL}/xtensa-esp32s3-elf-${VER}-x86_64-linux-gnu.tar.xz )"
-SRC_URI+=" riscv32? ( 
${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
-
+       
https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20221002/xtensa-esp-elf-gdb-12.1_20221002-x86_64-linux-gnu.tar.gz
+       esp32? ( 
${CROSSTOOL_URL}/xtensa-esp32-elf-${VER}-x86_64-linux-gnu.tar.xz )
+       esp32s2? ( 
${CROSSTOOL_URL}/xtensa-esp32s2-elf-${VER}-x86_64-linux-gnu.tar.xz )
+       esp32s3? ( 
${CROSSTOOL_URL}/xtensa-esp32s3-elf-${VER}-x86_64-linux-gnu.tar.xz )
+       riscv32? ( 
${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
 
#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz
 
-KEYWORDS="~amd64"
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
 IUSE="+esp32 esp32s2 esp32s3 riscv32"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-SLOT="0"
+RESTRICT="strip"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="
@@ -52,8 +55,6 @@ RDEPEND="
        dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
 "
 
-RESTRICT="strip"
-
 QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
 QA_PRESTRIPPED="opt/*"
 
@@ -61,8 +62,6 @@ PATCHES=(
        "${FILESDIR}/allow-system-install-${PN}-5.1.2.patch"
 )
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 install_tool() {
        shopt -s globstar
 

diff --git a/dev-embedded/esp-idf/esp-idf-5.2.ebuild 
b/dev-embedded/esp-idf/esp-idf-5.2.ebuild
index 0edfe91fb1..906a2a6568 100644
--- a/dev-embedded/esp-idf/esp-idf-5.2.ebuild
+++ b/dev-embedded/esp-idf/esp-idf-5.2.ebuild
@@ -17,18 +17,21 @@ HOMEPAGE="https://www.espressif.com/";
 #      
https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz
 
SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip
 -> ${P}.zip
        
https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz
-       
https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20231023/xtensa-esp-elf-gdb-12.1_20231023-x86_64-linux-gnu.tar.gz";
-SRC_URI+=" ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz"
-SRC_URI+=" riscv32? ( 
${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
-
+       
https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20231023/xtensa-esp-elf-gdb-12.1_20231023-x86_64-linux-gnu.tar.gz
+       ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz
+       riscv32? ( 
${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
 
#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz
 
-KEYWORDS="~amd64"
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
 IUSE="riscv32"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-SLOT="0"
+RESTRICT="strip"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="
@@ -50,8 +53,6 @@ RDEPEND="
        dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
 "
 
-RESTRICT="strip"
-
 QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
 QA_PRESTRIPPED="opt/*"
 
@@ -59,8 +60,6 @@ PATCHES=(
        "${FILESDIR}/allow-system-install-${PN}-5.1.2.patch"
 )
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 install_tool() {
        shopt -s globstar
 

diff --git 
a/dev-embedded/mv88e6xxx-dump/mv88e6xxx-dump-0.2.0_pre20210327.ebuild 
b/dev-embedded/mv88e6xxx-dump/mv88e6xxx-dump-0.2.0_pre20210327.ebuild
index 832b30734d..711a134998 100644
--- a/dev-embedded/mv88e6xxx-dump/mv88e6xxx-dump-0.2.0_pre20210327.ebuild
+++ b/dev-embedded/mv88e6xxx-dump/mv88e6xxx-dump-0.2.0_pre20210327.ebuild
@@ -11,16 +11,15 @@ DESCRIPTION="Dump information about Marvell mv88e6xxx 
Ethernet switches"
 HOMEPAGE="https://github.com/lunn/mv88e6xxx_dump";
 SRC_URI="https://github.com/lunn/mv88e6xxx_dump/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/mv88e6xxx_dump-${MY_COMMIT}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
-
 DEPEND="net-libs/libmnl:="
 
-S="${WORKDIR}/mv88e6xxx_dump-${MY_COMMIT}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-embedded/rauc/rauc-1.11.3.ebuild 
b/dev-embedded/rauc/rauc-1.11.3.ebuild
index 92f6b2e905..f19d213167 100644
--- a/dev-embedded/rauc/rauc-1.11.3.ebuild
+++ b/dev-embedded/rauc/rauc-1.11.3.ebuild
@@ -13,9 +13,10 @@ DESCRIPTION="Lightweight update client that runs on your 
Embedded Linux device"
 HOMEPAGE="https://rauc.io/";
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz";
 
-SLOT="0"
 LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="gpt json network service test"
 
 RESTRICT="!test? ( test )"

diff --git a/dev-embedded/squareline-studio/squareline-studio-1.3.2.ebuild 
b/dev-embedded/squareline-studio/squareline-studio-1.3.2.ebuild
index dac7c60e84..20893d5f2b 100644
--- a/dev-embedded/squareline-studio/squareline-studio-1.3.2.ebuild
+++ b/dev-embedded/squareline-studio/squareline-studio-1.3.2.ebuild
@@ -13,16 +13,17 @@ SRC_URI="
        
https://static.squareline.io/downloads/SquareLine_Studio_Linux_v${MY_PV}.zip -> 
${P}.zip
 "
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
-KEYWORDS="-* ~amd64"
 SLOT="0/${PV}"
+KEYWORDS="-* ~amd64"
 
 DEPEND="${RDEPEND}"
 BDEPEND="
        app-arch/unzip
 "
 
-S="${WORKDIR}"
 QA_PREBUILT="*"
 
 src_install() {

diff --git a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild 
b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
index 782dcab37f..c6d09670ef 100644
--- a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
+++ b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
@@ -9,14 +9,14 @@ DESCRIPTION="Bootstrap package for dev-lang/fbc"
 HOMEPAGE="https://www.freebasic.net";
 
SRC_URI="https://github.com/freebasic/fbc/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz";
 
+S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
+
 LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/fbc-1.07.0-Pass-ltinfo-to-linker.patch )
 
-S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
-
 src_compile() {
        emake bootstrap-minimal \
                AR=$(tc-getAR) AS=$(tc-getAS) CC=$(tc-getCC) CFLAGS="${CFLAGS}" 
V=1

diff --git a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild 
b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild
index d713fdb564..d0a2dfee38 100644
--- a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild
+++ b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.08.1.ebuild
@@ -9,14 +9,14 @@ DESCRIPTION="Bootstrap package for dev-lang/fbc"
 HOMEPAGE="https://www.freebasic.net";
 
SRC_URI="https://github.com/freebasic/fbc/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz";
 
+S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
+
 LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/fbc-1.08.1-Pass-ltinfo-to-linker.patch )
 
-S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
-
 src_compile() {
        emake bootstrap-minimal \
                AR=$(tc-getAR) AS=$(tc-getAS) CC=$(tc-getCC) CFLAGS="${CFLAGS}" 
V=1

diff --git a/dev-lang/gnu-apl/gnu-apl-1.8.ebuild 
b/dev-lang/gnu-apl/gnu-apl-1.8.ebuild
index bcec2c3256..6131d89c23 100644
--- a/dev-lang/gnu-apl/gnu-apl-1.8.ebuild
+++ b/dev-lang/gnu-apl/gnu-apl-1.8.ebuild
@@ -6,12 +6,13 @@ EAPI=8
 DESCRIPTION="GNU interpreter for the APL programming language"
 HOMEPAGE="https://www.gnu.org/software/apl/";
 SRC_URI="mirror://gnu/apl/apl-${PV}.tar.gz"
+
+S="${WORKDIR}/apl-${PV}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/apl-${PV}"
-
 IUSE="static-libs erlang libapl python gtk3 pcre2 sqlite3 postgresql"
 
 BDEPEND="dev-vcs/subversion"

diff --git a/dev-lang/opencilk-bin/opencilk-bin-1.1.ebuild 
b/dev-lang/opencilk-bin/opencilk-bin-1.1.ebuild
index 80a267391b..a9eb975f6a 100644
--- a/dev-lang/opencilk-bin/opencilk-bin-1.1.ebuild
+++ b/dev-lang/opencilk-bin/opencilk-bin-1.1.ebuild
@@ -5,9 +5,10 @@ EAPI=8
 
 DESCRIPTION="The OpenCilk concurrency platform for parallel programming"
 HOMEPAGE="https://opencilk.org/";
-
 
SRC_URI="https://github.com/OpenCilk/opencilk-project/releases/download/opencilk%2Fv${PV}/OpenCilk-${PV}-LLVM-12.0.0-Ubuntu-20.04-x86_64.tar.gz";
 
+S="${WORKDIR}"
+
 # Since opencilk-project is a fork of LLVM 12, this lists the licenses
 # of LLVM 12, while opencilk-project states that it us under "MIT with
 # the OpenCilk Addendum", which basically states that you can
@@ -25,8 +26,6 @@ RDEPEND="
        sys-libs/zlib
 "
 
-S="${WORKDIR}"
-
 QA_FLAGS_IGNORED="opt/${P}/.*"
 
 src_install() {

diff --git a/dev-lang/opencilk-bin/opencilk-bin-2.1.ebuild 
b/dev-lang/opencilk-bin/opencilk-bin-2.1.ebuild
index 83671bf108..95829fdc70 100644
--- a/dev-lang/opencilk-bin/opencilk-bin-2.1.ebuild
+++ b/dev-lang/opencilk-bin/opencilk-bin-2.1.ebuild
@@ -5,9 +5,10 @@ EAPI=8
 
 DESCRIPTION="The OpenCilk concurrency platform for parallel programming"
 HOMEPAGE="https://opencilk.org/";
-
 
SRC_URI="https://github.com/OpenCilk/opencilk-project/releases/download/opencilk%2Fv${PV}/opencilk-${PV}.0-x86_64-linux-gnu-ubuntu-22.04.tar.gz";
 
+S="${WORKDIR}"
+
 # Since opencilk-project is a fork of LLVM 12, this lists the licenses
 # of LLVM 12, while opencilk-project states that it us under "MIT with
 # the OpenCilk Addendum", which basically states that you can
@@ -25,8 +26,6 @@ RDEPEND="
        sys-libs/zlib
 "
 
-S="${WORKDIR}"
-
 QA_FLAGS_IGNORED="opt/${P}/.*"
 
 src_install() {

diff --git a/dev-lang/opencilk/opencilk-1.1.ebuild 
b/dev-lang/opencilk/opencilk-1.1.ebuild
index 92c3f32d2d..b27f5cb591 100644
--- a/dev-lang/opencilk/opencilk-1.1.ebuild
+++ b/dev-lang/opencilk/opencilk-1.1.ebuild
@@ -5,15 +5,18 @@ EAPI=8
 
 inherit cmake
 
+MY_POSTFIX="${PN}-v${PV}"
+
 DESCRIPTION="The OpenCilk concurrency platform for parallel programming"
 HOMEPAGE="https://opencilk.org/";
-
 SRC_URI="
        
https://github.com/OpenCilk/opencilk-project/archive/refs/tags/opencilk/v${PV}.tar.gz
 -> ${PN}-project-${PV}.tar.gz
        
https://github.com/OpenCilk/cheetah/archive/refs/tags/opencilk/v${PV}.tar.gz -> 
${PN}-cheetah-${PV}.tar.gz
        
https://github.com/OpenCilk/productivity-tools/archive/refs/tags/opencilk/v${PV}.tar.gz
 -> ${PN}-productivity-tools-${PV}.tar.gz
 "
 
+S="${WORKDIR}/${PN}-project-${MY_POSTFIX}"
+
 # Since opencilk-project is a fork of LLVM 12, this lists the licenses
 # of LLVM 12, while opencilk-project states that it us under "MIT with
 # the OpenCilk Addendum", which basically states that you can
@@ -24,10 +27,9 @@ SRC_URI="
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="debug"
 
-MY_POSTFIX="${PN}-v${PV}"
-S="${WORKDIR}/${PN}-project-${MY_POSTFIX}"
 CMAKE_USE_DIR="${S}/llvm"
 
 RDEPEND="

diff --git a/dev-lang/opencilk/opencilk-2.1.ebuild 
b/dev-lang/opencilk/opencilk-2.1.ebuild
index 1f4195b10a..9a81592986 100644
--- a/dev-lang/opencilk/opencilk-2.1.ebuild
+++ b/dev-lang/opencilk/opencilk-2.1.ebuild
@@ -5,15 +5,18 @@ EAPI=8
 
 inherit cmake
 
+MY_POSTFIX="${PN}-v${PV}"
+
 DESCRIPTION="The OpenCilk concurrency platform for parallel programming"
 HOMEPAGE="https://opencilk.org/";
-
 SRC_URI="
        
https://github.com/OpenCilk/opencilk-project/archive/refs/tags/opencilk/v${PV}.tar.gz
 -> ${PN}-project-${PV}.tar.gz
        
https://github.com/OpenCilk/cheetah/archive/refs/tags/opencilk/v${PV}.tar.gz -> 
${PN}-cheetah-${PV}.tar.gz
        
https://github.com/OpenCilk/productivity-tools/archive/refs/tags/opencilk/v${PV}.tar.gz
 -> ${PN}-productivity-tools-${PV}.tar.gz
 "
 
+S="${WORKDIR}/${PN}-project-${MY_POSTFIX}"
+
 # Since opencilk-project is a fork of LLVM 12, this lists the licenses
 # of LLVM 12, while opencilk-project states that it us under "MIT with
 # the OpenCilk Addendum", which basically states that you can
@@ -24,10 +27,9 @@ SRC_URI="
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="debug"
 
-MY_POSTFIX="${PN}-v${PV}"
-S="${WORKDIR}/${PN}-project-${MY_POSTFIX}"
 CMAKE_USE_DIR="${S}/llvm"
 
 RDEPEND="

diff --git 
a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.0.20220523.ebuild 
b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.0.20220523.ebuild
index e8d1ca4703..28969c8f7c 100644
--- 
a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.0.20220523.ebuild
+++ 
b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.0.20220523.ebuild
@@ -7,11 +7,13 @@ inherit meson
 
 MY_PV="v${PV}"
 MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="A daemon to provide haptic feedback on events (themes package)"
 HOMEPAGE="https://source.puri.sm/Librem5/feedbackd-device-themes";
 
SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz 
-> ${P}.tar.gz"
+
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"

diff --git 
a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.1.0.ebuild 
b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.1.0.ebuild
index 605c748860..324eebd42c 100644
--- a/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.1.0.ebuild
+++ b/dev-libs/feedbackd-device-themes/feedbackd-device-themes-0.1.0.ebuild
@@ -7,11 +7,13 @@ inherit meson
 
 MY_PV="v${PV}"
 MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="A daemon to provide haptic feedback on events (themes package)"
 HOMEPAGE="https://source.puri.sm/Librem5/feedbackd-device-themes";
 
SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2";
+
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"

diff --git a/dev-libs/feedbackd/feedbackd-0.2.0.ebuild 
b/dev-libs/feedbackd/feedbackd-0.2.0.ebuild
index deef8fc411..692c7289ab 100644
--- a/dev-libs/feedbackd/feedbackd-0.2.0.ebuild
+++ b/dev-libs/feedbackd/feedbackd-0.2.0.ebuild
@@ -16,8 +16,8 @@ SRC_URI="
 S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+daemon gtk-doc +introspection man test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"

diff --git a/dev-libs/fsst/fsst-0_pre20200830-r1.ebuild 
b/dev-libs/fsst/fsst-0_pre20200830-r1.ebuild
index 402640bea5..bf02f0cc26 100644
--- a/dev-libs/fsst/fsst-0_pre20200830-r1.ebuild
+++ b/dev-libs/fsst/fsst-0_pre20200830-r1.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Fast Static Symbol Table: fast text compression 
that allows random
 HOMEPAGE="https://github.com/cwida/fsst";
 SRC_URI="https://github.com/cwida/fsst/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz"
 
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
@@ -18,8 +20,6 @@ KEYWORDS="~amd64"
 BDEPEND="app-admin/chrpath"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_install() {
        chrpath -d "${BUILD_DIR}/fsst" || die
 

diff --git a/dev-libs/ip2loc/ip2loc-8.1.4.ebuild 
b/dev-libs/ip2loc/ip2loc-8.1.4.ebuild
index f9a282b8c0..4224101175 100644
--- a/dev-libs/ip2loc/ip2loc-8.1.4.ebuild
+++ b/dev-libs/ip2loc/ip2loc-8.1.4.ebuild
@@ -9,14 +9,14 @@ DESCRIPTION="IP2Location C Library"
 HOMEPAGE="https://github.com/chrislim2888/IP2Location-C-Library/";
 
SRC_URI="https://github.com/chrislim2888/IP2Location-C-Library/archive/${PV}.tar.gz
 -> ${P}.gh.tar.gz"
 
+S="${WORKDIR}/IP2Location-C-Library-${PV}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="dev-lang/perl"
 
-S="${WORKDIR}/IP2Location-C-Library-${PV}"
-
 src_configure() {
        eautoreconf
        default

diff --git a/dev-libs/libdbf/libdbf-0.0.1.ebuild 
b/dev-libs/libdbf/libdbf-0.0.1.ebuild
index 256053ed37..d8ed4cafc0 100644
--- a/dev-libs/libdbf/libdbf-0.0.1.ebuild
+++ b/dev-libs/libdbf/libdbf-0.0.1.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="Library to read the content of dBASE III, IV, 
and 5.0 files"
 HOMEPAGE="https://github.com/rollinhand/libdbf";
 SRC_URI="https://github.com/rollinhand/libdbf/archive/${MY_COMMIT}.tar.gz -> 
${P}.tgz"
 
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -23,8 +25,6 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig"
 BDEPEND="dev-util/intltool"
 
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libtypec/libtypec-0.5.0-r1.ebuild 
b/dev-libs/libtypec/libtypec-0.5.0-r1.ebuild
index 0e9c08e3aa..f6efb97b04 100644
--- a/dev-libs/libtypec/libtypec-0.5.0-r1.ebuild
+++ b/dev-libs/libtypec/libtypec-0.5.0-r1.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Library to interface with USB Type-c/Power 
Delivery devices"
 HOMEPAGE="https://github.com/Rajaram-Regupathy/libtypec";
 
SRC_URI="https://github.com/Rajaram-Regupathy/libtypec/releases/download/${P}/${P}-Source.tar.gz";
 
+S="${WORKDIR}/${P}-Source"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${P}-Source"
-
 PATCHES=(
        
"${FILESDIR}/${PN}-0.5.0-CMakeLists.txt-fix-pkgconfig-install-path.patch"
        
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-define-feature-test-macro-for-nft.patch"

diff --git a/dev-libs/libtypec/libtypec-0.5.0.ebuild 
b/dev-libs/libtypec/libtypec-0.5.0.ebuild
index 02697c52d9..c0cd16ca5d 100644
--- a/dev-libs/libtypec/libtypec-0.5.0.ebuild
+++ b/dev-libs/libtypec/libtypec-0.5.0.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Library to interface with USB Type-c/Power 
Delivery devices"
 HOMEPAGE="https://github.com/Rajaram-Regupathy/libtypec";
 
SRC_URI="https://github.com/Rajaram-Regupathy/libtypec/releases/download/${P}/${P}-Source.tar.gz";
 
+S="${WORKDIR}/${P}-Source"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/${P}-Source"
-
 PATCHES=(
        
"${FILESDIR}/${PN}-0.5.0-CMakeLists.txt-fix-pkgconfig-install-path.patch"
        
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-define-feature-test-macro-for-nft.patch"

diff --git a/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r1.ebuild 
b/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r1.ebuild
index 3bc066b9e7..62d5ed367a 100644
--- a/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r1.ebuild
+++ b/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r1.ebuild
@@ -4,15 +4,17 @@
 EAPI=8
 
 COMMIT="55ff64349dec3012cfbbb1c4f92d4dbd46920213"
+
 DESCRIPTION="libcrypt wrapper for LiteSpeedTech"
 HOMEPAGE="https://github.com/litespeedtech/libbcrypt/";
 SRC_URI="https://github.com/litespeedtech/libbcrypt/archive/${COMMIT}.tar.gz 
-> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/libbcrypt-${COMMIT}"
+
 LICENSE="CC0-1.0 public-domain"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/libbcrypt-${COMMIT}"
-
 PATCHES=(
        "${FILESDIR}"/${PV}-fix-tests.patch
 )

diff --git a/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild 
b/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild
index 36456f88df..605f740e3f 100644
--- a/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild
+++ b/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild
@@ -4,15 +4,17 @@
 EAPI=8
 
 COMMIT="55ff64349dec3012cfbbb1c4f92d4dbd46920213"
+
 DESCRIPTION="libcrypt wrapper for LiteSpeedTech"
 HOMEPAGE="https://github.com/litespeedtech/libbcrypt/";
 SRC_URI="https://github.com/litespeedtech/libbcrypt/archive/${COMMIT}.tar.gz 
-> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/libbcrypt-${COMMIT}"
+
 LICENSE="CC0-1.0 public-domain"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}/libbcrypt-${COMMIT}"
-
 PATCHES=(
        "${FILESDIR}"/${PV}-fix-tests.patch
        "${FILESDIR}"/${PV}-fix-flags-directly.patch

diff --git a/dev-libs/lsquic/lsquic-3.2.0-r1.ebuild 
b/dev-libs/lsquic/lsquic-3.2.0-r1.ebuild
index 41383d373c..574a042f4a 100644
--- a/dev-libs/lsquic/lsquic-3.2.0-r1.ebuild
+++ b/dev-libs/lsquic/lsquic-3.2.0-r1.ebuild
@@ -5,10 +5,9 @@ EAPI=8
 
 inherit cmake
 
-# LSQUIC
 LSQUIC_COMMIT="3bbf683f25ab84826951350c57ae226c88c54422"
-# BoringSSL
 BORINGSSL_COMMIT="15655052e8701f908937204785eaa8cd4363099f"
+
 DESCRIPTION="LiteSpeed QUIC (LSQUIC) Library"
 HOMEPAGE="https://github.com/litespeedtech/lsquic/";
 SRC_URI="
@@ -16,14 +15,15 @@ SRC_URI="
        https://github.com/google/boringssl/archive/${BORINGSSL_COMMIT}.tar.gz 
-> boringssl-fips-20230428.tar.gz
 "
 
+S="${WORKDIR}/lsquic-${LSQUIC_COMMIT}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
+
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/lsquic-${LSQUIC_COMMIT}"
-
 DEPEND="
        dev-lang/go
        dev-libs/ls-qpack:=[static-libs=]
@@ -38,7 +38,7 @@ PATCHES=(
 src_unpack() {
        unpack ${P}.tar.gz
        unpack boringssl-fips-20230428.tar.gz
-       mv boringssl-${BORINGSSL_COMMIT} ${S}/src/liblsquic/boringssl || die
+       mv boringssl-${BORINGSSL_COMMIT} "${S}"/src/liblsquic/boringssl || die
 }
 
 src_configure() {

diff --git a/dev-libs/lsquic/lsquic-3.2.0.ebuild 
b/dev-libs/lsquic/lsquic-3.2.0.ebuild
index 2a55f57fbb..86b5633709 100644
--- a/dev-libs/lsquic/lsquic-3.2.0.ebuild
+++ b/dev-libs/lsquic/lsquic-3.2.0.ebuild
@@ -5,10 +5,9 @@ EAPI=8
 
 inherit cmake
 
-# LSQUIC
 LSQUIC_COMMIT="3bbf683f25ab84826951350c57ae226c88c54422"
-# BoringSSL
 BORINGSSL_COMMIT="15655052e8701f908937204785eaa8cd4363099f"
+
 DESCRIPTION="LiteSpeed QUIC (LSQUIC) Library"
 HOMEPAGE="https://github.com/litespeedtech/lsquic/";
 SRC_URI="
@@ -16,14 +15,15 @@ SRC_URI="
        https://github.com/google/boringssl/archive/${BORINGSSL_COMMIT}.tar.gz 
-> boringssl-fips-20230428.tar.gz
 "
 
+S="${WORKDIR}/lsquic-${LSQUIC_COMMIT}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
+
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/lsquic-${LSQUIC_COMMIT}"
-
 DEPEND="
        dev-libs/ls-qpack:=[static-libs=]
        dev-libs/ls-hpack:=[static-libs=]
@@ -37,7 +37,7 @@ PATCHES=(
 src_unpack() {
        unpack ${P}.tar.gz
        unpack boringssl-fips-20230428.tar.gz
-       mv boringssl-${BORINGSSL_COMMIT} ${S}/src/liblsquic/boringssl || die
+       mv boringssl-${BORINGSSL_COMMIT} "${S}"/src/liblsquic/boringssl || die
 }
 
 src_configure() {

diff --git a/dev-libs/monero-seed/monero-seed-0.1.0.ebuild 
b/dev-libs/monero-seed/monero-seed-0.1.0.ebuild
index 49effee2b3..0eeb434db3 100644
--- a/dev-libs/monero-seed/monero-seed-0.1.0.ebuild
+++ b/dev-libs/monero-seed/monero-seed-0.1.0.ebuild
@@ -9,10 +9,10 @@ DESCRIPTION="14-word mnemonic seed for Monero"
 HOMEPAGE="https://git.wownero.com/feather/monero-seed";
 SRC_URI="https://git.wownero.com/feather/monero-seed/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${PN}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${PN}"
-
-PATCHES+=( "${FILESDIR}"/${PN}-9999-install-demo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-9999-install-demo.patch )

diff --git a/dev-libs/octetos-biblion/octetos-biblion-0.1.1_alpha.ebuild 
b/dev-libs/octetos-biblion/octetos-biblion-0.1.1_alpha.ebuild
index d3515824c9..ca1eb245f3 100644
--- a/dev-libs/octetos-biblion/octetos-biblion-0.1.1_alpha.ebuild
+++ b/dev-libs/octetos-biblion/octetos-biblion-0.1.1_alpha.ebuild
@@ -11,19 +11,16 @@ DESCRIPTION="Library for reading biblia."
 HOMEPAGE="https://github.com/azaeldevel/octetos-core";
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-
-DEPEND="
-       dev-libs/octetos-core
-"
+DEPEND="dev-libs/octetos-core"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/cunit"
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
        default
        eautoreconf -fi

diff --git a/dev-libs/octetos-coreutils/octetos-coreutils-0.11.1_alpha.ebuild 
b/dev-libs/octetos-coreutils/octetos-coreutils-0.11.1_alpha.ebuild
index fc4a7278f5..aed8a52fab 100644
--- a/dev-libs/octetos-coreutils/octetos-coreutils-0.11.1_alpha.ebuild
+++ b/dev-libs/octetos-coreutils/octetos-coreutils-0.11.1_alpha.ebuild
@@ -12,17 +12,16 @@ DESCRIPTION="Similar to coreutils but is a C++ API."
 HOMEPAGE="https://github.com/azaeldevel/octetos-coreutils";
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-
 DEPEND="dev-libs/octetos-core"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/cunit"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
        default
        eautoreconf -fi

diff --git a/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild 
b/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild
index 817ec4977f..86c6b2b647 100644
--- a/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild
+++ b/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild
@@ -18,6 +18,8 @@ else
        SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> 
${P}.tar.gz"
 fi
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -29,8 +31,6 @@ BDEPEND="
        dev-util/cunit
 "
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
        default
        eautoreconf -fi

diff --git a/dev-libs/octetos-coreutils/octetos-coreutils-0.17.0_alpha.ebuild 
b/dev-libs/octetos-coreutils/octetos-coreutils-0.17.0_alpha.ebuild
index 817ec4977f..86c6b2b647 100644
--- a/dev-libs/octetos-coreutils/octetos-coreutils-0.17.0_alpha.ebuild
+++ b/dev-libs/octetos-coreutils/octetos-coreutils-0.17.0_alpha.ebuild
@@ -18,6 +18,8 @@ else
        SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> 
${P}.tar.gz"
 fi
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -29,8 +31,6 @@ BDEPEND="
        dev-util/cunit
 "
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
        default
        eautoreconf -fi

diff --git a/dev-libs/octetos-db/octetos-db-1.3.2_alpha.ebuild 
b/dev-libs/octetos-db/octetos-db-1.3.2_alpha.ebuild
index 9f381919ae..2b80b156a4 100644
--- a/dev-libs/octetos-db/octetos-db-1.3.2_alpha.ebuild
+++ b/dev-libs/octetos-db/octetos-db-1.3.2_alpha.ebuild
@@ -13,16 +13,15 @@ DESCRIPTION="C++ library for Database Acces."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db";
 SRC_URI="https://github.com/azaeldevel/${MYPN}/archive/${MYPV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-
 DEPEND="dev-libs/octetos-core"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
        default
        eautoreconf -fi

diff --git a/dev-libs/octetos-db/octetos-db-1.3.3_alpha.ebuild 
b/dev-libs/octetos-db/octetos-db-1.3.3_alpha.ebuild
index 9f381919ae..2b80b156a4 100644
--- a/dev-libs/octetos-db/octetos-db-1.3.3_alpha.ebuild
+++ b/dev-libs/octetos-db/octetos-db-1.3.3_alpha.ebuild
@@ -13,16 +13,15 @@ DESCRIPTION="C++ library for Database Acces."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db";
 SRC_URI="https://github.com/azaeldevel/${MYPN}/archive/${MYPV}.tar.gz -> 
${P}.tar.gz"
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-
 DEPEND="dev-libs/octetos-core"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
        default
        eautoreconf -fi


Reply via email to