diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe
index 72a623d1b..db4bf79be 100644
--- a/app-accessibility/espeak/espeak-1.48.04.recipe
+++ b/app-accessibility/espeak/espeak-1.48.04.recipe
@@ -16,7 +16,7 @@ CHECKSUM_SHA256="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f065
 SOURCE_DIR="espeak-${portVersion}-source"
 PATCHES="espeak-1.48.04.patch"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	espeak = $portVersion
diff --git a/app-crypt/libmd/libmd-0.0.0.recipe b/app-crypt/libmd/libmd-0.0.0.recipe
index 2948f4d0c..127666809 100644
--- a/app-crypt/libmd/libmd-0.0.0.recipe
+++ b/app-crypt/libmd/libmd-0.0.0.recipe
@@ -29,7 +29,7 @@ SOURCE_URI="https://libbsd.freedesktop.org/releases/libmd-$portVersion.tar.xz"
 CHECKSUM_SHA256="fd3f2366236fb3fd0dac0c0a77ffff8511e2939c79d1d58daf56e3f5ee383a88"
 PATCHES="libmd-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/app-editors/nano/nano-2.8.1.recipe b/app-editors/nano/nano-2.8.1.recipe
index 0aaf80e84..da87bf20d 100644
--- a/app-editors/nano/nano-2.8.1.recipe
+++ b/app-editors/nano/nano-2.8.1.recipe
@@ -17,7 +17,7 @@ SOURCE_URI="http://www.nano-editor.org/dist/v2.8/nano-$portVersion.tar.gz"
 CHECKSUM_SHA256="a48650dab5fc069bb953d020721b6c0f650969abf5a34a27dfd6f038215c5910"
 PATCHES="nano-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	nano = $portVersion compat >= 2
diff --git a/app-misc/tmux/tmux-2.1.recipe b/app-misc/tmux/tmux-2.1.recipe
index 6e4157ec9..f89f5598e 100644
--- a/app-misc/tmux/tmux-2.1.recipe
+++ b/app-misc/tmux/tmux-2.1.recipe
@@ -12,7 +12,7 @@ REVISION="1"
 
 PATCHES="tmux-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/app-text/xmlroff/xmlroff-0.6.2.recipe b/app-text/xmlroff/xmlroff-0.6.2.recipe
index 1033df966..e4ccbb8f0 100644
--- a/app-text/xmlroff/xmlroff-0.6.2.recipe
+++ b/app-text/xmlroff/xmlroff-0.6.2.recipe
@@ -12,7 +12,7 @@ SOURCE_URI="https://github.com/xmlroff/xmlroff/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="9c4777c27418eeb013b50246a4852f49893829ee6463b9686f4e7f26bbb19fe9"
 PATCHES="xmlroff-$portVersion.patchset"
 
-ARCHITECTURES="?x86 x86_64"
+ARCHITECTURES="x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/dev-db/sqlite/sqlite-3.18.0.0.recipe b/dev-db/sqlite/sqlite-3.18.0.0.recipe
index 363df6df6..5c776d8f8 100644
--- a/dev-db/sqlite/sqlite-3.18.0.0.recipe
+++ b/dev-db/sqlite/sqlite-3.18.0.0.recipe
@@ -12,7 +12,7 @@ SOURCE_URI="https://www.sqlite.org/2017/sqlite-autoconf-$sqliteVersion.tar.gz"
 CHECKSUM_SHA256="3757612463976e7d08c5e9f0af3021613fc24bbcfe1c51197d6776b9ece9ac5c"
 SOURCE_DIR="sqlite-autoconf-$sqliteVersion"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="
diff --git a/dev-lang/python/python-2.7.13.recipe b/dev-lang/python/python-2.7.13.recipe
index 058a9477a..af9925edc 100644
--- a/dev-lang/python/python-2.7.13.recipe
+++ b/dev-lang/python/python-2.7.13.recipe
@@ -17,7 +17,7 @@ CHECKSUM_SHA256="35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f73
 SOURCE_DIR="Python-$portVersion"
 PATCHES="python-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	python = $portVersion compat >= 2.7
