Added KEYWORD to live ebuilds

Signed-off-by: ormorph <roma251078@mail.ru>

179 files changed, 534 insertions, 21 deletions

diff --git a/trinity-base/amor/amor-9999.ebuild b/trinity-base/amor/amor-9999.ebuild
index e56f6a25..bd6e193a 100644
--- a/trinity-base/amor/amor-9999.ebuild
+++ b/trinity-base/amor/amor-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Amusing Misuse Of Resources - desktop-dwelling creature"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ark/ark-9999.ebuild b/trinity-base/ark/ark-9999.ebuild
index b0a0831c..4139872f 100644
--- a/trinity-base/ark/ark-9999.ebuild
+++ b/trinity-base/ark/ark-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Archiving tool"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 pkg_postinst(){
 	elog "You may want to install app-arch/lha, app-arch/p7zip, app-arch/rar,"
diff --git a/trinity-base/arts/arts-9999.ebuild b/trinity-base/arts/arts-9999.ebuild
index 55e6c855..d30d744d 100644
--- a/trinity-base/arts/arts-9999.ebuild
+++ b/trinity-base/arts/arts-9999.ebuild
@@ -14,6 +14,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
 IUSE="alsa -artswrappersuid jack mp3 vorbis"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 SLOT="14"
 
 DEPEND="~dev-tqt/tqtinterface-${PV}
diff --git a/trinity-base/atlantik/atlantik-9999.ebuild b/trinity-base/atlantik/atlantik-9999.ebuild
index c4e7681b..d5c086b5 100644
--- a/trinity-base/atlantik/atlantik-9999.ebuild
+++ b/trinity-base/atlantik/atlantik-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegames"
 inherit trinity-meta-2
 
 DESCRIPTION="The Atlantic board game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
index 358042fd..ec125948 100644
--- a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
+++ b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
@@ -8,5 +8,8 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Atlantik gameboard designer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/atlantik-${PV}"
diff --git a/trinity-base/dcoprss/dcoprss-9999.ebuild b/trinity-base/dcoprss/dcoprss-9999.ebuild
index e50417d6..672db828 100644
--- a/trinity-base/dcoprss/dcoprss-9999.ebuild
+++ b/trinity-base/dcoprss/dcoprss-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="librss/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity RSS server and client for DCOP"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/librss-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/drkonqi/drkonqi-9999.ebuild b/trinity-base/drkonqi/drkonqi-9999.ebuild
index afe8a008..96071d19 100644
--- a/trinity-base/drkonqi/drkonqi-9999.ebuild
+++ b/trinity-base/drkonqi/drkonqi-9999.ebuild
@@ -10,6 +10,9 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed"
 
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="+hwlib"
 
 RDEPEND="sys-devel/gdb"
diff --git a/trinity-base/eyesapplet/eyesapplet-9999.ebuild b/trinity-base/eyesapplet/eyesapplet-9999.ebuild
index 4b189007..45cd36d3 100644
--- a/trinity-base/eyesapplet/eyesapplet-9999.ebuild
+++ b/trinity-base/eyesapplet/eyesapplet-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild b/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild
index 5b3e150b..9870a136 100644
--- a/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild
+++ b/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Kicker plugin for the 15-game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kamera/kamera-9999.ebuild b/trinity-base/kamera/kamera-9999.ebuild
index cd4770dc..d31c9048 100644
--- a/trinity-base/kamera/kamera-9999.ebuild
+++ b/trinity-base/kamera/kamera-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity digital camera manager"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="media-libs/libgphoto2"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kappfinder/kappfinder-9999.ebuild b/trinity-base/kappfinder/kappfinder-9999.ebuild
index bc730aeb..92c81b28 100644
--- a/trinity-base/kappfinder/kappfinder-9999.ebuild
+++ b/trinity-base/kappfinder/kappfinder-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity tool that generates *.desktop files for well known apps"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild
index 2f79cee0..2005526f 100644
--- a/trinity-base/kasteroids/kasteroids-9999.ebuild
+++ b/trinity-base/kasteroids/kasteroids-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Space Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kate-plugins/kate-plugins-9999.ebuild b/trinity-base/kate-plugins/kate-plugins-9999.ebuild
index 1d3ce92d..e5d88902 100644
--- a/trinity-base/kate-plugins/kate-plugins-9999.ebuild
+++ b/trinity-base/kate-plugins/kate-plugins-9999.ebuild
@@ -9,6 +9,9 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Kate plugins and docs"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/kate-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kate/kate-9999.ebuild b/trinity-base/kate/kate-9999.ebuild
index ae62db19..d3f89660 100644
--- a/trinity-base/kate/kate-9999.ebuild
+++ b/trinity-base/kate/kate-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Kate is an MDI texteditor"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/katomic/katomic-9999.ebuild b/trinity-base/katomic/katomic-9999.ebuild
index dcd8f6ef..c68ac0cc 100644
--- a/trinity-base/katomic/katomic-9999.ebuild
+++ b/trinity-base/katomic/katomic-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Atomic Entertainment Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbackgammon/kbackgammon-9999.ebuild b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
index 37a43f30..b50912a4 100644
--- a/trinity-base/kbackgammon/kbackgammon-9999.ebuild
+++ b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="A Backgammon program for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbattleship/kbattleship-9999.ebuild b/trinity-base/kbattleship/kbattleship-9999.ebuild
index 02064806..c5495610 100644
--- a/trinity-base/kbattleship/kbattleship-9999.ebuild
+++ b/trinity-base/kbattleship/kbattleship-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Battleship clone"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kblackbox/kblackbox-9999.ebuild b/trinity-base/kblackbox/kblackbox-9999.ebuild
index d61c7fd8..8a0c8116 100644
--- a/trinity-base/kblackbox/kblackbox-9999.ebuild
+++ b/trinity-base/kblackbox/kblackbox-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Blackbox Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild
index ed6b5109..a8b23c4a 100644
--- a/trinity-base/kbounce/kbounce-9999.ebuild
+++ b/trinity-base/kbounce/kbounce-9999.ebuild
@@ -12,6 +12,9 @@ inherit trinity-meta-2
 # Needs some dependency to play "au" sounds.
 
 DESCRIPTION="Trinity Bounce Ball Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kcalc/kcalc-9999.ebuild b/trinity-base/kcalc/kcalc-9999.ebuild
index 0f2fcc72..fe2bd01f 100644
--- a/trinity-base/kcalc/kcalc-9999.ebuild
+++ b/trinity-base/kcalc/kcalc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity calculator"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="dev-libs/gmp:*"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kcharselect/kcharselect-9999.ebuild b/trinity-base/kcharselect/kcharselect-9999.ebuild
index fcfd21ea..56136d05 100644
--- a/trinity-base/kcharselect/kcharselect-9999.ebuild
+++ b/trinity-base/kcharselect/kcharselect-9999.ebuild
@@ -9,3 +9,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity character selection utility and panel applet"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kcheckpass/kcheckpass-9999.ebuild b/trinity-base/kcheckpass/kcheckpass-9999.ebuild
index 8e163fc8..6f4b4a32 100644
--- a/trinity-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/trinity-base/kcheckpass/kcheckpass-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="pam"
 
 RDEPEND="pam? ( trinity-base/tdebase-pam )"
