From 53e790e14e7ad2c6dcc4d97d26cd538fdf3c5035 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 17 Sep 2018 07:49:05 +0200
Subject: [PATCH] code format.

---
 app-arch/zstd/zstd-1.1.2.recipe               |  8 +++----
 app-cdr/cdrtools/cdrtools-3.01.recipe         | 22 +++++++++----------
 app-cdr/cdrtools/cdrtools-3.02~a09.recipe     | 22 +++++++++----------
 .../johntheripper/johntheripper-1.8.0.recipe  | 18 +++++++--------
 app-editors/emacs/emacs-26.1.recipe           |  6 ++---
 .../vmware-addons/vmware_addons-1.2.0.recipe  |  2 +-
 6 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/app-arch/zstd/zstd-1.1.2.recipe b/app-arch/zstd/zstd-1.1.2.recipe
index 92631fe80..97f56936b 100644
--- a/app-arch/zstd/zstd-1.1.2.recipe
+++ b/app-arch/zstd/zstd-1.1.2.recipe
@@ -1,5 +1,4 @@
 SUMMARY="Zstandard, a fast real-time compression algorithm"
-SUMMARY_bin="Command line tools to compress/decompress .zst files"
 DESCRIPTION="Zstd, short for Zstandard, is a fast lossless compression \
 algorithm, targeting real-time compression scenarios at zlib-level and better \
 compression ratios. The zstd compression library provides in-memory \
@@ -12,14 +11,14 @@ COPYRIGHT="2016-2017 Facebook, Inc."
 LICENSE="BSD (2-clause)"
 REVISION="3"
 SOURCE_URI="https://github.com/facebook/zstd/archive/v$portVersion.tar.gz"
-SOURCE_FILENAME="zstd-$portVersion.tar.gz"
 CHECKSUM_SHA256="980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8"
+SOURCE_FILENAME="zstd-$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
@@ -33,6 +32,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+SUMMARY_bin="Command line tools to compress/decompress .zst files"
 PROVIDES_bin="
 	zstd${secondaryArchSuffix}_bin = $portVersion
 	cmd:gzstd$commandSuffix = $portVersion
diff --git a/app-cdr/cdrtools/cdrtools-3.01.recipe b/app-cdr/cdrtools/cdrtools-3.01.recipe
index 6bb6625c0..3c9d7ee57 100644
--- a/app-cdr/cdrtools/cdrtools-3.01.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01.recipe
@@ -34,22 +34,22 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	cdrtools = $portVersion compat >= 3
-	cmd:devdump = $portVersion compat >= 3
-	cmd:rscsi = $portVersion compat >= 3
-	cmd:scgcheck = $portVersion compat >= 3
-	cmd:mkisofs = $portVersion compat >= 3
 	cmd:btcflash = $portVersion compat >= 3
-	cmd:scgskeleton = $portVersion compat >= 3
-	cmd:isovfy = $portVersion compat >= 3
-	cmd:readcd = $portVersion compat >= 3
-	cmd:isodebug = $portVersion compat >= 3
 	cmd:cdda2mp3 = $portVersion compat >= 3
 	cmd:cdda2ogg = $portVersion compat >= 3
 	cmd:cdda2wav = $portVersion compat >= 3
-	cmd:mkhybrid = $portVersion compat >= 3
 	cmd:cdrecord = $portVersion compat >= 3
+	cmd:devdump = $portVersion compat >= 3
+	cmd:isodebug = $portVersion compat >= 3
 	cmd:isodump = $portVersion compat >= 3
 	cmd:isoinfo = $portVersion compat >= 3
+	cmd:isovfy = $portVersion compat >= 3
+	cmd:mkhybrid = $portVersion compat >= 3
+	cmd:mkisofs = $portVersion compat >= 3
+	cmd:readcd = $portVersion compat >= 3
+	cmd:rscsi = $portVersion compat >= 3
+	cmd:scgcheck = $portVersion compat >= 3
+	cmd:scgskeleton = $portVersion compat >= 3
 	"
 REQUIRES="
 	haiku
@@ -58,9 +58,9 @@ REQUIRES="
 PROVIDES_devel="
 	cdrtools_devel = $portVersion
 	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
 	devel:libedc_ecc = $portVersion compat >= 3
 	devel:libedc_ecc_dec = $portVersion compat >= 3
-	devel:libdeflt = $portVersion compat >= 3
 	devel:libfile = $portVersion compat >= 3
 	devel:libfind = $portVersion compat >= 3
 	devel:libhfs = $portVersion compat >= 3
@@ -68,9 +68,9 @@ PROVIDES_devel="
 	devel:libparanoia = $portVersion compat >= 3
 	devel:librscg = $portVersion compat >= 3
 	devel:libscg = $portVersion compat >= 3
-	devel:libsiconv = $portVersion compat >= 3
 	devel:libscgcmd = $portVersion compat >= 3
 	devel:libschily = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
 	"
 REQUIRES_devel="
 	cdrtools == $portVersion
