dev-libs/*: fix variable order

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

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

23 files changed, 47 insertions, 48 deletions

diff --git a/dev-libs/octetos-core/octetos-core-2.15.0_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.15.0_beta.ebuild
index 8254ceaea..8ae5ac921 100644
--- a/dev-libs/octetos-core/octetos-core-2.15.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.15.0_beta.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
 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"
@@ -27,8 +29,6 @@ BDEPEND="
 	>=sys-devel/gcc-8.1
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.20.0_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.20.0_beta.ebuild
index 8a3163264..c2610a64e 100644
--- a/dev-libs/octetos-core/octetos-core-2.20.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.20.0_beta.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
 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"
@@ -27,8 +29,6 @@ BDEPEND="
 	>=sys-devel/gcc-8.1
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.25.0_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.25.0_beta.ebuild
index 0b995377c..e4221012f 100644
--- a/dev-libs/octetos-core/octetos-core-2.25.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.25.0_beta.ebuild
@@ -15,6 +15,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -30,8 +32,6 @@ BDEPEND="
 	>=sys-devel/gcc-8.1
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild
index 139af41b4..55a658e6c 100644
--- a/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild
@@ -15,6 +15,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -31,8 +33,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild
index 139af41b4..55a658e6c 100644
--- a/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild
@@ -15,6 +15,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -31,8 +33,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild
index 139af41b4..55a658e6c 100644
--- a/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild
@@ -15,6 +15,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -31,8 +33,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
index 139af41b4..55a658e6c 100644
--- a/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
@@ -15,6 +15,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -31,8 +33,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild
index 139af41b4..55a658e6c 100644
--- a/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild
@@ -15,6 +15,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -31,8 +33,6 @@ BDEPEND="
 	dev-build/libtool
 "
 
-S="${WORKDIR}/${PN}-${MYPV}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild b/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild
index 5cf27078a..087b16919 100644
--- a/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild
+++ b/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild
@@ -13,19 +13,18 @@ DESCRIPTION="API to access database, abstract component."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db-abstract"
 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}
 	!!dev-libs/octetos-db
 "
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-abstract/octetos-db-abstract-0.6.0_alpha.ebuild b/dev-libs/octetos-db-abstract/octetos-db-abstract-0.6.0_alpha.ebuild
index 31744ab1f..56bcfe8cd 100644
--- a/dev-libs/octetos-db-abstract/octetos-db-abstract-0.6.0_alpha.ebuild
+++ b/dev-libs/octetos-db-abstract/octetos-db-abstract-0.6.0_alpha.ebuild
@@ -13,19 +13,18 @@ DESCRIPTION="API to access database, abstract component."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db-abstract"
 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}
 	!!dev-libs/octetos-db
 "
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild b/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild
index 7918b3a66..7a0d683bd 100644
--- a/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild
+++ b/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="C++ library for Database Acces."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db-maria"
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -24,8 +26,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-maria/octetos-db-maria-1.9.2_alpha.ebuild b/dev-libs/octetos-db-maria/octetos-db-maria-1.9.2_alpha.ebuild
index 732347034..fe7190337 100644
--- a/dev-libs/octetos-db-maria/octetos-db-maria-1.9.2_alpha.ebuild
+++ b/dev-libs/octetos-db-maria/octetos-db-maria-1.9.2_alpha.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="C++ library for Database Acces."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db-maria"
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -24,8 +26,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-maria/octetos-db-maria-9999.ebuild b/dev-libs/octetos-db-maria/octetos-db-maria-9999.ebuild
index cb4b1b145..f2a969d46 100644
--- a/dev-libs/octetos-db-maria/octetos-db-maria-9999.ebuild
+++ b/dev-libs/octetos-db-maria/octetos-db-maria-9999.ebuild
@@ -7,6 +7,7 @@ inherit autotools
 
 MYPV="${PV/_alpha/-alpha}"
 MYP="${PN}-${MYPV}"
+
 DESCRIPTION="C++ library for Database Acces."
 HOMEPAGE="https://github.com/azaeldevel/octetos-db-maria"
 if [[ ${PV} == 9999 ]]; then
@@ -17,6 +18,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+S="${WORKDIR}/${MYP}"
+
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -26,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.10_alpha.ebuild b/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.10_alpha.ebuild
index 5f712476f..97a5e9866 100644
--- a/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.10_alpha.ebuild
+++ b/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.10_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-db"
 RDEPEND="${DEPEND} dev-db/postgresql:*"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.9_alpha.ebuild b/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.9_alpha.ebuild
index 2b56cb32c..bf6504496 100644
--- a/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.9_alpha.ebuild
+++ b/dev-libs/octetos-db-postgresql/octetos-db-postgresql-1.3.9_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-db dev-db/postgresql:*"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}"
-
 src_prepare() {
 	default
 	eautoreconf -fi
diff --git a/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild b/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild
index 04ef8d8cb..3013ef07d 100644
--- a/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild
+++ b/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild
@@ -15,6 +15,8 @@ DESCRIPTION="Simple convenience library for handling properties and signals in C
 HOMEPAGE="https://launchpad.net/properties-cpp"
 SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -26,7 +28,6 @@ DEPEND="
 	doc? ( app-text/doxygen )
 "
 
-S="${WORKDIR}/${MY_P}"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
diff --git a/dev-libs/randomx/randomx-1.1.8.ebuild b/dev-libs/randomx/randomx-1.1.8.ebuild
index 832c87eff..075dd0aac 100644
--- a/dev-libs/randomx/randomx-1.1.8.ebuild
+++ b/dev-libs/randomx/randomx-1.1.8.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Proof of work algorithm based on random code execution"
 HOMEPAGE="https://github.com/tevador/RandomX"
 SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/RandomX-${PV}
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}"/RandomX-${PV}
-
 src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 	cmake_src_configure
diff --git a/dev-libs/randomx/randomx-1.1.9.ebuild b/dev-libs/randomx/randomx-1.1.9.ebuild
index 1431d2374..da8c2b40a 100644
--- a/dev-libs/randomx/randomx-1.1.9.ebuild
+++ b/dev-libs/randomx/randomx-1.1.9.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Proof of work algorithm based on random code execution"
 HOMEPAGE="https://github.com/tevador/RandomX"
 SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/RandomX-${PV}
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}"/RandomX-${PV}
-
 src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 	cmake_src_configure
diff --git a/dev-libs/randomx/randomx-1.2.1.ebuild b/dev-libs/randomx/randomx-1.2.1.ebuild
index 1431d2374..da8c2b40a 100644
--- a/dev-libs/randomx/randomx-1.2.1.ebuild
+++ b/dev-libs/randomx/randomx-1.2.1.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Proof of work algorithm based on random code execution"
 HOMEPAGE="https://github.com/tevador/RandomX"
 SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/RandomX-${PV}
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}"/RandomX-${PV}
-
 src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 	cmake_src_configure
diff --git a/dev-libs/supercop/supercop-0_p20200827.ebuild b/dev-libs/supercop/supercop-0_p20200827.ebuild
index 5edbf61ca..ec6c014b3 100644
--- a/dev-libs/supercop/supercop-0_p20200827.ebuild
+++ b/dev-libs/supercop/supercop-0_p20200827.ebuild
@@ -11,14 +11,14 @@ DESCRIPTION="Fast cryptographic operations for Monero wallets"
 HOMEPAGE="https://github.com/monero-project/supercop"
 SRC_URI="https://github.com/monero-project/supercop/archive/${MY_REV}.tar.gz -> ${PN}-${MY_REV}.tar.gz"
 
+S="${WORKDIR}"/${PN}-${MY_REV}
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="dev-lang/nasm"
 
-S="${WORKDIR}"/${PN}-${MY_REV}
-
 src_configure() {
 	append-flags -fPIC
 	append-ldflags -Wl,-z,noexecstack
diff --git a/dev-libs/xqilla/xqilla-2.3.4-r1.ebuild b/dev-libs/xqilla/xqilla-2.3.4-r1.ebuild
index 27dc638e1..da57ec191 100644
--- a/dev-libs/xqilla/xqilla-2.3.4-r1.ebuild
+++ b/dev-libs/xqilla/xqilla-2.3.4-r1.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C
 HOMEPAGE="https://sourceforge.net/projects/xqilla/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/XQilla-${PV}.tar.gz"
 
+S="${WORKDIR}"/XQilla-${PV}
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -19,8 +21,6 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/lib_to_lib64.patch )
 
-S="${WORKDIR}"/XQilla-${PV}
-
 src_prepare() {
 	append-cxxflags -std=c++14
 	default
diff --git a/dev-libs/xqilla/xqilla-2.3.4.ebuild b/dev-libs/xqilla/xqilla-2.3.4.ebuild
index 7ba5fed40..b3e9f6e21 100644
--- a/dev-libs/xqilla/xqilla-2.3.4.ebuild
+++ b/dev-libs/xqilla/xqilla-2.3.4.ebuild
@@ -7,6 +7,8 @@ DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C
 HOMEPAGE="https://sourceforge.net/projects/xqilla/"
 SRC_URI="https://downloads.sourceforge.net/${PN}/XQilla-${PV}.tar.gz"
 
+S="${WORKDIR}"/XQilla-${PV}
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -19,8 +21,6 @@ PATCHES=(
 	"${FILESDIR}"/lib_to_lib64.patch
 )
 
-S="${WORKDIR}"/XQilla-${PV}
-
 src_prepare() {
 	eapply -p1 "${FILESDIR}/lib_to_lib64.patch"
 	eapply_user
diff --git a/dev-libs/zfp/zfp-1.0.1.ebuild b/dev-libs/zfp/zfp-1.0.1.ebuild
index 28f00c5d4..bab143e7a 100644
--- a/dev-libs/zfp/zfp-1.0.1.ebuild
+++ b/dev-libs/zfp/zfp-1.0.1.ebuild
@@ -10,16 +10,17 @@ PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake fortran-2 python-single-r1 #docs
 
 DESCRIPTION="Compressed numerical arrays that support high-speed random access"
-SRC_URI="https://github.com/LLNL/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 HOMEPAGE="
 	https://computing.llnl.gov/projects/zfp
 	https://zfp.io
 	https://github.com/LLNL/ZFP
 "
+SRC_URI="https://github.com/LLNL/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+
 IUSE="aligned cfp fasthash examples fortran openmp profile python strided test twoway +utilities" #doc cuda
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"