*/*: fix variable order

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

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

7 files changed, 26 insertions, 27 deletions

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 711aaf170..31b8888ce 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 d111e5a27..9b52d9290 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 8b3b261b1..f45ed6907 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 1dc48b774..63cc7c701 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 74f411c17..55ff6f6e1 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 e29c25f22..cd4aa7b3e 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 7c63d9818..ba104fd5c 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() {