Rewrite ARCHITECTURES syntax to new HaikuPorter changes.

HaikuPorter now does not care what is in ARCHITECTURES when
building for a SECONDARY_ARCHITECTURE.

app-accessibility/festival/festival-2.4.recipe

@@ -24,14 +24,7 @@ CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d8
 SOURCE_DIR="festival"
 PATCHES="festival-${portVersion}.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
 
 PROVIDES="
@@ -89,7 +82,7 @@ BUILD()
 			-e "s,@LIBDIR@,$libDir/festival,g"	\
 			${f}.in > ${f}
 	done
-	    
+
 	make
 }
 

app-accessibility/speech_tools/speech_tools-2.4.recipe

@@ -28,14 +28,7 @@ COPYRIGHT="
 	1999-2003 Language Technologies Institute, Carnegie Mellon University
 	"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
 
 PROVIDES="

app-arch/libarchive/libarchive-3.1.2.recipe

@@ -27,14 +27,7 @@ LICENSE="BSD (2-clause)"
 COPYRIGHT="2003-2013 Tim Kientzle"
 REVISION="1"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -105,6 +98,6 @@ INSTALL()
 }
 
 TEST()
-{ 
-	make check 
+{
+	make check
 }

app-arch/lzip/lzip-1.16.recipe

@@ -29,14 +29,7 @@ HOMEPAGE="http://lzip.nongnu.org/lzip.html"
 SOURCE_URI="http://download.savannah.gnu.org/releases/lzip/lzip-1.16.tar.gz"
 CHECKSUM_SHA256="128cc25baf92c8b69700831e6f984d954016318cc78edca87870d0c033112751"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+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/.

app-arch/snappy/snappy-1.1.2.recipe

@@ -12,14 +12,7 @@ REVISION="1"
 SOURCE_URI="http://mirror.pistoncloud.com/source/snappy-$portVersion.tar.gz"
 CHECKSUM_SHA256="f9d8fe1c85494f62dbfa3efe8e73bc23d8dec7a254ff7fe09ec4b0ebfc586af4"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -49,7 +42,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-	
+
 BUILD()
 {
 	runConfigure ./configure

app-arch/xar/xar-1.5.2.recipe

@@ -15,14 +15,7 @@ HOMEPAGE="http://code.google.com/p/xar/"
 SOURCE_URI="http://xar.googlecode.com/files/xar-1.5.2.tar.gz"
 CHECKSUM_SHA256="4c5d5682803cdfab16d72365cf51fc4075d597c5eeaa8c7d1990fea98cdae3e6"
 REVISION="2"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-arch/xz_utils/xz_utils-5.0.8.recipe

@@ -13,14 +13,7 @@ LICENSE="
 	"
 COPYRIGHT="2005-2014 Lasse Collin"
 REVISION="2"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 ADDITIONAL_FILES="xz_utils-expander-rules"

app-doc/doxygen/doxygen-1.8.10.recipe

@@ -23,14 +23,7 @@ SOURCE_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-$portVersion.src.tar.g
 CHECKSUM_SHA256="cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93"
 PATCHES="doxygen-$portVersion.patch"
 REVISION="2"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe

@@ -9,12 +9,7 @@ HOMEPAGE="http://wiki.qemu.org/"
 LICENSE="GNU GPL v2"
 REVISION="1"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="https://launchpad.net/qemu-linaro/trunk/2014.01/+download/qemu-linaro-1.7.0-2014.01.tar.gz"

app-emulation/pearpc/pearpc-0.5.0_cvs.recipe

@@ -9,12 +9,7 @@ SOURCE_URI="cvs://:pserver:anonymous@pearpc.cvs.sourceforge.net:/cvsroot/pearpc/
 STATUS_HAIKU="untested"
 DEPEND=""
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-emulation/qemu/qemu-1.7.0.recipe

@@ -11,12 +11,7 @@ REVISION="1"
 SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3"
 PATCHES="qemu-1.7.0.patchset"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-emulation/qemu/qemu-2.0.0.recipe

@@ -12,12 +12,7 @@ SOURCE_URI="http://wiki.qemu-project.org/download/qemu-2.0.0.tar.bz2"
 CHECKSUM_SHA256="60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b"
 PATCHES="qemu-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-emulation/qemu/qemu-2.1.0.recipe

@@ -10,12 +10,7 @@ LICENSE="GNU GPL v2"
 REVISION="3"
 SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#4444401842251c18147f83c7d960ec3a82f2b9cb"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-emulation/qemu/qemu-2.1.2.recipe

@@ -11,12 +11,7 @@ REVISION="2"
 
 SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#d1b55862305d1eac5c7ca7cc56ec379bbc452d74"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-emulation/simh/simh-4.0.0_git.recipe

@@ -23,12 +23,7 @@ CHECKSUM_SHA256="4f6b475188039e209b930b76a58013f14e41da65a1895be0a8714b33d851907
 SOURCE_DIR="simh-18175040523db4d6195d1d32696d4c2178490c11"
 #PATCHES="simh-4.0.0_git.patchset"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe

@@ -9,12 +9,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2013 Morgan Germain"
 
-ARCHITECTURES="?x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-        ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-        ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-misc/jq/jq-1.4.recipe

@@ -15,12 +15,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2012 Stephen Dolan"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-        # x86_gcc2 is fine as primary target architecture as long as we're building
-        # for a different secondary architecture.
-        ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-misc/strigi/strigi-0.7.5.recipe

@@ -12,12 +12,7 @@ CHECKSUM_SHA256="111f5e3ede171292302b906418af0175445ca01958d40fb54879f80620b5189
 REVISION="2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2011 Jos van den Oever"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 
 SECONDARY_ARCHITECTURES="x86"
 

app-office/scribus/scribus-1.4.4.recipe

@@ -13,14 +13,7 @@ SOURCE_URI="http://downloadsurceforge.net/project/scribus/scribus/1.4.4/scribus-
 SOURCE_DIR="scribus-1.4.4"
 CKECKSUM_MD5=""
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 PATCHES="
 	scribus-1.4.4.patchset

app-shells/fish/fish-1.23.1_git.recipe

@@ -11,14 +11,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2009 Axel Liljencrantz"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libabw/libabw-0.1.0.recipe

@@ -8,12 +8,7 @@ REVISION="2"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libabw/libabw-$portVersion.tar.bz2"
 CHECKSUM_SHA256="49380c24e04e8d2a4824adc9b1b8f5026ad759bc335497e05f0983412821f8d9"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libebook/libebook-0.1.1.recipe

@@ -9,12 +9,7 @@ SOURCE_URI="http://prdownloads.sourceforge.net/libebook/libe-book-$portVersion.t
 CHECKSUM_SHA256="90353fc60827a33b391d0b63ecfe5239229d489af99ff6ea014ede3b39fa32b5"
 SOURCE_DIR="libe-book-$portVersion"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libetonyek/libetonyek-0.1.2.recipe

@@ -8,12 +8,7 @@ REVISION="1"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libetonyek/libetonyek-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f3f9342a34514a02c8a8c6d2a7957ee29cdb94ee69c67fe37b214fba50f49abf"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libmspub/libmspub-0.1.1.recipe

@@ -10,12 +10,7 @@ REVISION="2"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libmspub/libmspub-$portVersion.tar.bz2"
 CHECKSUM_SHA256="c3b69a4cf50ad80af5c9c00cb8ebca0586fc9ba9d6bdeeb40112d6f43ecdbbbb"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libmwaw/libmwaw-0.3.5.recipe

@@ -12,12 +12,7 @@ SOURCE_URI="http://prdownloads.sourceforge.net/libmwaw/libmwaw-$portVersion.tar.
 CHECKSUM_SHA256="fe71b7f120aca311a977569f51ffb258e824616db6afbb29ea0072398fc4c9b4"
 PATCHES="libmwaw-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libodfgen/libodfgen-0.1.1.recipe

@@ -10,12 +10,7 @@ REVISION="2"
 SOURCE_URI="http://prdownloads.sourceforge.net/libwpd/libodfgen-$portVersion.tar.bz2"
 CHECKSUM_SHA256="b8d5974de49b523c7a5b800d9817ff7ced9615ef456ba39128e2eb5a470483be"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libwpd/libwpd-0.10.0.recipe

@@ -18,12 +18,7 @@ COPYRIGHT="
 REVISION="2"
 CHECKSUM_SHA256="f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libwpd/libwpd-0.9.9.recipe

@@ -18,12 +18,7 @@ COPYRIGHT="
 REVISION="2"
 CHECKSUM_SHA256="6d894db0de312dbbef3359c14b967ee4d2bab4e70052c151f2a44dc39b0744b9"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libwpg/libwpg-0.2.2.recipe

@@ -18,12 +18,7 @@ COPYRIGHT="
 REVISION="2"
 CHECKSUM_SHA256="d5260dd46a9f2bb8ace90379b8afc47fe78f26048bb32abb982b900ef2fb2aa3"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libwpg/libwpg-0.3.0.recipe

@@ -18,12 +18,7 @@ COPYRIGHT="
 REVISION="2"
 CHECKSUM_SHA256="8fb8cb4229d4288a5363c78bab78811d94cf8e1e91a6a6b85941e43820561151"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/libwps/libwps-0.3.1.recipe

@@ -12,12 +12,7 @@ REVISION="1"
 SOURCE_URI="http://prdownloads.sourceforge.net/libwps/libwps-$portVersion.tar.bz2"
 CHECKSUM_SHA256="ceb6b1aac4646c641709a00a1bdceb296b30fe8b5e52446f104892e9cc338d4f"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/podofo/podofo-0.9.3.recipe

@@ -16,12 +16,7 @@ GNU LGPL v2.1
 SOURCE_URI="http://sourceforge.net/projects/podofo/files/podofo/$portVersion/podofo-$portVersion.tar.gz"
 CHECKSUM_SHA256="ec261e31e89dce45b1a31be61e9c6bb250532e631a02d68ec5bb849ef0a222d8"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $targetArchitecture != x86_gcc2 ]; then

app-text/sword/sword-1.7.3.recipe

@@ -11,14 +11,7 @@ COPYRIGHT="1998-2014 CrossWire Bible Society"
 SOURCE_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz"
 CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea"
 REVISION="3"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/sword/sword-1.7.4.recipe

@@ -11,14 +11,7 @@ COPYRIGHT="1998-2014 CrossWire Bible Society"
 SOURCE_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.4.tar.gz"
 CHECKSUM_SHA256="995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 
 SECONDARY_ARCHITECTURES="x86"
 

app-text/tesseract/tesseract-3.02.02.recipe

@@ -17,14 +17,7 @@ SOURCE_URI="https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar
 CHECKSUM_SHA256="26cd39cb3f2a6f6f1bf4050d1cc0aae35edee49eb49a92df3cb7f9487caa013d"
 REVISION="1"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

app-text/texlive/texlive-2014.recipe

@@ -17,12 +17,7 @@ SOURCE_DIR_2="texlive-20140525-texmf"
 REVISION="1"
 
 ARCHITECTURES="x86"
-SECONDARY_ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="texlive-2014.patchset"

dev-cpp/clucene/clucene-2.3.3.4.recipe

@@ -27,12 +27,7 @@ CHECKSUM_SHA256="ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732ea
 SOURCE_DIR="clucene-core-2.3.3.4"
 PATCHES="clucene-2.3.3.4.patchset"
 REVISION="1"
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe

@@ -9,10 +9,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2008 Jesse Beder"
  
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-embedded/arduino/arduino-1.0.6.recipe

@@ -11,12 +11,7 @@ SOURCE_URI="http://downloads.arduino.cc/arduino-1.0.6-linux32.tgz"
 CHECKSUM_SHA256="f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658"
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="arduino_x86-1.0.6.patchset"
@@ -40,7 +35,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
-	cmd:make	
+	cmd:make
 	"
 
 SOURCE_DIR="arduino-1.0.6"
@@ -55,7 +50,7 @@ INSTALL()
 {
 	arduinoDir=$appsDir/Arduino
 	mkdir -p $arduinoDir
-	
+
 	cp -r examples $arduinoDir
 	cp -r libraries $arduinoDir
 	cp -r reference $arduinoDir
@@ -64,14 +59,14 @@ INSTALL()
 	rm $arduinoDir/lib/RXTXcomm.jar
 	rm $arduinoDir/lib/librxtxSerial.so
 	rm $arduinoDir/lib/librxtxSerial64.so
-	
+
 	mkdir -p $arduinoDir/hardware
 	cp -r hardware/arduino $arduinoDir/hardware
-	
+
 	mkdir -p $arduinoDir/hardware/tools
 	cp hardware/tools/avrdude.conf $arduinoDir/hardware/tools
 	ln -s /bin/x86/avrdude $arduinoDir/hardware/tools/avrdude
-	
+
 	mkdir -p $arduinoDir/hardware/tools/avr
 	ln -s /bin/x86 $arduinoDir/hardware/tools/avr/bin
 	mkdir -p $arduinoDir/hardware/tools/avr/bin.gcc
@@ -80,7 +75,7 @@ INSTALL()
 	ln -s /bin/x86/avr-gcc $arduinoDir/hardware/tools/avr/bin.gcc/avr-gcc
 	mkdir -p $arduinoDir/hardware/tools/avr/etc
 	ln -s /system/settings/avrdude.conf $arduinoDir/hardware/tools/avr/etc/avrdude.conf
-	
+
 	echo '#!/bin/sh
 APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
 cd "$APPDIR"
@@ -98,11 +93,11 @@ export LD_LIBRARY_PATH
 export PATH="${APPDIR}/java/bin:${PATH}"
 java processing.app.Base "$@"
 ' > $arduinoDir/arduino.sh
-	
+
 	chmod +x $arduinoDir/arduino.sh
-		
-	cp "haiku/Arduino IDE" $arduinoDir	
+
+	cp "haiku/Arduino IDE" $arduinoDir
 	cp revisions.txt $arduinoDir
-	
+
 	addAppDeskbarSymlink "$arduinoDir/Arduino IDE"
 }

dev-embedded/arduino/arduino-1.7.4.recipe

@@ -1,5 +1,5 @@
 SUMMARY="IDE for the Arduino embedded hardware family"
-DESCRIPTION="Arduino is an open-source tool used for building electronics projects. 
+DESCRIPTION="Arduino is an open-source tool used for building electronics projects.
 Arduino consists of a physical programmable circuit board (often referred to as a micro-controller) \
 and a development environment, or IDE (Integrated Development Environment) that runs on your computer, \
 used to write and upload computer code to the board."
@@ -16,12 +16,7 @@ SOURCE_URI_4="svn+https://github.com/arduino-org/Arduino/trunk/arduino-core/src/
 
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="arduino-1.7.4.patchset"
@@ -94,7 +89,7 @@ BUILD()
 
 	javac -encoding ISO-8859-1 -cp ./jssc-2.8.0.jar:$sourceDir/lib/arduino-core.jar \
 		$sourceDir2/build/processing/app/SerialPortList.java
-	rm $sourceDir2/build/processing/app/SerialPortList.java	
+	rm $sourceDir2/build/processing/app/SerialPortList.java
 
 	cd $sourceDir
 	javac -encoding ISO-8859-1 -cp java/lib/rt.jar:java/lib/tools.jar:./lib/pde.jar:./lib/arduino-core.jar \
@@ -115,7 +110,7 @@ INSTALL()
 {
 	arduinoDir=$appsDir/Arduino
 	mkdir -p $arduinoDir
-	
+
 	cp -r examples $arduinoDir
 	cp -r libraries $arduinoDir
 	cp -r reference $arduinoDir
@@ -193,7 +188,7 @@ java processing.app.Base "$@"
 	chmod +x $arduinoDir/arduino.sh
 
 	#Copy binary launcher
-	cp "haiku/Arduino IDE" $arduinoDir	
+	cp "haiku/Arduino IDE" $arduinoDir
 
 	cp revisions.txt $arduinoDir
 

dev-embedded/avrdude/avrdude-6.0.1.recipe

@@ -10,12 +10,7 @@ SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.
 CHECKSUM_SHA256="c6804668dfa96b23185dfe2e8239089af4e4ae0b11aa7435bebb28c3260ede41"
 PATCHES="avrdude-6.0.1.patch"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 GLOBAL_WRITABLE_FILES="

dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe

@@ -20,12 +20,7 @@ SOURCE_DIR="dfu-programmer-0.6.2"
 CHECKSUM_SHA256="0120966a424dd98124962055750e90cbd6c7b6b0fbf5b187bf435daa0a24af65"
 PATCHES="dfu-programmer-0.6.2.patch"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-embedded/gcc6809/gcc6809-4.6.1.recipe

@@ -12,12 +12,7 @@ LICENSE="
 	"
 PATCHES="gcc6809-$portVersion.patchset"
 
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-embedded/lm4tools/lm4tools-0.1.3.recipe

@@ -6,12 +6,7 @@ HOMEPAGE="https://github.com/utzig/lm4tools"
 LICENSE="GNU GPL v2"
 REVISION="1"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="git+https://github.com/utzig/lm4tools.git#1cfd813779b9eb717b15b0a1814bde8338899ff9"

dev-embedded/lwtools/lwtools-4.10.recipe

@@ -11,12 +11,7 @@ REVISION="2"
 COPYRIGHT="2006-2014 William Astle"
 LICENSE="GNU GPL v3"
 
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-embedded/sdcc/sdcc-3.4.0.recipe

@@ -18,12 +18,7 @@ COPYRIGHT="
 SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/3.4.0/sdcc-src-3.4.0.tar.bz2"
 CHECKSUM_SHA256="cf6af862b94d5f259f11afa0a1b86304f3047b3723a9df96f20dba869deb5bf9"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-embedded/sdcc/sdcc-3.5.0.recipe

@@ -17,12 +17,7 @@ COPYRIGHT="
 SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/$portVersion/sdcc-src-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f82978d1614244b22e093402c0a4de1f688a07c807b2980126c964eb3df85fa9"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-embedded/stlink/stlink-1.0.0.recipe

@@ -8,12 +8,7 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="2011 The Capt'ns Missing Link Authors"
 REVISION="1"
 
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="https://github.com/texane/stlink/archive/1.0.0.tar.gz"

dev-embedded/stm32flash/stm32flash-0.3.recipe

@@ -15,12 +15,7 @@ ST serial bootloader.
 "
 HOMEPAGE="http://code.google.com/p/stm32flash/"
 REVISION="1"
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 COPYRIGHT="
 	Geoffrey McRae

dev-java/jamvm/jamvm-1.5.4.recipe

@@ -12,14 +12,7 @@ DEPEND=""
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2010 Robert Lougher"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-java/jamvm/jamvm-2.0.0.recipe

@@ -12,14 +12,7 @@ DEPEND=""
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2010 Robert Lougher"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-java/rxtx/rxtx-2.2_pre2.recipe

@@ -14,14 +14,7 @@ REVISION="1"
 SOURCE_URI="git+https://github.com/arduino/RXTX#84a009c"
 PATCHES="rxtx-2.2_haiku-support.patch"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/fpc/fpc-2.6.2.recipe

@@ -18,12 +18,7 @@ REVISION="2"
 
 DISABLE_SOURCE_PACKAGE=yes
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/fpc/fpc_bin-2.6.2.recipe

@@ -14,12 +14,7 @@ DISABLE_SOURCE_PACKAGE=yes
 
 BUILD_ACTIVATION_PHASE="INSTALL"
 
-ARCHITECTURES="x86 !x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/golang/golang-1.3.recipe

@@ -20,14 +20,7 @@ REVISION="2"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2009-2014 The Go Authors"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/julia/julia-0.3.5.recipe

@@ -18,14 +18,7 @@ COPYRIGHT="2009-2014 Jeff Bezanson et al."
 
 # Currently broken on all architectures, due to openlibm needing <complex.h>
 # which we do not have.
-ARCHITECTURES="!x86 !x86_64"
-#if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-#	# x86_gcc2 is fine as primary target architecture as long as we're building
-#	# for a different secondary architecture.
-#	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-#else
-#	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-#fi
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
 #SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/openjdk/openjdk-1.7.u80_b32.recipe

@@ -27,14 +27,7 @@ SOURCE_URI_8="hg+http://bitbucket.org/hamishm/haiku-jdk7u-hotspot#43c8a75"
 SOURCE_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk#5d173cf"
 
 REVISION="2"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes

dev-lang/openjdk/openjdk-1.7_u80_b02.recipe

@@ -27,14 +27,7 @@ SOURCE_URI_8="hg+http://bitbucket.org/hamishm/haiku-jdk7u-hotspot#755ff2f"
 SOURCE_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk#f39f6f6"
 
 REVISION="2"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes

dev-lang/openjdk/openjdk-1.8.u40_b27.recipe

@@ -23,14 +23,7 @@ SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27"
 
 
 REVISION="1"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes

dev-lang/ruby/ruby-2.1.5.recipe

@@ -19,12 +19,7 @@ PATCHES="ruby-$portVersion.patchset"
 
 REVISION="1"
 
-ARCHITECTURES="?x86 !x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/ruby/ruby-2.2.2.recipe

@@ -19,12 +19,7 @@ PATCHES="ruby-$portVersion.patchset"
 
 REVISION="1"
 
-ARCHITECTURES="?x86 !x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 !x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/squirrel/squirrel-3.0.4.recipe

@@ -12,14 +12,7 @@ LICENSE="MIT"
 COPYRIGHT="2004-2013 Alberto Demichelis"
 REVISION="1"
 
-ARCHITECTURES="!x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 !x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-lang/v8/v8-3.16.1.recipe

@@ -15,14 +15,7 @@ SOURCE_DIR="v8"
 SOURCE_DIR_2="gyp"
 PATCHES="v8-3.16.1.patch"
 
-ARCHITECTURES="?x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES ?x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.

dev-libs/boost/boost-1.55.0.recipe

@@ -11,12 +11,7 @@ CHECKSUM_SHA256="fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b5
 REVISION="6"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_DIR="boost_1_55_0"	

dev-libs/cloog/cloog-0.18.3.recipe

@@ -14,12 +14,7 @@ LICENSE="GNU LGPL v2.1"
 SOURCE_URI="http://www.bastoul.net/cloog/pages/download/cloog-$portVersion.tar.gz"
 CHECKSUM_SHA256="460c6c740acb8cdfbfbb387156b627cf731b3837605f2ec0001d079d89c69734"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="cloog-$portVersion.patchset"

dev-libs/isl/isl-0.13.recipe

@@ -16,12 +16,7 @@ COPYRIGHT="
 	"
 LICENSE="MIT"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/isl/isl-0.14.recipe

@@ -16,12 +16,7 @@ COPYRIGHT="
 	"
 LICENSE="MIT"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/libburn/libburn-1.3.8.recipe

@@ -13,12 +13,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://files.libburnia-project.org/releases/libburn-$portVersion.tar.gz"
 CHECKSUM_SHA256="46266bdd4b37ca9700a44bbd8dbfbf3526423ede25751fd2f0211b2b5ce29283"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 
 PATCHES="libburn-$portVersion.patchset"
 

dev-libs/libclaw/libclaw-1.7.4.recipe

@@ -23,12 +23,7 @@ CHECKSUM_SHA256="0be289da7f43b1892575f14b27860af5d1e1f6961eae11653d64e625fd7924b
 REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2008-2014 Julien Jorge"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/libevent/libevent-2.0.21.recipe

@@ -16,12 +16,7 @@ CHECKSUM_SHA256="22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f
 SOURCE_DIR="libevent-${portVersion}-stable"
 PATCHES="libevent-2.0.21.patch"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe

@@ -7,12 +7,7 @@ REVISION="1"
 COPYRIGHT="2013-2014 Maxmind"
 LICENSE="Apache v2"
 
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="https://github.com/maxmind/libmaxminddb/releases/download/$portVersion/libmaxminddb-$portVersion.tar.gz"

dev-libs/libpagemaker/libpagemaker-0.0.2.recipe

@@ -11,10 +11,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.2.tar.xz"
 CHECKSUM_SHA256="cdbdf86605773339caab6477ff694a95a90aaa4d45bb6cdb59e4a7f76c91ef17"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/libpurple/libpurple-2.10.11.recipe

@@ -6,10 +6,7 @@ HOMEPAGE="https://pidgin.im/"
 LICENSE="GNU GPL v2"
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2"

dev-libs/librevenge/librevenge-0.0.0.recipe

@@ -12,10 +12,7 @@ REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/libwpd/librevenge/librevenge-$portVersion/librevenge-$portVersion.tar.bz2"
 CHECKSUM_SHA256="55b9fde4c729a525db36d37b51a0f5d8614d4c631e336320e540dfce3128f7f7"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/librevenge/librevenge-0.0.1.recipe

@@ -16,10 +16,7 @@ HOMEPAGE="http://sourceforge.net/p/libwpd/wiki/librevenge/"
 SOURCE_URI="http://prdownloads.sourceforge.net/libwpd/librevenge-$portVersion.tar.bz2"
 CHECKSUM_SHA256="428c918c7775a860f4fb642643099932abcf6fe5cb72c8b0d25ee6b84ad55490"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/libsigc++/libsigc++-2.4.1.recipe

@@ -10,12 +10,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml"
 SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.4/libsigc++-$portVersion.tar.xz"
 #CHECKSUM_SHA256="355f2a580ea105514a1589610305ab1e3e0980aea19c3b427027dc160f6be06c"
 REVISION="1"
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/libuv/libuv-1.2.0.recipe

@@ -10,12 +10,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2009-2015 Ryan Dahl and others"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/nspr/nspr-4.10.7.recipe

@@ -14,12 +14,7 @@ HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
 SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz"
 CHECKSUM_SHA256="389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 SOURCE_DIR="nspr-$portVersion/nspr"
 

dev-libs/nspr/nspr-4.10.8.recipe

@@ -14,12 +14,7 @@ HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
 SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz"
 CHECKSUM_SHA256="507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 SOURCE_DIR="nspr-$portVersion/nspr"
 

dev-libs/nss/nss-3.17.4.recipe

@@ -18,12 +18,7 @@ CHECKSUM_SHA256="1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d7
 SOURCE_DIR="nss-$portVersion/nss"
 PATCHES="nss-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/nss/nss-3.18.recipe

@@ -18,12 +18,7 @@ CHECKSUM_SHA256="618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d4
 SOURCE_DIR="nss-$portVersion/nss"
 PATCHES="nss-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/nss/nss-3.19.1.recipe

@@ -18,12 +18,7 @@ CHECKSUM_SHA256="b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52ff
 SOURCE_DIR="nss-$portVersion/nss"
 PATCHES="nss-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/protobuf/protobuf-2.4.1.recipe

@@ -12,12 +12,7 @@ REVISION="1"
 SOURCE_URI="http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2"
 CHECKSUM_SHA256="cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf"
 PATCHES="protobuf_x86-2.4.1.patchset"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/tinyxml2/tinyxml2-2.2.0.recipe

@@ -9,10 +9,7 @@ COPYRIGHT="2011-2013 Lee Thomason"
 SOURCE_URI="https://github.com/leethomason/tinyxml2/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="f891224f32e7a06bf279290619cec80cc8ddc335c13696872195ffb87f5bce67"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-libs/xerces_c/xerces_c-3.1.2.recipe

@@ -11,14 +11,7 @@ SOURCE_URI="http://apache.mirrors.tds.net//xerces/c/3/sources/xerces-c-$portVers
 CHECKSUM_SHA256="743bd0a029bf8de56a587c270d97031e0099fe2b7142cef03e0da16e282655a0"
 SOURCE_DIR="xerces-c-$portVersion"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="

dev-python/pygame/pygame-1.9.1.recipe

@@ -19,12 +19,7 @@ PATCHES="pygame-1.9.1.patchset"
 ARCHITECTURES="x86 ?x86_gcc2"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
-#ARCHITECTURES="x86"
-#if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-# # x86_gcc2 is fine as primary target architecture as long as we're building
-# # for a different secondary architecture.
-# ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-#fi
+#ARCHITECTURES="!x86_gcc2 x86"
 #SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -39,8 +34,8 @@ REQUIRES="
 	sdl_mixer$secondaryArchSuffix >= 1.2
 	smpeg$secondaryArchSuffix >= 0.4.5
 	lib:libpng$secondaryArchSuffix
-	jpeg$secondaryArchSuffix	
-	sdl_gfx$secondaryArchSuffix	
+	jpeg$secondaryArchSuffix
+	sdl_gfx$secondaryArchSuffix
 	"
 #	portmidi ^
 #	portmap  |
@@ -60,9 +55,9 @@ BUILD_PREREQUIRES="
 	libpng${secondaryArchSuffix}_devel
 	jpeg${secondaryArchSuffix}_devel
 	smpeg${secondaryArchSuffix}_devel >= 0.4.5
-	sdl_gfx${secondaryArchSuffix}_devel	
+	sdl_gfx${secondaryArchSuffix}_devel
 	"
-	
+
 BUILD()
 {
 #	$portPackageLinksDir/cmd~python/bin/python setup.py build

dev-qt/automoc/automoc-0.9.88.recipe

@@ -9,12 +9,7 @@ LICENSE="BSD (2-clause)"
 COPYRIGHT="2007 Matthias Kretz"
 PATCHES="automoc-$portVersion.patch"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 
 SECONDARY_ARCHITECTURES="x86"
 

dev-qt/kdelibs4/kdelibs4-4.13.2.recipe

@@ -9,14 +9,7 @@ SOURCE_DIR="kdelibs-4.13.2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2014 KDE e.V."
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/libattica/libattica-0.4.2.recipe

@@ -10,14 +10,7 @@ SOURCE_DIR="attica-0.4.2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2009 KDE e.V."
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe

@@ -9,12 +9,7 @@ SOURCE_DIR="libdbusmenu-qt-$portVersion"
 REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2009 Canonical"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 
 SECONDARY_ARCHITECTURES="x86"
 

dev-qt/libqt4/libqt4-4.8.6.3.recipe

@@ -10,14 +10,7 @@ SOURCE_DIR="qt4-4.8.6-haiku-3"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2014 Digia Plc and/or its subsidiary(-ies)."
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/libqt4/libqt4-4.8.6.4.recipe

@@ -10,14 +10,7 @@ SOURCE_DIR="qt4-4.8.6-haiku-4"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2014 Digia Plc and/or its subsidiary(-ies)."
 REVISION="4"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/libqt4/libqt4-4.8.7.recipe

@@ -10,14 +10,7 @@ SOURCE_DIR="qt4-4.8.7-haiku-1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2015 Digia Plc and/or its subsidiary(-ies)."
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    # x86_gcc2 is fine as primary target architecture as long as we're building
-    # for a different secondary architecture.
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe

@@ -13,10 +13,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2012 Azevedo Filipe & The Monkey Studio Team"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/qca2/qca2-2.0.3.recipe

@@ -17,12 +17,7 @@ COPYRIGHT="2003-2014 Justin Karneges"
 
 PATCHES="qca2-$portVersion.patch"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-qt/qjson/qjson-0.8.1.recipe

@@ -14,12 +14,7 @@ SOURCE_DIR="qjson-$portVersion"
 REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2008 Flavio Castelli"
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 
 SECONDARY_ARCHITECTURES="x86"
 

dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe

@@ -29,12 +29,7 @@ REVISION="1"
 
 PATCHES="gdb-7.7.patchset"
 
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="

dev-util/astyle/astyle-2.05.recipe

@@ -4,7 +4,7 @@ Artistic Style is a filter written in C++ that automatically re-indents and \
 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" 
+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"
@@ -15,15 +15,7 @@ COPYRIGHT="
 "
 
 REVISION="1"
-ARCHITECTURES="x86 x86_64 arm ppc"
-
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm ppc"
 SECONDARY_ARCHITECTURES="x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.

dev-util/cmake/cmake-3.0.0.recipe

@@ -11,12 +11,7 @@ SOURCE_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0.tar.gz"
 CHECKSUM_SHA256="99a34b7f74000404feffd82fba9d9e0cd623428c74b6a4851a0dee1c272606c0"
 SOURCE_DIR="cmake-3.0.0"
 REVISION="1"
-ARCHITECTURES="x86 x86_64 arm"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="cmake-3.0.0_rc6.patchset"

dev-util/cmake/cmake-3.2.3.recipe

@@ -11,12 +11,7 @@ SOURCE_URI="http://www.cmake.org/files/v3.2/cmake-$portVersion.tar.gz"
 CHECKSUM_SHA256="a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297"
 SOURCE_DIR="cmake-$portVersion"
 REVISION="1"
-ARCHITECTURES="x86 x86_64 arm"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="cmake-$portVersion.patchset"