diff --git a/app-cdr/cdrtools/cdrtools-3.02~a09.recipe b/app-cdr/cdrtools/cdrtools-3.02~a09.recipe
index 9e38e160b..06eede676 100644
--- a/app-cdr/cdrtools/cdrtools-3.02~a09.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.02~a09.recipe
@@ -39,22 +39,22 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	cdrtools$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:devdump$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:rscsi$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:scgcheck$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:mkisofs$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:btcflash$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:scgskeleton$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:isovfy$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:readcd$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:isodebug$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:cdda2mp3$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:cdda2ogg$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:cdda2wav$secondaryArchSuffix = $portVersion compat >= 3
-	cmd:mkhybrid$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:cdrecord$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:devdump$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:isodebug$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:isodump$secondaryArchSuffix = $portVersion compat >= 3
 	cmd:isoinfo$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:isovfy$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:mkhybrid$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:mkisofs$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:readcd$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:rscsi$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:scgcheck$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:scgskeleton$secondaryArchSuffix = $portVersion compat >= 3
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -63,9 +63,9 @@ REQUIRES="
 PROVIDES_devel="
 	cdrtools${secondaryArchSuffix}_devel = $portVersion
 	devel:libcdrdeflt$secondaryArchSuffix = $portVersion compat >= 3
+	devel:libdeflt$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libedc_ecc$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libedc_ecc_dec$secondaryArchSuffix = $portVersion compat >= 3
-	devel:libdeflt$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libfile$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libfind$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libhfs$secondaryArchSuffix = $portVersion compat >= 3
@@ -73,9 +73,9 @@ PROVIDES_devel="
 	devel:libparanoia$secondaryArchSuffix = $portVersion compat >= 3
 	devel:librscg$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libscg$secondaryArchSuffix = $portVersion compat >= 3
-	devel:libsiconv$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libscgcmd$secondaryArchSuffix = $portVersion compat >= 3
 	devel:libschily$secondaryArchSuffix = $portVersion compat >= 3
+	devel:libsiconv$secondaryArchSuffix = $portVersion compat >= 3
 	"
 REQUIRES_devel="
 	cdrtools$secondaryArchSuffix == $portVersion base
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.recipe b/app-crypt/johntheripper/johntheripper-1.8.0.recipe
index 10a9d0b4a..b3dddc531 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.recipe
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.recipe
@@ -21,25 +21,30 @@ PATCHES="johntheripper-$portVersion-upstreamed.patchset
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/john/john.conf auto-merge
+	"
+USER_SETTINGS_FILES="
+	settings/john directory
+	settings/john/john.local.conf template $docDir/john.local.conf.example
+	"
+
 PROVIDES="
 	johntheripper$secondaryArchSuffix = $portVersion
 	cmd:john = $portVersion
 	"
-
 bins=(calc_stat cprepair genmkvpwd luks2john mkvcalcproba raw2dyna
 	tgtsnarf uaf2john wpapcap2john)
 syms=(base64conv dmg2john gpg2john hccap2john keepass2john keychain2john
 	keyring2john keystore2john kwallet2john pfx2john putty2john pwsafe2john
 	racf2john rar2john ssh2john truecrypt_volume2john unafs undrop unique
 	unshadow zip2john)
-
 for b in ${bins[@]} ${syms[@]}
 do
 	PROVIDES+="
 		cmd:$b = $portVersion
 		"
 done
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -63,13 +68,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/john/john.conf auto-merge
-	"
-USER_SETTINGS_FILES="
-	settings/john directory
-	settings/john/john.local.conf template $docDir/john.local.conf.example
-	"
 
 # Instruction sets for fallback chain
 instr=(ssse3 sse4.1 avx xop)
diff --git a/app-editors/emacs/emacs-26.1.recipe b/app-editors/emacs/emacs-26.1.recipe
index 440812285..c8d60cfa9 100644
--- a/app-editors/emacs/emacs-26.1.recipe
+++ b/app-editors/emacs/emacs-26.1.recipe
@@ -23,8 +23,8 @@ ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
@@ -63,8 +63,8 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
 	cmd:aclocal
+	cmd:autoconf
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
diff --git a/app-emulation/vmware-addons/vmware_addons-1.2.0.recipe b/app-emulation/vmware-addons/vmware_addons-1.2.0.recipe
index 5b83c1af1..9dfe06623 100644
--- a/app-emulation/vmware-addons/vmware_addons-1.2.0.recipe
+++ b/app-emulation/vmware-addons/vmware_addons-1.2.0.recipe
@@ -36,8 +36,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	vmware_addons$secondaryArchSuffix = $portVersion
-	cmd:vmware_tray$secondaryArchSuffix = $portVersion
 	cmd:run_backdoor$secondaryArchSuffix = $portVersion
+	cmd:vmware_tray$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix