www-apps/*: fix variable order

Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
Signed-off-by: Julien Roy <julien@jroy.ca>

8 files changed, 45 insertions, 34 deletions

diff --git a/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild b/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild
index 35845168a..e2684ffe0 100644
--- a/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild
@@ -15,7 +15,9 @@ SRC_URI="
 	amd64? ( ${BASE_URI}-amd64.tar.gz )
 	arm64? ( ${BASE_URI}-arm64.tar.gz )
 "
-RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
 LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 	|| ( BSD-2 MIT Apache-2.0 )
 	|| ( MIT WTFPL )
@@ -24,6 +26,8 @@ LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
+RESTRICT="test"
+
 RDEPEND="
 	${DEPEND}
 	>=net-libs/nodejs-16.0.0[ssl]
@@ -31,8 +35,6 @@ RDEPEND="
 	app-crypt/libsecret
 "
 
-S="${WORKDIR}/${MY_P}-linux-${ARCH}"
-
 PATCHES=( "${FILESDIR}/${PN}-node.patch" )
 
 DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
diff --git a/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild
index 35845168a..e2684ffe0 100644
--- a/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild
@@ -15,7 +15,9 @@ SRC_URI="
 	amd64? ( ${BASE_URI}-amd64.tar.gz )
 	arm64? ( ${BASE_URI}-arm64.tar.gz )
 "
-RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
 LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 	|| ( BSD-2 MIT Apache-2.0 )
 	|| ( MIT WTFPL )
@@ -24,6 +26,8 @@ LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
+RESTRICT="test"
+
 RDEPEND="
 	${DEPEND}
 	>=net-libs/nodejs-16.0.0[ssl]
@@ -31,8 +35,6 @@ RDEPEND="
 	app-crypt/libsecret
 "
 
-S="${WORKDIR}/${MY_P}-linux-${ARCH}"
-
 PATCHES=( "${FILESDIR}/${PN}-node.patch" )
 
 DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
diff --git a/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild
index 35845168a..e2684ffe0 100644
--- a/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild
@@ -15,7 +15,9 @@ SRC_URI="
 	amd64? ( ${BASE_URI}-amd64.tar.gz )
 	arm64? ( ${BASE_URI}-arm64.tar.gz )
 "
-RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
 LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 	|| ( BSD-2 MIT Apache-2.0 )
 	|| ( MIT WTFPL )
@@ -24,6 +26,8 @@ LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
+RESTRICT="test"
+
 RDEPEND="
 	${DEPEND}
 	>=net-libs/nodejs-16.0.0[ssl]
@@ -31,8 +35,6 @@ RDEPEND="
 	app-crypt/libsecret
 "
 
-S="${WORKDIR}/${MY_P}-linux-${ARCH}"
-
 PATCHES=( "${FILESDIR}/${PN}-node.patch" )
 
 DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
diff --git a/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild b/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild
index cdf7ad04c..177cd81c5 100644
--- a/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild
@@ -15,7 +15,9 @@ SRC_URI="
 	amd64? ( ${BASE_URI}-amd64.tar.gz -> ${P}-amd64.tar.gz )
 	arm64? ( ${BASE_URI}-arm64.tar.gz -> ${P}-arm64.tar.gz )
 "
-RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
 LICENSE="MIT ISC BSD Apache-2.0 BSD-2 PYTHON GPL-2 0BSD"
 LICENSE+=" LGPL-2.1+
 	|| ( MIT WTFPL )
@@ -24,6 +26,8 @@ LICENSE+=" LGPL-2.1+
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
+RESTRICT="test"
+
 RDEPEND="
 	${DEPEND}
 	>=net-libs/nodejs-16.0.0[ssl]
@@ -31,8 +35,6 @@ RDEPEND="
 	app-crypt/libsecret
 "
 
-S="${WORKDIR}/${MY_P}-linux-${ARCH}"
-
 PATCHES=( "${FILESDIR}/${PN}-node.patch" )
 
 DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" )
diff --git a/www-apps/libmedium/libmedium-20231020.ebuild b/www-apps/libmedium/libmedium-20231020.ebuild
index b83f110b8..810c3565c 100644
--- a/www-apps/libmedium/libmedium-20231020.ebuild
+++ b/www-apps/libmedium/libmedium-20231020.ebuild
@@ -288,6 +288,8 @@ SHA="1808d2fd77526d335ab6ab4e85b99b1ddbbf07ed"
 SRC_URI="https://github.com/realaravinth/libmedium/archive/${SHA}.tar.gz"
 SRC_URI+=" ${CARGO_CRATE_URIS}"
 
+S="${WORKDIR}/${PN}-${SHA}"
+
 # License set may be more restrictive as OR is not respected
 # use cargo-license for a more accurate license picture
 LICENSE="0BSD AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB"
@@ -300,7 +302,6 @@ RDEPEND="acct-user/libmedium
 # rust does not use *FLAGS from make.conf, silence portage warning
 # update with proper path to binaries this crate installs, omit leading /
 QA_FLAGS_IGNORED="usr/bin/${PN}"
-S="${WORKDIR}/${PN}-${SHA}"
 
 src_prepare() {
 	sed -i -e 's/#cache = "\/var\/lib\/libmedium"/cache = "\/var\/cache\/libmedium"/' 'config/default.toml' || die
diff --git a/www-apps/librarian/librarian-2023.05.07.ebuild b/www-apps/librarian/librarian-2023.05.07.ebuild
index 069eb6013..a86baea26 100644
--- a/www-apps/librarian/librarian-2023.05.07.ebuild
+++ b/www-apps/librarian/librarian-2023.05.07.ebuild
@@ -7,17 +7,9 @@ inherit go-module
 
 DESCRIPTION="An alternative frontend for LBRY/Odysee. Inspired by Invidious and Libreddit."
 HOMEPAGE="https://codeberg.org/librarian/librarian"
-S="${WORKDIR}/${PN}"
 SHA="8f5bef89a558ee24b1193694fee693b57d50e66f"
 SRC_URI="https://codeberg.org/librarian/librarian/archive/${SHA}.tar.gz  -> ${P}.tar.gz"
 
-LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="acct-user/librarian
-	acct-group/librarian"
-
 EGO_SUM=(
 	"cloud.google.com/go v0.26.0/go.mod"
 	"cloud.google.com/go v0.34.0/go.mod"
@@ -1499,9 +1491,18 @@ go-module_set_globals
 
 SRC_URI+=" ${EGO_SUM_SRC_URI}"
 
+S="${WORKDIR}/${PN}"
+
+LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-user/librarian
+	acct-group/librarian"
+
 src_prepare() {
 	default
-        sed -i -e 's/IMAGE_CACHE: false/IMAGE_CACHE: true/' 'config.example.yml' || die
+	sed -i -e 's/IMAGE_CACHE: false/IMAGE_CACHE: true/' 'config.example.yml' || die
 }
 
 src_compile() {
@@ -1512,6 +1513,6 @@ src_install() {
 	einstalldocs
 	dobin librarian
 	newinitd "${FILESDIR}/librarian.initd" "librarian"
-        insinto "/etc/librarian"
-        newins "config.example.yml" "config.yml"
+	insinto "/etc/librarian"
+	newins "config.example.yml" "config.yml"
 }
diff --git a/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild b/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild
index 17387f97a..3e58b5dc3 100644
--- a/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild
+++ b/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild
@@ -7,16 +7,15 @@ inherit go-module
 
 DESCRIPTION="Git-based wiki engine written in Go using mycomarkup"
 HOMEPAGE="https://mycorrhiza.wiki"
-
 SRC_URI="
 	https://github.com/bouncepaw/mycorrhiza/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://codeberg.org/BratishkaErik/distfiles/media/branch/master/${P}-vendor.tar.xz
 "
 
-KEYWORDS="~amd64 ~x86"
-
 LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2 CC-BY-4.0"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
 RESTRICT="mirror"
 
 BDEPEND=">=dev-lang/go-1.19.0"
diff --git a/www-apps/rimgo/rimgo-1.2.1.ebuild b/www-apps/rimgo/rimgo-1.2.1.ebuild
index 04fbfcebf..63f52233e 100644
--- a/www-apps/rimgo/rimgo-1.2.1.ebuild
+++ b/www-apps/rimgo/rimgo-1.2.1.ebuild
@@ -7,15 +7,8 @@ inherit go-module
 
 DESCRIPTION="An alternative frontend for Imgur. Originally based on rimgu."
 HOMEPAGE="https://codeberg.org/rimgo/rimgo"
-S="${WORKDIR}/${PN}"
-LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
 SRC_URI="https://codeberg.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-RDEPEND="acct-user/rimgo
-	acct-group/rimgo"
-
 EGO_SUM=(
 	"github.com/PuerkitoBio/goquery v1.8.1"
 	"github.com/PuerkitoBio/goquery v1.8.1/go.mod"
@@ -170,6 +163,15 @@ go-module_set_globals
 
 SRC_URI+=" ${EGO_SUM_SRC_URI}"
 
+S="${WORKDIR}/${PN}"
+
+LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-user/rimgo
+	acct-group/rimgo"
+
 src_prepare() {
 	default