diff --git a/dev-qt/assistant/assistant-4.8.6-r1.ebuild b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
index fc4c237c260ab..48ed93d4dc71c 100644
--- a/dev-qt/assistant/assistant-4.8.6-r1.ebuild
+++ b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
index f50bdf939146d..c2b608ed3ced5 100644
--- a/dev-qt/assistant/assistant-4.8.7.ebuild
+++ b/dev-qt/assistant/assistant-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-4.8.6-r1.ebuild b/dev-qt/designer/designer-4.8.6-r1.ebuild
index 59da51d991b51..69def52653dfe 100644
--- a/dev-qt/designer/designer-4.8.6-r1.ebuild
+++ b/dev-qt/designer/designer-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
index ebc8d43c73d9d..110f61af4ebd0 100644
--- a/dev-qt/designer/designer-4.8.7.ebuild
+++ b/dev-qt/designer/designer-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/linguist/linguist-4.8.6-r1.ebuild b/dev-qt/linguist/linguist-4.8.6-r1.ebuild
index ae3578b8ae7f7..13a10e4e1cf1c 100644
--- a/dev-qt/linguist/linguist-4.8.6-r1.ebuild
+++ b/dev-qt/linguist/linguist-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Graphical tool for translating Qt applications"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild
index c4256337c754d..b3d06f1a530a7 100644
--- a/dev-qt/linguist/linguist-4.8.7.ebuild
+++ b/dev-qt/linguist/linguist-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
index 0442239c2fbfc..242c763d2e128 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt screen magnifier"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
index 5cc9d5cb5dd8e..43e0a9bcea1ba 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
index c9de1e559d250..fe245c7645468 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
index e4dcc3274a2c7..77be25a60da61 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild b/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
index 3260d42e488fd..e1a82eb408bf2 100644
--- a/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The Qt3Support module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild
index 93372ee45d326..a6035eda61a89 100644
--- a/dev-qt/qt3support/qt3support-4.8.7.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Qt3Support module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
index 09fed4ad7f902..7612179c9fbcc 100644
--- a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit qt4-build-multilib
 
 DESCRIPTION="Cross-platform application development framework"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+glib iconv icu qt3support ssl"
 
 DEPEND="
diff --git a/dev-qt/qtcore/qtcore-4.8.7.ebuild b/dev-qt/qtcore/qtcore-4.8.7.ebuild
index e8c48cb7b78b5..d266f1ffe9b7f 100644
--- a/dev-qt/qtcore/qtcore-4.8.7.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+glib iconv icu qt3support ssl"
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
index 1dc853cbfd50d..a03b16df64915 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The DBus module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
index 344bac52f481a..1ef3a0b4b6098 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The DBus module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
index c2b97dcd2cb23..c2796f68fa4d4 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The Declarative module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility qt3support webkit"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
index 0f8589cd7769b..80798839f465c 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Declarative module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility qt3support webkit"
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
index c984ec83e408f..cd259175dbf1a 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Demonstration module and examples for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="arm ppc ppc64"
 else
-	KEYWORDS="amd64 arm ppc ppc64 x86 ~x64-macos"
+	KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
 IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
index f3cc44200d36f..631b3bbb81fa8 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Demonstration module and examples for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
diff --git a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
index c8e55e936c9c0..efc02fe4a3643 100644
--- a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-syst
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index e004690962bea..05ee2a1967126 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The GUI module for the Qt toolkit"
 SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
index 99576c00a7119..1914cc5b54b16 100644
--- a/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI+="
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 fi
 
 IUSE="compat doc"
diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild
index 29226424ce674..4f8849e276d53 100644
--- a/dev-qt/qthelp/qthelp-4.8.7.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI+="
 	)"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="compat doc"
diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
index 11809eb70dead..8b0b49d428700 100644
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
index fd70391e226ff..9fb56ec07d6c3 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The Multimedia module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="arm ppc ppc64"
 else
-	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
 fi
 
 IUSE="alsa"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
index 69dec093f4ef7..35169e5df0146 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Multimedia module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="alsa"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
index f1c2fce89c0af..1820c350fa0fc 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The OpenGL module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="egl qt3support"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
index cd1cd279bd559..86790720d5943 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The OpenGL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="egl qt3support"
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6-r1.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6-r1.ebuild
index 914081e4f430e..b47b386492839 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.6-r1.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The OpenVG module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd"
 fi
 
 IUSE="qt3support"
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.7.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.7.ebuild
index 97782b85b3cba..f36bacce1a370 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.7.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The OpenVG module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
 IUSE="qt3support"
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
index fe6646e288781..1d54b4b799438 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The Phonon module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="arm hppa ppc ppc64"
 else
-	KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd"
 fi
 
 IUSE="dbus qt3support"
diff --git a/dev-qt/qtphonon/qtphonon-4.8.7.ebuild b/dev-qt/qtphonon/qtphonon-4.8.7.ebuild
index efed283ad200f..b6a79410b8b4a 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.7.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Phonon module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
 IUSE="dbus qt3support"
diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
index 93e7540a847ca..a41e157986bc6 100644
--- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The QtScript module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+jit"
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
index 22954160520e1..fdb078711d2a5 100644
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtScript module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+jit"
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
index ff9f3b9510cd1..ff3e25ce148b8 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc +qt4 qt5 X"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
index 06104dc2588ac..d92d3c13a3b22 100644
--- a/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The SQL module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
diff --git a/dev-qt/qtsql/qtsql-4.8.7.ebuild b/dev-qt/qtsql/qtsql-4.8.7.ebuild
index 1db82d0777a2a..2a9307aa8724c 100644
--- a/dev-qt/qtsql/qtsql-4.8.7.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit multilib qt4-build-multilib
 DESCRIPTION="The SQL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
index be2ed413fc32f..eec129617b95e 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The SVG module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
index 82a19294be9e9..9d323dfbbef9d 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The SVG module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qttest/qttest-4.8.6-r1.ebuild b/dev-qt/qttest/qttest-4.8.6-r1.ebuild
index f7bea9c109733..16e587cc67bdb 100644
--- a/dev-qt/qttest/qttest-4.8.6-r1.ebuild
+++ b/dev-qt/qttest/qttest-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
index cc92e4638e087..1fbfb15586ddf 100644
--- a/dev-qt/qttest/qttest-4.8.7.ebuild
+++ b/dev-qt/qttest/qttest-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
index 327b3f156826e..8a404cb1e2518 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Translation files for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
index abaa361b79298..000134f76f42f 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Translation files for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
index 78f4e0ed9d6b5..47f09d17f16a5 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The WebKit module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="arm ia64 ppc ppc64"
 else
-	KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+gstreamer icu +jit"
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
index d20cbc2e3d9d1..53a6f560a0f6c 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The WebKit module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+gstreamer icu +jit"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
index 36734bc999550..ebee8ac80073a 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The XmlPatterns module for the Qt toolkit"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS="alpha arm hppa ia64 ppc ppc64"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
index eb8453e4c7356..efb99bc740fd8 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
@@ -8,7 +8,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The XmlPatterns module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""