diff --git a/dev-libs/boost/boost163-1.63.0.recipe b/dev-libs/boost/boost163-1.63.0.recipe
index df8f2e6b8..993242405 100644
--- a/dev-libs/boost/boost163-1.63.0.recipe
+++ b/dev-libs/boost/boost163-1.63.0.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="1998-2014 Beman Dawes, David Abrahams, Rene Rivera, et al."
 SOURCE_DIR="boost_1_63_0"
 PATCHES="boost-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/dev-libs/cereal/cereal-1.2.2.recipe b/dev-libs/cereal/cereal-1.2.2.recipe
index 01207f751..44b9fcefb 100644
--- a/dev-libs/cereal/cereal-1.2.2.recipe
+++ b/dev-libs/cereal/cereal-1.2.2.recipe
@@ -11,7 +11,7 @@ REVISION="1"
 SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="1921f26d2e1daf9132da3c432e2fd02093ecaedf846e65d7679ddf868c7289c4"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/dev-libs/crypto++/crypto++-5.6.5.recipe b/dev-libs/crypto++/crypto++-5.6.5.recipe
index 25d1329aa..470620dab 100644
--- a/dev-libs/crypto++/crypto++-5.6.5.recipe
+++ b/dev-libs/crypto++/crypto++-5.6.5.recipe
@@ -22,7 +22,7 @@ SOURCE_URI="https://www.cryptopp.com/cryptopp565.zip"
 CHECKSUM_SHA256="a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34"
 SOURCE_DIR=""
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/dev-libs/libevent/libevent21-2.1.8.recipe b/dev-libs/libevent/libevent21-2.1.8.recipe
index 03937d94c..f4ec43cc0 100644
--- a/dev-libs/libevent/libevent21-2.1.8.recipe
+++ b/dev-libs/libevent/libevent21-2.1.8.recipe
@@ -15,7 +15,7 @@ SOURCE_URI="https://github.com/libevent/libevent/releases/download/release-$port
 CHECKSUM_SHA256="965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2"
 SOURCE_DIR="libevent-${portVersion}-stable"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/dev-util/cmake/cmake-3.8.0.recipe b/dev-util/cmake/cmake-3.8.0.recipe
index 1f8caa45d..7670c1f59 100644
--- a/dev-util/cmake/cmake-3.8.0.recipe
+++ b/dev-util/cmake/cmake-3.8.0.recipe
@@ -13,7 +13,7 @@ CHECKSUM_SHA256="cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f3596
 SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
+ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/dev-util/ninja/ninja-1.6.0.recipe b/dev-util/ninja/ninja-1.6.0.recipe
index 0e2db64e4..eec7fa999 100644
--- a/dev-util/ninja/ninja-1.6.0.recipe
+++ b/dev-util/ninja/ninja-1.6.0.recipe
@@ -14,7 +14,7 @@ SOURCE_URI="https://github.com/martine/ninja/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7"
 PATCHES="ninja-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.25.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.25.recipe
index 3883556a9..d4958970e 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.25.recipe
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.25.recipe
@@ -16,7 +16,7 @@ SOURCE_URI="http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagi
 CHECKSUM_SHA256="1fae84925a50c1d0d6f64636ffc57b6458dc892e1f181ea5d6bf731936245005"
 SOURCE_DIR="GraphicsMagick-$portVersion"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe
index d8bb84301..61f8ea9c4 100644
--- a/media-libs/faac/faac-1.28.recipe
+++ b/media-libs/faac/faac-1.28.recipe
@@ -9,7 +9,7 @@ LICENSE="FAAC
 	GNU GPL v2"
 COPYRIGHT="2003 Krzysztof Nikiel"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.12.recipe b/media-libs/libgphoto2/libgphoto2-2.5.12.recipe
index 04f7a3b6e..61980c8a5 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.12.recipe
+++ b/media-libs/libgphoto2/libgphoto2-2.5.12.recipe
@@ -13,7 +13,7 @@ REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/gphoto/files/libgphoto2-$portVersion.tar.bz2"
 CHECKSUM_SHA256="b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e"
 
