*/*: fix variable order

Manually went through some entries for `pkgcheck scan -c VariableOrderCheck`. Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
2026-07-10 15:45:15 -04:00 · 2024-04-26 16:46:35 +02:00
parent 7d1147ff43
commit f2be215fb9
147 changed files with 453 additions and 464 deletions
--- a/app-misc/anki-bin/anki-bin-23.12.1.ebuild
+++ b/app-misc/anki-bin/anki-bin-23.12.1.ebuild
@@ -23,6 +23,8 @@ SRC_URI="
 	https://raw.githubusercontent.com/ankitects/anki/${PV}/qt/bundle/lin/anki.xpm -> ${P}.xpm
 "

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 inherit distutils-r1

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

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

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

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

 inherit distutils-r1

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-KEYWORDS="-* ~amd64"
 # Electron bundles a bunch of things
 LICENSE="
 	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
 	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
+KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 inherit go-module bash-completion-r1 desktop xdg

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

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

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

 inherit go-module desktop shell-completion xdg

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

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

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

 inherit go-module bash-completion-r1 desktop xdg

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

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

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

 inherit go-module bash-completion-r1 desktop xdg

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

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

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

 inherit go-module shell-completion desktop xdg

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

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

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

 inherit cargo xdg-utils

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

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

 inherit cargo xdg-utils

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

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

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

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

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

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

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

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

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

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

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

 EAPI=8

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

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

 EAPI=8

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

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

 EAPI=8

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

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

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

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

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

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

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

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

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

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

 DESCRIPTION="Wego is a weather client for the terminal"
-SRC_URI="https://github.com/schachmat/wego/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"
 HOMEPAGE="https://github.com/schachmat/wego"
+SRC_URI="https://github.com/schachmat/wego/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"
+
 LICENSE="BSD ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64"