*/*: fix variable order

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

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

9 files changed, 32 insertions, 36 deletions

diff --git a/app-crypt/autofirma/autofirma-1.8.2.ebuild b/app-crypt/autofirma/autofirma-1.8.2.ebuild
index a13f35083..3e1ae0b64 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 f0578cf4a..ea2a9886f 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 425d68e1a..31ab5103f 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 425d68e1a..31ab5103f 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 f0578cf4a..ea2a9886f 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 5925e8fb3..ce5d62b7e 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 5cfcc62db..9b7a17e61 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 2dc21af40..03650089e 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 862429748..4f0fd1d90 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 )"