diff --git a/app-accessibility/festival/festival-2.4.recipe b/app-accessibility/festival/festival-2.4.recipe
index 89e8fe821..8ad63105b 100644
--- a/app-accessibility/festival/festival-2.4.recipe
+++ b/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
 }
 
diff --git a/app-accessibility/speech_tools/speech_tools-2.4.recipe b/app-accessibility/speech_tools/speech_tools-2.4.recipe
index 04f3ca063..db18575c0 100644
--- a/app-accessibility/speech_tools/speech_tools-2.4.recipe
+++ b/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="
diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe
index 9d86a3491..d1cd82864 100644
--- a/app-arch/libarchive/libarchive-3.1.2.recipe
+++ b/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
 }
diff --git a/app-arch/lzip/lzip-1.16.recipe b/app-arch/lzip/lzip-1.16.recipe
index 6a81e1d31..704367623 100644
--- a/app-arch/lzip/lzip-1.16.recipe
+++ b/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/.
diff --git a/app-arch/snappy/snappy-1.1.2.recipe b/app-arch/snappy/snappy-1.1.2.recipe
index ca487d065..c3c1cf139 100644
--- a/app-arch/snappy/snappy-1.1.2.recipe
+++ b/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
diff --git a/app-arch/xar/xar-1.5.2.recipe b/app-arch/xar/xar-1.5.2.recipe
index 71b6718bd..50d42a42d 100644
--- a/app-arch/xar/xar-1.5.2.recipe
+++ b/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="
diff --git a/app-arch/xz_utils/xz_utils-5.0.8.recipe b/app-arch/xz_utils/xz_utils-5.0.8.recipe
index c8edf6ac4..1fcd8e40f 100644
--- a/app-arch/xz_utils/xz_utils-5.0.8.recipe
+++ b/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"
diff --git a/app-doc/doxygen/doxygen-1.8.10.recipe b/app-doc/doxygen/doxygen-1.8.10.recipe
index b6443f258..6cf8ec043 100644
--- a/app-doc/doxygen/doxygen-1.8.10.recipe
+++ b/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="
diff --git a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
index 21c14d2f1..9555d63ba 100644
--- a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
+++ b/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"
diff --git a/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe b/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe
index ff73721dd..4e2adfb45 100644
--- a/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe
+++ b/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="
diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe
index dd17114e7..61391a66f 100644
--- a/app-emulation/qemu/qemu-1.7.0.recipe
+++ b/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="
diff --git a/app-emulation/qemu/qemu-2.0.0.recipe b/app-emulation/qemu/qemu-2.0.0.recipe
index a62cf7514..8a6369af8 100644
--- a/app-emulation/qemu/qemu-2.0.0.recipe
+++ b/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="
diff --git a/app-emulation/qemu/qemu-2.1.0.recipe b/app-emulation/qemu/qemu-2.1.0.recipe
index 27d1ee46e..d95b496ab 100644
--- a/app-emulation/qemu/qemu-2.1.0.recipe
+++ b/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="
diff --git a/app-emulation/qemu/qemu-2.1.2.recipe b/app-emulation/qemu/qemu-2.1.2.recipe
index 91e726a2e..89a0d1d24 100644
--- a/app-emulation/qemu/qemu-2.1.2.recipe
+++ b/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="
diff --git a/app-emulation/simh/simh-4.0.0_git.recipe b/app-emulation/simh/simh-4.0.0_git.recipe
index f95e792ef..f85486f26 100644
--- a/app-emulation/simh/simh-4.0.0_git.recipe
+++ b/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="
diff --git a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe
index ded8a377e..2543bba71 100644
--- a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe
+++ b/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="
diff --git a/app-misc/jq/jq-1.4.recipe b/app-misc/jq/jq-1.4.recipe
index 4405d10e2..4948d6023 100644
--- a/app-misc/jq/jq-1.4.recipe
+++ b/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="
diff --git a/app-misc/strigi/strigi-0.7.5.recipe b/app-misc/strigi/strigi-0.7.5.recipe
index e86440a90..37a1b7d90 100644
--- a/app-misc/strigi/strigi-0.7.5.recipe
+++ b/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"
 
diff --git a/app-office/scribus/scribus-1.4.4.recipe b/app-office/scribus/scribus-1.4.4.recipe
index d95c3eb9c..e6ed4e4c5 100644
--- a/app-office/scribus/scribus-1.4.4.recipe
+++ b/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
diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe
index f27de38c4..4707a3690 100644
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/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="
diff --git a/app-text/libabw/libabw-0.1.0.recipe b/app-text/libabw/libabw-0.1.0.recipe
index 242e9da36..4aa3767a0 100644
--- a/app-text/libabw/libabw-0.1.0.recipe
+++ b/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="
diff --git a/app-text/libebook/libebook-0.1.1.recipe b/app-text/libebook/libebook-0.1.1.recipe
index 33cd30e67..47885ba6d 100644
--- a/app-text/libebook/libebook-0.1.1.recipe
+++ b/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="
diff --git a/app-text/libetonyek/libetonyek-0.1.2.recipe b/app-text/libetonyek/libetonyek-0.1.2.recipe
index 87f967bff..8dfe2b000 100644
--- a/app-text/libetonyek/libetonyek-0.1.2.recipe
+++ b/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="
diff --git a/app-text/libmspub/libmspub-0.1.1.recipe b/app-text/libmspub/libmspub-0.1.1.recipe
index fcbb12bab..0fbb7fc3b 100644
--- a/app-text/libmspub/libmspub-0.1.1.recipe
+++ b/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="
diff --git a/app-text/libmwaw/libmwaw-0.3.5.recipe b/app-text/libmwaw/libmwaw-0.3.5.recipe
index 392998d00..9405f5703 100644
--- a/app-text/libmwaw/libmwaw-0.3.5.recipe
+++ b/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="
diff --git a/app-text/libodfgen/libodfgen-0.1.1.recipe b/app-text/libodfgen/libodfgen-0.1.1.recipe
index 40a41acfe..96f579aeb 100644
--- a/app-text/libodfgen/libodfgen-0.1.1.recipe
+++ b/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="
diff --git a/app-text/libwpd/libwpd-0.10.0.recipe b/app-text/libwpd/libwpd-0.10.0.recipe
index 74c0a08d1..18aec9cbb 100644
--- a/app-text/libwpd/libwpd-0.10.0.recipe
+++ b/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="
diff --git a/app-text/libwpd/libwpd-0.9.9.recipe b/app-text/libwpd/libwpd-0.9.9.recipe
index 65a323d62..326baecb4 100644
--- a/app-text/libwpd/libwpd-0.9.9.recipe
+++ b/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="
diff --git a/app-text/libwpg/libwpg-0.2.2.recipe b/app-text/libwpg/libwpg-0.2.2.recipe
index 70d126107..9a7913b08 100644
--- a/app-text/libwpg/libwpg-0.2.2.recipe
+++ b/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="
diff --git a/app-text/libwpg/libwpg-0.3.0.recipe b/app-text/libwpg/libwpg-0.3.0.recipe
index c063bef53..f3ed696dd 100644
--- a/app-text/libwpg/libwpg-0.3.0.recipe
+++ b/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="
diff --git a/app-text/libwps/libwps-0.3.1.recipe b/app-text/libwps/libwps-0.3.1.recipe
index f4667b66a..5888cfadb 100644
--- a/app-text/libwps/libwps-0.3.1.recipe
+++ b/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="
diff --git a/app-text/podofo/podofo-0.9.3.recipe b/app-text/podofo/podofo-0.9.3.recipe
index 13748974b..6c00547b2 100644
--- a/app-text/podofo/podofo-0.9.3.recipe
+++ b/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
diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe
index 6dcb595a4..7be272a7f 100644
--- a/app-text/sword/sword-1.7.3.recipe
+++ b/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="
diff --git a/app-text/sword/sword-1.7.4.recipe b/app-text/sword/sword-1.7.4.recipe
index d81828d9d..61b008dc6 100644
--- a/app-text/sword/sword-1.7.4.recipe
+++ b/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"
 
diff --git a/app-text/tesseract/tesseract-3.02.02.recipe b/app-text/tesseract/tesseract-3.02.02.recipe
index a7f3481af..4fb2e80e0 100644
--- a/app-text/tesseract/tesseract-3.02.02.recipe
+++ b/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="
diff --git a/app-text/texlive/texlive-2014.recipe b/app-text/texlive/texlive-2014.recipe
index 2ea380479..7c942be0b 100644
--- a/app-text/texlive/texlive-2014.recipe
+++ b/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"
diff --git a/dev-cpp/clucene/clucene-2.3.3.4.recipe b/dev-cpp/clucene/clucene-2.3.3.4.recipe
index 00a91a486..0dd247661 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4.recipe
+++ b/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="
diff --git a/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe b/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
index 48f7ca90f..653d6b2c9 100644
--- a/dev-cpp/yaml_cpp/yaml_cpp-0.5.1.recipe
+++ b/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="
diff --git a/dev-embedded/arduino/arduino-1.0.6.recipe b/dev-embedded/arduino/arduino-1.0.6.recipe
index 391c2001e..c70fe0b87 100644
--- a/dev-embedded/arduino/arduino-1.0.6.recipe
+++ b/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"
 }
diff --git a/dev-embedded/arduino/arduino-1.7.4.recipe b/dev-embedded/arduino/arduino-1.7.4.recipe
index 95067d995..146219347 100644
--- a/dev-embedded/arduino/arduino-1.7.4.recipe
+++ b/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
 
diff --git a/dev-embedded/avrdude/avrdude-6.0.1.recipe b/dev-embedded/avrdude/avrdude-6.0.1.recipe
index 733f54a3a..2b4eff70d 100644
--- a/dev-embedded/avrdude/avrdude-6.0.1.recipe
+++ b/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="
diff --git a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
index 1a6a213fa..0dbc2333c 100644
--- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
+++ b/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="
diff --git a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
index 262ce1b1e..adc4d32bd 100644
--- a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
+++ b/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="
diff --git a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
index 4731d044b..1d2d29729 100644
--- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
+++ b/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"
diff --git a/dev-embedded/lwtools/lwtools-4.10.recipe b/dev-embedded/lwtools/lwtools-4.10.recipe
index 785292484..d480a6d0c 100644
--- a/dev-embedded/lwtools/lwtools-4.10.recipe
+++ b/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="
diff --git a/dev-embedded/sdcc/sdcc-3.4.0.recipe b/dev-embedded/sdcc/sdcc-3.4.0.recipe
index 4d8eb293e..144f11d8f 100644
--- a/dev-embedded/sdcc/sdcc-3.4.0.recipe
+++ b/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="
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.recipe b/dev-embedded/sdcc/sdcc-3.5.0.recipe
index eb0245219..172f8e276 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.recipe
+++ b/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="
diff --git a/dev-embedded/stlink/stlink-1.0.0.recipe b/dev-embedded/stlink/stlink-1.0.0.recipe
index 2cc8ccd6d..58393f24d 100644
--- a/dev-embedded/stlink/stlink-1.0.0.recipe
+++ b/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"
diff --git a/dev-embedded/stm32flash/stm32flash-0.3.recipe b/dev-embedded/stm32flash/stm32flash-0.3.recipe
index 250f1e51b..f44e666d2 100644
--- a/dev-embedded/stm32flash/stm32flash-0.3.recipe
+++ b/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
diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index e7065c003..cbb130af0 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/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="
diff --git a/dev-java/jamvm/jamvm-2.0.0.recipe b/dev-java/jamvm/jamvm-2.0.0.recipe
index 82a6c1eab..b43576857 100644
--- a/dev-java/jamvm/jamvm-2.0.0.recipe
+++ b/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="
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.recipe b/dev-java/rxtx/rxtx-2.2_pre2.recipe
index d167d73cf..a62e9e7d9 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2.recipe
+++ b/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="
diff --git a/dev-lang/fpc/fpc-2.6.2.recipe b/dev-lang/fpc/fpc-2.6.2.recipe
index 59364e6a4..5b3744c99 100644
--- a/dev-lang/fpc/fpc-2.6.2.recipe
+++ b/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="
diff --git a/dev-lang/fpc/fpc_bin-2.6.2.recipe b/dev-lang/fpc/fpc_bin-2.6.2.recipe
index 0cb35dfde..bc7728a41 100644
--- a/dev-lang/fpc/fpc_bin-2.6.2.recipe
+++ b/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="
diff --git a/dev-lang/golang/golang-1.3.recipe b/dev-lang/golang/golang-1.3.recipe
index 7cad66b22..5bd01e329 100644
--- a/dev-lang/golang/golang-1.3.recipe
+++ b/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="
diff --git a/dev-lang/julia/julia-0.3.5.recipe b/dev-lang/julia/julia-0.3.5.recipe
index 18c340598..438865395 100644
--- a/dev-lang/julia/julia-0.3.5.recipe
+++ b/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="
diff --git a/dev-lang/openjdk/openjdk-1.7.u80_b32.recipe b/dev-lang/openjdk/openjdk-1.7.u80_b32.recipe
index bdd32a103..c98244060 100644
--- a/dev-lang/openjdk/openjdk-1.7.u80_b32.recipe
+++ b/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
diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe
index 7178f674b..3c702ef67 100644
--- a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe
+++ b/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
diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
index 4debd4368..d0feddad5 100644
--- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
+++ b/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
diff --git a/dev-lang/ruby/ruby-2.1.5.recipe b/dev-lang/ruby/ruby-2.1.5.recipe
index 63b54a870..ed9d782e7 100644
--- a/dev-lang/ruby/ruby-2.1.5.recipe
+++ b/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="
diff --git a/dev-lang/ruby/ruby-2.2.2.recipe b/dev-lang/ruby/ruby-2.2.2.recipe
index 6bf861bd1..bc5421b19 100644
--- a/dev-lang/ruby/ruby-2.2.2.recipe
+++ b/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="
diff --git a/dev-lang/squirrel/squirrel-3.0.4.recipe b/dev-lang/squirrel/squirrel-3.0.4.recipe
index f9cc5d109..8b1632f1b 100644
--- a/dev-lang/squirrel/squirrel-3.0.4.recipe
+++ b/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="
diff --git a/dev-lang/v8/v8-3.16.1.recipe b/dev-lang/v8/v8-3.16.1.recipe
index f1379c46b..9c28cde7a 100644
--- a/dev-lang/v8/v8-3.16.1.recipe
+++ b/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/.
diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 6405c921a..65fe2e7ef 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/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"	
diff --git a/dev-libs/cloog/cloog-0.18.3.recipe b/dev-libs/cloog/cloog-0.18.3.recipe
index ab6bacbd1..423a63aef 100644
--- a/dev-libs/cloog/cloog-0.18.3.recipe
+++ b/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"
diff --git a/dev-libs/isl/isl-0.13.recipe b/dev-libs/isl/isl-0.13.recipe
index 43d393d91..61bdc6902 100644
--- a/dev-libs/isl/isl-0.13.recipe
+++ b/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="
diff --git a/dev-libs/isl/isl-0.14.recipe b/dev-libs/isl/isl-0.14.recipe
index 91d6fea82..75dfce8d4 100644
--- a/dev-libs/isl/isl-0.14.recipe
+++ b/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="
diff --git a/dev-libs/libburn/libburn-1.3.8.recipe b/dev-libs/libburn/libburn-1.3.8.recipe
index 9569e49ad..46aef8bac 100644
--- a/dev-libs/libburn/libburn-1.3.8.recipe
+++ b/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"
 