-ARCHITECTURES="?x86 x86_64"
+ARCHITECTURES="x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/media-libs/libmatroska/libmatroska-1.4.7.recipe b/media-libs/libmatroska/libmatroska-1.4.7.recipe
index 5f4c79e1c..c84b0ee91 100644
--- a/media-libs/libmatroska/libmatroska-1.4.7.recipe
+++ b/media-libs/libmatroska/libmatroska-1.4.7.recipe
@@ -7,7 +7,7 @@ REVISION="1"
 SOURCE_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2"
 CHECKSUM_SHA256="46441eb3bae9f970f68affaa211dd74302a7072dcd2becfb1114da11b66525fa"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="
diff --git a/media-sound/mpg123/mpg123-1.24.0.recipe b/media-sound/mpg123/mpg123-1.24.0.recipe
index f48f0db28..3b945315a 100644
--- a/media-sound/mpg123/mpg123-1.24.0.recipe
+++ b/media-sound/mpg123/mpg123-1.24.0.recipe
@@ -8,7 +8,7 @@ REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/mpg123/mpg123-$portVersion.tar.bz2"
 CHECKSUM_SHA256="55fb169a7711938f5df0497d1ffe28419fbef50011dc01d00b216379e6a2256c"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
 
 PROVIDES="
diff --git a/media-video/ffmpeg/ffmpeg-3.3.recipe b/media-video/ffmpeg/ffmpeg-3.3.recipe
index 4a0c7e8cb..88ff19810 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.recipe
+++ b/media-video/ffmpeg/ffmpeg-3.3.recipe
@@ -12,7 +12,7 @@ SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
 CHECKSUM_SHA256="599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d"
 PATCHES="ffmpeg-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
 
 PROVIDES="
diff --git a/net-libs/libsrtp/libsrtp-1.5.4.recipe b/net-libs/libsrtp/libsrtp-1.5.4.recipe
index 61906f052..484ef42a9 100644
--- a/net-libs/libsrtp/libsrtp-1.5.4.recipe
+++ b/net-libs/libsrtp/libsrtp-1.5.4.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0"
 PATCHES="libsrtp-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="
diff --git a/net-misc/openssh/openssh-7.5p1.recipe b/net-misc/openssh/openssh-7.5p1.recipe
index e5e8eeb5a..50eae8497 100644
--- a/net-misc/openssh/openssh-7.5p1.recipe
+++ b/net-misc/openssh/openssh-7.5p1.recipe
@@ -23,7 +23,7 @@ PATCHES="sshd_config.patch
 	pathnames.patch
 	bzero.patch"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
diff --git a/net-misc/wget/wget-1.19.1.recipe b/net-misc/wget/wget-1.19.1.recipe
index 971015d57..c8ff6e986 100644
--- a/net-misc/wget/wget-1.19.1.recipe
+++ b/net-misc/wget/wget-1.19.1.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="http://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz"
 CHECKSUM_SHA256="9e4f12da38cc6167d0752d934abe27c7b1599a9af294e73829be7ac7b5b4da40"
 PATCHES="wget-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
 
 PROVIDES="
diff --git a/sci-libs/armadillo/armadillo-7.800.2.recipe b/sci-libs/armadillo/armadillo-7.800.2.recipe
index 581c3d343..cd2faf59c 100644
--- a/sci-libs/armadillo/armadillo-7.800.2.recipe
+++ b/sci-libs/armadillo/armadillo-7.800.2.recipe
@@ -11,7 +11,7 @@ REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/arma/files/armadillo-$portVersion.tar.xz"
 CHECKSUM_SHA256="efd70600ab6f30449d90a3e58ff7499937985209bb0a03ce4e322474dbf11fe3"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
 
 PROVIDES="
diff --git a/sci-libs/hdf5/hdf5-1.8.18.recipe b/sci-libs/hdf5/hdf5-1.8.18.recipe
index 6982ae4db..7611f582b 100644
--- a/sci-libs/hdf5/hdf5-1.8.18.recipe
+++ b/sci-libs/hdf5/hdf5-1.8.18.recipe
@@ -10,7 +10,7 @@ REVISION="2"
 SOURCE_URI="https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-$portVersion.tar.gz"
 CHECKSUM_SHA256="cdb195ad8d9e6782acf24b2488061289f615628c2ccda8457b0a0c3fb7a8a063"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
