media-fonts/*: fix variable order

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

32 files changed, 72 insertions, 44 deletions

diff --git a/media-fonts/firacode-nerdfont/firacode-nerdfont-2.2.2.ebuild b/media-fonts/firacode-nerdfont/firacode-nerdfont-2.2.2.ebuild
index dc5bcb419..41c982c25 100644
--- a/media-fonts/firacode-nerdfont/firacode-nerdfont-2.2.2.ebuild
+++ b/media-fonts/firacode-nerdfont/firacode-nerdfont-2.2.2.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraCode.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/firacode-nerdfont/firacode-nerdfont-3.1.1.ebuild b/media-fonts/firacode-nerdfont/firacode-nerdfont-3.1.1.ebuild
index c37887eed..ac4c44343 100644
--- a/media-fonts/firacode-nerdfont/firacode-nerdfont-3.1.1.ebuild
+++ b/media-fonts/firacode-nerdfont/firacode-nerdfont-3.1.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraCode.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.0.ebuild b/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.0.ebuild
index c37887eed..ac4c44343 100644
--- a/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.0.ebuild
+++ b/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.0.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraCode.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.1.ebuild b/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.1.ebuild
index c37887eed..ac4c44343 100644
--- a/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.1.ebuild
+++ b/media-fonts/firacode-nerdfont/firacode-nerdfont-3.2.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraCode.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/firago/firago-1.001.ebuild b/media-fonts/firago/firago-1.001.ebuild
index eee7b1d4c..eef4c66e2 100644
--- a/media-fonts/firago/firago-1.001.ebuild
+++ b/media-fonts/firago/firago-1.001.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="A continuation of FiraSans"
 HOMEPAGE="https://bboxtype.com/typefaces/FiraGO"
 SRC_URI="https://bboxtype.com/downloads/${MY_PN}/${MY_P}.zip"
 
+S="${WORKDIR}/${MY_P}/Fonts"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -21,7 +23,6 @@ DEPEND="
 	${RDEPEND}
 	app-arch/unzip
 "
-S="${WORKDIR}/${MY_P}/Fonts"
 DOCS=(
 	${MY_PN}_${MY_PV}_CHANGE_LOG.rtf
 )
diff --git a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.2.2.ebuild b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.2.2.ebuild
index 7a4d82039..2d3eb9f04 100644
--- a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.2.2.ebuild
+++ b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.2.2.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.3.3.ebuild b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.3.3.ebuild
index 7a4d82039..2d3eb9f04 100644
--- a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.3.3.ebuild
+++ b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-2.3.3.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.1.1.ebuild b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.1.1.ebuild
index 12450eb3d..dd53095dc 100644
--- a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.1.1.ebuild
+++ b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.1.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.0.ebuild b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.0.ebuild
index 12450eb3d..dd53095dc 100644
--- a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.0.ebuild
+++ b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.0.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.1.ebuild b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.1.ebuild
index 12450eb3d..dd53095dc 100644
--- a/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.1.ebuild
+++ b/media-fonts/iosevka-nerdfont/iosevka-nerdfont-3.2.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-2.2.2.ebuild b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-2.2.2.ebuild
index aa40cb311..2bba5f1e0 100644
--- a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-2.2.2.ebuild
+++ b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-2.2.2.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/JetBrainsMono.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.1.1.ebuild b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.1.1.ebuild
index 1a1b2194a..2f093b273 100644
--- a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.1.1.ebuild
+++ b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.1.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/JetBrainsMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.0.ebuild b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.0.ebuild
index 1a1b2194a..2f093b273 100644
--- a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.0.ebuild
+++ b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.0.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/JetBrainsMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.1.ebuild b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.1.ebuild
index 1a1b2194a..2f093b273 100644
--- a/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.1.ebuild
+++ b/media-fonts/jetbrainsmono-nerdfont/jetbrainsmono-nerdfont-3.2.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/JetBrainsMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/lato/lato-2.ebuild b/media-fonts/lato/lato-2.ebuild
index 1e9ef90f7..4d3f65d4c 100644
--- a/media-fonts/lato/lato-2.ebuild
+++ b/media-fonts/lato/lato-2.ebuild
@@ -9,12 +9,13 @@ DESCRIPTION="Lato font"
 HOMEPAGE="https://www.latofonts.com/"
 SRC_URI="https://www.latofonts.com/files/Lato2OFL.zip -> ${P}.zip"
 
+S="${WORKDIR}/Lato2OFL"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DOCS="OFL.txt README.txt"
-S="${WORKDIR}/Lato2OFL"
 FONT_SUFFIX="ttf"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/libertinus/libertinus-7.040.ebuild b/media-fonts/libertinus/libertinus-7.040.ebuild
index 0eec95141..1bb92c0af 100644
--- a/media-fonts/libertinus/libertinus-7.040.ebuild
+++ b/media-fonts/libertinus/libertinus-7.040.ebuild
@@ -10,11 +10,12 @@ DESCRIPTION="Libertinus font"
 HOMEPAGE="https://github.com/alerque/libertinus"
 SRC_URI="https://github.com/alerque/libertinus/releases/download/v${PV}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DOCS="AUTHORS.txt CONTRIBUTING.md CONTRIBUTORS.txt FONTLOG.txt OFL.txt README.md"
-S="${WORKDIR}/${MY_PN}-${PV}"
 FONT_S="${S}/static/OTF"
 FONT_SUFFIX="otf"
diff --git a/media-fonts/overpass/overpass-3.0.4.ebuild b/media-fonts/overpass/overpass-3.0.4.ebuild
index f2eb8d44d..3176d402d 100644
--- a/media-fonts/overpass/overpass-3.0.4.ebuild
+++ b/media-fonts/overpass/overpass-3.0.4.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="An open source webfont family inspired by Highway Gothic"
 HOMEPAGE="http://overpassfont.org/"
 SRC_URI="https://github.com/RedHatOfficial/Overpass/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/Overpass-${PV}"
+
 LICENSE="|| ( LGPL-2.1 OFL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/Overpass-${PV}"
-
 src_install() {
 
 FONT_SUFFIX="otf" && FONT_S="${S}/desktop-fonts/overpass" font_src_install
diff --git a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-2.2.2.ebuild b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-2.2.2.ebuild
index 0c82be95f..983b1f97c 100644
--- a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-2.2.2.ebuild
+++ b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-2.2.2.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/RobotoMono.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.1.1.ebuild b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.1.1.ebuild
index 7ae2d0dd4..242084ac3 100644
--- a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.1.1.ebuild
+++ b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.1.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/RobotoMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.0.ebuild b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.0.ebuild
index 7ae2d0dd4..242084ac3 100644
--- a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.0.ebuild
+++ b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.0.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/RobotoMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.1.ebuild b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.1.ebuild
index 7ae2d0dd4..242084ac3 100644
--- a/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.1.ebuild
+++ b/media-fonts/robotomono-nerdfont/robotomono-nerdfont-3.2.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/RobotoMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/symbola/symbola-13.00.ebuild b/media-fonts/symbola/symbola-13.00.ebuild
index 626d7fc20..aaf004e3a 100644
--- a/media-fonts/symbola/symbola-13.00.ebuild
+++ b/media-fonts/symbola/symbola-13.00.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Unicode font for Latin, IPA Extensions, Greek, Cyrillic and many Sy
 HOMEPAGE="https://dn-works.com/ufas/"
 SRC_URI="https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/Symbola.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="UFAS"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -18,7 +20,6 @@ RESTRICT="bindist mirror"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_S="${S}"
 
 DOCS=(
diff --git a/media-fonts/symbola/symbola-7.17.ebuild b/media-fonts/symbola/symbola-7.17.ebuild
index 9611e3060..26d92b56d 100644
--- a/media-fonts/symbola/symbola-7.17.ebuild
+++ b/media-fonts/symbola/symbola-7.17.ebuild
@@ -14,14 +14,14 @@ SRC_URI="
 	https://web.archive.org/web/20140913154759if_/http://users.teilar.gr/~g1951d/Symbola.pdf -> ${P}.pdf
 "
 
+S="${WORKDIR}"
+
 LICENSE="Unicode_Fonts_for_Ancient_Scripts"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 DOCS=(
 	"${DISTDIR}/${P}.pdf"
 	"${MY_PN}.docx"
diff --git a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-2.2.2.ebuild b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-2.2.2.ebuild
index ae559bacb..70e1964f3 100644
--- a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-2.2.2.ebuild
+++ b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-2.2.2.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/UbuntuMono.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.1.1.ebuild b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.1.1.ebuild
index b991aea4b..518cd5d3f 100644
--- a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.1.1.ebuild
+++ b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.1.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/UbuntuMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.0.ebuild b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.0.ebuild
index b991aea4b..518cd5d3f 100644
--- a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.0.ebuild
+++ b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.0.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/UbuntuMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.1.ebuild b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.1.ebuild
index b991aea4b..518cd5d3f 100644
--- a/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.1.ebuild
+++ b/media-fonts/ubuntumono-nerdfont/ubuntumono-nerdfont-3.2.1.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="A free and open-source typeface for developers"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/UbuntuMono.tar.xz -> ${P}.gh.tar.xz"
 
+S="${WORKDIR}"
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64"
 
-S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 pkg_postinst() {
diff --git a/media-fonts/unscii/unscii-2.1.ebuild b/media-fonts/unscii/unscii-2.1.ebuild
index 8e225728d..04cc7179c 100644
--- a/media-fonts/unscii/unscii-2.1.ebuild
+++ b/media-fonts/unscii/unscii-2.1.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts"
 HOMEPAGE="http://viznut.fi/unscii/"
 SRC_URI="http://viznut.fi/unscii/${P}-src.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${P}-src"
+
 LICENSE="
 	public-domain
 	unicode? ( GPL-2 )
@@ -28,7 +30,6 @@ DEPEND="
 	unicode? ( media-fonts/unifont[utils] )
 "
 
-S="${WORKDIR}/${P}-src"
 DOCS=( ${PN}.txt )
 
 src_prepare() {
diff --git a/media-fonts/victor-mono/victor-mono-1.5.4.ebuild b/media-fonts/victor-mono/victor-mono-1.5.4.ebuild
index 22d36addc..3db83c69f 100644
--- a/media-fonts/victor-mono/victor-mono-1.5.4.ebuild
+++ b/media-fonts/victor-mono/victor-mono-1.5.4.ebuild
@@ -8,19 +8,18 @@ inherit font
 DESCRIPTION="A free programming font with cursive italics and ligatures"
 HOMEPAGE="https://rubjo.github.io/victor-mono/"
 SRC_URI="https://github.com/rubjo/victor-mono/raw/v${PV}/public/VictorMonoAll.zip -> ${P}.zip"
-RESTRICT="binchecks strip"
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+otf ttf"
 
+IUSE="+otf ttf"
 REQUIRED_USE="|| ( otf ttf )"
+RESTRICT="binchecks strip"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 FONT_CONF=(
 	"${FILESDIR}/66-victor-mono.conf"
 )
diff --git a/media-fonts/victor-mono/victor-mono-1.5.5.ebuild b/media-fonts/victor-mono/victor-mono-1.5.5.ebuild
index 22d36addc..1e4037e12 100644
--- a/media-fonts/victor-mono/victor-mono-1.5.5.ebuild
+++ b/media-fonts/victor-mono/victor-mono-1.5.5.ebuild
@@ -8,19 +8,19 @@ inherit font
 DESCRIPTION="A free programming font with cursive italics and ligatures"
 HOMEPAGE="https://rubjo.github.io/victor-mono/"
 SRC_URI="https://github.com/rubjo/victor-mono/raw/v${PV}/public/VictorMonoAll.zip -> ${P}.zip"
-RESTRICT="binchecks strip"
+
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+otf ttf"
 
+IUSE="+otf ttf"
 REQUIRED_USE="|| ( otf ttf )"
+RESTRICT="binchecks strip"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 FONT_CONF=(
 	"${FILESDIR}/66-victor-mono.conf"
 )
diff --git a/media-fonts/victor-mono/victor-mono-1.5.6.ebuild b/media-fonts/victor-mono/victor-mono-1.5.6.ebuild
index 20ae2db9d..6e707bce4 100644
--- a/media-fonts/victor-mono/victor-mono-1.5.6.ebuild
+++ b/media-fonts/victor-mono/victor-mono-1.5.6.ebuild
@@ -8,19 +8,19 @@ inherit font
 DESCRIPTION="A free programming font with cursive italics and ligatures"
 HOMEPAGE="https://rubjo.github.io/victor-mono/"
 SRC_URI="https://github.com/rubjo/victor-mono/raw/v${PV}/public/VictorMonoAll.zip -> ${P}.zip"
-RESTRICT="binchecks strip"
+
+S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+otf ttf"
 
+IUSE="+otf ttf"
 REQUIRED_USE="|| ( otf ttf )"
+RESTRICT="binchecks strip"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 FONT_CONF=(
 	"${FILESDIR}/66-victor-mono.conf"
 )
diff --git a/media-fonts/warframe-fonts/warframe-fonts-0_pre20191111.ebuild b/media-fonts/warframe-fonts/warframe-fonts-0_pre20191111.ebuild
index 9289db5a8..acb346632 100644
--- a/media-fonts/warframe-fonts/warframe-fonts-0_pre20191111.ebuild
+++ b/media-fonts/warframe-fonts/warframe-fonts-0_pre20191111.ebuild
@@ -13,10 +13,13 @@ SRC_URI="
 	https://m.box.com/file/401042823306/download?shared_link=https%3A%2F%2Fdigitalextremesltd.app.box.com%2Fs%2Fvh2u41yhdlgp3girffucbynadoi33173 -> Grineer.ttf
 	https://m.box.com/file/302545392046/download?shared_link=https%3A%2F%2Fdigitalextremesltd.app.box.com%2Fs%2Fvh2u41yhdlgp3girffucbynadoi33173 -> Solaris.ttf
 "
+S="${DISTDIR}"
+
 LICENSE="Warframe-EULA"
-RESTRICT="bindist mirror"
 SLOT="0"
 KEYWORDS="~amd64"
-S="${DISTDIR}"
+
+RESTRICT="bindist mirror"
+
 FONT_S="${S}"
 FONT_SUFFIX="ttf"