diff --git a/trinity-base/kcminit/kcminit-9999.ebuild b/trinity-base/kcminit/kcminit-9999.ebuild
index 1ca81c24..2f1d3425 100644
--- a/trinity-base/kcminit/kcminit-9999.ebuild
+++ b/trinity-base/kcminit/kcminit-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="KCMInit - initializes Control Modules during startup."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/trinity-base/kcoloredit/kcoloredit-9999.ebuild b/trinity-base/kcoloredit/kcoloredit-9999.ebuild
index 4498a3b2..43989c23 100644
--- a/trinity-base/kcoloredit/kcoloredit-9999.ebuild
+++ b/trinity-base/kcoloredit/kcoloredit-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity color selector/editor"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild
index b5c831b8..80862a4a 100644
--- a/trinity-base/kcontrol/kcontrol-9999.ebuild
+++ b/trinity-base/kcontrol/kcontrol-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/ translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Control Center"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 IUSE="+hwlib ieee1394 logitech-mouse samba +svg +xrandr"
 
diff --git a/trinity-base/kdcop/kdcop-9999.ebuild b/trinity-base/kdcop/kdcop-9999.ebuild
index 18718fcf..383b0a38 100644
--- a/trinity-base/kdcop/kdcop-9999.ebuild
+++ b/trinity-base/kdcop/kdcop-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: graphical DCOP browser/client"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild
index 15fe8329..d4331bf8 100644
--- a/trinity-base/kdesktop/kdesktop-9999.ebuild
+++ b/trinity-base/kdesktop/kdesktop-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="kcheckpass/ translations/ FindXscreensaver.cmake"
 inherit trinity-meta-2
 
 DESCRIPTION="The part of TDE UI that handles icons, desktop, screensaver etc"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="pam xscreensaver hwlib"
 
 COMMON_DEPEND="
diff --git a/trinity-base/kdf/kdf-9999.ebuild b/trinity-base/kdf/kdf-9999.ebuild
index cfd6c4a3..634a485e 100644
--- a/trinity-base/kdf/kdf-9999.ebuild
+++ b/trinity-base/kdf/kdf-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity free disk space utility"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kdialog/kdialog-9999.ebuild b/trinity-base/kdialog/kdialog-9999.ebuild
index 2f7295a6..b0175d78 100644
--- a/trinity-base/kdialog/kdialog-9999.ebuild
+++ b/trinity-base/kdialog/kdialog-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kdict/kdict-9999.ebuild b/trinity-base/kdict/kdict-9999.ebuild
index f006dc04..decc65b9 100644
--- a/trinity-base/kdict/kdict-9999.ebuild
+++ b/trinity-base/kdict/kdict-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity dict client (for dict.org-like servers)"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kdvi/kdvi-9999.ebuild b/trinity-base/kdvi/kdvi-9999.ebuild
index 09a435ba..3cb9473f 100644
--- a/trinity-base/kdvi/kdvi-9999.ebuild
+++ b/trinity-base/kdvi/kdvi-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="kviewshell"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity DVI viewer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="
 	media-libs/freetype
