media-gfx/*: fix variable order

Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
Closes: https://github.com/gentoo/guru/pull/170
Signed-off-by: Julien Roy <julien@jroy.ca>

8 files changed, 25 insertions, 26 deletions

diff --git a/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.7.ebuild b/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.7.ebuild
index 27b151db35..028d83bb08 100644
--- a/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.7.ebuild
+++ b/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.7.ebuild
@@ -12,14 +12,13 @@ DESCRIPTION="Web based tool to extract data from plots, images, and maps"
 HOMEPAGE="https://automeris.io/WebPlotDigitizer/"
 SRC_URI="https://automeris.io/downloads/${MY_PN}-${PV}-linux-x64.zip"
 
+S="${WORKDIR}/${MY_PN}-${PV}-linux-x64"
+
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-#RESTRICT="strip"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-QA_PREBUILT="*"
-
 ## RDEPEND is still required to be filled with actual runtime-deps:
 ## python is just assumed runtime-dependency.
 RDEPEND="
@@ -29,9 +28,8 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${MY_PN}-${PV}-linux-x64"
-
 QA_FLAGS_IGNORED="*"
+QA_PREBUILT="*"
 
 ## It seems media-libs/alsa-lib is required by chrome-sandbox.
 ## Actually this library isn't required to work.
diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
index 2e5d34f330..044d12b6df 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="A pixelart-oriented painting program"
 HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2"
 SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${P}-src.tgz"
 
+S="${WORKDIR}/${PN}/src/"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -29,8 +31,6 @@ DEPEND="
 	lua? ( ${LUA_DEPS} )
 "
 
-S="${WORKDIR}/${PN}/src/"
-
 PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )
 
 src_prepare() {
diff --git a/media-gfx/grafx2/grafx2-2.7.2978.ebuild b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
index 574d98c6f8..4517af4d3d 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="A pixelart-oriented painting program"
 HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2"
 SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${P}-src.tgz"
 
+S="${WORKDIR}/${PN}/src/"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -30,8 +32,6 @@ DEPEND="
 	lua? ( >=dev-lang/lua-5.1.0 )
 "
 
-S="${WORKDIR}/${PN}/src/"
-
 src_prepare() {
 	pushd ../
 	eapply ${PATCHES}
diff --git a/media-gfx/oda-file-converter/oda-file-converter-23.5.0.0.ebuild b/media-gfx/oda-file-converter/oda-file-converter-23.5.0.0.ebuild
index 277974d07e..12bfeaeea1 100644
--- a/media-gfx/oda-file-converter/oda-file-converter-23.5.0.0.ebuild
+++ b/media-gfx/oda-file-converter/oda-file-converter-23.5.0.0.ebuild
@@ -9,9 +9,10 @@ inherit desktop unpacker xdg
 
 DESCRIPTION="For converting between different versions of .dwg and .dxf"
 HOMEPAGE="https://www.opendesign.com"
-
 SRC_URI="https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_8.3dll_${MY_PV}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -27,8 +28,6 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="dev-util/patchelf"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="*"
 QA_DESKTOP_FILE="usr/share/applications/ODAFileConverter.*\\.desktop"
 
diff --git a/media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild b/media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild
index d44f22bb54..db8f94bfe5 100644
--- a/media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild
+++ b/media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild
@@ -1,22 +1,19 @@
-EAPI=7
-
-DESCRIPTION="VTuber application made with Godot 3.4"
-HOMEPAGE="https://github.com/virtual-puppet-project/vpuppr"
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
-RESTRICT="strip"
+EAPI=7
 
 PYTHON_COMPAT=( python3_{10..12} )
 inherit desktop xdg python-single-r1
 
-IUSE="+osf-tracker ifm-tracker mouse-tracker vts-tracker meowface-tracker remote-control"
-REQUIRED_USE="osf-tracker? ( ${PYTHON_REQUIRED_USE} )"
-
 IFACIALMOCAP_COMMIT="8095807804b138a3236d9ce21e800e02fe44e53a"
 MEOWFACE_COMMIT="790e4c7a5913184f71076e1c8606236b02ff1de8"
 OPENSEEFACE_COMMIT="c1b8bc5fd0014abb1a059368d205740dd7f0f592"
 RC_SERVER_COMMIT="e95d2bf0f29767f9be8461422c696d691ca3da48"
 VTUBE_STUDIO_COMMIT="0cf3304723dbe0f71d5e12bff2b76d0ef0c22aea"
 
+DESCRIPTION="VTuber application made with Godot 3.4"
+HOMEPAGE="https://github.com/virtual-puppet-project/vpuppr"
 SRC_URI="
 	https://github.com/virtual-puppet-project/vpuppr/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/virtual-puppet-project/godot-builds/releases/download/latest/Godot_v3.x-stable_linux_headless.64.tar.gz
@@ -49,6 +46,11 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
+
+IUSE="+osf-tracker ifm-tracker mouse-tracker vts-tracker meowface-tracker remote-control"
+REQUIRED_USE="osf-tracker? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="strip"
 RDEPEND="
 	osf-tracker? ( ${PYTHON_DEPS} )
 "
diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
index 7aa3a55b2b..f32fd72a4d 100644
--- a/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="CAD/CAM software for 3D design and processing"
 HOMEPAGE="https://www.zwsoft.cn/product/zw3d/linux"
 SRC_URI="https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${PV}_amd64.deb -> ${P}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -60,8 +62,6 @@ BDEPEND="
 	dev-util/patchelf
 "
 
-S=${WORKDIR}
-
 QA_PREBUILT="*"
 
 src_install() {
diff --git a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
index 0c655df975..39d41d97ff 100644
--- a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
+++ b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="CAD/CAM software for 3D design and processing"
 HOMEPAGE="https://www.zwsoft.cn/product/zw3d/linux"
 SRC_URI="https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${PV}_amd64.deb -> ${P}.deb"
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -60,8 +62,6 @@ BDEPEND="
 	dev-util/patchelf
 "
 
-S=${WORKDIR}
-
 QA_PREBUILT="*"
 
 src_compile() {
diff --git a/media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild
index 2f72246741..1031017185 100644
--- a/media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild
+++ b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild
@@ -18,6 +18,8 @@ SRC_URI="
 	${URI_ANACONDA}/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
 "
 
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -37,8 +39,6 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="dev-util/patchelf"
 
-S=${WORKDIR}
-
 QA_PREBUILT="*"
 
 src_unpack() {