diff --git a/dev-libs/libclaw/libclaw-1.7.4.recipe b/dev-libs/libclaw/libclaw-1.7.4.recipe
index 6ad1f2464..f03e6c4a8 100644
--- a/dev-libs/libclaw/libclaw-1.7.4.recipe
+++ b/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="
diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index d6b5ed3fb..69296ed0a 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/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="
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
index 6d53b803e..d8095652f 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe
+++ b/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"
diff --git a/dev-libs/libpagemaker/libpagemaker-0.0.2.recipe b/dev-libs/libpagemaker/libpagemaker-0.0.2.recipe
index 924ba92b5..962cf6a4e 100644
--- a/dev-libs/libpagemaker/libpagemaker-0.0.2.recipe
+++ b/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="
diff --git a/dev-libs/libpurple/libpurple-2.10.11.recipe b/dev-libs/libpurple/libpurple-2.10.11.recipe
index 7c8122e86..8ac7088fa 100644
--- a/dev-libs/libpurple/libpurple-2.10.11.recipe
+++ b/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"
diff --git a/dev-libs/librevenge/librevenge-0.0.0.recipe b/dev-libs/librevenge/librevenge-0.0.0.recipe
index 0f1acb66e..55cb206b1 100644
--- a/dev-libs/librevenge/librevenge-0.0.0.recipe
+++ b/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="
diff --git a/dev-libs/librevenge/librevenge-0.0.1.recipe b/dev-libs/librevenge/librevenge-0.0.1.recipe
index 1723abd0e..dc8af8915 100644
--- a/dev-libs/librevenge/librevenge-0.0.1.recipe
+++ b/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="
diff --git a/dev-libs/libsigc++/libsigc++-2.4.1.recipe b/dev-libs/libsigc++/libsigc++-2.4.1.recipe
index 67643f351..5796f7448 100644
--- a/dev-libs/libsigc++/libsigc++-2.4.1.recipe
+++ b/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="
diff --git a/dev-libs/libuv/libuv-1.2.0.recipe b/dev-libs/libuv/libuv-1.2.0.recipe
index 1aa93758f..fbebf7156 100644
--- a/dev-libs/libuv/libuv-1.2.0.recipe
+++ b/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="
diff --git a/dev-libs/nspr/nspr-4.10.7.recipe b/dev-libs/nspr/nspr-4.10.7.recipe
index 8bcd35a8b..f451886dc 100644
--- a/dev-libs/nspr/nspr-4.10.7.recipe
+++ b/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"
 
diff --git a/dev-libs/nspr/nspr-4.10.8.recipe b/dev-libs/nspr/nspr-4.10.8.recipe
index fa097c302..1907c7ad2 100644
--- a/dev-libs/nspr/nspr-4.10.8.recipe
+++ b/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"
 
diff --git a/dev-libs/nss/nss-3.17.4.recipe b/dev-libs/nss/nss-3.17.4.recipe
index 97cf171a6..984b0dfff 100644
--- a/dev-libs/nss/nss-3.17.4.recipe
+++ b/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="
diff --git a/dev-libs/nss/nss-3.18.recipe b/dev-libs/nss/nss-3.18.recipe
index 0b55d5865..52cacf962 100644
--- a/dev-libs/nss/nss-3.18.recipe
+++ b/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="
diff --git a/dev-libs/nss/nss-3.19.1.recipe b/dev-libs/nss/nss-3.19.1.recipe
index a137bd904..d94be4a2d 100644
--- a/dev-libs/nss/nss-3.19.1.recipe
+++ b/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="
diff --git a/dev-libs/protobuf/protobuf-2.4.1.recipe b/dev-libs/protobuf/protobuf-2.4.1.recipe
index dec68cf76..9d349fb85 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.recipe
+++ b/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="
diff --git a/dev-libs/tinyxml2/tinyxml2-2.2.0.recipe b/dev-libs/tinyxml2/tinyxml2-2.2.0.recipe
index c5a9db60d..611aabc0c 100644
--- a/dev-libs/tinyxml2/tinyxml2-2.2.0.recipe
+++ b/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="
diff --git a/dev-libs/xerces_c/xerces_c-3.1.2.recipe b/dev-libs/xerces_c/xerces_c-3.1.2.recipe
index 9c72c8fa4..ce27b16a2 100644
--- a/dev-libs/xerces_c/xerces_c-3.1.2.recipe
+++ b/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="
diff --git a/dev-python/pygame/pygame-1.9.1.recipe b/dev-python/pygame/pygame-1.9.1.recipe
index 4b9a5a21b..36285cbc0 100644
--- a/dev-python/pygame/pygame-1.9.1.recipe
+++ b/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
diff --git a/dev-qt/automoc/automoc-0.9.88.recipe b/dev-qt/automoc/automoc-0.9.88.recipe
index 6b092d6a2..d8ee3a640 100644
--- a/dev-qt/automoc/automoc-0.9.88.recipe
+++ b/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"
 
diff --git a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
index 238666b12..6b1fe179f 100644
--- a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe
+++ b/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="
diff --git a/dev-qt/libattica/libattica-0.4.2.recipe b/dev-qt/libattica/libattica-0.4.2.recipe
index cbeca7b90..cab7837e5 100644
--- a/dev-qt/libattica/libattica-0.4.2.recipe
+++ b/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="
diff --git a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe
index 201016c2d..084c85184 100644
--- a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe
+++ b/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"
 
diff --git a/dev-qt/libqt4/libqt4-4.8.6.3.recipe b/dev-qt/libqt4/libqt4-4.8.6.3.recipe
index 6c7c11206..bacd10c19 100644
--- a/dev-qt/libqt4/libqt4-4.8.6.3.recipe
+++ b/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="
diff --git a/dev-qt/libqt4/libqt4-4.8.6.4.recipe b/dev-qt/libqt4/libqt4-4.8.6.4.recipe
index 37f3ea6bb..239909cf4 100644
--- a/dev-qt/libqt4/libqt4-4.8.6.4.recipe
+++ b/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="
diff --git a/dev-qt/libqt4/libqt4-4.8.7.recipe b/dev-qt/libqt4/libqt4-4.8.7.recipe
index 1a9ab4bcc..05fadb729 100644
--- a/dev-qt/libqt4/libqt4-4.8.7.recipe
+++ b/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="
diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
index 08c91e29c..501f249ca 100644
--- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
+++ b/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="
diff --git a/dev-qt/qca2/qca2-2.0.3.recipe b/dev-qt/qca2/qca2-2.0.3.recipe
index 392c80072..c430b9f77 100644
--- a/dev-qt/qca2/qca2-2.0.3.recipe
+++ b/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="
diff --git a/dev-qt/qjson/qjson-0.8.1.recipe b/dev-qt/qjson/qjson-0.8.1.recipe
index 41f63e615..b37fccf4d 100644
--- a/dev-qt/qjson/qjson-0.8.1.recipe
+++ b/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"
 
diff --git a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
index 8ca209e0c..93f02ff8a 100644
--- a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe
+++ b/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="
diff --git a/dev-util/astyle/astyle-2.05.recipe b/dev-util/astyle/astyle-2.05.recipe
index 32f599040..c3c8262f7 100644
--- a/dev-util/astyle/astyle-2.05.recipe
+++ b/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/.
diff --git a/dev-util/cmake/cmake-3.0.0.recipe b/dev-util/cmake/cmake-3.0.0.recipe
index 663db9302..122a25e32 100644
--- a/dev-util/cmake/cmake-3.0.0.recipe
+++ b/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"
diff --git a/dev-util/cmake/cmake-3.2.3.recipe b/dev-util/cmake/cmake-3.2.3.recipe
index ba42f2ab0..39685748b 100644
--- a/dev-util/cmake/cmake-3.2.3.recipe
+++ b/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"
diff --git a/dev-util/fenris/fenris-0.07.recipe b/dev-util/fenris/fenris-0.07.recipe
index 72c301158..e04316a44 100644
--- a/dev-util/fenris/fenris-0.07.recipe
+++ b/dev-util/fenris/fenris-0.07.recipe
@@ -42,13 +42,8 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://lcamtuf.coredump.cx/fenris/fenris.tgz"
 CHECKSUM_SHA256="1f9eec0259166428445fa1f241b555e2d5afeeabb6f87f5402deef935ca91092"
 REVISION="1"
-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"
-#fi
-SECONDARY_ARCHITECTURES="!x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	fenris$secondaryArchSuffix = $portVersion compat >= 0.07
diff --git a/dev-util/ninja/ninja-1.5.1.recipe b/dev-util/ninja/ninja-1.5.1.recipe
index 1184d826b..743939778 100644
--- a/dev-util/ninja/ninja-1.5.1.recipe
+++ b/dev-util/ninja/ninja-1.5.1.recipe
@@ -14,12 +14,7 @@ SOURCE_URI="https://github.com/martine/ninja/archive/v1.5.1.tar.gz"
 CHECKSUM_SHA256="fba77b9ed4b4dd0e86c4513776938dc64bd4508dc2055b04c0c6df68bcfa397d"
 PATCHES="ninja-1.5.1.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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/dev-util/premake/premake-4.4.beta5.recipe b/dev-util/premake/premake-4.4.beta5.recipe
index 0b7ba45f3..ef33cb408 100644
--- a/dev-util/premake/premake-4.4.beta5.recipe
+++ b/dev-util/premake/premake-4.4.beta5.recipe
@@ -11,12 +11,7 @@ REVISION="1"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2012 Industrious One, LLC"
 
-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="
diff --git a/dev-util/uncrustify/uncrustify-0.60.recipe b/dev-util/uncrustify/uncrustify-0.60.recipe
index 45e73d850..6ad1b5c01 100644
--- a/dev-util/uncrustify/uncrustify-0.60.recipe
+++ b/dev-util/uncrustify/uncrustify-0.60.recipe
@@ -18,14 +18,7 @@ SOURCE_URI="https://github.com/bengardner/uncrustify/archive/uncrustify-$portVer
 CHECKSUM_SHA256="42c9f84340c5d6a0087037c96b4fe4b46955691e7038700dec98a2e4782b57a3"
 SOURCE_DIR="uncrustify-uncrustify-$portVersion"
 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="
diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe
index 705ba44bf..b45171709 100644
--- a/dev-vcs/bzr/bzr-2.6.0.recipe
+++ b/dev-vcs/bzr/bzr-2.6.0.recipe
@@ -14,13 +14,6 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2013 Canonical"
 
 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
 SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
diff --git a/dev-vcs/cvsps/cvsps-2.2b1.recipe b/dev-vcs/cvsps/cvsps-2.2b1.recipe
index c66b7aac4..edecd6485 100644
--- a/dev-vcs/cvsps/cvsps-2.2b1.recipe
+++ b/dev-vcs/cvsps/cvsps-2.2b1.recipe
@@ -14,12 +14,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz"
 CHECKSUM_SHA256="6906acb3636cdb4a4a9d608111aec22a85530037cb08a62ed5eb74ca0b218f81"
 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="
diff --git a/dev-vcs/rcs/rcs-5.9.4.recipe b/dev-vcs/rcs/rcs-5.9.4.recipe
index ed7aaafb6..263a94c67 100644
--- a/dev-vcs/rcs/rcs-5.9.4.recipe
+++ b/dev-vcs/rcs/rcs-5.9.4.recipe
@@ -14,14 +14,7 @@ LICENSE="GNU GPL v1
 SOURCE_URI="https://ftp.gnu.org/gnu/rcs/rcs-$portVersion.tar.xz"
 CHECKSUM_SHA256="063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff"
 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="
diff --git a/dev-vcs/tig/tig-2.1.recipe b/dev-vcs/tig/tig-2.1.recipe
index 03eb23ae1..36f87e74c 100644
--- a/dev-vcs/tig/tig-2.1.recipe
+++ b/dev-vcs/tig/tig-2.1.recipe
@@ -10,12 +10,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2006-2014 Jonas Fonseca"
 
-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="
diff --git a/games-action/bzflag/bzflag-2.4.2.recipe b/games-action/bzflag/bzflag-2.4.2.recipe
index d1d8f08dd..47fbd65fe 100644
--- a/games-action/bzflag/bzflag-2.4.2.recipe
+++ b/games-action/bzflag/bzflag-2.4.2.recipe
@@ -6,11 +6,8 @@ Silicon Graphics machines and continues to be developed and improved to this day
 "
 HOMEPAGE="http://www.bzflag.org/"
 REVISION="1"
-ARCHITECTURES=""
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture == "x86" ]; then
-	ARCHITECTURES+="x86_gcc2 $ARCHITECTURES"
-fi
 
 SOURCE_URI="http://downloads.sourceforge.net/project/bzflag/bzflag%20source/$portVersion/bzflag-$portVersion.tar.bz2"
 CHECKSUM_SHA256="4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811"
diff --git a/games-action/teeworlds/teeworlds-0.6.3.recipe b/games-action/teeworlds/teeworlds-0.6.3.recipe
index 52a904ec1..9103ad36c 100644
--- a/games-action/teeworlds/teeworlds-0.6.3.recipe
+++ b/games-action/teeworlds/teeworlds-0.6.3.recipe
@@ -7,13 +7,8 @@ design your own maps!"
 LICENSE="Zlib"
 COPYRIGHT="2007-2012 Magnus Auvinen"
 
-ARCHITECTURES="!x86" # Once it works, remove the bang
-if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" # Once it works, remove the bang
-else
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
-fi
-SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" # Once it works, remove the bang on x86
+ARCHITECTURES="!x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="?x86"
 REVISION="1"
 HOMEPAGE="https://www.teeworlds.com"
 SOURCE_URI="https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz"
@@ -30,7 +25,7 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	lib:libGLU$secondaryArchSuffix
 	"
-	
+
 BUILD_REQUIRES="
 	"
 
@@ -46,10 +41,10 @@ BUILD_PREREQUIRES="
 	"
 
 PATCHES="teeworlds-0.6.3.patch"
-	
+
 BUILD()
 {
-	bam release	
+	bam release
 }
 
 INSTALL()
diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe
index e411dc40b..e14ae2f99 100644
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -20,12 +20,7 @@ COPYRIGHT="2006-2009 Brain Games"
 SOURCE_URI="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
 CHECKSUM_SHA256="9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
index 58858714f..82c563bbd 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
@@ -15,12 +15,7 @@ COPYRIGHT="2001-2013 Artsoft Entertainment"
 SOURCE_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz"
 CHECKSUM_SHA256="c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-emulation/advancemame/advancemame-1.3.recipe b/games-emulation/advancemame/advancemame-1.3.recipe