diff --git a/sys-apps/coreutils/coreutils-8.26.recipe b/sys-apps/coreutils/coreutils-8.26.recipe
index 9175e8799..e8a6694f6 100644
--- a/sys-apps/coreutils/coreutils-8.26.recipe
+++ b/sys-apps/coreutils/coreutils-8.26.recipe
@@ -22,7 +22,7 @@ LICENSE="GNU GPL v3"
 SOURCE_URI="http://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz"
 CHECKSUM_SHA256="155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e"
 REVISION="2"
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
+ARCHITECTURES="?x86_gcc2 x86 x86_64 ?arm"
 
 PATCHES="
 	coreutils-$portVersion.patchset
diff --git a/sys-apps/grep/grep-3.0.recipe b/sys-apps/grep/grep-3.0.recipe
index 607243e63..e400269eb 100644
--- a/sys-apps/grep/grep-3.0.recipe
+++ b/sys-apps/grep/grep-3.0.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
 CHECKSUM_SHA256="e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5"
 #PATCHES="grep-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
+ARCHITECTURES="?x86_gcc2 x86 x86_64 ?arm"
 
 PROVIDES="
 	grep = $portVersion compat >= 3
diff --git a/sys-apps/sed/sed-4.4.recipe b/sys-apps/sed/sed-4.4.recipe
index d50de5498..e0f3da21d 100644
--- a/sys-apps/sed/sed-4.4.recipe
+++ b/sys-apps/sed/sed-4.4.recipe
@@ -13,7 +13,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/sed/sed-$portVersion.tar.xz"
 CHECKSUM_SHA256="cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b"
 PATCHES="sed-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
+ARCHITECTURES="?x86_gcc2 x86 x86_64 ?arm"
 
 PROVIDES="
 	sed = $portVersion compat >= 4
diff --git a/sys-block/parted/parted-3.2.recipe b/sys-block/parted/parted-3.2.recipe
index 8e4b88b54..d041bd357 100644
--- a/sys-block/parted/parted-3.2.recipe
+++ b/sys-block/parted/parted-3.2.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/parted/parted-$portVersion.tar.xz"
 CHECKSUM_SHA256="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
 PATCHES="parted-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
diff --git a/sys-devel/bc/bc-1.07.1.recipe b/sys-devel/bc/bc-1.07.1.recipe
index d71996139..77f003461 100644
--- a/sys-devel/bc/bc-1.07.1.recipe
+++ b/sys-devel/bc/bc-1.07.1.recipe
@@ -12,7 +12,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/bc/bc-$portVersion.tar.gz"
 CHECKSUM_SHA256="62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
 PATCHES="bc-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	bc = $portVersion
diff --git a/sys-power/iasl/iasl-20170303.recipe b/sys-power/iasl/iasl-20170303.recipe
index 5ef0e23de..74e571c4b 100644
--- a/sys-power/iasl/iasl-20170303.recipe
+++ b/sys-power/iasl/iasl-20170303.recipe
@@ -13,7 +13,7 @@ SOURCE_URI="https://acpica.org/sites/acpica/files/acpica-unix-$portVersion.tar.g
 CHECKSUM_SHA256="c093c9eabd1f8c51d79364d829975c5335c8028c4816a7a80dfb8590f31889b5"
 SOURCE_DIR="acpica-unix-$portVersion"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+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/x11-libs/cairo/cairo-1.14.8.recipe b/x11-libs/cairo/cairo-1.14.8.recipe
index cf4283de8..9b6f0b19d 100644
--- a/x11-libs/cairo/cairo-1.14.8.recipe
+++ b/x11-libs/cairo/cairo-1.14.8.recipe
@@ -24,7 +24,7 @@ SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
 CHECKSUM_SHA256="d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"
 PATCHES="cairo-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="