From 689cc2054b0d414609adceb568668d9bcd00dcdf Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 28 Sep 2018 02:59:41 +0000
Subject: [PATCH] dev-util/astyle: drop commandSuffix, simplify PROVIDES.

Also reorder sections, without any changes.
---
 dev-util/astyle/astyle-2.05.recipe | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-util/astyle/astyle-2.05.recipe b/dev-util/astyle/astyle-2.05.recipe
index 6150081f1..554effb92 100644
--- a/dev-util/astyle/astyle-2.05.recipe
+++ b/dev-util/astyle/astyle-2.05.recipe
@@ -5,30 +5,30 @@ re-formats C / C++ / C# / Java source files. It can be used from a command \
 line, or it can be incorporated as classes in another C++ program.
 "
 HOMEPAGE="http://astyle.sourceforge.net"
-SOURCE_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%20${portVersion}/astyle_${portVersion}_linux.tar.gz"
-CHECKSUM_SHA256="da34eb1f8f12e6f50f1cf674944c0db70c91b203008e11be0f57aa8267823a39"
-LICENSE="GNU LGPL v3"
-
 COPYRIGHT="
 1998-2002 by Tal Davidson \
 2006-2013 Jim Pattee
 "
-
+LICENSE="GNU LGPL v3"
 REVISION="2"
+SOURCE_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%20${portVersion}/astyle_${portVersion}_linux.tar.gz"
+CHECKSUM_SHA256="da34eb1f8f12e6f50f1cf674944c0db70c91b203008e11be0f57aa8267823a39"
+SOURCE_DIR="astyle"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64 arm ppc"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
+fi
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
 if [ "$targetArchitecture" = x86_gcc2 ]; then
-    commandSuffix=
     commandBinDir=$prefix/bin
 fi
 
 PROVIDES="
 	astyle$secondaryArchSuffix = $portVersion
-	cmd:astyle$commandSuffix = $portVersion
+	cmd:astyle = $portVersion
 	"
 
 REQUIRES="
@@ -41,8 +41,6 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	"
 
-SOURCE_DIR="astyle"
-
 BUILD()
 {
 	cd build/gcc