index c50ce6fef..73734c4f4 100644
--- a/games-emulation/advancemame/advancemame-1.3.recipe
+++ b/games-emulation/advancemame/advancemame-1.3.recipe
@@ -9,12 +9,7 @@ CHECKSUM_SHA256="f8c30408d64617f1b737a05c9d3e06cdafc3824e66eee68a2888d63c4e1ecf7
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1996-2006, Nicola Salmoria and the MAME Team"
-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="advancemame-$portVersion.patchset"
diff --git a/games-emulation/atari++/atari++-1.73.recipe b/games-emulation/atari++/atari++-1.73.recipe
index 04a9055d3..5c5f1b3a7 100644
--- a/games-emulation/atari++/atari++-1.73.recipe
+++ b/games-emulation/atari++/atari++-1.73.recipe
@@ -21,14 +21,7 @@ PATCHES="atari++-$portVersion.patch"
 REVISION="1"
 LICENSE="GNU GPL v1"
 
-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="
diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe
index 17da524d8..9f0a7d2a8 100644
--- a/games-emulation/dgen/dgen-1.33.recipe
+++ b/games-emulation/dgen/dgen-1.33.recipe
@@ -15,14 +15,7 @@ SOURCE_DIR="dgen-sdl-$portVersion"
 REVISION="1"
 LICENSE="BSD (2-clause)"
 
-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="
diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe
index 6f9154ac2..efb119a71 100644
--- a/games-emulation/dosbox/dosbox-0.74.recipe
+++ b/games-emulation/dosbox/dosbox-0.74.recipe
@@ -18,12 +18,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2013 The DosBox Team"
 
-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="
diff --git a/games-emulation/fceux/fceux-2.2.2.recipe b/games-emulation/fceux/fceux-2.2.2.recipe
index e8608cf47..376446eb0 100644
--- a/games-emulation/fceux/fceux-2.2.2.recipe
+++ b/games-emulation/fceux/fceux-2.2.2.recipe
@@ -10,14 +10,7 @@ CHECKSUM_SHA256="804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e
 REVISION="1"
 LICENSE="GNU GPL v2"
 
-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="fceux-$portVersion.patch"
diff --git a/games-emulation/mupen64/mupen64-0.5.recipe b/games-emulation/mupen64/mupen64-0.5.recipe
index 1e5c17f17..bff59b53a 100644
--- a/games-emulation/mupen64/mupen64-0.5.recipe
+++ b/games-emulation/mupen64/mupen64-0.5.recipe
@@ -12,14 +12,7 @@ LICENSE="GNU GPL v2"
 
 DISABLE_SOURCE_PACKAGE="YES" # bug in HaikuPorter that makes this fail
 
-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="
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
index be8a26838..547559f44 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
@@ -8,10 +8,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2004 Forgotten"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-emulation/z26/z26-2.16.00s.recipe b/games-emulation/z26/z26-2.16.00s.recipe
index 9b3ba8f2b..aba7edc77 100644
--- a/games-emulation/z26/z26-2.16.00s.recipe
+++ b/games-emulation/z26/z26-2.16.00s.recipe
@@ -9,12 +9,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2004 John Saeger"
 
-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"
 
diff --git a/games-engines/klystron/klystron-0.0.0.recipe b/games-engines/klystron/klystron-0.0.0.recipe
index e3ae911bf..b6faf329c 100644
--- a/games-engines/klystron/klystron-0.0.0.recipe
+++ b/games-engines/klystron/klystron-0.0.0.recipe
@@ -27,14 +27,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2009-2015 Tero Lindeman (kometbomb)"
 
-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"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-engines/love/love-0.9.1.recipe b/games-engines/love/love-0.9.1.recipe
index ec6fa29a0..f0fa05d2c 100644
--- a/games-engines/love/love-0.9.1.recipe
+++ b/games-engines/love/love-0.9.1.recipe
@@ -5,12 +5,7 @@ HOMEPAGE="http://love2d.org/"
 LICENSE="Zlib"
 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://bitbucket.org/rude/love/downloads/love-$portVersion-linux-src.tar.gz"
diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe
index 93e25572a..6873ac84a 100644
--- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe
+++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe
@@ -14,14 +14,7 @@ REVISION="1"
 LICENSE="OSGPL"
 COPYRIGHT="2002-2014 Robert Osfield and others"
 
-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="
diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe
index 0d025fcca..d8b6ab1f0 100644
--- a/games-engines/openscenegraph/openscenegraph-git.recipe
+++ b/games-engines/openscenegraph/openscenegraph-git.recipe
@@ -13,14 +13,7 @@ REVISION="1"
 LICENSE="OSGPL"
 COPYRIGHT="2002-2014 Robert Osfield and others"
 
-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="
diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index a08e84985..290f93daa 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -11,14 +11,7 @@ REVISION="4"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
-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="
diff --git a/games-engines/scummvm/scummvm-1.7.0.recipe b/games-engines/scummvm/scummvm-1.7.0.recipe
index 9d52edf3e..b0b1b19ff 100644
--- a/games-engines/scummvm/scummvm-1.7.0.recipe
+++ b/games-engines/scummvm/scummvm-1.7.0.recipe
@@ -11,14 +11,7 @@ REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2014 ScummVM Team"
 
-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="
diff --git a/games-puzzle/colorcode/colorcode-0.7.2.recipe b/games-puzzle/colorcode/colorcode-0.7.2.recipe
index 54350c04a..da370ebd8 100644
--- a/games-puzzle/colorcode/colorcode-0.7.2.recipe
+++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe
@@ -13,14 +13,7 @@ SOURCE_DIR="ColorCode-0.7.2"
 REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2009-2011 Dirk Laebisch"
-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="
diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe
index c5dd1710f..8fab4c860 100644
--- a/games-puzzle/neverball/neverball-1.5.4.recipe
+++ b/games-puzzle/neverball/neverball-1.5.4.recipe
@@ -10,14 +10,7 @@ SOURCE_URI="http://neverball.org/neverball-1.5.4.tar.gz"
 CHECKSUM_SHA256="ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6"
 PATCHES="neverball-1.5.4.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="
diff --git a/games-puzzle/neverball/neverball-1.6.0.recipe b/games-puzzle/neverball/neverball-1.6.0.recipe
index d531e09f2..762a05efa 100644
--- a/games-puzzle/neverball/neverball-1.6.0.recipe
+++ b/games-puzzle/neverball/neverball-1.6.0.recipe
@@ -10,14 +10,7 @@ SOURCE_URI="http://neverball.org/neverball-$portVersion.tar.gz"
 CHECKSUM_SHA256="73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0"
 PATCHES="neverball-$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"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-puzzle/wizznic/wizznic-0.9.9.recipe b/games-puzzle/wizznic/wizznic-0.9.9.recipe
index 9844ceba2..074d58d62 100644
--- a/games-puzzle/wizznic/wizznic-0.9.9.recipe
+++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe
@@ -12,12 +12,7 @@ CHECKSUM_SHA256="2cf9462177474d7f5bfe95bbc21303ec7031ca86412b587b5e7d3ed531d5b16
 LICENSE="GNU GPL v3"
 COPYRIGHT="2011 Jimmy Christensen"
 REVISION="2"
-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_DIR="wizznic-$portVersion-src"
diff --git a/games-rpg/fheroes2/fheroes2-r3182.recipe b/games-rpg/fheroes2/fheroes2-r3182.recipe
index bb8d93a34..f56e03b2c 100644
--- a/games-rpg/fheroes2/fheroes2-r3182.recipe
+++ b/games-rpg/fheroes2/fheroes2-r3182.recipe
@@ -11,14 +11,7 @@ CHECKSUM_SHA256="1a64dafc5b9e6c37683509f151fa7fdbc6fe0ad95da437a15d275f24b93bda2
 REVISION="1"
 SOURCE_DIR="fheroes-src"
 
-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="fheroes2-r3182.patch"
diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe
index ebc998b6e..79358f80a 100644
--- a/games-rpg/flare/flare-0.19.recipe
+++ b/games-rpg/flare/flare-0.19.recipe
@@ -9,10 +9,7 @@ REVISION="3"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2010-2013 Clint Bellanger"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
index 99dd179e1..3084d9a79 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
@@ -24,10 +24,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2010 The Freedroid team"
 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="
diff --git a/games-simulation/corsix_th/corsix_th-0.30.recipe b/games-simulation/corsix_th/corsix_th-0.30.recipe
index eefc73037..fb1160dcc 100644
--- a/games-simulation/corsix_th/corsix_th-0.30.recipe
+++ b/games-simulation/corsix_th/corsix_th-0.30.recipe
@@ -12,12 +12,7 @@ SOURCE_URI="https://github.com/CorsixTH/CorsixTH/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4947ebdc50b01fde0aca797250d50b9806b9e6f3f4323872fd914f033f4c92e7"
 SOURCE_FILENAME="CorsixTH-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/games-simulation/openttd/openttd-1.5.1.recipe b/games-simulation/openttd/openttd-1.5.1.recipe
index 7c7d1e0f7..8b4ce1ba7 100644
--- a/games-simulation/openttd/openttd-1.5.1.recipe
+++ b/games-simulation/openttd/openttd-1.5.1.recipe
@@ -11,12 +11,7 @@ SOURCE_URI="http://binaries.openttd.org/releases/$portVersion/openttd-$portVersi
 CHECKSUM_SHA256="c98e76e57de213c8d2ccafa4fa2e02b91c031b2487639ccf9b85c725c1428f49"
 PATCHES="openttd-$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="
diff --git a/games-simulation/simutrans/simutrans-120.0.1.recipe b/games-simulation/simutrans/simutrans-120.0.1.recipe
index 7a5cff62f..12f82f1cc 100644
--- a/games-simulation/simutrans/simutrans-120.0.1.recipe
+++ b/games-simulation/simutrans/simutrans-120.0.1.recipe
@@ -13,12 +13,7 @@ COPYRIGHT="1997-2004 Hj. Malthaner
 	2005-2014 The Simutrans Team"
 LICENSE="Artistic"
 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="simutrans-$portVersion.patchset"
 PROVIDES="
diff --git a/games-simulation/simutrans/simutrans-nightly.recipe b/games-simulation/simutrans/simutrans-nightly.recipe
index bf2af2f7c..31bae554b 100644
--- a/games-simulation/simutrans/simutrans-nightly.recipe
+++ b/games-simulation/simutrans/simutrans-nightly.recipe
@@ -17,12 +17,7 @@ COPYRIGHT="1997-2004 Hj. Malthaner
 	2005-2015 The Simutrans Team"
 LICENSE="Artistic"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	simutrans$secondaryArchSuffix = $portVersion
diff --git a/games-simulation/simutrans_pak128/simutrans_pak128-nightly.recipe b/games-simulation/simutrans_pak128/simutrans_pak128-nightly.recipe
index 7aa08eaf7..7a3a94929 100644
--- a/games-simulation/simutrans_pak128/simutrans_pak128-nightly.recipe
+++ b/games-simulation/simutrans_pak128/simutrans_pak128-nightly.recipe
@@ -21,12 +21,7 @@ COPYRIGHT="2004-2007 Tomas Kubes
 	2008-2015 The pak128-Team"
 LICENSE="Artistic"
 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="
diff --git a/games-simulation/simutrans_pak64/simutrans_pak64-nightly.recipe b/games-simulation/simutrans_pak64/simutrans_pak64-nightly.recipe
index f98e5a735..be1e667f9 100644
--- a/games-simulation/simutrans_pak64/simutrans_pak64-nightly.recipe
+++ b/games-simulation/simutrans_pak64/simutrans_pak64-nightly.recipe
@@ -21,12 +21,7 @@ COPYRIGHT="1997-2004 Hj. Malthaner
 	2005-2015 The Simutrans Team"
 LICENSE="Artistic"
 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="
diff --git a/games-sports/xut/xut-0.2.1.recipe b/games-sports/xut/xut-0.2.1.recipe
index 1cc165a24..7ea58b77b 100644
--- a/games-sports/xut/xut-0.2.1.recipe
+++ b/games-sports/xut/xut-0.2.1.recipe
@@ -52,12 +52,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 "
 
-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"
 
 BUILD()
diff --git a/games-strategy/freeciv/freeciv-2.4.3.recipe b/games-strategy/freeciv/freeciv-2.4.3.recipe
index 416af268f..af29b0e12 100644
--- a/games-strategy/freeciv/freeciv-2.4.3.recipe
+++ b/games-strategy/freeciv/freeciv-2.4.3.recipe
@@ -15,14 +15,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://sourceforge.net/projects/freeciv/files/Freeciv%202.4/$portVersion/freeciv-$portVersion.tar.bz2"
 CHECKSUM_SHA256="7f107fe3b09f37934410dc7a64ac1b99a95997ddf53da53933b75d4da79fa899"
 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"
 
 GLOBAL_WRITABLE_FILES="
diff --git a/games-strategy/freeciv/freeciv-2.4.4.recipe b/games-strategy/freeciv/freeciv-2.4.4.recipe
index 1ad3d5cc3..e3e66cb80 100644
--- a/games-strategy/freeciv/freeciv-2.4.4.recipe
+++ b/games-strategy/freeciv/freeciv-2.4.4.recipe
@@ -15,14 +15,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://sourceforge.net/projects/freeciv/files/Freeciv%202.4/$portVersion/freeciv-$portVersion.tar.bz2"
 CHECKSUM_SHA256="7f107fe3b09f37934410dc7a64ac1b99a95997ddf53da53933b75d4da79fa899"
 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"
 
 GLOBAL_WRITABLE_FILES="
diff --git a/games-strategy/freeciv/freeciv-2.5.0.recipe b/games-strategy/freeciv/freeciv-2.5.0.recipe
index 584214107..2a98bf3aa 100644
--- a/games-strategy/freeciv/freeciv-2.5.0.recipe
+++ b/games-strategy/freeciv/freeciv-2.5.0.recipe
@@ -15,14 +15,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://downloads.sourceforge.net/project/freeciv/Freeciv%202.5/$portVersion/freeciv-$portVersion.tar.bz2"
 CHECKSUM_SHA256="bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b"
 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"
 
 GLOBAL_WRITABLE_FILES="
diff --git a/games-strategy/netpanzer/netpanzer-0.8.6.recipe b/games-strategy/netpanzer/netpanzer-0.8.6.recipe
index 10920f401..fb9641a5e 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.6.recipe
+++ b/games-strategy/netpanzer/netpanzer-0.8.6.recipe
@@ -20,12 +20,7 @@ REVISION="1"
 SOURCE_URI="svn://svn.code.sf.net/p/netpanzerfp/code/trunk/netpanzer#1450"
 PATCHES="netpanzer-$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="
diff --git a/games-strategy/uqm/uqm-0.7.0.recipe b/games-strategy/uqm/uqm-0.7.0.recipe
index 925603742..f53cd4ca5 100644
--- a/games-strategy/uqm/uqm-0.7.0.recipe
+++ b/games-strategy/uqm/uqm-0.7.0.recipe
@@ -13,12 +13,7 @@ SOURCE_URI="http://prdownloads.sourceforge.net/sc2/uqm-0.7.0-source.tgz"
 CHECKSUM_SHA256="a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221"
 PATCHES="uqm-$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="