diff --git a/trinity-base/kedit/kedit-9999.ebuild b/trinity-base/kedit/kedit-9999.ebuild
index 8c24fa51..72b431a0 100644
--- a/trinity-base/kedit/kedit-9999.ebuild
+++ b/trinity-base/kedit/kedit-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Very simple text editor for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kenolaba/kenolaba-9999.ebuild b/trinity-base/kenolaba/kenolaba-9999.ebuild
index 14109883..a65e174f 100644
--- a/trinity-base/kenolaba/kenolaba-9999.ebuild
+++ b/trinity-base/kenolaba/kenolaba-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Board game inspired by Abalone"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfax/kfax-9999.ebuild b/trinity-base/kfax/kfax-9999.ebuild
index 37caf389..ce14e814 100644
--- a/trinity-base/kfax/kfax-9999.ebuild
+++ b/trinity-base/kfax/kfax-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="kviewshell"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity G3/G4 fax viewer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/kviewshell-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfind/kfind-9999.ebuild b/trinity-base/kfind/kfind-9999.ebuild
index 12d5f6a2..8cf06c9b 100644
--- a/trinity-base/kfind/kfind-9999.ebuild
+++ b/trinity-base/kfind/kfind-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity file find utility"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfloppy/kfloppy-9999.ebuild b/trinity-base/kfloppy/kfloppy-9999.ebuild
index ff8fa44e..a97b9bc2 100644
--- a/trinity-base/kfloppy/kfloppy-9999.ebuild
+++ b/trinity-base/kfloppy/kfloppy-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kfouleggs/kfouleggs-9999.ebuild b/trinity-base/kfouleggs/kfouleggs-9999.ebuild
index 389bc031..46562389 100644
--- a/trinity-base/kfouleggs/kfouleggs-9999.ebuild
+++ b/trinity-base/kfouleggs/kfouleggs-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kgamma/kgamma-9999.ebuild b/trinity-base/kgamma/kgamma-9999.ebuild
index 92bcaa50..0b2911a4 100644
--- a/trinity-base/kgamma/kgamma-9999.ebuild
+++ b/trinity-base/kgamma/kgamma-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity screen gamma values kcontrol module"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/kcontrol-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kget/kget-9999.ebuild b/trinity-base/kget/kget-9999.ebuild
index 4305d676..260ac857 100644
--- a/trinity-base/kget/kget-9999.ebuild
+++ b/trinity-base/kget/kget-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="An advanced download manager for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXext"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kghostview/kghostview-9999.ebuild b/trinity-base/kghostview/kghostview-9999.ebuild
index 11268366..8bcffb3d 100644
--- a/trinity-base/kghostview/kghostview-9999.ebuild
+++ b/trinity-base/kghostview/kghostview-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="A Trinity Viewer for PostScript (.ps, .eps) and PDF (.pdf) files"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXft"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
index b73b5791..8b965ea6 100644
--- a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: KGoldrunner is a game of action and puzzle solving"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kgpg/kgpg-9999.ebuild b/trinity-base/kgpg/kgpg-9999.ebuild
index 560a9f67..98b87b40 100644
--- a/trinity-base/kgpg/kgpg-9999.ebuild
+++ b/trinity-base/kgpg/kgpg-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity gpg keyring manager"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="app-crypt/gnupg
 	|| (
diff --git a/trinity-base/khelpcenter/khelpcenter-9999.ebuild b/trinity-base/khelpcenter/khelpcenter-9999.ebuild
index c7dd9f2a..f6053741 100644
--- a/trinity-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="The Trinity help center"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/tdebase-tdeioslaves-${PV}
diff --git a/trinity-base/khexedit/khexedit-9999.ebuild b/trinity-base/khexedit/khexedit-9999.ebuild
index 211b44b3..43f2701d 100644
--- a/trinity-base/khexedit/khexedit-9999.ebuild
+++ b/trinity-base/khexedit/khexedit-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity hex editor"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild
index 6bb6ce64..cc6a00fa 100644
--- a/trinity-base/khotkeys/khotkeys-9999.ebuild
+++ b/trinity-base/khotkeys/khotkeys-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity hotkey daemon"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXtst"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kicker-applets/kicker-applets-9999.ebuild b/trinity-base/kicker-applets/kicker-applets-9999.ebuild
index db8115e1..ff94e61f 100644
--- a/trinity-base/kicker-applets/kicker-applets-9999.ebuild
+++ b/trinity-base/kicker-applets/kicker-applets-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="kicker applets"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/kicker-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild
index bc4a8d2d..de3b1633 100644
--- a/trinity-base/kicker/kicker-9999.ebuild
+++ b/trinity-base/kicker/kicker-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="The Trinity application starter panel, capable of applets and extensions"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="xcomposite hwlib"
 
 DEPEND="~trinity-base/libkonq-${PV}
diff --git a/trinity-base/kjots/kjots-9999.ebuild b/trinity-base/kjots/kjots-9999.ebuild
index f1a58b34..ba65da84 100644
--- a/trinity-base/kjots/kjots-9999.ebuild
+++ b/trinity-base/kjots/kjots-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity note taking utility"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
index e551a7a0..14c586cb 100644
--- a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Tactical one or two player game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild b/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild
index 535509e4..b7375c64 100644
--- a/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild
+++ b/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity battery monitoring and management for laptops"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="xscreensaver"
 
 RDEPEND="
diff --git a/trinity-base/klickety/klickety-9999.ebuild b/trinity-base/klickety/klickety-9999.ebuild
index a92a5a69..aaa7f61e 100644
--- a/trinity-base/klickety/klickety-9999.ebuild
+++ b/trinity-base/klickety/klickety-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Klickety is an adaptation of the clickomania game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klines/klines-9999.ebuild b/trinity-base/klines/klines-9999.ebuild
index 4c9b80dc..ad7b135a 100644
--- a/trinity-base/klines/klines-9999.ebuild
+++ b/trinity-base/klines/klines-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Kolor Lines - a little game about balls and how to get rid of them"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klipper/klipper-9999.ebuild b/trinity-base/klipper/klipper-9999.ebuild
index 68977738..f9c5bfd7 100644
--- a/trinity-base/klipper/klipper-9999.ebuild
+++ b/trinity-base/klipper/klipper-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="kicker applet for Trinity and X clipboard management"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXfixes"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmahjongg/kmahjongg-9999.ebuild b/trinity-base/kmahjongg/kmahjongg-9999.ebuild
index 0111cabd..47c9c030 100644
--- a/trinity-base/kmahjongg/kmahjongg-9999.ebuild
+++ b/trinity-base/kmahjongg/kmahjongg-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Mahjongg for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmenuedit/kmenuedit-9999.ebuild b/trinity-base/kmenuedit/kmenuedit-9999.ebuild
index 57a18714..b8fbf866 100644
--- a/trinity-base/kmenuedit/kmenuedit-9999.ebuild
+++ b/trinity-base/kmenuedit/kmenuedit-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity menu editor"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kmilo/kmilo-9999.ebuild b/trinity-base/kmilo/kmilo-9999.ebuild
index 83b224e5..3a842a2f 100644
--- a/trinity-base/kmilo/kmilo-9999.ebuild
+++ b/trinity-base/kmilo/kmilo-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="kded module that supports some hardware input devices, such as special keys"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="asus-laptop dell-laptop lm-sensors powerbook-laptop thinkpad-laptop vaio-laptop"
 
 DEPEND="powerbook-laptop? ( app-laptop/pbbuttonsd )"
diff --git a/trinity-base/kmines/kmines-9999.ebuild b/trinity-base/kmines/kmines-9999.ebuild
index dc859136..565d2cd3 100644
--- a/trinity-base/kmines/kmines-9999.ebuild
+++ b/trinity-base/kmines/kmines-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="KMines is a classic mine sweeper game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmobile/kmobile-9999.ebuild b/trinity-base/kmobile/kmobile-9999.ebuild
index 960f85c0..c7c2b15e 100644
--- a/trinity-base/kmobile/kmobile-9999.ebuild
+++ b/trinity-base/kmobile/kmobile-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="libtdepim/"
 inherit trinity-meta-2
 
 DESCRIPTION="A TDE Mobile Devices Manager"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kmoon/kmoon-9999.ebuild b/trinity-base/kmoon/kmoon-9999.ebuild
index 27afdae2..f9625217 100644
--- a/trinity-base/kmoon/kmoon-9999.ebuild
+++ b/trinity-base/kmoon/kmoon-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity moon phase display"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kmrml/kmrml-9999.ebuild b/trinity-base/kmrml/kmrml-9999.ebuild
index 667b355a..70c3515b 100644
--- a/trinity-base/kmrml/kmrml-9999.ebuild
+++ b/trinity-base/kmrml/kmrml-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="TDEIO and konqueror plugins for MRML - an image indexing service"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/knetattach/knetattach-9999.ebuild b/trinity-base/knetattach/knetattach-9999.ebuild
index e372bbe7..96e09ab4 100644
--- a/trinity-base/knetattach/knetattach-9999.ebuild
+++ b/trinity-base/knetattach/knetattach-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity network wizard"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/knetwalk/knetwalk-9999.ebuild b/trinity-base/knetwalk/knetwalk-9999.ebuild
index 2653c39b..592882b8 100644
--- a/trinity-base/knetwalk/knetwalk-9999.ebuild
+++ b/trinity-base/knetwalk/knetwalk-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity tron game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild
index 357678e4..a98e0140 100644
--- a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild
+++ b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Kicker applet - RSS news ticker"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/knewsticker-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knewsticker/knewsticker-9999.ebuild b/trinity-base/knewsticker/knewsticker-9999.ebuild
index 558dcf48..3772450e 100644
--- a/trinity-base/knewsticker/knewsticker-9999.ebuild
+++ b/trinity-base/knewsticker/knewsticker-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="librss"
 inherit trinity-meta-2
 
 DESCRIPTION="kicker plugin: rss news ticker"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/librss-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kodo/kodo-9999.ebuild b/trinity-base/kodo/kodo-9999.ebuild
index 2faec021..4c2eff16 100644
--- a/trinity-base/kodo/kodo-9999.ebuild
+++ b/trinity-base/kodo/kodo-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: measure the desktop mileage of your mouse pointer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kolf/kolf-9999.ebuild b/trinity-base/kolf/kolf-9999.ebuild
index 7a5359a5..a159769a 100644
--- a/trinity-base/kolf/kolf-9999.ebuild
+++ b/trinity-base/kolf/kolf-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Minigolf Game by Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kolourpaint/kolourpaint-9999.ebuild b/trinity-base/kolourpaint/kolourpaint-9999.ebuild
index 750617db..14a3ee5a 100644
--- a/trinity-base/kolourpaint/kolourpaint-9999.ebuild
+++ b/trinity-base/kolourpaint/kolourpaint-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Paint Program for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/konq-plugins/konq-plugins-9999.ebuild b/trinity-base/konq-plugins/konq-plugins-9999.ebuild
index e2735ce7..909094c1 100644
--- a/trinity-base/konq-plugins/konq-plugins-9999.ebuild
+++ b/trinity-base/konq-plugins/konq-plugins-9999.ebuild
@@ -9,6 +9,9 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Various plugins for Konqueror"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/konqueror-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/konqueror/konqueror-9999.ebuild b/trinity-base/konqueror/konqueror-9999.ebuild
index ed12a642..314df785 100644
--- a/trinity-base/konqueror/konqueror-9999.ebuild
+++ b/trinity-base/konqueror/konqueror-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="kdesktop translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Web browser, file manager, ..."
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="java"
 # FIXME: support branding USE flag
 
diff --git a/trinity-base/konquest/konquest-9999.ebuild b/trinity-base/konquest/konquest-9999.ebuild
index 67589743..4c897699 100644
--- a/trinity-base/konquest/konquest-9999.ebuild
+++ b/trinity-base/konquest/konquest-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Galactic Strategy Trinity Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild
index bec88333..0434f135 100644
--- a/trinity-base/konsole/konsole-9999.ebuild
+++ b/trinity-base/konsole/konsole-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="X terminal for use with Trinity"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="sudo"
 
 DEPEND="
diff --git a/trinity-base/kontact/Manifest b/trinity-base/kontact/Manifest
index 7add9d33..6cfcf9e7 100644
--- a/trinity-base/kontact/Manifest
+++ b/trinity-base/kontact/Manifest
@@ -1,2 +1 @@
-DIST tdepim-trinity-14.0.7.tar.xz 9367460 BLAKE2B cbb4a16cd18dcfbd09dffd829b086c02af36863e57b72af8496c28870b21cbfe2525809f0116e38ccbfd03ec0216617c240c46248f63fb35c993fe632c434048 SHA512 ebedf72b1454c22dfa60608ce83083e3e366758160b42dbaf881f754a0d95ea3cef9b5bbfe1849f3ef6ecfc2fb9635056cc8595d3f7e910e1c91394aceb2c76d
 DIST tdepim-trinity-14.0.8.tar.xz 9357184 BLAKE2B d5e489faa5a2e7db41dc1f076280e8115fd5c7cfd136c65088418ef1e2f2e5ddb0eaf013818acabeb96d7b4ed72ae4b749b1872066c6f804fd4292aa7c0d1c5f SHA512 f9f4d49d5ec02f1e2f472d4dff5b1f326ffa657e3e33f83a3d396ae729c978afcf2ee6256098f4bf0f958a17838a50633a27cbb11e4d177f19b306b72bb5db62
diff --git a/trinity-base/kooka/kooka-9999.ebuild b/trinity-base/kooka/kooka-9999.ebuild
index 73ccd63e..0cfa2d30 100644
--- a/trinity-base/kooka/kooka-9999.ebuild
+++ b/trinity-base/kooka/kooka-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libkscan"
 inherit trinity-meta-2
 
 DESCRIPTION="Kooka is a Trinity application which provides access to scanner hardware"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="
 	media-libs/tiff:=
diff --git a/trinity-base/kopete/kopete-9999.ebuild b/trinity-base/kopete/kopete-9999.ebuild
index e07887e8..1963acaa 100644
--- a/trinity-base/kopete/kopete-9999.ebuild
+++ b/trinity-base/kopete/kopete-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity multi-protocol IM client"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="gsmlib jingle kernel_linux netmeeting speex"
 PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt
 	highlight history latex motionautoaway netmeeting nowlistening smpppdcs
diff --git a/trinity-base/kpager/kpager-9999.ebuild b/trinity-base/kpager/kpager-9999.ebuild
index 03aab229..94f98290 100644
--- a/trinity-base/kpager/kpager-9999.ebuild
+++ b/trinity-base/kpager/kpager-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Virtual Desktop Overview"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kpat/kpat-9999.ebuild b/trinity-base/kpat/kpat-9999.ebuild
index 21bf56f3..8c71f645 100644
--- a/trinity-base/kpat/kpat-9999.ebuild
+++ b/trinity-base/kpat/kpat-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity patience game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kpdf/kpdf-9999.ebuild b/trinity-base/kpdf/kpdf-9999.ebuild
index cee0ba4f..cc0a13c6 100644
--- a/trinity-base/kpdf/kpdf-9999.ebuild
+++ b/trinity-base/kpdf/kpdf-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="KPDF, a Trinity PDF viewer based on XPDF"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="media-libs/freetype"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild
index 44ee15bd..ae1cf546 100644
--- a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild
+++ b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="libkonq/ translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity user settings wizard"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kpf/kpf-9999.ebuild b/trinity-base/kpf/kpf-9999.ebuild
index 2056d2c7..5fc0a519 100644
--- a/trinity-base/kpf/kpf-9999.ebuild
+++ b/trinity-base/kpf/kpf-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Kicker file server (http) applet"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kpoker/kpoker-9999.ebuild b/trinity-base/kpoker/kpoker-9999.ebuild
index c016afc8..b9264364 100644
--- a/trinity-base/kpoker/kpoker-9999.ebuild
+++ b/trinity-base/kpoker/kpoker-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity poker game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild b/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild
index 435c177f..5680ae13 100644
--- a/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild
+++ b/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Modeler for POV-Ray Scenes."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="virtual/opengl
 	media-libs/freetype"
diff --git a/trinity-base/kppp/kppp-9999.ebuild b/trinity-base/kppp/kppp-9999.ebuild
index 5905a4e4..568df676 100644
--- a/trinity-base/kppp/kppp-9999.ebuild
+++ b/trinity-base/kppp/kppp-9999.ebuild
@@ -8,5 +8,8 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: A dialer and front-end to pppd."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="net-dialup/ppp"
diff --git a/trinity-base/krdc/krdc-9999.ebuild b/trinity-base/krdc/krdc-9999.ebuild
index f28523a2..86d94d45 100644
--- a/trinity-base/krdc/krdc-9999.ebuild
+++ b/trinity-base/krdc/krdc-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity remote desktop connection (RDP and VNC) client"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="rdp libressl"
 
 DEPEND="
diff --git a/trinity-base/kreadconfig/kreadconfig-9999.ebuild b/trinity-base/kreadconfig/kreadconfig-9999.ebuild
index fea27dff..b28e7534 100644
--- a/trinity-base/kreadconfig/kreadconfig-9999.ebuild
+++ b/trinity-base/kreadconfig/kreadconfig-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="A Trinity tool to read KConfig entries - for use in shell scripts"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild b/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild
index 82126d61..855f819a 100644
--- a/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild
+++ b/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Editor for Regular Expressions"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kreversi/kreversi-9999.ebuild b/trinity-base/kreversi/kreversi-9999.ebuild
index 51aad368..5d5e6923 100644
--- a/trinity-base/kreversi/kreversi-9999.ebuild
+++ b/trinity-base/kreversi/kreversi-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Board Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/krfb/krfb-9999.ebuild b/trinity-base/krfb/krfb-9999.ebuild
index 4ef1a159..8444bcd0 100644
--- a/trinity-base/krfb/krfb-9999.ebuild
+++ b/trinity-base/krfb/krfb-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="VNC-compatible server to share Trinity desktops"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="libressl"
 
 DEPEND="
diff --git a/trinity-base/krootbacking/krootbacking-9999.ebuild b/trinity-base/krootbacking/krootbacking-9999.ebuild
index 34bf6684..8756c2d7 100644
--- a/trinity-base/krootbacking/krootbacking-9999.ebuild
+++ b/trinity-base/krootbacking/krootbacking-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="A program to grab the current TDE desktop background for xscreensaver."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kruler/kruler-9999.ebuild b/trinity-base/kruler/kruler-9999.ebuild
index 14dada39..85a25bda 100644
--- a/trinity-base/kruler/kruler-9999.ebuild
+++ b/trinity-base/kruler/kruler-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="A screen ruler for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ksame/ksame-9999.ebuild b/trinity-base/ksame/ksame-9999.ebuild
index 7f723bf3..68bd2566 100644
--- a/trinity-base/ksame/ksame-9999.ebuild
+++ b/trinity-base/ksame/ksame-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Same Game - a little game about balls and how to get rid of them"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kshisen/kshisen-9999.ebuild b/trinity-base/kshisen/kshisen-9999.ebuild
index 531ecc0e..d31605f2 100644
--- a/trinity-base/kshisen/kshisen-9999.ebuild
+++ b/trinity-base/kshisen/kshisen-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="A Trinity game similiar to Mahjongg"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksig/ksig-9999.ebuild b/trinity-base/ksig/ksig-9999.ebuild
index 0ab298ed..a1a7b605 100644
--- a/trinity-base/ksig/ksig-9999.ebuild
+++ b/trinity-base/ksig/ksig-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity email signature manager"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ksim/ksim-9999.ebuild b/trinity-base/ksim/ksim-9999.ebuild
index cafc64ee..33b4047b 100644
--- a/trinity-base/ksim/ksim-9999.ebuild
+++ b/trinity-base/ksim/ksim-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity system monitoring applets"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="dell-laptop lm-sensors snmp"
 
 DEPEND="
diff --git a/trinity-base/ksirc/ksirc-9999.ebuild b/trinity-base/ksirc/ksirc-9999.ebuild
index 2e131c24..cc4bb164 100644
--- a/trinity-base/ksirc/ksirc-9999.ebuild
+++ b/trinity-base/ksirc/ksirc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity irc client"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/trinity-base/ksirtet/ksirtet-9999.ebuild b/trinity-base/ksirtet/ksirtet-9999.ebuild
index a664cd49..6bc65e4f 100644
--- a/trinity-base/ksirtet/ksirtet-9999.ebuild
+++ b/trinity-base/ksirtet/ksirtet-9999.ebuild
@@ -10,6 +10,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksmiletris/ksmiletris-9999.ebuild b/trinity-base/ksmiletris/ksmiletris-9999.ebuild
index 07e683f3..3a854eed 100644
--- a/trinity-base/ksmiletris/ksmiletris-9999.ebuild
+++ b/trinity-base/ksmiletris/ksmiletris-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity SmileTris"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksmserver/ksmserver-9999.ebuild b/trinity-base/ksmserver/ksmserver-9999.ebuild
index cf46c428..dfc8b3fd 100644
--- a/trinity-base/ksmserver/ksmserver-9999.ebuild
+++ b/trinity-base/ksmserver/ksmserver-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="The reliable Trinity session manager that talks the standard X11R6"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="+hwlib"
 
 src_configure() {
diff --git a/trinity-base/ksnake/ksnake-9999.ebuild b/trinity-base/ksnake/ksnake-9999.ebuild
index c5428e03..70434556 100644
--- a/trinity-base/ksnake/ksnake-9999.ebuild
+++ b/trinity-base/ksnake/ksnake-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Tron game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksnapshot/ksnapshot-9999.ebuild b/trinity-base/ksnapshot/ksnapshot-9999.ebuild
index 75f992d6..d54369ad 100644
--- a/trinity-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/trinity-base/ksnapshot/ksnapshot-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Screenshot Utility"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXext"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksokoban/ksokoban-9999.ebuild b/trinity-base/ksokoban/ksokoban-9999.ebuild
index e40d913b..0c337d8e 100644
--- a/trinity-base/ksokoban/ksokoban-9999.ebuild
+++ b/trinity-base/ksokoban/ksokoban-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="The japanese warehouse keeper game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kspaceduel/kspaceduel-9999.ebuild b/trinity-base/kspaceduel/kspaceduel-9999.ebuild
index 88892aa5..d62945b6 100644
--- a/trinity-base/kspaceduel/kspaceduel-9999.ebuild
+++ b/trinity-base/kspaceduel/kspaceduel-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Space Game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksplashml/ksplashml-9999.ebuild b/trinity-base/ksplashml/ksplashml-9999.ebuild
index 9846b251..7393c0fe 100644
--- a/trinity-base/ksplashml/ksplashml-9999.ebuild
+++ b/trinity-base/ksplashml/ksplashml-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individual apps)"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="xinerama"
 
 DEPEND="xinerama? ( x11-base/xorg-proto )"
diff --git a/trinity-base/kstart/kstart-9999.ebuild b/trinity-base/kstart/kstart-9999.ebuild
index 97888d06..7873d228 100644
--- a/trinity-base/kstart/kstart-9999.ebuild
+++ b/trinity-base/kstart/kstart-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity utility to launch applications with special window properties"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ksvg/ksvg-9999.ebuild b/trinity-base/ksvg/ksvg-9999.ebuild
index a9d36cf2..c699587b 100644
--- a/trinity-base/ksvg/ksvg-9999.ebuild
+++ b/trinity-base/ksvg/ksvg-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="SVG viewer library and embeddable kpart"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="
 	dev-libs/fribidi
diff --git a/trinity-base/ksysguard/ksysguard-9999.ebuild b/trinity-base/ksysguard/ksysguard-9999.ebuild
index 875fc99b..fc6eb4ff 100644
--- a/trinity-base/ksysguard/ksysguard-9999.ebuild
+++ b/trinity-base/ksysguard/ksysguard-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="A network enabled task manager/system monitor"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="dell-laptop lm-sensors"
 
 DEPEND="lm-sensors? ( sys-apps/lm-sensors )"
diff --git a/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild b/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild
index a1d4b3e1..86c8262d 100644
--- a/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild
+++ b/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ktalkd/ktalkd-9999.ebuild b/trinity-base/ktalkd/ktalkd-9999.ebuild
index c41671a0..ede60d5a 100644
--- a/trinity-base/ktalkd/ktalkd-9999.ebuild
+++ b/trinity-base/ktalkd/ktalkd-9999.ebuild
@@ -8,5 +8,8 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity talk daemon"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="net-misc/netkit-talk"
diff --git a/trinity-base/kteatime/kteatime-9999.ebuild b/trinity-base/kteatime/kteatime-9999.ebuild
index cc5d74a8..7e8a314f 100644
--- a/trinity-base/kteatime/kteatime-9999.ebuild
+++ b/trinity-base/kteatime/kteatime-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity utility for making a fine cup of tea"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ktimer/ktimer-9999.ebuild b/trinity-base/ktimer/ktimer-9999.ebuild
index ec308289..fb70b9fb 100644
--- a/trinity-base/ktimer/ktimer-9999.ebuild
+++ b/trinity-base/ktimer/ktimer-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Timer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ktip/ktip-9999.ebuild b/trinity-base/ktip/ktip-9999.ebuild
index e27959c7..dc1da4b6 100644
--- a/trinity-base/ktip/ktip-9999.ebuild
+++ b/trinity-base/ktip/ktip-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity tip-of-the-day displayer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/ktron/ktron-9999.ebuild b/trinity-base/ktron/ktron-9999.ebuild
index 2653c39b..592882b8 100644
--- a/trinity-base/ktron/ktron-9999.ebuild
+++ b/trinity-base/ktron/ktron-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity tron game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ktuberling/ktuberling-9999.ebuild b/trinity-base/ktuberling/ktuberling-9999.ebuild
index 02e96f00..a5bdcc74 100644
--- a/trinity-base/ktuberling/ktuberling-9999.ebuild
+++ b/trinity-base/ktuberling/ktuberling-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="A Trinity potato game for kids"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ktux/ktux-9999.ebuild b/trinity-base/ktux/ktux-9999.ebuild
index 2db65a13..8adbe424 100644
--- a/trinity-base/ktux/ktux-9999.ebuild
+++ b/trinity-base/ktux/ktux-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: screensaver featuring the Space-Faring Tux"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kuickshow/kuickshow-9999.ebuild b/trinity-base/kuickshow/kuickshow-9999.ebuild
index 0c3e1b8e..e38cd7db 100644
--- a/trinity-base/kuickshow/kuickshow-9999.ebuild
+++ b/trinity-base/kuickshow/kuickshow-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="A fast and versatile image viewer for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXext
 	media-libs/imlib"
diff --git a/trinity-base/kview/kview-9999.ebuild b/trinity-base/kview/kview-9999.ebuild
index 397fc3f8..82432992 100644
--- a/trinity-base/kview/kview-9999.ebuild
+++ b/trinity-base/kview/kview-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity image viewer"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kviewshell/kviewshell-9999.ebuild b/trinity-base/kviewshell/kviewshell-9999.ebuild
index 6a874c1f..0905b25c 100644
--- a/trinity-base/kviewshell/kviewshell-9999.ebuild
+++ b/trinity-base/kviewshell/kviewshell-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Generic framework for viewer applications"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kweather/kweather-9999.ebuild b/trinity-base/kweather/kweather-9999.ebuild
index 28a9eb6b..d5f479b2 100644
--- a/trinity-base/kweather/kweather-9999.ebuild
+++ b/trinity-base/kweather/kweather-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity weather status display"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kwifimanager/kwifimanager-9999.ebuild b/trinity-base/kwifimanager/kwifimanager-9999.ebuild
index 51739569..838e4027 100644
--- a/trinity-base/kwifimanager/kwifimanager-9999.ebuild
+++ b/trinity-base/kwifimanager/kwifimanager-9999.ebuild
@@ -10,6 +10,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity wifi (wireless network) gui"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="net-wireless/wireless-tools"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kworldclock/kworldclock-9999.ebuild b/trinity-base/kworldclock/kworldclock-9999.ebuild
index 08597f3e..fcf66733 100644
--- a/trinity-base/kworldclock/kworldclock-9999.ebuild
+++ b/trinity-base/kworldclock/kworldclock-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity program that displays the part of the Earth lit up by the Sun"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/kxkb/kxkb-9999.ebuild b/trinity-base/kxkb/kxkb-9999.ebuild
index d6b25352..b99a83b1 100644
--- a/trinity-base/kxkb/kxkb-9999.ebuild
+++ b/trinity-base/kxkb/kxkb-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="KControl module to configure and switch keyboard layouts"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXtst"
 RDEPEND="${DEPEND}
diff --git a/trinity-base/libkonq/libkonq-9999.ebuild b/trinity-base/libkonq/libkonq-9999.ebuild
index 4a2e4e78..5fd7a825 100644
--- a/trinity-base/libkonq/libkonq-9999.ebuild
+++ b/trinity-base/libkonq/libkonq-9999.ebuild
@@ -10,3 +10,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="The embeddable part of konqueror"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/libkscan/libkscan-9999.ebuild b/trinity-base/libkscan/libkscan-9999.ebuild
index 05b22801..616e116b 100644
--- a/trinity-base/libkscan/libkscan-9999.ebuild
+++ b/trinity-base/libkscan/libkscan-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity scanner library"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="media-gfx/sane-backends"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/librss/librss-9999.ebuild b/trinity-base/librss/librss-9999.ebuild
index 2ff8bfd5..adeebfd1 100644
--- a/trinity-base/librss/librss-9999.ebuild
+++ b/trinity-base/librss/librss-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity rss library"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
\ No newline at end of file
diff --git a/trinity-base/libtdegames/libtdegames-9999.ebuild b/trinity-base/libtdegames/libtdegames-9999.ebuild
index ea5c5c0a..0e84bee7 100644
--- a/trinity-base/libtdegames/libtdegames-9999.ebuild
+++ b/trinity-base/libtdegames/libtdegames-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Base library common to many Trinity games"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/lisa/lisa-9999.ebuild b/trinity-base/lisa/lisa-9999.ebuild
index 24474e81..1e471c6f 100644
--- a/trinity-base/lisa/lisa-9999.ebuild
+++ b/trinity-base/lisa/lisa-9999.ebuild
@@ -9,6 +9,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Lan Information Server - allows to share information over a network."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 src_install() {
 	trinity-meta-2_src_install
diff --git a/trinity-base/lskat/lskat-9999.ebuild b/trinity-base/lskat/lskat-9999.ebuild
index 28d50952..0cd9b934 100644
--- a/trinity-base/lskat/lskat-9999.ebuild
+++ b/trinity-base/lskat/lskat-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity card game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
index 67edc994..09cf4788 100644
--- a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
+++ b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
@@ -9,7 +9,9 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2 db-use
 
 DESCRIPTION="Various plugins for Noatun"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="sdl berkdb"
 
 COMMON_DEPEND="
diff --git a/trinity-base/noatun/noatun-9999.ebuild b/trinity-base/noatun/noatun-9999.ebuild
index f3162a5b..40a3a0bd 100644
--- a/trinity-base/noatun/noatun-9999.ebuild
+++ b/trinity-base/noatun/noatun-9999.ebuild
@@ -10,6 +10,9 @@ inherit trinity-meta-2
 
 DESCRIPTION="Media player featuring audio effects, graphic equalizer and network transparency"
 HOMEPAGE="https://trinitydesktop.org/"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
 DEPEND="${RDEPEND}
diff --git a/trinity-base/nsplugins/nsplugins-9999.ebuild b/trinity-base/nsplugins/nsplugins-9999.ebuild
index f75c529b..2bc45099 100644
--- a/trinity-base/nsplugins/nsplugins-9999.ebuild
+++ b/trinity-base/nsplugins/nsplugins-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Netscape plugins support for Konqueror"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="x11-libs/libXt
 	dev-libs/glib"
diff --git a/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
index 7b22c3bc..946130b2 100644
--- a/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
+++ b/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT="renamedlgplugins"
 inherit trinity-meta-2
 
 DESCRIPTION="Renamedlg plugins for image and audio files"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/superkaramba/superkaramba-9999.ebuild b/trinity-base/superkaramba/superkaramba-9999.ebuild
index b6d66768..04985b63 100644
--- a/trinity-base/superkaramba/superkaramba-9999.ebuild
+++ b/trinity-base/superkaramba/superkaramba-9999.ebuild
@@ -8,7 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="A tool to create interactive applets for the Trinity desktop"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 #FIXME: add xmms use
 IUSE=""
 
diff --git a/trinity-base/tde-i18n/tde-i18n-9999.ebuild b/trinity-base/tde-i18n/tde-i18n-9999.ebuild
index dfcd88df..b8bf3981 100644
--- a/trinity-base/tde-i18n/tde-i18n-9999.ebuild
+++ b/trinity-base/tde-i18n/tde-i18n-9999.ebuild
@@ -16,6 +16,9 @@ DESCRIPTION="Trinity internationalization package"
 HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 SLOT="14"
 
 for X in ${TRINITY_LANGS} ; do
diff --git a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild
index 20646f61..83f5ebf6 100644
--- a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild
+++ b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Documentaion for tdeaddons-derived packages"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/khelpcenter-${PV}"
diff --git a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild
index f8e2a342..506cdd27 100644
--- a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild
+++ b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/atlantikdesigner-${PV}
diff --git a/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild b/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild
index da57989a..74fb49f7 100644
--- a/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild
+++ b/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeaddons"
 inherit trinity-meta-2
 
 DESCRIPTION="Various basic tdefile plugins provided by tdeaddons"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
\ No newline at end of file
diff --git a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild
index 24bb1576..ad933bda 100644
--- a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild
+++ b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="EmotIcons (icons for things like smilies :-) for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild
index 22955bed..026bf1c5 100644
--- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild
+++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Themes for IceWM from the tdeartwork package."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/tdeartwork-twin-styles-${PV}"
diff --git a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild
index 2217bd54..ffdba3a9 100644
--- a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild
+++ b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT="IconThemes/"
 inherit trinity-meta-2
 
 DESCRIPTION="Icon themes for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild
index f6b2c476..03907acc 100644
--- a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild
+++ b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="kworldclock from tdeartwork"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/kworldclock-${PV}"
diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
index 6735ce27..8cc9cc13 100644
--- a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
+++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/tdeartwork-emoticons-${PV}
diff --git a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild
index a7f92a57..57fbe1f6 100644
--- a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild
+++ b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Extra sound themes for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild b/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild
index f34024d4..baeab437 100644
--- a/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild
+++ b/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Extra styles for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild
index d06792a8..7ba4e9c8 100644
--- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild
+++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild
@@ -10,7 +10,9 @@ TSM_EXTRACT_ALSO="FindXscreensaver.cmake"
 inherit trinity-meta-2
 
 DESCRIPTION="Extra screensavers for Trinity"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="kclock opengl xscreensaver"
 
 DEPEND="
diff --git a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
index 8c0f46b3..9bbfc9ac 100644
--- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
+++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
@@ -7,6 +7,9 @@ EAPI="7"
 TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 DESCRIPTION="Window styles for Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/twin-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild
index 9b09c0f0..b94fb838 100644
--- a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild
+++ b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Wallpapers from Trinity"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdebase-data/tdebase-data-9999.ebuild b/trinity-base/tdebase-data/tdebase-data-9999.ebuild
index 40affb67..3ffa5425 100644
--- a/trinity-base/tdebase-data/tdebase-data-9999.ebuild
+++ b/trinity-base/tdebase-data/tdebase-data-9999.ebuild
@@ -10,3 +10,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Icons, localization data and .desktop files from tdebase"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
index 90b52904..58efc180 100644
--- a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
+++ b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/drkonqi-${PV}
diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
index 58ed2600..11d5bd7e 100644
--- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
+++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm r14-xd
 inherit trinity-meta-2
 
 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="x11-apps/xmessage
 	x11-apps/xsetroot
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
index c7dbc9c0..8d0e3ccb 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
@@ -10,7 +10,9 @@ TSM_EXTRACT="tdeioslave"
 inherit trinity-meta-2
 
 DESCRIPTION="Generic Trinity TDEIOslaves"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="+hwlib ldap openexr samba sasl"
 
 DEPEND="
diff --git a/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild b/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild
index 8c8504d3..a1ff7fa4 100644
--- a/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild
+++ b/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="A Trinity dialog box for setting preferences for debug output"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdednssd/tdednssd-9999.ebuild b/trinity-base/tdednssd/tdednssd-9999.ebuild
index 92c6585c..e0bf761e 100644
--- a/trinity-base/tdednssd/tdednssd-9999.ebuild
+++ b/trinity-base/tdednssd/tdednssd-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdeeject/tdeeject-9999.ebuild b/trinity-base/tdeeject/tdeeject-9999.ebuild
index e2b37d2a..c52548bc 100644
--- a/trinity-base/tdeeject/tdeeject-9999.ebuild
+++ b/trinity-base/tdeeject/tdeeject-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity eject frontend"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/kdialog-${PV}"
 RDEPEND="${DEPEND}
diff --git a/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild b/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild
index f72b6cbc..c3cf92b5 100644
--- a/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild
+++ b/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="A batch search and replace tool for TDE"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
index 0f3e5f5d..21ca7771 100644
--- a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
+++ b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegames"
 inherit trinity-meta-2
 
 DESCRIPTION="Documentaion for tdegames-derived packages"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/khelpcenter-${PV}"
diff --git a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
index a5ae70fb..b021adc9 100644
--- a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
+++ b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/atlantik-${PV}
diff --git a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild
index fcfbeeed..c5da4f32 100644
--- a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild
+++ b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Documentaion for tdegraphics-derived packages"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/khelpcenter-${PV}"
diff --git a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild
index d8f2fb18..dee407a1 100644
--- a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild
+++ b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/kamera-${PV}
diff --git a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild
index b45a8d68..68ff5774 100644
--- a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild
+++ b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="kghostview/dscparse/"
 inherit trinity-meta-2
 
 DESCRIPTION="tdefile plugins from tdegraphics"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="tiff openexr pdf"
 
 DEPEND="
diff --git a/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild b/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild
index b91a182b..539d8b32 100644
--- a/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild
+++ b/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdegraphics"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Icon Editor"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdeinit/tdeinit-9999.ebuild b/trinity-base/tdeinit/tdeinit-9999.ebuild
index 516a5835..35f54735 100644
--- a/trinity-base/tdeinit/tdeinit-9999.ebuild
+++ b/trinity-base/tdeinit/tdeinit-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity init binary replacing some functions of the starttde script"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdelirc/tdelirc-9999.ebuild b/trinity-base/tdelirc/tdelirc-9999.ebuild
index 69980301..03cf955c 100644
--- a/trinity-base/tdelirc/tdelirc-9999.ebuild
+++ b/trinity-base/tdelirc/tdelirc-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="TDElirc - Trinity Frontend to lirc"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild
index 15c1adcd..a911e202 100644
--- a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild
+++ b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="Documentaion for tdenetwork-derived packages"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/khelpcenter-${PV}"
diff --git a/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild b/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild
index 3977b49d..e1b82be9 100644
--- a/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild
+++ b/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
index 371deb05..c1fedfec 100644
--- a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
+++ b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/dcoprss-${PV}
diff --git a/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild b/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild
index 9e5031ef..f8448953 100644
--- a/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild
+++ b/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdenetwork"
 inherit trinity-meta-2
 
 DESCRIPTION="tdefile plugins from the tdenetwork provides a torrent file support."
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdepasswd/tdepasswd-9999.ebuild b/trinity-base/tdepasswd/tdepasswd-9999.ebuild
index d2eecd1a..812a961d 100644
--- a/trinity-base/tdepasswd/tdepasswd-9999.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity GUI for passwd"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdeprint/tdeprint-9999.ebuild b/trinity-base/tdeprint/tdeprint-9999.ebuild
index 5a9032c6..5efff02e 100644
--- a/trinity-base/tdeprint/tdeprint-9999.ebuild
+++ b/trinity-base/tdeprint/tdeprint-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity printer queue/device manager"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
index 2ee1fc48..cc484994 100644
--- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity screensaver framework"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="opengl +krootbacking"
 
 DEPEND="x11-libs/libXt
diff --git a/trinity-base/tdesu/tdesu-9999.ebuild b/trinity-base/tdesu/tdesu-9999.ebuild
index 0b3d522d..3b72f07e 100644
--- a/trinity-base/tdesu/tdesu-9999.ebuild
+++ b/trinity-base/tdesu/tdesu-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity gui for su(1) or sudo"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="sudo"
 
 DEPEND="sudo? ( app-admin/sudo )"
diff --git a/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild b/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild
index 1b2c249e..e911b602 100644
--- a/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild
+++ b/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdetoys"
 inherit trinity-meta-2
 
 DESCRIPTION="Documentation for tdetoys-derived packages"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/khelpcenter-${PV}
diff --git a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
index 436a3e00..d230113c 100644
--- a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
+++ b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/amor-${PV}
diff --git a/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild b/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild
index 898fca44..312d34d4 100644
--- a/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild
+++ b/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild
@@ -8,6 +8,9 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Documentaion for tdeutils-derived packages"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="~trinity-base/khelpcenter-${PV}"
 
diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
index 79032745..9dc64e93 100644
--- a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
+++ b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
@@ -9,6 +9,9 @@ HOMEPAGE="https://trinitydesktop.org/"
 
 LICENSE="metapackage"
 SLOT="14"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 RDEPEND="
 	~trinity-base/ark-${PV}
diff --git a/trinity-base/tdewallet/tdewallet-9999.ebuild b/trinity-base/tdewallet/tdewallet-9999.ebuild
index 37bfc406..c9e3e26f 100644
--- a/trinity-base/tdewallet/tdewallet-9999.ebuild
+++ b/trinity-base/tdewallet/tdewallet-9999.ebuild
@@ -8,3 +8,6 @@ TRINITY_MODULE_NAME="tdeutils"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity Wallet Management Tool"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index a95b41ad..c0729579 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity login manager, similar to XDM and GDM"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="+hwlib pam sak +svg xcomposite xdmcp +xrandr"
 
 DEPEND="
diff --git a/trinity-base/tqt3integration/tqt3integration-9999.ebuild b/trinity-base/tqt3integration/tqt3integration-9999.ebuild
index 46e38bd6..45817c17 100644
--- a/trinity-base/tqt3integration/tqt3integration-9999.ebuild
+++ b/trinity-base/tqt3integration/tqt3integration-9999.ebuild
@@ -9,3 +9,6 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2
 
 DESCRIPTION="Makes TQt-only apps use several TDE dialogs"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
diff --git a/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild b/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild
index ee611c8c..36d85ce3 100644
--- a/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild
+++ b/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild
@@ -11,6 +11,9 @@ inherit trinity-base-2
 DESCRIPTION="Common cmake modules for Trinity Desktop Environment"
 HOMEPAGE="https://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 src_configure() {
 	cmake-utils_src_configure
diff --git a/trinity-base/twin/twin-9999.ebuild b/trinity-base/twin/twin-9999.ebuild
index a6111d66..80498c50 100644
--- a/trinity-base/twin/twin-9999.ebuild
+++ b/trinity-base/twin/twin-9999.ebuild
@@ -9,7 +9,9 @@ TSM_EXTRACT_ALSO="translations/"
 inherit trinity-meta-2 eutils
 
 DESCRIPTION="Trinity window manager"
-
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 IUSE="xcomposite xrandr xinerama +libconfig +pcre opengl"
 
 DEPEND="x11-libs/libXext
diff --git a/trinity-base/twin4/twin4-9999.ebuild b/trinity-base/twin4/twin4-9999.ebuild
index 6debceab..c3808df9 100644
--- a/trinity-base/twin4/twin4-9999.ebuild
+++ b/trinity-base/twin4/twin4-9999.ebuild
@@ -9,6 +9,9 @@ TSM_EXTRACT_ALSO="libtdegames/"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity four-in-a-row game"
+if [[ ${PV} != *9999* ]] ; then
+    KEYWORDS="~amd64 ~x86"
+fi
 
 DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"