diff --git a/games-strategy/vcmi/vcmi-0.94.recipe b/games-strategy/vcmi/vcmi-0.94.recipe
index 5e5b89f34..7dcff18e7 100644
--- a/games-strategy/vcmi/vcmi-0.94.recipe
+++ b/games-strategy/vcmi/vcmi-0.94.recipe
@@ -12,12 +12,7 @@ CHECKSUM_SHA256="2a1ad60cd64e7d5cb0a9eda11c6bc1cbf8866035f95597e467591c958dfde4d
 COPYRIGHT="2005-2013 VCMI Team"
 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"
 
 PATCHES="vcmi-0.94.patchset"
diff --git a/games-strategy/wesnoth/wesnoth-1.12.2.recipe b/games-strategy/wesnoth/wesnoth-1.12.2.recipe
index d0348ff58..3d1b90da1 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.2.recipe
+++ b/games-strategy/wesnoth/wesnoth-1.12.2.recipe
@@ -26,12 +26,7 @@ REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/wesnoth/files/wesnoth-1.12/wesnoth-$portVersion/wesnoth-$portVersion.tar.bz2"
 CHECKSUM_SHA256="1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b"
 
-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="
diff --git a/games-util/makeobj/makeobj-nightly.recipe b/games-util/makeobj/makeobj-nightly.recipe
index 9e67584b7..fd3ead433 100644
--- a/games-util/makeobj/makeobj-nightly.recipe
+++ b/games-util/makeobj/makeobj-nightly.recipe
@@ -12,12 +12,7 @@ COPYRIGHT="1997-2004 Hj. Malthaner
 	2005-2015 The Simutrans Team"
 LICENSE="Artistic"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	makeobj$secondaryArchSuffix = $portVersion
diff --git a/haiku-apps/beshare/beshare-2.31.recipe b/haiku-apps/beshare/beshare-2.31.recipe
index d937e83dd..a39568c5c 100644
--- a/haiku-apps/beshare/beshare-2.31.recipe
+++ b/haiku-apps/beshare/beshare-2.31.recipe
@@ -24,12 +24,7 @@ SOURCE_URI_2="https://public.msli.com/lcs/muscle/muscle6.11.zip"
 REVISION="1"
 CHECKSUM_SHA256_2="7cf3c92095f46e5a0858852e7d387d11fdf8e1e95a4de26b5e68e8319a373340"
 
-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="
diff --git a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe
index acc90a62e..c631e2d74 100644
--- a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe
+++ b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe
@@ -10,14 +10,7 @@ REVISION="1"
 COPYRIGHT="2010-2014 BurnItNow Team"
 LICENSE="MIT"
 
-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="
diff --git a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
index fde4b7ba7..1bda48187 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe
@@ -5,14 +5,7 @@ COPYRIGHT="2010-2014 Haiku, Inc"
 HOMEPAGE="http://github.com/HaikuArchives/DocumentViewer"
 SOURCE_URI="git://github.com/HaikuArchives/DocumentViewer#4313980"
 REVISION="7"
-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="
diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe
index b293edcc8..173f3036b 100644
--- a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe
+++ b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe
@@ -9,12 +9,7 @@ CHECKSUM_SHA256="bc330cb15c8e10362306eef7d85228f5dee08db667d16a15c0a5245f6013b1e
 SOURCE_DIR="HaikuTwitter-918dd954b6db3c5ed476b3a4826910992f3b4566"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
index 8098439a8..be61ff043 100644
--- a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
+++ b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
@@ -11,12 +11,7 @@ CHECKSUM_SHA256="63b36186eaf4be130f333e62fa0fb283dbff90149a14763e96c157d9950777b
 SOURCE_DIR="ScriptureGuide-$portVersion"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe
index 149043624..ca16ceece 100644
--- a/haiku-apps/torrentor/torrentor-0.0.5.recipe
+++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe
@@ -9,14 +9,7 @@ LICENSE="MIT"
 REVISION="2"
 SOURCE_URI="git+https://github.com/HaikuArchives/Torrentor.git#a04c10fba39c8ba39ffb8ef16c5e67d217231ac6"
 
-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="
diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe
index 4afe2083f..50cfb0ec4 100644
--- a/haiku-apps/whisper/whisper-1.2.recipe
+++ b/haiku-apps/whisper/whisper-1.2.recipe
@@ -9,7 +9,7 @@ LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="git+https://github.com/HaikuArchives/WhisperBeNet#902635a"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 !x86 ?x86_64"
 
 PROVIDES="
 	whisper = $portVersion
@@ -40,7 +40,7 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir
-	
+
 	cd build
 	cp Whisper $appsDir
 	addAppDeskbarSymlink $appsDir/Whisper
diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
index f0605490c..f55468ba0 100644
--- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
+++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
@@ -19,17 +19,13 @@ change most of an objects properties later on. This could be called \
 non-destructive editing, because adding another object (like a filter) does \
 not actually destroy any pixel data.
 "
-HOMEPAGE="http://yellowbites.com/wonderbrush.html" 
+HOMEPAGE="http://yellowbites.com/wonderbrush.html"
 LICENSE="WonderBrush"
 COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR"
 SOURCE_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive"
 CHECKSUM_SHA256="d0e9fad818c3f7900a475b80a249c9aa4eb118dc8498a6370a87e7a10fa42067"
 REVISION="5"
-ARCHITECTURES="x86_gcc2"
-if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
-then
-	ARCHITECTURES="$ARCHITECTURES x86"
-fi
+ARCHITECTURES="x86_gcc2 !x86"
 SECONDARY_ARCHITECTURES="x86_gcc2"
 DISABLE_SOURCE_PACKAGE=yes
 
diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe
index 5ea145157..a33e5fd3d 100644
--- a/haiku-games/puri/puri-0.3.9.1.recipe
+++ b/haiku-games/puri/puri-0.3.9.1.recipe
@@ -11,12 +11,7 @@ SOURCE_DIR="puri-master-of-chess-puri"
 SOURCE_FILENAME="puri-$portVersion.tar.gz"
 
 ARCHITECTURES="?x86 ?x86_64"
-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"
 
 PROVIDES="
 	Puri$secondaryArchSuffix = $portVersion
diff --git a/haiku-games/superfreecell/superfreecell-0.1.0.recipe b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
index acf06ddea..756a7b95b 100644
--- a/haiku-games/superfreecell/superfreecell-0.1.0.recipe
+++ b/haiku-games/superfreecell/superfreecell-0.1.0.recipe
@@ -10,9 +10,6 @@ COPYRIGHT="2014-2015 Adrián Arroyo Calle"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -44,6 +41,6 @@ INSTALL()
 {
 	mkdir -p $appsDir
 	cp SuperFreeCell $appsDir/SuperFreeCell
-	
+
 	addAppDeskbarSymlink $appsDir/SuperFreeCell
 }
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
index 7832c928d..a1c1f1240 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
@@ -16,12 +16,7 @@ LICENSE="
 SOURCE_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2"
 CHECKSUM_SHA256="5df4e69bf765fffc030c431f5af9b3b285fe747cb9d355ef4657d461e025b245"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="haikuwebkit-1.1.3_2013_08_09.patchset"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe
index c8e1ed8a0..3955e6337 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe
@@ -15,12 +15,7 @@ LICENSE="
 	"
 SOURCE_URI="git+https://github.com/haiku/haiku-webkit.git#0a2867a628bbe7cf59127b49b7d66b661eac961c"
 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="
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
index 32298a875..840f84d58 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
@@ -15,12 +15,7 @@ LICENSE="
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.0-Source.tar.bz2"
 CHECKSUM_SHA256="b840d22eaf76f4b8fb14aa18e140a80abc0d58fa3c14694c978374c8fb4383d7"
 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="
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
index 12c24bef4..e0db2b737 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
@@ -15,12 +15,7 @@ LICENSE="
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.1-Source.tar.bz2"
 CHECKSUM_MD5="9b5624345b633693ec90a95a1e9e52bf"
 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="
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
index 03a3fdb77..9e0ca80bf 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
@@ -15,12 +15,7 @@ LICENSE="
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.2-Source.tar.bz2"
 CHECKSUM_SHA256="50688a5f78cbcc80dc2ec512effbcde36295560d2bbec0efaa9e0c679f303a42"
 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="haikuwebkit-1.2.2.patchset"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
index cc5053315..6a0c2a387 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/1.2.3.tar.gz"
 CHECKSUM_SHA256="4784781c36dfbf7d09fb41bedbe3777bdd216c5a25ed77463c49a8120c1777a1"
 SOURCE_FILENAME="haikuwebkit-1.2.3.tar.gz"
 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="
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
index f8dc4cc8c..9f199b45e 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="891df5f95ad796c86691267912739ef774de0222073f9f8bfc91523a082eab49"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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="
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
index 8128dfbb6..6701d2d1e 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="751a4818c017deafb0b872e1ba83e6473ddcc7bbab278618acb1b99686a6b646"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
index 6c00bd9bd..e8bb478ee 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="6466ca02d5f1bd3632bcfff5451af8fae15f62696afba1231e11ac10a961449c"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
index 9ff929327..a96771926 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="a1992fd1001d85d431b469addf62451eccd8d491c14a82b1a4fd478c731aa41d"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
 
 
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
index 34615f339..64031d5c6 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="9f620ab0c2e65a543f7976421e1a9dbc059c8a3dc7b8766860732792cdddd6bf"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
 
 
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe
index 1969fb765..baf1fad7f 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="32f2b2a000253ac0127bf7347fd239db3692176cd80246bf32275b3340165f7f"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
 
 # TODO see if this is still needed.
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe
index dc6bbfef0..2f354299f 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="2fcd29738e32a191f16805a94a36da1a60074d10830be77ca5e052ce779cc683"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.10.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.10.recipe
index 77a7a19c1..60521e3f6 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.10.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.10.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 CHECKSUM_SHA256="287fe1796a640b32721d47adc568f488e6aa496f997c06be51fa0a9d37de63f0"
 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 [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.11.recipe
index df8a0380a..f610a9d73 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.11.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.11.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 CHECKSUM_SHA256="7486e7bf1a22b35fcc319a1c1bdb6682d0bb3d421c0fbf670e551f16296c2ba0"
 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 [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe
index 6cfc3901e..4e796df9f 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="53f45f6411d2b5e377209254229f5273979bdb5185cc613a19e2020cc0b0fbf7"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe
index 24eea8bcf..a028c98e0 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="0bc738691a87661d2e601f13e7f86a379bc00c20ec9a6130923e9b9c56d06cd5"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe
index cf5ee7806..70cd350c1 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="933912bcef0cd5d4d74faa4315b96baf63973b5a2de169c1247c61ea66d23f8e"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe
index 959b735d7..75c505be8 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 CHECKSUM_SHA256="0ddb77e3c4a2f927b25615209f90d5d26472c28db0550c40e364bdc658a30f99"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe
index 98ae24c51..fc3f819c5 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 CHECKSUM_SHA256="436bab32fa760a3bbc64ba40f33cc38dddd8b04ff7989a42bb87287ce80bc66e"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe
index 4d277e26d..681021803 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 CHECKSUM_SHA256="ccec934f64f88e4b46d20cc83e41bfbd028f194264d841b5428d865b6ee0ab37"
 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 [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe
index 01336b2cc..fe802ed7d 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="a8ecce6a38af093113e03b437da1a3ea7bf075172fbc0e580da2a0b4a4da37e6"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.9.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.9.recipe
index 0b32fc147..eb2323dbd 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.9.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.9.recipe
@@ -16,12 +16,7 @@ SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="c5ddc561fa965cc13515bc353f57b7816b5b1281cd11c30afc9963e279277880"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 if [ $effectiveTargetArchitecture == x86_64 ]; then
diff --git a/kde-base/marble/marble-1.9.2.recipe b/kde-base/marble/marble-1.9.2.recipe
index 13b5e6c91..e63b65735 100644
--- a/kde-base/marble/marble-1.9.2.recipe
+++ b/kde-base/marble/marble-1.9.2.recipe
@@ -15,12 +15,7 @@ REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2007-2014 by the authors of Marble Virtual Globe"
 
-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="
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
index d5fd27c67..d3920cdf7 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe
+++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
@@ -19,14 +19,7 @@ CHECKSUM_SHA256="e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2
 COPYRIGHT="2002-2012 by Joachim Eibl"
 LICENSE="GNU GPL v2"
 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"
 
 PROVIDES="
diff --git a/media-gfx/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.24.recipe
index 7e1c951af..478f35188 100644
--- a/media-gfx/exiv2/exiv2-0.24.recipe
+++ b/media-gfx/exiv2/exiv2-0.24.recipe
@@ -11,12 +11,7 @@ SOURCE_URI="http://www.exiv2.org/exiv2-0.24.tar.gz"
 CHECKSUM_SHA256="f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e"
 PATCHES="exiv2-0.24.patch"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
-else
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 
diff --git a/media-gfx/fontforge/fontforge-20141126.recipe b/media-gfx/fontforge/fontforge-20141126.recipe
index 9ac9f96af..f485d95fa 100644
--- a/media-gfx/fontforge/fontforge-20141126.recipe
+++ b/media-gfx/fontforge/fontforge-20141126.recipe
@@ -13,12 +13,7 @@ SOURCE_FILENAME="fontforge-$portVersion.tar.gz"
 CHECKSUM_SHA256="853d52c36d2da8a80c64def2483ddd9f79a028ec8fcea41ae46a7df2cc2cd38f"
 #PATCHES="fontforge-$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="
diff --git a/media-gfx/graphite2/graphite2-1.2.4.recipe b/media-gfx/graphite2/graphite2-1.2.4.recipe
index 060ef0aec..c073bd20e 100644
--- a/media-gfx/graphite2/graphite2-1.2.4.recipe
+++ b/media-gfx/graphite2/graphite2-1.2.4.recipe
@@ -10,14 +10,7 @@ SOURCE_URI="http://dev-www.libreoffice.org/src/graphite2-$portVersion.tgz"
 CHECKSUM_SHA256="4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003"
 PATCHES="graphite2-$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"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
diff --git a/media-gfx/librecad/librecad-2.0.7.recipe b/media-gfx/librecad/librecad-2.0.7.recipe
index 2ff833348..8a7267411 100644
--- a/media-gfx/librecad/librecad-2.0.7.recipe
+++ b/media-gfx/librecad/librecad-2.0.7.recipe
@@ -10,12 +10,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2015 LibreCAD"
 
-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="
diff --git a/media-libs/audiofile/audiofile-0.3.6.recipe b/media-libs/audiofile/audiofile-0.3.6.recipe
index 385cb87ec..055939dd2 100644
--- a/media-libs/audiofile/audiofile-0.3.6.recipe
+++ b/media-libs/audiofile/audiofile-0.3.6.recipe
@@ -33,12 +33,7 @@ REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2013 Michael Pruett, Chris Pirazzi, Scott Porter, Doug Scott"
 ARCHITECTURES="x86 x86_64"
-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"
 
 SOURCE_URI="http://audiofile.68k.org/audiofile-0.3.6.tar.gz"
 CHECKSUM_SHA256="cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965"
diff --git a/media-libs/bpg/bpg-0.9.4.recipe b/media-libs/bpg/bpg-0.9.4.recipe
index 002b24930..1dc480765 100644
--- a/media-libs/bpg/bpg-0.9.4.recipe
+++ b/media-libs/bpg/bpg-0.9.4.recipe
@@ -16,14 +16,7 @@ CHECKSUM_SHA256="9986d66408f36fb678014bfcbb693c0f8358767719bc05797e4af54fa4237c2
 SOURCE_DIR="libbpg-$portVersion"
 
 REVISION="1"
-ARCHITECTURES="x86 ?x86_64"
-# libbpg requires gcc4, so we can only do x86_gcc2 if it's a hybrid
-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="
diff --git a/media-libs/dumb/dumb-0.9.3.recipe b/media-libs/dumb/dumb-0.9.3.recipe
index 3f418d769..f933c9def 100644
--- a/media-libs/dumb/dumb-0.9.3.recipe
+++ b/media-libs/dumb/dumb-0.9.3.recipe
@@ -9,14 +9,7 @@ SOURCE_URI_2="http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.g
 CHECKSUM_SHA256_2="9e3fa1e0932e00e31f2314cefb3ea0343ee4f850b6a8e6a6a9627a35b2dc0dbd"
 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="
diff --git a/media-libs/gosu/gosu-0.8.7.2.recipe b/media-libs/gosu/gosu-0.8.7.2.recipe
index 757bda229..629ece933 100644
--- a/media-libs/gosu/gosu-0.8.7.2.recipe
+++ b/media-libs/gosu/gosu-0.8.7.2.recipe
@@ -8,13 +8,8 @@ Gosu only provides basic building blocks:
 "
 REVISION="1"
 HOMEPAGE="http://www.libgosu.org/"
-ARCHITECTURES="x86_gcc2"
-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"
+ARCHITECTURES="!x86_gcc2"
+SECONDARY_ARCHITECTURES="!x86"
 SOURCE_URI="https://github.com/jlnr/gosu/archive/v$portVersion.tar.gz"
 #CHECKSUM_SHA256="e24c2d75409ea6d7b8bd476540e187fe7ab06aef84844450ec1183cf3bd3f953"
 LICENSE="MIT"
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.40.recipe b/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
index bd0661b0a..c9e7ae989 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
+++ b/media-libs/harfbuzz/harfbuzz-0.9.40.recipe
@@ -19,12 +19,7 @@ COPYRIGHT="
 SOURCE_URI="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2"
 CHECKSUM_SHA256="1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f"
 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="harfbuzz-$portVersion.patchset"
diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe
index 26b0aa32f..90588839f 100644
--- a/media-libs/ilmbase/ilmbase-2.1.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe
@@ -14,14 +14,7 @@ SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.1.0.t
 CHECKSUM_SHA256="1e841ad89c5761940b07a125e6909ad22fe9fe0f99eadef45e0cca4efc6819b4"
 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="ilmbase-2.1.0.patch"
diff --git a/media-libs/ilmbase/ilmbase-2.2.0.recipe b/media-libs/ilmbase/ilmbase-2.2.0.recipe
index b7fce470e..499dae349 100644
--- a/media-libs/ilmbase/ilmbase-2.2.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.2.0.recipe
@@ -14,14 +14,7 @@ SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVe
 CHECKSUM_SHA256="ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7"
 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="
diff --git a/media-libs/lcms/lcms-2.7.recipe b/media-libs/lcms/lcms-2.7.recipe
index 70316617a..cf0673a8c 100644
--- a/media-libs/lcms/lcms-2.7.recipe
+++ b/media-libs/lcms/lcms-2.7.recipe
@@ -14,14 +14,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2007 Marti Maria"
 
-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"
 
 
diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe
index ec852c983..a9e17442f 100644
--- a/media-libs/leptonica/leptonica-1.69.recipe
+++ b/media-libs/leptonica/leptonica-1.69.recipe
@@ -14,12 +14,7 @@ LICENSE="BSD (2-clause)"
 COPYRIGHT="2001-2012 Dan Bloomberg"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
-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"
 
 PROVIDES="
 	leptonica$secondaryArchSuffix = $portVersion
diff --git a/media-libs/libaacs/libaacs-0.8.1.recipe b/media-libs/libaacs/libaacs-0.8.1.recipe
index 56662eab0..4b1d9cfea 100644
--- a/media-libs/libaacs/libaacs-0.8.1.recipe
+++ b/media-libs/libaacs/libaacs-0.8.1.recipe
@@ -16,12 +16,7 @@ COPYRIGHT="
 	"
 LICENSE="GNU LGPL v2.1"
 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="
diff --git a/media-libs/libbdplus/libbdplus-0.1.1.recipe b/media-libs/libbdplus/libbdplus-0.1.1.recipe
index 7ea1abada..5202d9c57 100644
--- a/media-libs/libbdplus/libbdplus-0.1.1.recipe
+++ b/media-libs/libbdplus/libbdplus-0.1.1.recipe
@@ -9,12 +9,7 @@ COPYRIGHT="2011-2013 VideoLAN"
 LICENSE="GNU LGPL v2.1"
 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="
diff --git a/media-libs/libbluray/libbluray-0.8.1.recipe b/media-libs/libbluray/libbluray-0.8.1.recipe
index 5b68a60b3..e78a1b5f8 100644
--- a/media-libs/libbluray/libbluray-0.8.1.recipe
+++ b/media-libs/libbluray/libbluray-0.8.1.recipe
@@ -10,12 +10,7 @@ LICENSE="GNU LGPL v2.1"
 SOURCE_URI="http://ftp.videolan.org/pub/videolan/libbluray/$portVersion/libbluray-$portVersion.tar.bz2"
 CHECKSUM_SHA256="cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f"
 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="
diff --git a/media-libs/libcdr/libcdr-0.1.1.recipe b/media-libs/libcdr/libcdr-0.1.1.recipe
index 30bc31948..27fa51f53 100644
--- a/media-libs/libcdr/libcdr-0.1.1.recipe
+++ b/media-libs/libcdr/libcdr-0.1.1.recipe
@@ -8,12 +8,7 @@ REVISION="1"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libcdr/libcdr-$portVersion.tar.bz2"
 CHECKSUM_SHA256="72fe7bbbf2275242acdf67ad2f9b6c71ac9146a56c409def360dabcac5695b49"
 
-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="
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe
index be57bf062..73c94c1b9 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe
+++ b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe
@@ -17,11 +17,6 @@ SOURCE_URI="http://download.videolan.org/pub/libdvbpsi/$portVersion/libdvbpsi-$p
 CHECKSUM_SHA256="36d9b233306e48b58999e87864253b564e20932ed46a485e44ef7058f1f927e8"
 REVISION="1"
 ARCHITECTURES="x86 x86_64 x86_gcc2"
-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"
 
 PATCHES="libdvbpsi-$portVersion.patchset"
diff --git a/media-libs/libfreehand/libfreehand-0.1.0.recipe b/media-libs/libfreehand/libfreehand-0.1.0.recipe
index bd5b559bf..f5b021654 100644
--- a/media-libs/libfreehand/libfreehand-0.1.0.recipe
+++ b/media-libs/libfreehand/libfreehand-0.1.0.recipe
@@ -9,12 +9,7 @@ SOURCE_URI="http://dev-www.libreoffice.org/src/libfreehand/libfreehand-$portVers
 
 CHECKSUM_SHA256="c69962d5947561afeefeee71bc78ba7419e9d9b0fea8bcef2f625be867afe307"
 
-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="
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
index 33a0fbcd2..2516452f9 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
@@ -9,12 +9,7 @@ HOMEPAGE="https://code.google.com/p/mp4v2/"
 LICENSE="MPL v1.1"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="https://mp4v2.googlecode.com/files/mp4v2-$portVersion.tar.bz2"
diff --git a/media-libs/libmpdclient/libmpdclient-2.10_git.recipe b/media-libs/libmpdclient/libmpdclient-2.10_git.recipe
index df91921e5..732ea2713 100644
--- a/media-libs/libmpdclient/libmpdclient-2.10_git.recipe
+++ b/media-libs/libmpdclient/libmpdclient-2.10_git.recipe
@@ -10,14 +10,7 @@ SOURCE_URI="git://git.musicpd.org/master/libmpdclient.git#cc2ffe943dd36a4c95ec34
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2003-2014 The Music Player Daemon Project"
 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="
diff --git a/media-libs/libraw/libraw-0.16.2.recipe b/media-libs/libraw/libraw-0.16.2.recipe
index bb326f68d..d5a3751f5 100644
--- a/media-libs/libraw/libraw-0.16.2.recipe
+++ b/media-libs/libraw/libraw-0.16.2.recipe
@@ -18,12 +18,7 @@ LICENSE="
 SOURCE_URI="http://www.libraw.org/data/LibRaw-$portVersion.tar.gz"
 CHECKSUM_SHA256="6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187"
 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="LibRaw-$portVersion"
 
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
index 3e6a22281..118316336 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
+++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe
@@ -15,14 +15,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://www.mega-nerd.com/SRC/libsamplerate-$portVersion.tar.gz"
 CHECKSUM_SHA256="93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06"
 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"
 
 PATCHES="libsamplerate-$portVersion.patchset"
diff --git a/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe b/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe
index bad05aa79..0aba42260 100644
--- a/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe
+++ b/media-libs/libsoundtouch/libsoundtouch-1.8.0.recipe
@@ -14,12 +14,7 @@ HOMEPAGE="http://www.surina.net/soundtouch"
 LICENSE="GNU LGPL v2.1"
 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="http://www.surina.net/soundtouch/soundtouch-$portVersion.tar.gz"
diff --git a/media-libs/libvisio/libvisio-0.0.31.recipe b/media-libs/libvisio/libvisio-0.0.31.recipe
index b888467cb..a4821359e 100644
--- a/media-libs/libvisio/libvisio-0.0.31.recipe
+++ b/media-libs/libvisio/libvisio-0.0.31.recipe
@@ -18,12 +18,7 @@ COPYRIGHT="
 REVISION="2"
 CHECKSUM_SHA256="4805b530eb79a9817d5daa3f069ef24959f439c0c0c80f12d30f9bc67b00cf90"
 
-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="
diff --git a/media-libs/libvisio/libvisio-0.1.0.recipe b/media-libs/libvisio/libvisio-0.1.0.recipe
index 3766b7010..b349acf91 100644
--- a/media-libs/libvisio/libvisio-0.1.0.recipe
+++ b/media-libs/libvisio/libvisio-0.1.0.recipe
@@ -11,12 +11,7 @@ REVISION="2"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libvisio/libvisio-$portVersion.tar.bz2"
 CHECKSUM_SHA256="12383fcf39098ed0685a595d43e466dbc6222ee289e6f4e5e006e232973debee"
 
-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="
diff --git a/media-libs/opencolorio/opencolorio-1.0.9.recipe b/media-libs/opencolorio/opencolorio-1.0.9.recipe
index d0fecbac6..d4ed1a947 100644
--- a/media-libs/opencolorio/opencolorio-1.0.9.recipe
+++ b/media-libs/opencolorio/opencolorio-1.0.9.recipe
@@ -17,12 +17,7 @@ SOURCE_FILENAME="opencolorio-$portVersion.tar.gz"
 CHECKSUM_SHA256="27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
-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"
 
 PATCHES="opencolorio-$portVersion.patchset"
 
diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe
index 462785ef5..152fe9878 100644
--- a/media-libs/openexr/openexr-2.1.0.recipe
+++ b/media-libs/openexr/openexr-2.1.0.recipe
@@ -14,14 +14,7 @@ SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-2.1.0.t
 CHECKSUM_SHA256="54486b454073c1dcb5ae9892cf0f730ffefe62f38176325281505093fd218a14"
 PATCHES="openexr-2.1.0.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="
diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe
index ced0878f4..ab1400334 100644
--- a/media-libs/openexr/openexr-2.2.0.recipe
+++ b/media-libs/openexr/openexr-2.2.0.recipe
@@ -13,14 +13,7 @@ REVISION="1"
 SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz"
 CHECKSUM_SHA256="36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231"
 
-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="
diff --git a/media-libs/openimageio/openimageio-1.5.15.recipe b/media-libs/openimageio/openimageio-1.5.15.recipe
index 87c435886..e9eb16444 100644
--- a/media-libs/openimageio/openimageio-1.5.15.recipe
+++ b/media-libs/openimageio/openimageio-1.5.15.recipe
@@ -16,12 +16,7 @@ SOURCE_DIR="oiio-Release-$portVersion"
 PATCHES="openimageio-1.5.15.patchset"
 
 ARCHITECTURES="x86 x86_64"
-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"
 
 PROVIDES="
 	openimageio$secondaryArchSuffix = $portVersion compat >= 1.5
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe
index 59998b945..5925bc597 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.recipe
+++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe
@@ -20,14 +20,7 @@ SOURCE_URI="http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz"
 CHECKSUM_SHA256="c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace"
 SOURCE_DIR="openjpeg-1.5.0"
 
-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="
diff --git a/media-libs/sbc/sbc-1.3.recipe b/media-libs/sbc/sbc-1.3.recipe
index 33b088801..9ecee8637 100644
--- a/media-libs/sbc/sbc-1.3.recipe
+++ b/media-libs/sbc/sbc-1.3.recipe
@@ -21,12 +21,7 @@ SOURCE_URI="http://www.kernel.org/pub/linux/bluetooth/sbc-$portVersion.tar.gz"
 CHECKSUM_SHA256="4a358581fb57b98e0c1c34606a35343f31f908f57c26659e51495f75e283785d"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
-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"
 
 PATCHES="sbc-$portVersion.patchset"
 
diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe
index 8bdd6d8ec..f42f8a0ed 100644
--- a/media-libs/taglib/taglib-1.9.1.recipe
+++ b/media-libs/taglib/taglib-1.9.1.recipe
@@ -15,12 +15,7 @@ LICENSE="
 	"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe
index d14692e1b..5ab45c2d8 100644
--- a/media-libs/x264/x264-20140308.recipe
+++ b/media-libs/x264/x264-20140308.recipe
@@ -10,12 +10,7 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2"
 CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe"
 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="x264-$portVersion.patchset"
diff --git a/media-libs/x265/x265-1.7.recipe b/media-libs/x265/x265-1.7.recipe
index e6a604159..ae83c552a 100644
--- a/media-libs/x265/x265-1.7.recipe
+++ b/media-libs/x265/x265-1.7.recipe
@@ -11,13 +11,8 @@ COPYRIGHT="2013-2014 x265 Project"
 SOURCE_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2"
 CHECKSUM_SHA256="133dd4d7121116e75c1664e2295d61c36dee7569718a714f37caefc5a1a521db"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 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
 
 # BitBucket sucks
 SOURCE_DIR='multicoreware-x265-8425278def1e'
diff --git a/media-sound/lmms/lmms-1.2.0_git.recipe b/media-sound/lmms/lmms-1.2.0_git.recipe
index 980593dd2..9d21a9601 100644
--- a/media-sound/lmms/lmms-1.2.0_git.recipe
+++ b/media-sound/lmms/lmms-1.2.0_git.recipe
@@ -14,12 +14,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2004-2014 Tobias Doerffel et al."
 
-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="
diff --git a/media-sound/mpc/musicpc-0.26.recipe b/media-sound/mpc/musicpc-0.26.recipe
index d758dfe77..503044a6c 100644
--- a/media-sound/mpc/musicpc-0.26.recipe
+++ b/media-sound/mpc/musicpc-0.26.recipe
@@ -11,14 +11,7 @@ CHECKSUM_SHA256="20735f7173cce56bec50c1d8b4633751052dc68365b29a6113206dc1cdc6e24
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2014 The Music Player Daemon Project"
 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="
diff --git a/media-sound/mpd/mpd-0.18.12_git.recipe b/media-sound/mpd/mpd-0.18.12_git.recipe
index 23405ed02..f57773450 100644
--- a/media-sound/mpd/mpd-0.18.12_git.recipe
+++ b/media-sound/mpd/mpd-0.18.12_git.recipe
@@ -10,14 +10,7 @@ SOURCE_URI="git://git.musicpd.org/master/mpd.git#e0ca4347beb2e2e7235e16c4555d426
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2014 The Music Player Daemon Project"
 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="
diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe
index fa8bbb5b8..52cbce52e 100644
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -10,14 +10,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
 ##		media-libs/flac >= 1.2.1"
 ## ncurses zlib ... cf. ocp.spec
 
-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="
diff --git a/media-sound/protrekkr/protrekkr-2.5.4.recipe b/media-sound/protrekkr/protrekkr-2.5.4.recipe
index b5ef422dc..159105e35 100644
--- a/media-sound/protrekkr/protrekkr-2.5.4.recipe
+++ b/media-sound/protrekkr/protrekkr-2.5.4.recipe
@@ -13,12 +13,7 @@ Based on Juan Antonio Arguelles Rius's NoiseTrekker.
 LICENSE="BSD (3-clause)"
 SOURCE_URI="svn+http://protrekkr.googlecode.com/svn/trunk/#670"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/media-sound/schismtracker/schismtracker-20120105.recipe b/media-sound/schismtracker/schismtracker-20120105.recipe
index f76cb7cc8..af66c8317 100644
--- a/media-sound/schismtracker/schismtracker-20120105.recipe
+++ b/media-sound/schismtracker/schismtracker-20120105.recipe
@@ -17,12 +17,7 @@ SOURCE_URI="http://schismtracker.org/dl/schismtracker-20120105.tar.bz2"
 PATCHES="schismtracker-$portVersion.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="
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.recipe b/media-video/ffmpeg/ffmpeg-2.6.3.recipe
index c089ecb27..dc7f96dac 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.recipe
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.recipe
@@ -11,14 +11,7 @@ SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2"
 CHECKSUM_SHA256="59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb"
 SOURCE_DIR="ffmpeg-$portVersion"
 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="
diff --git a/media-video/ffmpeg/ffmpeg-2.7.2.recipe b/media-video/ffmpeg/ffmpeg-2.7.2.recipe
index e5fb41f83..8c2f6a1aa 100644
--- a/media-video/ffmpeg/ffmpeg-2.7.2.recipe
+++ b/media-video/ffmpeg/ffmpeg-2.7.2.recipe
@@ -11,14 +11,7 @@ SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2"
 CHECKSUM_SHA256="7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2"
 SOURCE_DIR="ffmpeg-$portVersion"
 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="
diff --git a/media-video/mpv/mpv-0.9.1.recipe b/media-video/mpv/mpv-0.9.1.recipe
index c262a2d83..d00cf39af 100644
--- a/media-video/mpv/mpv-0.9.1.recipe
+++ b/media-video/mpv/mpv-0.9.1.recipe
@@ -9,12 +9,7 @@ REVISION="1"
 SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.zip"
 CHECKSUM_SHA256="59994bf2da9b7c617c98a6188a40a507b9b09badcfb8d99a4f68b0ba327b3d6e"
 
-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="
diff --git a/media-video/qmplay2/qmplay2-15.05.30.recipe b/media-video/qmplay2/qmplay2-15.05.30.recipe
index 1dca61388..aa0968635 100644
--- a/media-video/qmplay2/qmplay2-15.05.30.recipe
+++ b/media-video/qmplay2/qmplay2-15.05.30.recipe
@@ -10,12 +10,7 @@ REVISION="2"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2010-2015 Błażej Szczygieł"
 
-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="
diff --git a/media-video/rtmpdump/rtmpdump-2.4_git.recipe b/media-video/rtmpdump/rtmpdump-2.4_git.recipe
index 61a33ab2e..3085a924c 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_git.recipe
+++ b/media-video/rtmpdump/rtmpdump-2.4_git.recipe
@@ -14,14 +14,7 @@ REVISION="1"
 SOURCE_URI="git://git.ffmpeg.org/rtmpdump#a1900c3e152085406ecb87c1962c55ec9c6e4016"
 PATCHES="rtmpdump-2.4_git.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="
diff --git a/media-video/vlc/vlc-2.2.1.recipe b/media-video/vlc/vlc-2.2.1.recipe
index 826ec9df5..53dc42c2b 100644
--- a/media-video/vlc/vlc-2.2.1.recipe
+++ b/media-video/vlc/vlc-2.2.1.recipe
@@ -10,12 +10,7 @@ SOURCE_URI="http://download.videolan.org/pub/videolan/vlc/2.2.1/vlc-2.2.1.tar.xz
 CHECKSUM_SHA256="543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb"
 PATCHES="vlc-2.2.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"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe
index 905b4fcd1..22862b2c9 100644
--- a/net-dialup/minicom/minicom-2.6.2.recipe
+++ b/net-dialup/minicom/minicom-2.6.2.recipe
@@ -6,12 +6,7 @@ LICENSE="GNU GPL v2"
 REVISION="1"
 
 ARCHITECTURES="x86 x86_64"
-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"
 
 SOURCE_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz"
 CHECKSUM_SHA256="f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168"
diff --git a/net-im/vacuum/vacuum-1.2.5.recipe b/net-im/vacuum/vacuum-1.2.5.recipe
index 392ef3a97..11982b58e 100644
--- a/net-im/vacuum/vacuum-1.2.5.recipe
+++ b/net-im/vacuum/vacuum-1.2.5.recipe
@@ -9,12 +9,7 @@ REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2008-2015 Vacuum Team"
 
-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"
 
diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe
index 104840041..b9caccf48 100644
--- a/net-irc/quassel/quassel-0.10.0.recipe
+++ b/net-irc/quassel/quassel-0.10.0.recipe
@@ -19,12 +19,7 @@ SOURCE_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2"
 CHECKSUM_SHA256="68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23"
 PATCHES="quassel-0.9.2.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"
 
diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index b676eea1a..f9709a7d0 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -18,12 +18,7 @@ REVISION="3"
 SOURCE_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
 CHECKSUM_SHA256="f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0"
 
-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"
 
diff --git a/net-libs/gloox/gloox-1.0.13.recipe b/net-libs/gloox/gloox-1.0.13.recipe
index 16bf0f388..24810ca5b 100644
--- a/net-libs/gloox/gloox-1.0.13.recipe
+++ b/net-libs/gloox/gloox-1.0.13.recipe
@@ -8,14 +8,7 @@ COPYRIGHT="2002-2012 Jakob Schröter"
 SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2"
 CHECKSUM_SHA256="4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a"
 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_gcc2 x86"
 PATCHES="gloox-1.0.9.patch"
 
diff --git a/net-libs/libupnp/libupnp-1.6.19.recipe b/net-libs/libupnp/libupnp-1.6.19.recipe
index 9f6f0d8b8..32cff070d 100644
--- a/net-libs/libupnp/libupnp-1.6.19.recipe
+++ b/net-libs/libupnp/libupnp-1.6.19.recipe
@@ -14,12 +14,7 @@ SOURCE_URI="http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$port
 CHECKSUM_SHA256="b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a"
 PATCHES="libupnp-$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="
diff --git a/net-misc/aria2/aria2-1.18.9.recipe b/net-misc/aria2/aria2-1.18.9.recipe
index d7b31ac8d..5ce46d5a0 100644
--- a/net-misc/aria2/aria2-1.18.9.recipe
+++ b/net-misc/aria2/aria2-1.18.9.recipe
@@ -18,12 +18,7 @@ REVISION="1"
 
 PATCHES="aria2-$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="
diff --git a/net-misc/mosh/mosh-1.2.4.recipe b/net-misc/mosh/mosh-1.2.4.recipe
index ff2c6d373..9c18585e4 100644
--- a/net-misc/mosh/mosh-1.2.4.recipe
+++ b/net-misc/mosh/mosh-1.2.4.recipe
@@ -13,12 +13,7 @@ HOMEPAGE="https://mosh.mit.edu/"
 REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2012-2013 Keith Winstein"
-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"
 
 SOURCE_URI="https://mosh.mit.edu/mosh-$portVersion.tar.gz"
diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe
index 37cc68427..ac47a115d 100644
--- a/net-misc/muscle/muscle-6.00.recipe
+++ b/net-misc/muscle/muscle-6.00.recipe
@@ -22,12 +22,7 @@ REVISION="2"
 
 #TODO:enable multithreading for the devel package!
 
-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="
diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe
index 3b0f3fddd..223500ed2 100644
--- a/net-misc/tor/tor-0.2.4.20.recipe
+++ b/net-misc/tor/tor-0.2.4.20.recipe
@@ -39,12 +39,7 @@ CHECKSUM_SHA256="ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9
 
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
-else
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -74,7 +69,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:awk
 	"
-	
+
 LICENSE="Tor"
 COPYRIGHT="
 	2001-2004, Roger Dingledine
@@ -85,7 +80,7 @@ COPYRIGHT="
 #USER_SETTINGS_FILES="
 #	settings/tor directory
 #	"
-	
+
 #GLOBAL_WRITABLE_FILES="
 #	settings/tor/torrc.sample auto-merge
 #	"
@@ -93,10 +88,10 @@ COPYRIGHT="
 BUILD()
 {
 	runConfigure ./configure
-	make	
+	make
 }
 
 INSTALL()
 {
-	make install	
+	make install
 }
diff --git a/net-misc/tor/tor-0.2.5.10.recipe b/net-misc/tor/tor-0.2.5.10.recipe
index 489f05152..cc7f7d76b 100644
--- a/net-misc/tor/tor-0.2.5.10.recipe
+++ b/net-misc/tor/tor-0.2.5.10.recipe
@@ -11,12 +11,7 @@ CHECKSUM_SHA256="b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83
 
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
-else
-	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -48,7 +43,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-	
+
 LICENSE="BSD (3-clause)"
 COPYRIGHT="
 	2001-2004, Roger Dingledine
@@ -59,7 +54,7 @@ COPYRIGHT="
 USER_SETTINGS_FILES="
 	settings/tor directory
 	"
-	
+
 GLOBAL_WRITABLE_FILES="
 	settings/tor/torrc.sample auto-merge
 	"
@@ -71,10 +66,10 @@ BUILD()
 	autoconf
 	automake --add-missing
 	runConfigure ./configure
-	make	
+	make
 }
 
 INSTALL()
 {
-	make install	
+	make install
 }
diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe
index 8c855ff1b..89012f688 100644
--- a/net-p2p/transmission/transmission-2.82.recipe
+++ b/net-p2p/transmission/transmission-2.82.recipe
@@ -42,14 +42,7 @@ SOURCE_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz"
 CHECKSUM_SHA256="3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522"
 PATCHES="transmission-2.82.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_gcc2 x86"
 
 PROVIDES="
diff --git a/net-p2p/transmission/transmission-2.84.recipe b/net-p2p/transmission/transmission-2.84.recipe
index c3fd91974..666fbdc27 100644
--- a/net-p2p/transmission/transmission-2.84.recipe
+++ b/net-p2p/transmission/transmission-2.84.recipe
@@ -13,14 +13,7 @@ SOURCE_URI="https://transmission.cachefly.net/transmission-$portVersion.tar.xz"
 CHECKSUM_SHA256="a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb"
 PATCHES="transmission-$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"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
diff --git a/net-proxy/torsocks/torsocks-1.2.recipe b/net-proxy/torsocks/torsocks-1.2.recipe
index 9f208ca05..b28bc85a5 100644
--- a/net-proxy/torsocks/torsocks-1.2.recipe
+++ b/net-proxy/torsocks/torsocks-1.2.recipe
@@ -9,12 +9,7 @@ CHECKSUM_SHA256="bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d
 
 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_gcc2 x86"
 
 PROVIDES="
@@ -38,7 +33,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:make
 	"
-	
+
 LICENSE="GNU GPL v2"
 COPYRIGHT="
 	2000-2008 Shaun Clowes
@@ -62,7 +57,7 @@ BUILD()
 	aclocal
 	autoconf
 	automake
-	
+
 	runConfigure ./configure
 	make
 }
@@ -70,10 +65,10 @@ BUILD()
 INSTALL()
 {
 	make install
-	
+
 	# Documentation is put into $dataDir/torsocks
 	# as opposed to $dataDir
-	
+
 	mkdir /temp
 	mv $dataDir/* /temp
 	mkdir $dataDir/torsocks
diff --git a/sci-astronomy/celestia/celestia-1.6.1.recipe b/sci-astronomy/celestia/celestia-1.6.1.recipe
index 1746d86c5..dec68c65d 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.recipe
+++ b/sci-astronomy/celestia/celestia-1.6.1.recipe
@@ -19,14 +19,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2011 Celestia Development Team"
 
-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="
diff --git a/sci-libs/gdal/gdal-1.11.0.recipe b/sci-libs/gdal/gdal-1.11.0.recipe
index 887d18462..3e4b797d1 100644
--- a/sci-libs/gdal/gdal-1.11.0.recipe
+++ b/sci-libs/gdal/gdal-1.11.0.recipe
@@ -34,12 +34,7 @@ LICENSE="MIT"
 SOURCE_URI="http://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz"
 CHECKSUM_SHA256="b5186b5817e94743de1bceef66aeee1461687e14f73bf81034fcf0377eacbcc3"
 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
 	commandSuffix=
diff --git a/sci-libs/gsl/gsl-1.16.recipe b/sci-libs/gsl/gsl-1.16.recipe
index db9d3fa5a..31b41f404 100644
--- a/sci-libs/gsl/gsl-1.16.recipe
+++ b/sci-libs/gsl/gsl-1.16.recipe
@@ -54,12 +54,7 @@ REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/gsl/gsl-$portVersion.tar.gz"
 CHECKSUM_SHA256="73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53"
 
-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="
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
index 2bfdd57bd..436ad5df8 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
@@ -5,12 +5,7 @@ HOMEPAGE="http://trac.osgeo.org/geotiff/"
 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"
 
 if [ $targetArchitecture != x86_gcc2 ]; then
diff --git a/sci-libs/proj/proj-4.8.0.recipe b/sci-libs/proj/proj-4.8.0.recipe
index 7765d0b93..15400a61d 100644
--- a/sci-libs/proj/proj-4.8.0.recipe
+++ b/sci-libs/proj/proj-4.8.0.recipe
@@ -9,12 +9,7 @@ SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="49635259993aa3ed7d06ae39ed12fac250401e7fc2d1c459d86e28400abbeb44"
 SOURCE_DIR="proj.4-$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"
 
 if [ $targetArchitecture != x86_gcc2 ]; then
diff --git a/sys-apps/dbus/dbus-1.8.6.recipe b/sys-apps/dbus/dbus-1.8.6.recipe
index 7784cd1b3..cc75d05b4 100644
--- a/sys-apps/dbus/dbus-1.8.6.recipe
+++ b/sys-apps/dbus/dbus-1.8.6.recipe
@@ -17,14 +17,7 @@ SOURCE_URI="http://dbus.freedesktop.org/releases/dbus/dbus-1.8.6.tar.gz"
 CHECKSUM_SHA256="eded83ca007b719f32761e60fd8b9ffd0f5796a4caf455b01b5a5ef740ebd23f"
 SOURCE_DIR="dbus-$portVersion"
 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"
 
 GLOBAL_WRITABLE_FILES="
diff --git a/sys-apps/dtc/dtc-1.4.1.recipe b/sys-apps/dtc/dtc-1.4.1.recipe
index aaee77aa3..e178363ce 100644
--- a/sys-apps/dtc/dtc-1.4.1.recipe
+++ b/sys-apps/dtc/dtc-1.4.1.recipe
@@ -7,12 +7,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2005 David Gibson, IBM Corporation"
 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="
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
index 5ab11054d..e9e61c1b6 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe
@@ -12,12 +12,7 @@ LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#ae5f4417d1"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ];then
-	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/.
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
index 9f6bd49b2..18ef6992e 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe
@@ -12,12 +12,7 @@ LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="git+https://github.com/ggreer/the_silver_searcher.git#0.26.0"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ];then
-	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/.
diff --git a/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe b/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe
index 5dc5c4704..18b70a201 100644
--- a/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe
@@ -13,12 +13,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
 
-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"
 
 targetArch="arm-none-eabi"
diff --git a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
index a0d91edf4..48285565f 100644
--- a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
+++ b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
@@ -15,12 +15,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
 
-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"
 
 targetArch="arm-none-eabi"
diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
index 1a0e1b564..8ab12921a 100644
--- a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
+++ b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
@@ -15,12 +15,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
 
-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"
 
 targetArch="arm-none-eabi"
diff --git a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
index 78366a650..29465886a 100644
--- a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
@@ -13,12 +13,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
 
-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"
 
 PROVIDES="
diff --git a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
index 9523ad16a..60cebaffb 100644
--- a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
+++ b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
@@ -16,12 +16,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
 
-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"
 
 PROVIDES="
diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
index c9bae86b1..2658c1515 100644
--- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
+++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
@@ -8,11 +8,7 @@ LICENSE="
 	"
 COPYRIGHT="1988-2006 Free Software Foundation, Inc."
 
-ARCHITECTURES="x86_gcc2"
-if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
-then
-	ARCHITECTURES="$ARCHITECTURES x86"
-fi
+ARCHITECTURES="x86_gcc2! x86"
 SECONDARY_ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
@@ -93,7 +89,7 @@ INSTALL()
 	rm -r $developDir/headers
 
 	### HTML documentation ####################################
-	
+
 	echo "Organizing HTML documentation..."
 	cd $docDir
 
@@ -113,13 +109,13 @@ INSTALL()
 	rm -r $infoDir
 
 	### Strip #################################################
-	
+
 	echo "Strip debug info"
 
 	cd $prefix
 	find bin -type f | xargs -r strip --strip-debug
 	strip --strip-debug $installDir/$archName/bin/*
-	
+
 	### Symlinks ##############################################
 
 	echo "Creating required symlinks"
@@ -131,7 +127,7 @@ INSTALL()
 	done
 
 	### Cleanup #################################################
-	
+
 	echo "Cleanup"
 
 	# delete man pages for commands that we aren't including
diff --git a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
index 27624c809..c246ee726 100644
--- a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
+++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
@@ -10,12 +10,7 @@ LICENSE="
 	"
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
-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="
diff --git a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
index c15b12e5b..150539236 100644
--- a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
+++ b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
@@ -13,12 +13,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 
 
-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"
 
 PROVIDES="
diff --git a/sys-devel/binutils/binutils-2.25_12015_07_31.recipe b/sys-devel/binutils/binutils-2.25_12015_07_31.recipe
index 4a124fa4a..3d2bdaf29 100644
--- a/sys-devel/binutils/binutils-2.25_12015_07_31.recipe
+++ b/sys-devel/binutils/binutils-2.25_12015_07_31.recipe
@@ -13,12 +13,7 @@ LICENSE="
 COPYRIGHT="1988-2015 Free Software Foundation, Inc."
 
 
-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"
 
 PROVIDES="
diff --git a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe
index 0cb81b2ea..21458537a 100644
--- a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe
+++ b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe
@@ -13,12 +13,7 @@ LICENSE="
 COPYRIGHT="1988-2014 Free Software Foundation, Inc."
 
 
-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"
 
 PROVIDES="
diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe
index 14b65cb98..a86fea50e 100644
--- a/sys-devel/clang/clang-3.2.recipe
+++ b/sys-devel/clang/clang-3.2.recipe
@@ -1,4 +1,4 @@
-SUMMARY="A llvm front end compiler for C and C++" 
+SUMMARY="A llvm front end compiler for C and C++"
 DESCRIPTION="
 Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims to deliver \
 amazingly fast compiles (e.g. about 3x faster than GCC when compiling \
@@ -16,10 +16,7 @@ SOURCE_URI_2="http://llvm.org/releases/${portVersion}/clang-${portVersion}.src.t
 CHECKSUM_SHA256_2="2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658"
 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="
@@ -61,7 +58,7 @@ BUILD()
 	cp -rd $sourceDir2/clang-${portVersion}.src/* tools/clang/
 	#cp -r /boot/system/data/libtool/config/. autoconf/
 	#cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/
-	
+
 	# Haiku C++ requires rtti in a lot of central system components
 	# such as Mesa
 	export REQUIRES_RTTI=1
diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe
index 319e2fc3c..f426f6dd7 100644
--- a/sys-devel/clang/clang-3.4.recipe
+++ b/sys-devel/clang/clang-3.4.recipe
@@ -18,10 +18,7 @@ CHECKSUM_SHA256_2="22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242
 
 REVISION="2"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/sys-devel/clang/clang-3.5.1.recipe b/sys-devel/clang/clang-3.5.1.recipe
index 19860ef1c..7d840f1bf 100644
--- a/sys-devel/clang/clang-3.5.1.recipe
+++ b/sys-devel/clang/clang-3.5.1.recipe
@@ -21,10 +21,7 @@ CHECKSUM_SHA256_3="e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72
 
 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="
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
index 2c2c50de2..c61eedcf0 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe
@@ -11,11 +11,7 @@ srcGitRev="e5a1aa929a5e26ccff8d56228634ef6ba0078212"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="1e19de45203765ff494649b25df44aa1cb13a787c55ed57d3d18f8d95ff72397"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
-if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
-then
-	ARCHITECTURES="$ARCHITECTURES x86"
-fi
+ARCHITECTURES="x86_gcc2 !x86"
 SECONDARY_ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
@@ -129,8 +125,8 @@ INSTALL()
 
 	echo "Moving libraries around"
 
-	# Move/copy libraries such that copies of static libraries (libgcc.a) 
-	# exist in $developLibDir. These are put into a separate package 
+	# Move/copy libraries such that copies of static libraries (libgcc.a)
+	# exist in $developLibDir. These are put into a separate package
 	# (gcc_syslibs_devel), which is used by Haiku's build system.
 	mkdir -p $libDir
 	mkdir -p $developLibDir
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
index 1612bc377..db8e913a1 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
@@ -12,11 +12,7 @@ srcGitRev="d86116d57a09505802ed6a38adc43ef294f7f364"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 SOURCE_FILENAME="gcc-$portVersion.tar.gz"
 REVISION="3"
-ARCHITECTURES="x86_gcc2"
-if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
-then
-	ARCHITECTURES="$ARCHITECTURES x86"
-fi
+ARCHITECTURES="x86_gcc2 !x86"
 SECONDARY_ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
@@ -130,8 +126,8 @@ INSTALL()
 
 	echo "Moving libraries around"
 
-	# Move/copy libraries such that copies of static libraries (libgcc.a) 
-	# exist in $developLibDir. These are put into a separate package 
+	# Move/copy libraries such that copies of static libraries (libgcc.a)
+	# exist in $developLibDir. These are put into a separate package
 	# (gcc_syslibs_devel), which is used by Haiku's build system.
 	mkdir -p $libDir
 	mkdir -p $developLibDir
diff --git a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
index 816b65f97..296c087c1 100644
--- a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
+++ b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe
@@ -14,12 +14,7 @@ LICENSE="
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
 PATCHES="gcc-4.8.3_2014_05_28.patchset"
 
-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"
 
 PROVIDES="
diff --git a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
index 24f12587c..78ac475c5 100644
--- a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
+++ b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe
@@ -17,12 +17,7 @@ if [ $effectiveTargetArchitecture = x86_64 ]; then
 	PATCHES="gcc-4.8.3_buildfixes_for_x86_64.patchset"
 fi
 
-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"
 
 libstdcxxSoVersion="6"
diff --git a/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe b/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe
index d4b602dd4..ee9f49b77 100644
--- a/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe
+++ b/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe
@@ -17,12 +17,7 @@ if [ $effectiveTargetArchitecture = x86_64 ]; then
 	PATCHES="gcc-4.8.3_buildfixes_for_x86_64.patchset"
 fi
 
-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"
 
 libstdcxxSoVersion="6"
diff --git a/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe b/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe
index aa7a347cf..561a82db6 100644
--- a/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe
+++ b/sys-devel/gcc/gcc-4.8.5_2015_07_11.recipe
@@ -19,12 +19,7 @@ else
 	PATCHES="gcc-4.8.5_2015_07_11_for_x86.patchset"
 fi
 
-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"
 
 libstdcxxSoVersion="6"
diff --git a/sys-devel/gcc/gcc5-5.2.0_2015_07_27.recipe b/sys-devel/gcc/gcc5-5.2.0_2015_07_27.recipe
index feaa6e808..3e8650d23 100644
--- a/sys-devel/gcc/gcc5-5.2.0_2015_07_27.recipe
+++ b/sys-devel/gcc/gcc5-5.2.0_2015_07_27.recipe
@@ -15,12 +15,7 @@ COPYRIGHT="1988-2015 Free Software Foundation, Inc."
 
 PATCHES="gcc5-5.2.0_2015_07_27.patchset"
 
-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"
 
 libstdcxxSoVersion="6"
@@ -117,7 +112,7 @@ BUILD()
 		$additionalConfigureFlags
 
 	make $jobArgs
-	
+
 	echo "######################## building special libraries ################"
 
 	echo "### libgcc"
@@ -186,7 +181,7 @@ INSTALL()
 
 	echo "Moving libraries around"
 
-	# Move/copy libraries such that copies of the runtime (shared) libs exist 
+	# Move/copy libraries such that copies of the runtime (shared) libs exist
 	# in $libDir and copies of static libraries exist in $developLibDir. These
 	# are put into separate packages gcc_syslibs and gcc_syslibs_devel, which
 	# are both used by Haiku's build system.
@@ -221,7 +216,7 @@ INSTALL()
 		$gccLibDir/libgcc_s.so.$libgccSoVersion \
 		$libDir/
 	cp $gccLibDir/libgcc*.a $developLibDir/
-	
+
 	# gcc and c++ headers
 	mkdir -p $includeDir/gcc
 	cp -r $gccLibDir/include $includeDir/gcc/
@@ -269,7 +264,7 @@ INSTALL()
 	for f in c++ cc cpp g++ gcc gcov; do
 		symlinkRelative -sfn $installDir/bin/$f $binDir
 	done
-	
+
 	### Cleanup ###############################################
 
 	echo "Cleanup"
@@ -295,7 +290,7 @@ INSTALL()
 		$relativeDevelopLibDir/libsupc++.a \
 		$relativeDevelopLibDir/libsupc++-kernel.a \
 		$relativeIncludeDir
-		
+
 	rm -rf $includeDir
 	rm -rf $developLibDir
 }
diff --git a/sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe b/sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe
index 3c673b868..efc75804b 100644
--- a/sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe
+++ b/sys-devel/gcc/gcc6-6.0.0_2015_07_17.recipe
@@ -15,12 +15,7 @@ COPYRIGHT="1988-2015 Free Software Foundation, Inc."
 
 PATCHES="gcc6-6.0.0_2015_07_17.patchset"
 
-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"
 
 libstdcxxSoVersion="6"
@@ -117,7 +112,7 @@ BUILD()
 		$additionalConfigureFlags
 
 	make $jobArgs
-	
+
 	echo "######################## building special libraries ################"
 
 	echo "### libgcc"
@@ -186,7 +181,7 @@ INSTALL()
 
 	echo "Moving libraries around"
 
-	# Move/copy libraries such that copies of the runtime (shared) libs exist 
+	# Move/copy libraries such that copies of the runtime (shared) libs exist
 	# in $libDir and copies of static libraries exist in $developLibDir. These
 	# are put into separate packages gcc_syslibs and gcc_syslibs_devel, which
 	# are both used by Haiku's build system.
@@ -221,7 +216,7 @@ INSTALL()
 		$gccLibDir/libgcc_s.so.$libgccSoVersion \
 		$libDir/
 	cp $gccLibDir/libgcc*.a $developLibDir/
-	
+
 	# gcc and c++ headers
 	mkdir -p $includeDir/gcc
 	cp -r $gccLibDir/include $includeDir/gcc/
@@ -269,7 +264,7 @@ INSTALL()
 	for f in c++ cc cpp g++ gcc gcov; do
 		symlinkRelative -sfn $installDir/bin/$f $binDir
 	done
-	
+
 	### Cleanup ###############################################
 
 	echo "Cleanup"
@@ -295,7 +290,7 @@ INSTALL()
 		$relativeDevelopLibDir/libsupc++.a \
 		$relativeDevelopLibDir/libsupc++-kernel.a \
 		$relativeIncludeDir
-		
+
 	rm -rf $includeDir
 	rm -rf $developLibDir
 }
diff --git a/sys-devel/ham/ham-0.1.recipe b/sys-devel/ham/ham-0.1.recipe
index a623ae20b..341fdaf48 100644
--- a/sys-devel/ham/ham-0.1.recipe
+++ b/sys-devel/ham/ham-0.1.recipe
@@ -13,12 +13,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2010-2013 Ingo Weinhold"
 
-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="
diff --git a/sys-devel/llvm/llvm-3.0.recipe b/sys-devel/llvm/llvm-3.0.recipe
index 5395616a5..bd61ee01a 100644
--- a/sys-devel/llvm/llvm-3.0.recipe
+++ b/sys-devel/llvm/llvm-3.0.recipe
@@ -83,12 +83,7 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 SOURCE_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz"
diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe
index 0b430d7d7..945c17f72 100644
--- a/sys-devel/llvm/llvm-3.2.recipe
+++ b/sys-devel/llvm/llvm-3.2.recipe
@@ -5,10 +5,7 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 REVISION="2"
 
-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://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe
index de5e6df41..dbf7a3b1b 100644
--- a/sys-devel/llvm/llvm-3.3.recipe
+++ b/sys-devel/llvm/llvm-3.3.recipe
@@ -1,15 +1,12 @@
-SUMMARY="Modular and reuseable compiler and toolchain technologies" 
+SUMMARY="Modular and reuseable compiler and toolchain technologies"
 DESCRIPTION="LLVM is a collection of modular and reuseable compiler and \
 toolchain technologies."
 HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 REVISION="1"
 
-ARCHITECTURES="!x86 !x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="!x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
 CHECKSUM_SHA256="68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578"
@@ -48,7 +45,7 @@ BUILD()
 	# Haiku C++ requires rtti in a lot of central system components
 	# such as Mesa
 	export REQUIRES_RTTI=1
-	runConfigure ./configure --enable-optimized 
+	runConfigure ./configure --enable-optimized
 	make $jobArgs
 }
 
diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe
index 19ed6c821..e5e45007f 100644
--- a/sys-devel/llvm/llvm-3.4.1.recipe
+++ b/sys-devel/llvm/llvm-3.4.1.recipe
@@ -5,10 +5,7 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 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"
 
 COPYRIGHT="2003-2013 University of Illinois at Urbana-Champaign"
diff --git a/sys-devel/llvm/llvm-3.4.2.recipe b/sys-devel/llvm/llvm-3.4.2.recipe
index dba5363d0..68409b7e3 100644
--- a/sys-devel/llvm/llvm-3.4.2.recipe
+++ b/sys-devel/llvm/llvm-3.4.2.recipe
@@ -5,10 +5,7 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 REVISION="4"
 
-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://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
diff --git a/sys-devel/llvm/llvm-3.4.recipe b/sys-devel/llvm/llvm-3.4.recipe
index d0ceb5709..c2f28e47f 100644
--- a/sys-devel/llvm/llvm-3.4.recipe
+++ b/sys-devel/llvm/llvm-3.4.recipe
@@ -6,10 +6,7 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 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://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe
index c210e4392..6f00eb391 100644
--- a/sys-devel/llvm/llvm-3.5.0.recipe
+++ b/sys-devel/llvm/llvm-3.5.0.recipe
@@ -9,10 +9,7 @@ COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
 CHECKSUM_SHA256="28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03"
 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="
diff --git a/sys-devel/llvm/llvm-3.5.1.recipe b/sys-devel/llvm/llvm-3.5.1.recipe
index 4952a9f54..618b13623 100644
--- a/sys-devel/llvm/llvm-3.5.1.recipe
+++ b/sys-devel/llvm/llvm-3.5.1.recipe
@@ -9,10 +9,7 @@ COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
 CHECKSUM_SHA256="bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15"
 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="
diff --git a/sys-devel/llvm/llvm-3.5.2.recipe b/sys-devel/llvm/llvm-3.5.2.recipe
index 255653ee2..ff9178712 100644
--- a/sys-devel/llvm/llvm-3.5.2.recipe
+++ b/sys-devel/llvm/llvm-3.5.2.recipe
@@ -9,10 +9,7 @@ COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz"
 CHECKSUM_SHA256="44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575"
 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="
diff --git a/sys-devel/openwatcom/openwatcom-1.9.0.recipe b/sys-devel/openwatcom/openwatcom-1.9.0.recipe
index 8bc960822..78a437e19 100644
--- a/sys-devel/openwatcom/openwatcom-1.9.0.recipe
+++ b/sys-devel/openwatcom/openwatcom-1.9.0.recipe
@@ -9,12 +9,7 @@ LICENSE="Open Watcom Public Licence v1.0"
 COPYRIGHT="1983-2002 Sybase, Inc."
 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="ftp://ftp.openwatcom.org/source/open_watcom_$portVersion-src.tar.bz2"
diff --git a/sys-devel/openwatcom/openwatcom-2.0.0.recipe b/sys-devel/openwatcom/openwatcom-2.0.0.recipe
index 9e9c26ac1..8d3b49610 100644
--- a/sys-devel/openwatcom/openwatcom-2.0.0.recipe
+++ b/sys-devel/openwatcom/openwatcom-2.0.0.recipe
@@ -9,12 +9,7 @@ LICENSE="Open Watcom Public Licence v1.0"
 COPYRIGHT="1983-2002 Sybase, Inc."
 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="git@github.com:open-watcom/open-watcom-v2.git#ca9213e7973593caf73b50cc2185db8d1cef185c"
diff --git a/sys-fs/ddrescue/ddrescue-1.19.recipe b/sys-fs/ddrescue/ddrescue-1.19.recipe
index 345946e9d..519559366 100644
--- a/sys-fs/ddrescue/ddrescue-1.19.recipe
+++ b/sys-fs/ddrescue/ddrescue-1.19.recipe
@@ -11,14 +11,7 @@ COPYRIGHT="
 	"
 LICENSE="GNU GPL v2"
 
-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/.
 commandSuffix=$secondaryArchSuffix
diff --git a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
index d2d1d758d..0d1fd07fe 100644
--- a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
+++ b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
@@ -35,12 +35,7 @@ SOURCE_URI="ftp://sourceware.org/pub/newlib/newlib-2.1.0.tar.gz"
 CHECKSUM_SHA256="3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48"
 SOURCE_DIR="newlib-$portVersion"
 
-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"
 
 targetArch="arm-none-eabi"
diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe
index 6d4922eab..3faa3621a 100644
--- a/sys-libs/mesa/mesa-10.0.1.recipe
+++ b/sys-libs/mesa/mesa-10.0.1.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2"
 CHECKSUM_SHA256="3cdf868f9599ca310c17fcf5b4ce9aec9903d8bf8561fde2577f3d422f823270"
 REVISION="5"
-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="
diff --git a/sys-libs/mesa/mesa-10.0.2.recipe b/sys-libs/mesa/mesa-10.0.2.recipe
index e8187b519..6c9b4be4c 100644
--- a/sys-libs/mesa/mesa-10.0.2.recipe
+++ b/sys-libs/mesa/mesa-10.0.2.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.2/MesaLib-10.0.2.tar.bz2"
 CHECKSUM_SHA256="4502a8e2dfa53e15d8fff89c153e6b14824fe82e49bd101e7edc02fa8cf76a7e"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/sys-libs/mesa/mesa-10.1.0.recipe b/sys-libs/mesa/mesa-10.1.0.recipe
index 35c175c48..af8af9fa2 100644
--- a/sys-libs/mesa/mesa-10.1.0.recipe
+++ b/sys-libs/mesa/mesa-10.1.0.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-10.1.0.tar.bz2"
 CHECKSUM_SHA256="5941c3d4772a9f447f51569dfca48e01af98080bc996991d00a13f900dab2230"
 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="
diff --git a/sys-libs/mesa/mesa-10.1.1.recipe b/sys-libs/mesa/mesa-10.1.1.recipe
index 0d484b4aa..9ac598f5f 100644
--- a/sys-libs/mesa/mesa-10.1.1.recipe
+++ b/sys-libs/mesa/mesa-10.1.1.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/10.1.1/MesaLib-10.1.1.tar.bz2"
 CHECKSUM_SHA256="f3ae730ed81fffcb1ec59076813f9955157da7a1dd9ba23a6b1b8ff8cf6798b0"
 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="
diff --git a/sys-libs/mesa/mesa-10.2.9.recipe b/sys-libs/mesa/mesa-10.2.9.recipe
index 8fecb053f..c35b056ca 100644
--- a/sys-libs/mesa/mesa-10.2.9.recipe
+++ b/sys-libs/mesa/mesa-10.2.9.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/10.2.9/MesaLib-10.2.9.tar.bz2"
 CHECKSUM_SHA256="f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/sys-libs/mesa/mesa-10.3.7.recipe b/sys-libs/mesa/mesa-10.3.7.recipe
index 4b70354c5..a81574e6d 100644
--- a/sys-libs/mesa/mesa-10.3.7.recipe
+++ b/sys-libs/mesa/mesa-10.3.7.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/$portVersion/MesaLib-$portVersion.tar.bz2"
 CHECKSUM_SHA256="43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/sys-libs/mesa/mesa-10.4.7.recipe b/sys-libs/mesa/mesa-10.4.7.recipe
index cf34a5913..092c58ed0 100644
--- a/sys-libs/mesa/mesa-10.4.7.recipe
+++ b/sys-libs/mesa/mesa-10.4.7.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/$portVersion/MesaLib-$portVersion.tar.bz2"
 CHECKSUM_SHA256="2c351c98671f9a7ab3fd9c601bb7a255801b1580f5dd0992639f99152801b0d2"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/sys-libs/mesa/mesa-10.5.2.recipe b/sys-libs/mesa/mesa-10.5.2.recipe
index 2e206a6c3..30a798a42 100644
--- a/sys-libs/mesa/mesa-10.5.2.recipe
+++ b/sys-libs/mesa/mesa-10.5.2.recipe
@@ -11,12 +11,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://ftp.freedesktop.org/pub/mesa/10.5.2/mesa-10.5.2.tar.xz"
 CHECKSUM_SHA256="2f4b6fb77c3e7d6f861558d0884a3073f575e1e673dad8d1b0624e78e9c4dd44"
 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"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe
index ba0aea285..8e089ead1 100644
--- a/sys-libs/mesa/mesa-7.9.2.recipe
+++ b/sys-libs/mesa/mesa-7.9.2.recipe
@@ -16,12 +16,7 @@ CHECKSUM_SHA256="445c4081c761851343ae732b5f233f269f6751ff422aa0299aae009fe049c27
 PATCHES="mesa-7.9.2.patchset"
 
 REVISION="10"
-ARCHITECTURES="x86_gcc2"
-if [ $effectiveTargetArchitecture != x86 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86"
-fi
+ARCHITECTURES="x86_gcc2 !x86"
 SECONDARY_ARCHITECTURES="?x86_gcc2"
 
 PROVIDES="
@@ -35,7 +30,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-	
+
 BUILD_PREREQUIRES="
 	libxml2_python
 	cmd:bison
diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe
index 972efe536..0f82ec6ac 100644
--- a/sys-libs/mesa/mesa-9.1.1.recipe
+++ b/sys-libs/mesa/mesa-9.1.1.recipe
@@ -21,12 +21,7 @@ LICENSE="MIT"
 SOURCE_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2"
 CHECKSUM_SHA256="3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb"
 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="mesa-9.1.1.patch"
diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe
index b0531da70..0a14f8b8b 100644
--- a/www-client/qupzilla/qupzilla-1.4.x.recipe
+++ b/www-client/qupzilla/qupzilla-1.4.x.recipe
@@ -14,18 +14,15 @@ REVISION="1"
 SOURCE_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46"
 PATCHES="qupzilla-1.4.x.patchset"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	qupzilla${secondaryArchSuffix} = $portVersion
 	app:qupzilla${secondaryArchSuffix} = $portVersion
 	"
-# TODO: update requirements to be more specific about which Qt 
-# libraries are required.	
+# TODO: update requirements to be more specific about which Qt
+# libraries are required.
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	qtcore${secondaryArchSuffix} >= 4.8.0
@@ -35,7 +32,7 @@ BUILD_PREREQUIRES="
 	cmd:qmake${secondaryArchSuffix}
 	cmd:make
 	cmd:g++${secondaryArchSuffix}
-	"  
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	openssl${secondaryArchSuffix}_devel
@@ -44,7 +41,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD()
-{	
+{
 	qmake QUPZILLA_PREFIX=${appsDir}/QupZilla
 	make $jobArgs
 }
@@ -52,18 +49,18 @@ BUILD()
 INSTALL()
 {
 	echo "Installing QupZilla..."
-	
+
 	mkdir -p ${appsDir}/QupZilla/
 	mkdir -p ${appsDir}/QupZilla/lib/
-		
+
 	cd bin/
-	
+
 	cp qupzilla ${appsDir}/QupZilla/
 	cp -R locale ${appsDir}/QupZilla/
 	cp -R plugins ${appsDir}/QupZilla/
 	cp -R themes ${appsDir}/QupZilla/
 	cp libQupZilla.* ${appsDir}/QupZilla/lib/
-	
+
 	echo "Linking QupZilla..."
 	addAppDeskbarSymlink ${appsDir}/QupZilla/qupzilla "QupZilla"
 }
diff --git a/www-client/qupzilla/qupzilla-1.7.x.recipe b/www-client/qupzilla/qupzilla-1.7.x.recipe
index 134992f71..c5bbd2e50 100644
--- a/www-client/qupzilla/qupzilla-1.7.x.recipe
+++ b/www-client/qupzilla/qupzilla-1.7.x.recipe
@@ -15,10 +15,7 @@ SOURCE_URI="https://github.com/QupZilla/qupzilla/archive/eee3895f6954617f8eb1f15
 CHECKSUM_SHA256="1ed2b9f1edd6908349d047e932114e7a0215c6dfe6290fe4a6f3bc1a4dd05e25"
 SOURCE_DIR="qupzilla-eee3895f6954617f8eb1f15df18b33a9745491ba"
 
-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/www-client/qupzilla/qupzilla-1.8.6.recipe b/www-client/qupzilla/qupzilla-1.8.6.recipe
index 0c195426b..f8253560c 100644
--- a/www-client/qupzilla/qupzilla-1.8.6.recipe
+++ b/www-client/qupzilla/qupzilla-1.8.6.recipe
@@ -16,12 +16,7 @@ CHECKSUM_SHA256="aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a
 SOURCE_DIR="QupZilla-$portVersion"
 PATCHES="qupzilla-1.8.x-system_certificates.patchset"
 
-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="
diff --git a/x11-libs/cairo/cairo-1.12.16.recipe b/x11-libs/cairo/cairo-1.12.16.recipe
index 0db8e50e6..29c31919e 100644
--- a/x11-libs/cairo/cairo-1.12.16.recipe
+++ b/x11-libs/cairo/cairo-1.12.16.recipe
@@ -28,12 +28,7 @@ MPL v1.1
 SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
 CHECKSUM_SHA256="2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846"
 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="cairo-$portVersion.patchset"
diff --git a/x11-libs/cairo/cairo-1.12.18.recipe b/x11-libs/cairo/cairo-1.12.18.recipe
index a13940d7a..ee0f9358a 100644
--- a/x11-libs/cairo/cairo-1.12.18.recipe
+++ b/x11-libs/cairo/cairo-1.12.18.recipe
@@ -28,12 +28,7 @@ MPL v1.1
 SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
 CHECKSUM_SHA256="dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6"
 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="cairo-$portVersion.patchset"
diff --git a/x11-libs/pango/pango-1.37.0.recipe b/x11-libs/pango/pango-1.37.0.recipe
index a5f5e45bf..bde800441 100644
--- a/x11-libs/pango/pango-1.37.0.recipe
+++ b/x11-libs/pango/pango-1.37.0.recipe
@@ -25,12 +25,7 @@ SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.37/pango-$portVersion
 CHECKSUM_SHA256="932e6c2410de378222e195edc46376dc0a82bf91038c8211c47bf859e2d20f0e"
 PATCHES="pango-$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="