public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/krdc/, kde-base/juk/, kde-base/libplasmagenericshell/, ...
Date: Fri, 16 Nov 2012 18:19:42 +0000 (UTC)	[thread overview]
Message-ID: <1353089878.7be3ab27c8329b5a533340da7ae8a63b06e1fa01.alexxy@gentoo> (raw)

commit:     7be3ab27c8329b5a533340da7ae8a63b06e1fa01
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 18:17:58 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 18:17:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7be3ab27

[kde-base] Add KDE SC 4.10 beta1

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 ...le-9999.ebuild => akonadiconsole-4.9.80.ebuild} |    4 +-
 kde-base/akonadiconsole/akonadiconsole-9999.ebuild |    2 +-
 ...regator-9999.ebuild => akregator-4.9.80.ebuild} |    4 +-
 kde-base/akregator/akregator-9999.ebuild           |    2 +-
 .../amor/{amor-9999.ebuild => amor-4.9.80.ebuild}  |    4 +-
 kde-base/amor/amor-9999.ebuild                     |    2 +-
 ...analitza-9999.ebuild => analitza-4.9.80.ebuild} |    4 +-
 kde-base/analitza/analitza-9999.ebuild             |    2 +-
 .../ark/{ark-9999.ebuild => ark-4.9.80.ebuild}     |    4 +-
 kde-base/ark/ark-9999.ebuild                       |    2 +-
 .../{attica-9999.ebuild => attica-4.9.80.ebuild}   |    4 +-
 kde-base/attica/attica-9999.ebuild                 |    2 +-
 ...d-kio-9999.ebuild => audiocd-kio-4.9.80.ebuild} |    4 +-
 kde-base/audiocd-kio/audiocd-kio-9999.ebuild       |    2 +-
 .../{blinken-9999.ebuild => blinken-4.9.80.ebuild} |    4 +-
 kde-base/blinken/blinken-9999.ebuild               |    2 +-
 .../{blogilo-9999.ebuild => blogilo-4.9.80.ebuild} |    4 +-
 kde-base/blogilo/blogilo-9999.ebuild               |    2 +-
 .../{bomber-9999.ebuild => bomber-4.9.80.ebuild}   |    4 +-
 kde-base/bomber/bomber-9999.ebuild                 |    2 +-
 .../bovo/{bovo-9999.ebuild => bovo-4.9.80.ebuild}  |    4 +-
 kde-base/bovo/bovo-9999.ebuild                     |    2 +-
 .../{cantor-9999.ebuild => cantor-4.9.80.ebuild}   |    4 +-
 kde-base/cantor/cantor-9999.ebuild                 |    2 +-
 ...cervisia-9999.ebuild => cervisia-4.9.80.ebuild} |    4 +-
 kde-base/cervisia/cervisia-9999.ebuild             |    2 +-
 ...s-9999.ebuild => dolphin-plugins-4.9.80.ebuild} |    4 +-
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |    2 +-
 .../{dolphin-9999.ebuild => dolphin-4.9.80.ebuild} |    4 +-
 kde-base/dolphin/dolphin-9999.ebuild               |    2 +-
 .../{dragon-9999.ebuild => dragon-4.9.80.ebuild}   |    4 +-
 kde-base/dragon/dragon-9999.ebuild                 |    2 +-
 .../{drkonqi-9999.ebuild => drkonqi-4.9.80.ebuild} |    4 +-
 kde-base/drkonqi/drkonqi-9999.ebuild               |    2 +-
 ...umbs-9999.ebuild => ffmpegthumbs-4.9.80.ebuild} |    4 +-
 kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild     |    2 +-
 ...lelight-9999.ebuild => filelight-4.9.80.ebuild} |    4 +-
 kde-base/filelight/filelight-9999.ebuild           |    2 +-
 ...9999.ebuild => freespacenotifier-4.9.80.ebuild} |    4 +-
 .../freespacenotifier-9999.ebuild                  |    2 +-
 ...anatier-9999.ebuild => granatier-4.9.80.ebuild} |    4 +-
 kde-base/granatier/granatier-9999.ebuild           |    2 +-
 ...gwenview-9999.ebuild => gwenview-4.9.80.ebuild} |    4 +-
 kde-base/gwenview/gwenview-9999.ebuild             |    2 +-
 .../{jovie-9999.ebuild => jovie-4.9.80.ebuild}     |    4 +-
 kde-base/jovie/jovie-9999.ebuild                   |    2 +-
 .../juk/{juk-9999.ebuild => juk-4.9.80.ebuild}     |    4 +-
 kde-base/juk/juk-9999.ebuild                       |    2 +-
 ...client-9999.ebuild => kabcclient-4.9.80.ebuild} |    4 +-
 kde-base/kabcclient/kabcclient-9999.ebuild         |    2 +-
 ...sible-9999.ebuild => kaccessible-4.9.80.ebuild} |    4 +-
 kde-base/kaccessible/kaccessible-9999.ebuild       |    2 +-
 ...ities-9999.ebuild => kactivities-4.9.80.ebuild} |    4 +-
 kde-base/kactivities/kactivities-9999.ebuild       |    2 +-
 ...book-9999.ebuild => kaddressbook-4.9.80.ebuild} |    4 +-
 kde-base/kaddressbook/kaddressbook-9999.ebuild     |    2 +-
 .../{kajongg-9999.ebuild => kajongg-4.9.80.ebuild} |    4 +-
 kde-base/kajongg/kajongg-9999.ebuild               |    2 +-
 .../{kalarm-9999.ebuild => kalarm-4.9.80.ebuild}   |    4 +-
 kde-base/kalarm/kalarm-9999.ebuild                 |    2 +-
 ...kalgebra-9999.ebuild => kalgebra-4.9.80.ebuild} |    4 +-
 kde-base/kalgebra/kalgebra-9999.ebuild             |    2 +-
 .../{kalzium-9999.ebuild => kalzium-4.9.80.ebuild} |    4 +-
 kde-base/kalzium/kalzium-9999.ebuild               |    2 +-
 .../{kamera-9999.ebuild => kamera-4.9.80.ebuild}   |    4 +-
 kde-base/kamera/kamera-9999.ebuild                 |    2 +-
 ...kanagram-9999.ebuild => kanagram-4.9.80.ebuild} |    4 +-
 kde-base/kanagram/kanagram-9999.ebuild             |    2 +-
 .../{kapman-9999.ebuild => kapman-4.9.80.ebuild}   |    4 +-
 kde-base/kapman/kapman-9999.ebuild                 |    2 +-
 ...late-9999.ebuild => kapptemplate-4.9.80.ebuild} |    4 +-
 kde-base/kapptemplate/kapptemplate-9999.ebuild     |    2 +-
 .../kate/{kate-9999.ebuild => kate-4.9.80.ebuild}  |    4 +-
 kde-base/kate/kate-9999.ebuild                     |    2 +-
 ...katepart-9999.ebuild => katepart-4.9.80.ebuild} |    4 +-
 kde-base/katepart/katepart-9999.ebuild             |    2 +-
 .../{katomic-9999.ebuild => katomic-4.9.80.ebuild} |    4 +-
 kde-base/katomic/katomic-9999.ebuild               |    2 +-
 ...lackbox-9999.ebuild => kblackbox-4.9.80.ebuild} |    4 +-
 kde-base/kblackbox/kblackbox-9999.ebuild           |    2 +-
 .../{kblocks-9999.ebuild => kblocks-4.9.80.ebuild} |    4 +-
 kde-base/kblocks/kblocks-9999.ebuild               |    2 +-
 .../{kbounce-9999.ebuild => kbounce-4.9.80.ebuild} |    4 +-
 kde-base/kbounce/kbounce-9999.ebuild               |    2 +-
 ...reakout-9999.ebuild => kbreakout-4.9.80.ebuild} |    4 +-
 kde-base/kbreakout/kbreakout-9999.ebuild           |    2 +-
 .../{kbruch-9999.ebuild => kbruch-4.9.80.ebuild}   |    4 +-
 kde-base/kbruch/kbruch-9999.ebuild                 |    2 +-
 ...grind-9999.ebuild => kcachegrind-4.9.80.ebuild} |    4 +-
 kde-base/kcachegrind/kcachegrind-9999.ebuild       |    2 +-
 .../{kcalc-9999.ebuild => kcalc-4.9.80.ebuild}     |    4 +-
 kde-base/kcalc/kcalc-9999.ebuild                   |    2 +-
 ...elect-9999.ebuild => kcharselect-4.9.80.ebuild} |    4 +-
 kde-base/kcharselect/kcharselect-9999.ebuild       |    2 +-
 ...ckpass-9999.ebuild => kcheckpass-4.9.80.ebuild} |    4 +-
 kde-base/kcheckpass/kcheckpass-9999.ebuild         |    2 +-
 .../{kcminit-9999.ebuild => kcminit-4.9.80.ebuild} |    4 +-
 kde-base/kcminit/kcminit-9999.ebuild               |    2 +-
 ...kcmshell-9999.ebuild => kcmshell-4.9.80.ebuild} |    4 +-
 kde-base/kcmshell/kcmshell-9999.ebuild             |    2 +-
 ...ser-9999.ebuild => kcolorchooser-4.9.80.ebuild} |    4 +-
 kde-base/kcolorchooser/kcolorchooser-9999.ebuild   |    2 +-
 ...kcontrol-9999.ebuild => kcontrol-4.9.80.ebuild} |    4 +-
 kde-base/kcontrol/kcontrol-9999.ebuild             |    2 +-
 .../{kcron-9999.ebuild => kcron-4.9.80.ebuild}     |    4 +-
 kde-base/kcron/kcron-9999.ebuild                   |    2 +-
 ...-9999.ebuild => kde-base-artwork-4.9.80.ebuild} |    4 +-
 .../kde-base-artwork/kde-base-artwork-9999.ebuild  |    2 +-
 kde-base/kde-env/kde-env-4.9.80.ebuild             |   55 ++++
 kde-base/kde-l10n/kde-l10n-9999.ebuild             |    2 +-
 ...kde-meta-9999.ebuild => kde-meta-4.9.80.ebuild} |    4 +-
 kde-base/kde-meta/kde-meta-9999.ebuild             |    2 +-
 ...rs-9999.ebuild => kde-wallpapers-4.9.80.ebuild} |    4 +-
 kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild |    2 +-
 ....ebuild => kdeaccessibility-meta-4.9.80.ebuild} |    4 +-
 .../kdeaccessibility-meta-9999.ebuild              |    2 +-
 ...eta-9999.ebuild => kdeadmin-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild   |    2 +-
 ...build => kdeartwork-colorschemes-4.9.80.ebuild} |    4 +-
 .../kdeartwork-colorschemes-9999.ebuild            |    2 +-
 ...uild => kdeartwork-desktopthemes-4.9.80.ebuild} |    4 +-
 .../kdeartwork-desktopthemes-9999.ebuild           |    2 +-
 ...9.ebuild => kdeartwork-emoticons-4.9.80.ebuild} |    4 +-
 .../kdeartwork-emoticons-9999.ebuild               |    2 +-
 ....ebuild => kdeartwork-iconthemes-4.9.80.ebuild} |    4 +-
 .../kdeartwork-iconthemes-9999.ebuild              |    2 +-
 ...build => kdeartwork-kscreensaver-4.9.80.ebuild} |    4 +-
 .../kdeartwork-kscreensaver-9999.ebuild            |    2 +-
 ...a-9999.ebuild => kdeartwork-meta-4.9.80.ebuild} |    4 +-
 .../kdeartwork-meta/kdeartwork-meta-9999.ebuild    |    2 +-
 ...9999.ebuild => kdeartwork-sounds-4.9.80.ebuild} |    4 +-
 .../kdeartwork-sounds-9999.ebuild                  |    2 +-
 ...9999.ebuild => kdeartwork-styles-4.9.80.ebuild} |    4 +-
 .../kdeartwork-styles-9999.ebuild                  |    2 +-
 ....ebuild => kdeartwork-wallpapers-4.9.80.ebuild} |    4 +-
 .../kdeartwork-wallpapers-9999.ebuild              |    2 +-
 ... => kdeartwork-weatherwallpapers-4.9.80.ebuild} |    4 +-
 .../kdeartwork-weatherwallpapers-9999.ebuild       |    2 +-
 ...s-9999.ebuild => kdebase-cursors-4.9.80.ebuild} |    4 +-
 .../kdebase-cursors/kdebase-cursors-9999.ebuild    |    2 +-
 ...data-9999.ebuild => kdebase-data-4.9.80.ebuild} |    4 +-
 kde-base/kdebase-data/kdebase-data-9999.ebuild     |    2 +-
 ...9.ebuild => kdebase-desktoptheme-4.9.80.ebuild} |    4 +-
 .../kdebase-desktoptheme-9999.ebuild               |    2 +-
 ...9999.ebuild => kdebase-kioslaves-4.9.80.ebuild} |    4 +-
 .../kdebase-kioslaves-9999.ebuild                  |    2 +-
 ...999.ebuild => kdebase-menu-icons-4.9.80.ebuild} |    4 +-
 .../kdebase-menu-icons-9999.ebuild                 |    2 +-
 ...menu-9999.ebuild => kdebase-menu-4.9.80.ebuild} |    4 +-
 kde-base/kdebase-menu/kdebase-menu-9999.ebuild     |    2 +-
 ...meta-9999.ebuild => kdebase-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdebase-meta/kdebase-meta-9999.ebuild     |    2 +-
 ...9.ebuild => kdebase-runtime-meta-4.9.80.ebuild} |    4 +-
 .../kdebase-runtime-meta-9999.ebuild               |    2 +-
 ...-9999.ebuild => kdebase-startkde-4.9.80.ebuild} |    4 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    2 +-
 ...-9999.ebuild => kdebindings-meta-4.9.80.ebuild} |    4 +-
 .../kdebindings-meta/kdebindings-meta-9999.ebuild  |    2 +-
 ...alog-9999.ebuild => kdebugdialog-4.9.80.ebuild} |    4 +-
 kde-base/kdebugdialog/kdebugdialog-9999.ebuild     |    2 +-
 ...-meta-9999.ebuild => kdeedu-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild       |    2 +-
 ...eta-9999.ebuild => kdegames-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdegames-meta/kdegames-meta-9999.ebuild   |    2 +-
 ...-9999.ebuild => kdegraphics-meta-4.9.80.ebuild} |    4 +-
 .../kdegraphics-meta/kdegraphics-meta-9999.ebuild  |    2 +-
 ...ebuild => kdegraphics-mobipocket-4.9.80.ebuild} |    4 +-
 .../kdegraphics-mobipocket-9999.ebuild             |    2 +-
 ...d => kdegraphics-strigi-analyzer-4.9.80.ebuild} |    4 +-
 .../kdegraphics-strigi-analyzer-9999.ebuild        |    2 +-
 .../{kdelibs-9999.ebuild => kdelibs-4.9.80.ebuild} |    4 +-
 kde-base/kdelibs/kdelibs-9999.ebuild               |    2 +-
 ...999.ebuild => kdemultimedia-meta-4.9.80.ebuild} |    4 +-
 .../kdemultimedia-meta-9999.ebuild                 |    2 +-
 ...ebuild => kdenetwork-filesharing-4.9.80.ebuild} |    4 +-
 .../kdenetwork-filesharing-9999.ebuild             |    2 +-
 ...a-9999.ebuild => kdenetwork-meta-4.9.80.ebuild} |    4 +-
 .../kdenetwork-meta/kdenetwork-meta-9999.ebuild    |    2 +-
 ...epasswd-9999.ebuild => kdepasswd-4.9.80.ebuild} |    4 +-
 kde-base/kdepasswd/kdepasswd-9999.ebuild           |    2 +-
 ...999.ebuild => kdepim-common-libs-4.9.80.ebuild} |    4 +-
 .../kdepim-common-libs-9999.ebuild                 |    2 +-
 ...cons-9999.ebuild => kdepim-icons-4.9.80.ebuild} |    4 +-
 kde-base/kdepim-icons/kdepim-icons-9999.ebuild     |    2 +-
 ...9999.ebuild => kdepim-kresources-4.9.80.ebuild} |    4 +-
 .../kdepim-kresources-9999.ebuild                  |    2 +-
 kde-base/kdepim-l10n/kdepim-l10n-9999.ebuild       |    2 +-
 ...-meta-9999.ebuild => kdepim-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdepim-meta/kdepim-meta-9999.ebuild       |    2 +-
 ...me-9999.ebuild => kdepim-runtime-4.9.80.ebuild} |    4 +-
 kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild |    2 +-
 ...ebuild => kdepim-strigi-analyzer-4.9.80.ebuild} |    4 +-
 .../kdepim-strigi-analyzer-9999.ebuild             |    2 +-
 ...imlibs-9999.ebuild => kdepimlibs-4.9.80.ebuild} |    4 +-
 kde-base/kdepimlibs/kdepimlibs-9999.ebuild         |    2 +-
 ...-9999.ebuild => kdeplasma-addons-4.9.80.ebuild} |    4 +-
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  |    2 +-
 ...-9999.ebuild => kdesdk-kioslaves-4.9.80.ebuild} |    4 +-
 .../kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild  |    2 +-
 ...-meta-9999.ebuild => kdesdk-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild       |    2 +-
 ...-misc-9999.ebuild => kdesdk-misc-4.9.80.ebuild} |    4 +-
 kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild       |    2 +-
 ...ts-9999.ebuild => kdesdk-scripts-4.9.80.ebuild} |    4 +-
 kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild |    2 +-
 ...ebuild => kdesdk-strigi-analyzer-4.9.80.ebuild} |    4 +-
 .../kdesdk-strigi-analyzer-9999.ebuild             |    2 +-
 .../{kdesu-9999.ebuild => kdesu-4.9.80.ebuild}     |    4 +-
 kde-base/kdesu/kdesu-9999.ebuild                   |    2 +-
 ...meta-9999.ebuild => kdetoys-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild     |    2 +-
 ...eta-9999.ebuild => kdeutils-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild   |    2 +-
 ...ta-9999.ebuild => kdewebdev-meta-4.9.80.ebuild} |    4 +-
 kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild |    2 +-
 .../kdf/{kdf-9999.ebuild => kdf-4.9.80.ebuild}     |    4 +-
 kde-base/kdf/kdf-9999.ebuild                       |    2 +-
 .../{kdialog-9999.ebuild => kdialog-4.9.80.ebuild} |    4 +-
 kde-base/kdialog/kdialog-9999.ebuild               |    2 +-
 ...kdiamond-9999.ebuild => kdiamond-4.9.80.ebuild} |    4 +-
 kde-base/kdiamond/kdiamond-9999.ebuild             |    2 +-
 .../kdm/{kdm-9999.ebuild => kdm-4.9.80.ebuild}     |    4 +-
 kde-base/kdm/kdm-9999.ebuild                       |    2 +-
 .../{kdnssd-9999.ebuild => kdnssd-4.9.80.ebuild}   |    4 +-
 kde-base/kdnssd/kdnssd-9999.ebuild                 |    2 +-
 ...ebuild => kdontchangethehostname-4.9.80.ebuild} |    4 +-
 .../kdontchangethehostname-9999.ebuild             |    2 +-
 ...ks-9999.ebuild => keditbookmarks-4.9.80.ebuild} |    4 +-
 kde-base/keditbookmarks/keditbookmarks-9999.ebuild |    2 +-
 ...ype-9999.ebuild => keditfiletype-4.9.80.ebuild} |    4 +-
 kde-base/keditfiletype/keditfiletype-9999.ebuild   |    2 +-
 .../{kephal-9999.ebuild => kephal-4.9.80.ebuild}   |    4 +-
 kde-base/kephal/kephal-9999.ebuild                 |    2 +-
 .../{kfile-9999.ebuild => kfile-4.9.80.ebuild}     |    4 +-
 kde-base/kfile/kfile-9999.ebuild                   |    2 +-
 ...lace-9999.ebuild => kfilereplace-4.9.80.ebuild} |    4 +-
 kde-base/kfilereplace/kfilereplace-9999.ebuild     |    2 +-
 .../{kfind-9999.ebuild => kfind-4.9.80.ebuild}     |    4 +-
 kde-base/kfind/kfind-9999.ebuild                   |    2 +-
 .../{kfloppy-9999.ebuild => kfloppy-4.9.80.ebuild} |    4 +-
 kde-base/kfloppy/kfloppy-9999.ebuild               |    2 +-
 ...mclient-9999.ebuild => kfmclient-4.9.80.ebuild} |    4 +-
 kde-base/kfmclient/kfmclient-9999.ebuild           |    2 +-
 ...nline-9999.ebuild => kfourinline-4.9.80.ebuild} |    4 +-
 kde-base/kfourinline/kfourinline-9999.ebuild       |    2 +-
 .../{kgamma-9999.ebuild => kgamma-4.9.80.ebuild}   |    4 +-
 kde-base/kgamma/kgamma-9999.ebuild                 |    2 +-
 ...graphy-9999.ebuild => kgeography-4.9.80.ebuild} |    4 +-
 kde-base/kgeography/kgeography-9999.ebuild         |    2 +-
 .../kget/{kget-9999.ebuild => kget-4.9.80.ebuild}  |    4 +-
 kde-base/kget/kget-9999.ebuild                     |    2 +-
 ...ccel-9999.ebuild => kglobalaccel-4.9.80.ebuild} |    4 +-
 kde-base/kglobalaccel/kglobalaccel-9999.ebuild     |    2 +-
 ...unner-9999.ebuild => kgoldrunner-4.9.80.ebuild} |    4 +-
 kde-base/kgoldrunner/kgoldrunner-9999.ebuild       |    2 +-
 .../kgpg/{kgpg-9999.ebuild => kgpg-4.9.80.ebuild}  |    4 +-
 kde-base/kgpg/kgpg-9999.ebuild                     |    2 +-
 ...khangman-9999.ebuild => khangman-4.9.80.ebuild} |    4 +-
 kde-base/khangman/khangman-9999.ebuild             |    2 +-
 ...enter-9999.ebuild => khelpcenter-4.9.80.ebuild} |    4 +-
 kde-base/khelpcenter/khelpcenter-9999.ebuild       |    2 +-
 ...khotkeys-9999.ebuild => khotkeys-4.9.80.ebuild} |    4 +-
 kde-base/khotkeys/khotkeys-9999.ebuild             |    2 +-
 ...inder-9999.ebuild => kiconfinder-4.9.80.ebuild} |    4 +-
 kde-base/kiconfinder/kiconfinder-9999.ebuild       |    2 +-
 .../kig/{kig-9999.ebuild => kig-4.9.80.ebuild}     |    4 +-
 kde-base/kig/kig-9999.ebuild                       |    2 +-
 .../kigo/{kigo-9999.ebuild => kigo-4.9.80.ebuild}  |    4 +-
 kde-base/kigo/kigo-9999.ebuild                     |    2 +-
 ...killbots-9999.ebuild => killbots-4.9.80.ebuild} |    4 +-
 kde-base/killbots/killbots-9999.ebuild             |    2 +-
 ...r-9999.ebuild => kimagemapeditor-4.9.80.ebuild} |    4 +-
 .../kimagemapeditor/kimagemapeditor-9999.ebuild    |    2 +-
 .../{kimono-9999.ebuild => kimono-4.9.80.ebuild}   |    4 +-
 kde-base/kimono/kimono-9999.ebuild                 |    2 +-
 ...enter-9999.ebuild => kinfocenter-4.9.80.ebuild} |    4 +-
 kde-base/kinfocenter/kinfocenter-9999.ebuild       |    2 +-
 ...oclient-9999.ebuild => kioclient-4.9.80.ebuild} |    4 +-
 kde-base/kioclient/kioclient-9999.ebuild           |    2 +-
 .../{kiriki-9999.ebuild => kiriki-4.9.80.ebuild}   |    4 +-
 kde-base/kiriki/kiriki-9999.ebuild                 |    2 +-
 .../{kiten-9999.ebuild => kiten-4.9.80.ebuild}     |    4 +-
 kde-base/kiten/kiten-9999.ebuild                   |    2 +-
 .../{kjots-9999.ebuild => kjots-4.9.80.ebuild}     |    4 +-
 kde-base/kjots/kjots-9999.ebuild                   |    2 +-
 ...cube-9999.ebuild => kjumpingcube-4.9.80.ebuild} |    4 +-
 kde-base/kjumpingcube/kjumpingcube-9999.ebuild     |    2 +-
 ...eopatra-9999.ebuild => kleopatra-4.9.80.ebuild} |    4 +-
 kde-base/kleopatra/kleopatra-9999.ebuild           |    2 +-
 ...klettres-9999.ebuild => klettres-4.9.80.ebuild} |    4 +-
 kde-base/klettres/klettres-9999.ebuild             |    2 +-
 ...klickety-9999.ebuild => klickety-4.9.80.ebuild} |    4 +-
 kde-base/klickety/klickety-9999.ebuild             |    2 +-
 .../{klines-9999.ebuild => klines-4.9.80.ebuild}   |    4 +-
 kde-base/klines/klines-9999.ebuild                 |    2 +-
 ...tatus-9999.ebuild => klinkstatus-4.9.80.ebuild} |    4 +-
 kde-base/klinkstatus/klinkstatus-9999.ebuild       |    2 +-
 .../{klipper-9999.ebuild => klipper-4.9.80.ebuild} |    4 +-
 kde-base/klipper/klipper-9999.ebuild               |    2 +-
 .../kmag/{kmag-9999.ebuild => kmag-4.9.80.ebuild}  |    4 +-
 kde-base/kmag/kmag-9999.ebuild                     |    2 +-
 ...ahjongg-9999.ebuild => kmahjongg-4.9.80.ebuild} |    4 +-
 kde-base/kmahjongg/kmahjongg-9999.ebuild           |    2 +-
 .../{kmail-9999.ebuild => kmail-4.9.80.ebuild}     |    4 +-
 kde-base/kmail/kmail-9999.ebuild                   |    2 +-
 ...enuedit-9999.ebuild => kmenuedit-4.9.80.ebuild} |    4 +-
 kde-base/kmenuedit/kmenuedit-9999.ebuild           |    2 +-
 ...r-9999.ebuild => kmimetypefinder-4.9.80.ebuild} |    4 +-
 .../kmimetypefinder/kmimetypefinder-9999.ebuild    |    2 +-
 .../{kmines-9999.ebuild => kmines-4.9.80.ebuild}   |    4 +-
 kde-base/kmines/kmines-9999.ebuild                 |    2 +-
 .../kmix/{kmix-9999.ebuild => kmix-4.9.80.ebuild}  |    4 +-
 kde-base/kmix/kmix-9999.ebuild                     |    2 +-
 ...setool-9999.ebuild => kmousetool-4.9.80.ebuild} |    4 +-
 kde-base/kmousetool/kmousetool-9999.ebuild         |    2 +-
 .../{kmouth-9999.ebuild => kmouth-4.9.80.ebuild}   |    4 +-
 kde-base/kmouth/kmouth-9999.ebuild                 |    2 +-
 .../{kmplot-9999.ebuild => kmplot-4.9.80.ebuild}   |    4 +-
 kde-base/kmplot/kmplot-9999.ebuild                 |    2 +-
 ...ttle-9999.ebuild => knavalbattle-4.9.80.ebuild} |    4 +-
 kde-base/knavalbattle/knavalbattle-9999.ebuild     |    2 +-
 ...attach-9999.ebuild => knetattach-4.9.80.ebuild} |    4 +-
 kde-base/knetattach/knetattach-9999.ebuild         |    2 +-
 ...knetwalk-9999.ebuild => knetwalk-4.9.80.ebuild} |    4 +-
 kde-base/knetwalk/knetwalk-9999.ebuild             |    2 +-
 ...ewstuff-9999.ebuild => knewstuff-4.9.80.ebuild} |    4 +-
 kde-base/knewstuff/knewstuff-9999.ebuild           |    2 +-
 .../{knode-9999.ebuild => knode-4.9.80.ebuild}     |    4 +-
 kde-base/knode/knode-9999.ebuild                   |    2 +-
 .../{knotes-9999.ebuild => knotes-4.9.80.ebuild}   |    4 +-
 kde-base/knotes/knotes-9999.ebuild                 |    2 +-
 .../{knotify-9999.ebuild => knotify-4.9.80.ebuild} |    4 +-
 kde-base/knotify/knotify-9999.ebuild               |    2 +-
 .../kolf/{kolf-9999.ebuild => kolf-4.9.80.ebuild}  |    4 +-
 kde-base/kolf/kolf-9999.ebuild                     |    2 +-
 ...llision-9999.ebuild => kollision-4.9.80.ebuild} |    4 +-
 kde-base/kollision/kollision-9999.ebuild           |    2 +-
 ...paint-9999.ebuild => kolourpaint-4.9.80.ebuild} |    4 +-
 kde-base/kolourpaint/kolourpaint-9999.ebuild       |    2 +-
 ...mmander-9999.ebuild => kommander-4.9.80.ebuild} |    4 +-
 kde-base/kommander/kommander-9999.ebuild           |    2 +-
 .../{kompare-9999.ebuild => kompare-4.9.80.ebuild} |    4 +-
 kde-base/kompare/kompare-9999.ebuild               |    2 +-
 ...gins-9999.ebuild => konq-plugins-4.9.80.ebuild} |    4 +-
 kde-base/konq-plugins/konq-plugins-9999.ebuild     |    2 +-
 ...nqueror-9999.ebuild => konqueror-4.9.80.ebuild} |    4 +-
 kde-base/konqueror/konqueror-9999.ebuild           |    2 +-
 ...konquest-9999.ebuild => konquest-4.9.80.ebuild} |    4 +-
 kde-base/konquest/konquest-9999.ebuild             |    2 +-
 .../{konsole-9999.ebuild => konsole-4.9.80.ebuild} |    4 +-
 kde-base/konsole/konsole-9999.ebuild               |    2 +-
 ...r-9999.ebuild => konsolekalendar-4.9.80.ebuild} |    4 +-
 .../konsolekalendar/konsolekalendar-9999.ebuild    |    2 +-
 .../{kontact-9999.ebuild => kontact-4.9.80.ebuild} |    4 +-
 kde-base/kontact/kontact-9999.ebuild               |    2 +-
 .../{kopete-9999.ebuild => kopete-4.9.80.ebuild}   |    4 +-
 kde-base/kopete/kopete-9999.ebuild                 |    2 +-
 ...anizer-9999.ebuild => korganizer-4.9.80.ebuild} |    4 +-
 kde-base/korganizer/korganizer-9999.ebuild         |    2 +-
 ...korundum-9999.ebuild => korundum-4.9.80.ebuild} |    4 +-
 kde-base/korundum/korundum-9999.ebuild             |    2 +-
 ...ver-9999.ebuild => kpasswdserver-4.9.80.ebuild} |    4 +-
 kde-base/kpasswdserver/kpasswdserver-9999.ebuild   |    2 +-
 .../kpat/{kpat-9999.ebuild => kpat-4.9.80.ebuild}  |    4 +-
 kde-base/kpat/kpat-9999.ebuild                     |    2 +-
 .../kppp/{kppp-9999.ebuild => kppp-4.9.80.ebuild}  |    4 +-
 kde-base/kppp/kppp-9999.ebuild                     |    2 +-
 ...kquitapp-9999.ebuild => kquitapp-4.9.80.ebuild} |    4 +-
 kde-base/kquitapp/kquitapp-9999.ebuild             |    2 +-
 .../krdc/{krdc-9999.ebuild => krdc-4.9.80.ebuild}  |    4 +-
 kde-base/krdc/krdc-9999.ebuild                     |    2 +-
 ...onfig-9999.ebuild => kreadconfig-4.9.80.ebuild} |    4 +-
 kde-base/kreadconfig/kreadconfig-9999.ebuild       |    2 +-
 ...ol-9999.ebuild => kremotecontrol-4.9.80.ebuild} |    4 +-
 kde-base/kremotecontrol/kremotecontrol-9999.ebuild |    2 +-
 ...kreversi-9999.ebuild => kreversi-4.9.80.ebuild} |    4 +-
 kde-base/kreversi/kreversi-9999.ebuild             |    2 +-
 .../krfb/{krfb-9999.ebuild => krfb-4.9.80.ebuild}  |    4 +-
 kde-base/krfb/krfb-9999.ebuild                     |    2 +-
 ...ossjava-9999.ebuild => krossjava-4.9.80.ebuild} |    4 +-
 kde-base/krossjava/krossjava-9999.ebuild           |    2 +-
 ...ython-9999.ebuild => krosspython-4.9.80.ebuild} |    4 +-
 kde-base/krosspython/krosspython-9999.ebuild       |    2 +-
 ...ossruby-9999.ebuild => krossruby-4.9.80.ebuild} |    4 +-
 kde-base/krossruby/krossruby-9999.ebuild           |    2 +-
 .../{kruler-9999.ebuild => kruler-4.9.80.ebuild}   |    4 +-
 kde-base/kruler/kruler-9999.ebuild                 |    2 +-
 .../{krunner-9999.ebuild => krunner-4.9.80.ebuild} |    4 +-
 kde-base/krunner/krunner-9999.ebuild               |    2 +-
 ...lugin-9999.ebuild => ksaneplugin-4.9.80.ebuild} |    4 +-
 kde-base/ksaneplugin/ksaneplugin-9999.ebuild       |    2 +-
 .../kscd/{kscd-9999.ebuild => kscd-4.9.80.ebuild}  |    4 +-
 kde-base/kscd/kscd-9999.ebuild                     |    2 +-
 ...aver-9999.ebuild => kscreensaver-4.9.80.ebuild} |    4 +-
 kde-base/kscreensaver/kscreensaver-9999.ebuild     |    2 +-
 kde-base/ksecrets/ksecrets-9999.ebuild             |    2 +-
 .../{kshisen-9999.ebuild => kshisen-4.9.80.ebuild} |    4 +-
 kde-base/kshisen/kshisen-9999.ebuild               |    2 +-
 .../{ksirk-9999.ebuild => ksirk-4.9.80.ebuild}     |    4 +-
 kde-base/ksirk/ksirk-9999.ebuild                   |    2 +-
 ...mserver-9999.ebuild => ksmserver-4.9.80.ebuild} |    4 +-
 kde-base/ksmserver/ksmserver-9999.ebuild           |    2 +-
 ...keduel-9999.ebuild => ksnakeduel-4.9.80.ebuild} |    4 +-
 kde-base/ksnakeduel/ksnakeduel-9999.ebuild         |    2 +-
 ...napshot-9999.ebuild => ksnapshot-4.9.80.ebuild} |    4 +-
 kde-base/ksnapshot/ksnapshot-9999.ebuild           |    2 +-
 ...ceduel-9999.ebuild => kspaceduel-4.9.80.ebuild} |    4 +-
 kde-base/kspaceduel/kspaceduel-9999.ebuild         |    2 +-
 .../{ksplash-9999.ebuild => ksplash-4.9.80.ebuild} |    4 +-
 kde-base/ksplash/ksplash-9999.ebuild               |    2 +-
 ...ksquares-9999.ebuild => ksquares-4.9.80.ebuild} |    4 +-
 kde-base/ksquares/ksquares-9999.ebuild             |    2 +-
 .../{kstars-9999.ebuild => kstars-4.9.80.ebuild}   |    4 +-
 kde-base/kstars/kstars-9999.ebuild                 |    2 +-
 .../{kstart-9999.ebuild => kstart-4.9.80.ebuild}   |    4 +-
 kde-base/kstart/kstart-9999.ebuild                 |    2 +-
 ...rtperf-9999.ebuild => kstartperf-4.9.80.ebuild} |    4 +-
 kde-base/kstartperf/kstartperf-9999.ebuild         |    2 +-
 ...ig-9999.ebuild => kstartupconfig-4.9.80.ebuild} |    4 +-
 kde-base/kstartupconfig/kstartupconfig-9999.ebuild |    2 +-
 .../{kstyles-9999.ebuild => kstyles-4.9.80.ebuild} |    4 +-
 kde-base/kstyles/kstyles-9999.ebuild               |    2 +-
 .../{ksudoku-9999.ebuild => ksudoku-4.9.80.ebuild} |    4 +-
 kde-base/ksudoku/ksudoku-9999.ebuild               |    2 +-
 ...ysguard-9999.ebuild => ksysguard-4.9.80.ebuild} |    4 +-
 kde-base/ksysguard/ksysguard-9999.ebuild           |    2 +-
 ...temlog-9999.ebuild => ksystemlog-4.9.80.ebuild} |    4 +-
 kde-base/ksystemlog/ksystemlog-9999.ebuild         |    2 +-
 ...aycmd-9999.ebuild => ksystraycmd-4.9.80.ebuild} |    4 +-
 kde-base/ksystraycmd/ksystraycmd-9999.ebuild       |    2 +-
 ...kteatime-9999.ebuild => kteatime-4.9.80.ebuild} |    4 +-
 kde-base/kteatime/kteatime-9999.ebuild             |    2 +-
 .../{ktimer-9999.ebuild => ktimer-4.9.80.ebuild}   |    4 +-
 kde-base/ktimer/ktimer-9999.ebuild                 |    2 +-
 ...cker-9999.ebuild => ktimetracker-4.9.80.ebuild} |    4 +-
 kde-base/ktimetracker/ktimetracker-9999.ebuild     |    2 +-
 ...ezoned-9999.ebuild => ktimezoned-4.9.80.ebuild} |    4 +-
 kde-base/ktimezoned/ktimezoned-9999.ebuild         |    2 +-
 .../{ktouch-9999.ebuild => ktouch-4.9.80.ebuild}   |    4 +-
 kde-base/ktouch/ktouch-9999.ebuild                 |    2 +-
 ...ent-9999.ebuild => ktraderclient-4.9.80.ebuild} |    4 +-
 kde-base/ktraderclient/ktraderclient-9999.ebuild   |    2 +-
 ...erling-9999.ebuild => ktuberling-4.9.80.ebuild} |    4 +-
 kde-base/ktuberling/ktuberling-9999.ebuild         |    2 +-
 .../{kturtle-9999.ebuild => kturtle-4.9.80.ebuild} |    4 +-
 kde-base/kturtle/kturtle-9999.ebuild               |    2 +-
 .../ktux/{ktux-9999.ebuild => ktux-4.9.80.ebuild}  |    4 +-
 kde-base/ktux/ktux-9999.ebuild                     |    2 +-
 .../{kubrick-9999.ebuild => kubrick-4.9.80.ebuild} |    4 +-
 kde-base/kubrick/kubrick-9999.ebuild               |    2 +-
 ...iserver-9999.ebuild => kuiserver-4.9.80.ebuild} |    4 +-
 kde-base/kuiserver/kuiserver-9999.ebuild           |    2 +-
 ...iviewer-9999.ebuild => kuiviewer-4.9.80.ebuild} |    4 +-
 kde-base/kuiviewer/kuiviewer-9999.ebuild           |    2 +-
 ...999.ebuild => kurifilter-plugins-4.9.80.ebuild} |    4 +-
 .../kurifilter-plugins-9999.ebuild                 |    2 +-
 .../{kuser-9999.ebuild => kuser-4.9.80.ebuild}     |    4 +-
 kde-base/kuser/kuser-9999.ebuild                   |    2 +-
 .../{kwallet-9999.ebuild => kwallet-4.9.80.ebuild} |    4 +-
 kde-base/kwallet/kwallet-9999.ebuild               |    2 +-
 ...kwalletd-9999.ebuild => kwalletd-4.9.80.ebuild} |    4 +-
 kde-base/kwalletd/kwalletd-9999.ebuild             |    2 +-
 .../kwin/{kwin-9999.ebuild => kwin-4.9.80.ebuild}  |    4 +-
 kde-base/kwin/kwin-9999.ebuild                     |    2 +-
 ...ordquiz-9999.ebuild => kwordquiz-4.9.80.ebuild} |    4 +-
 kde-base/kwordquiz/kwordquiz-9999.ebuild           |    2 +-
 .../{kwrite-9999.ebuild => kwrite-4.9.80.ebuild}   |    4 +-
 kde-base/kwrite/kwrite-9999.ebuild                 |    2 +-
 .../{kwrited-9999.ebuild => kwrited-4.9.80.ebuild} |    4 +-
 kde-base/kwrited/kwrited-9999.ebuild               |    2 +-
 ...libkcddb-9999.ebuild => libkcddb-4.9.80.ebuild} |    4 +-
 kde-base/libkcddb/libkcddb-9999.ebuild             |    2 +-
 ...c-9999.ebuild => libkcompactdisc-4.9.80.ebuild} |    4 +-
 .../libkcompactdisc/libkcompactdisc-9999.ebuild    |    2 +-
 ...bkdcraw-9999.ebuild => libkdcraw-4.9.80.ebuild} |    4 +-
 kde-base/libkdcraw/libkdcraw-9999.ebuild           |    2 +-
 ...bkdeedu-9999.ebuild => libkdeedu-4.9.80.ebuild} |    4 +-
 kde-base/libkdeedu/libkdeedu-9999.ebuild           |    2 +-
 ...games-9999.ebuild => libkdegames-4.9.80.ebuild} |    4 +-
 kde-base/libkdegames/libkdegames-9999.ebuild       |    2 +-
 ...bkexiv2-9999.ebuild => libkexiv2-4.9.80.ebuild} |    4 +-
 kde-base/libkexiv2/libkexiv2-9999.ebuild           |    2 +-
 .../{libkipi-9999.ebuild => libkipi-4.9.80.ebuild} |    4 +-
 kde-base/libkipi/libkipi-9999.ebuild               |    2 +-
 ...ongg-9999.ebuild => libkmahjongg-4.9.80.ebuild} |    4 +-
 kde-base/libkmahjongg/libkmahjongg-9999.ebuild     |    2 +-
 .../{libkonq-9999.ebuild => libkonq-4.9.80.ebuild} |    4 +-
 kde-base/libkonq/libkonq-9999.ebuild               |    2 +-
 ...libksane-9999.ebuild => libksane-4.9.80.ebuild} |    4 +-
 kde-base/libksane/libksane-9999.ebuild             |    2 +-
 ...ace-9999.ebuild => libkworkspace-4.9.80.ebuild} |    4 +-
 kde-base/libkworkspace/libkworkspace-9999.ebuild   |    2 +-
 ...le-9999.ebuild => liboxygenstyle-4.9.80.ebuild} |    4 +-
 kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild |    2 +-
 ...ck-9999.ebuild => libplasmaclock-4.9.80.ebuild} |    4 +-
 kde-base/libplasmaclock/libplasmaclock-9999.ebuild |    2 +-
 ....ebuild => libplasmagenericshell-4.9.80.ebuild} |    4 +-
 .../libplasmagenericshell-9999.ebuild              |    2 +-
 ...er-9999.ebuild => libtaskmanager-4.9.80.ebuild} |    4 +-
 kde-base/libtaskmanager/libtaskmanager-9999.ebuild |    2 +-
 ...lokalize-9999.ebuild => lokalize-4.9.80.ebuild} |    4 +-
 kde-base/lokalize/lokalize-9999.ebuild             |    2 +-
 .../{lskat-9999.ebuild => lskat-4.9.80.ebuild}     |    4 +-
 kde-base/lskat/lskat-9999.ebuild                   |    2 +-
 .../{marble-9999.ebuild => marble-4.9.80.ebuild}   |    4 +-
 kde-base/marble/marble-9999.ebuild                 |    2 +-
 ...mbs-9999.ebuild => mplayerthumbs-4.9.80.ebuild} |    4 +-
 kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild   |    2 +-
 ...core-9999.ebuild => nepomuk-core-4.9.80.ebuild} |    4 +-
 kde-base/nepomuk-core/nepomuk-core-9999.ebuild     |    2 +-
 ...s-9999.ebuild => nepomuk-widgets-4.9.80.ebuild} |    4 +-
 .../nepomuk-widgets/nepomuk-widgets-9999.ebuild    |    2 +-
 .../{nepomuk-9999.ebuild => nepomuk-4.9.80.ebuild} |    4 +-
 kde-base/nepomuk/nepomuk-9999.ebuild               |    2 +-
 ...plugins-9999.ebuild => nsplugins-4.9.80.ebuild} |    4 +-
 kde-base/nsplugins/nsplugins-9999.ebuild           |    2 +-
 .../{okteta-9999.ebuild => okteta-4.9.80.ebuild}   |    4 +-
 kde-base/okteta/okteta-9999.ebuild                 |    2 +-
 .../{okular-9999.ebuild => okular-4.9.80.ebuild}   |    4 +-
 kde-base/okular/okular-9999.ebuild                 |    2 +-
 ...cons-9999.ebuild => oxygen-icons-4.9.80.ebuild} |    4 +-
 kde-base/oxygen-icons/oxygen-icons-9999.ebuild     |    2 +-
 .../{pairs-9999.ebuild => pairs-4.9.80.ebuild}     |    4 +-
 kde-base/pairs/pairs-9999.ebuild                   |    2 +-
 ...palapeli-9999.ebuild => palapeli-4.9.80.ebuild} |    4 +-
 kde-base/palapeli/palapeli-9999.ebuild             |    2 +-
 .../{parley-9999.ebuild => parley-4.9.80.ebuild}   |    4 +-
 kde-base/parley/parley-9999.ebuild                 |    2 +-
 .../{perlkde-9999.ebuild => perlkde-4.9.80.ebuild} |    4 +-
 kde-base/perlkde/perlkde-9999.ebuild               |    2 +-
 .../{perlqt-9999.ebuild => perlqt-4.9.80.ebuild}   |    4 +-
 kde-base/perlqt/perlqt-9999.ebuild                 |    2 +-
 ...on-kde-9999.ebuild => phonon-kde-4.9.80.ebuild} |    4 +-
 kde-base/phonon-kde/phonon-kde-9999.ebuild         |    2 +-
 ...-apps-9999.ebuild => plasma-apps-4.9.80.ebuild} |    4 +-
 kde-base/plasma-apps/plasma-apps-9999.ebuild       |    2 +-
 ...me-9999.ebuild => plasma-runtime-4.9.80.ebuild} |    4 +-
 kde-base/plasma-runtime/plasma-runtime-9999.ebuild |    2 +-
 ...-9999.ebuild => plasma-workspace-4.9.80.ebuild} |    4 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    2 +-
 ...rdevil-9999.ebuild => powerdevil-4.9.80.ebuild} |    4 +-
 kde-base/powerdevil/powerdevil-9999.ebuild         |    2 +-
 ...ger-9999.ebuild => print-manager-4.9.80.ebuild} |    4 +-
 kde-base/print-manager/print-manager-9999.ebuild   |    2 +-
 .../{pykde4-9999.ebuild => pykde4-4.9.80.ebuild}   |    4 +-
 kde-base/pykde4/pykde4-9999.ebuild                 |    2 +-
 ...ebuild => qguiplatformplugin_kde-4.9.80.ebuild} |    4 +-
 .../qguiplatformplugin_kde-9999.ebuild             |    2 +-
 .../{qtruby-9999.ebuild => qtruby-4.9.80.ebuild}   |    4 +-
 kde-base/qtruby/qtruby-9999.ebuild                 |    2 +-
 .../{qyoto-9999.ebuild => qyoto-4.9.80.ebuild}     |    4 +-
 kde-base/qyoto/qyoto-9999.ebuild                   |    2 +-
 ...9999.ebuild => renamedlg-plugins-4.9.80.ebuild} |    4 +-
 .../renamedlg-plugins-9999.ebuild                  |    2 +-
 .../rocs/{rocs-9999.ebuild => rocs-4.9.80.ebuild}  |    4 +-
 kde-base/rocs/rocs-9999.ebuild                     |    2 +-
 ...smokegen-9999.ebuild => smokegen-4.9.80.ebuild} |    4 +-
 kde-base/smokegen/smokegen-9999.ebuild             |    2 +-
 ...smokekde-9999.ebuild => smokekde-4.9.80.ebuild} |    4 +-
 kde-base/smokekde/smokekde-9999.ebuild             |    2 +-
 .../{smokeqt-9999.ebuild => smokeqt-4.9.80.ebuild} |    4 +-
 kde-base/smokeqt/smokeqt-9999.ebuild               |    2 +-
 ...ime-9999.ebuild => solid-runtime-4.9.80.ebuild} |    4 +-
 kde-base/solid-runtime/solid-runtime-9999.ebuild   |    2 +-
 .../{solid-9999.ebuild => solid-4.9.80.ebuild}     |    4 +-
 kde-base/solid/solid-9999.ebuild                   |    2 +-
 .../step/{step-9999.ebuild => step-4.9.80.ebuild}  |    4 +-
 kde-base/step/step-9999.ebuild                     |    2 +-
 ...amba-9999.ebuild => superkaramba-4.9.80.ebuild} |    4 +-
 kde-base/superkaramba/superkaramba-9999.ebuild     |    2 +-
 .../{svgpart-9999.ebuild => svgpart-4.9.80.ebuild} |    4 +-
 kde-base/svgpart/svgpart-9999.ebuild               |    2 +-
 .../{sweeper-9999.ebuild => sweeper-4.9.80.ebuild} |    4 +-
 kde-base/sweeper/sweeper-9999.ebuild               |    2 +-
 ...gs-9999.ebuild => systemsettings-4.9.80.ebuild} |    4 +-
 kde-base/systemsettings/systemsettings-9999.ebuild |    2 +-
 ...lers-9999.ebuild => thumbnailers-4.9.80.ebuild} |    4 +-
 kde-base/thumbnailers/thumbnailers-9999.ebuild     |    2 +-
 ...umbrello-9999.ebuild => umbrello-4.9.80.ebuild} |    4 +-
 kde-base/umbrello/umbrello-9999.ebuild             |    2 +-
 profiles/package.mask                              |  290 ++++++++++++++++++++
 profiles/package.mask.d/kde-4.9.80                 |  289 +++++++++++++++++++
 582 files changed, 1501 insertions(+), 867 deletions(-)

diff --git a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.9.80.ebuild
similarity index 88%
copy from kde-base/akonadiconsole/akonadiconsole-9999.ebuild
copy to kde-base/akonadiconsole/akonadiconsole-4.9.80.ebuild
index 6072537..03dbdc4 100644
--- a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Akonadi developer console"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild b/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
index 6072537..b48ccae 100644
--- a/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 inherit kde4-meta

diff --git a/kde-base/akregator/akregator-9999.ebuild b/kde-base/akregator/akregator-4.9.80.ebuild
similarity index 87%
copy from kde-base/akregator/akregator-9999.ebuild
copy to kde-base/akregator/akregator-4.9.80.ebuild
index fb63756..04986a9 100644
--- a/kde-base/akregator/akregator-9999.ebuild
+++ b/kde-base/akregator/akregator-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KDE news feed aggregator."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/akregator/akregator-9999.ebuild b/kde-base/akregator/akregator-9999.ebuild
index fb63756..8eb9011 100644
--- a/kde-base/akregator/akregator-9999.ebuild
+++ b/kde-base/akregator/akregator-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/amor/amor-9999.ebuild b/kde-base/amor/amor-4.9.80.ebuild
similarity index 84%
copy from kde-base/amor/amor-9999.ebuild
copy to kde-base/amor/amor-4.9.80.ebuild
index 6777f90..0f5126a 100644
--- a/kde-base/amor/amor-9999.ebuild
+++ b/kde-base/amor/amor-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdetoys"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/amor/amor-9999.ebuild b/kde-base/amor/amor-9999.ebuild
index 6777f90..2a2265a 100644
--- a/kde-base/amor/amor-9999.ebuild
+++ b/kde-base/amor/amor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdetoys"

diff --git a/kde-base/analitza/analitza-9999.ebuild b/kde-base/analitza/analitza-4.9.80.ebuild
similarity index 88%
copy from kde-base/analitza/analitza-9999.ebuild
copy to kde-base/analitza/analitza-4.9.80.ebuild
index ebe216d..60c85d8 100644
--- a/kde-base/analitza/analitza-9999.ebuild
+++ b/kde-base/analitza/analitza-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="never"
 inherit kde4-base
 
 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug readline"
 
 DEPEND="

diff --git a/kde-base/analitza/analitza-9999.ebuild b/kde-base/analitza/analitza-9999.ebuild
index ebe216d..aa4b101 100644
--- a/kde-base/analitza/analitza-9999.ebuild
+++ b/kde-base/analitza/analitza-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="never"
 inherit kde4-base

diff --git a/kde-base/ark/ark-9999.ebuild b/kde-base/ark/ark-4.9.80.ebuild
similarity index 92%
copy from kde-base/ark/ark-9999.ebuild
copy to kde-base/ark/ark-4.9.80.ebuild
index 93f446e..0c6e88a 100644
--- a/kde-base/ark/ark-9999.ebuild
+++ b/kde-base/ark/ark-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+archive +bzip2 debug lzma"
 
 DEPEND="

diff --git a/kde-base/ark/ark-9999.ebuild b/kde-base/ark/ark-9999.ebuild
index 93f446e..be9b2d8 100644
--- a/kde-base/ark/ark-9999.ebuild
+++ b/kde-base/ark/ark-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/attica/attica-9999.ebuild b/kde-base/attica/attica-4.9.80.ebuild
similarity index 84%
copy from kde-base/attica/attica-9999.ebuild
copy to kde-base/attica/attica-4.9.80.ebuild
index 5d0feac..2a61839 100644
--- a/kde-base/attica/attica-9999.ebuild
+++ b/kde-base/attica/attica-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/attica/attica-9999.ebuild b/kde-base/attica/attica-9999.ebuild
index 5d0feac..8250ac2 100644
--- a/kde-base/attica/attica-9999.ebuild
+++ b/kde-base/attica/attica-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/audiocd-kio/audiocd-kio-9999.ebuild b/kde-base/audiocd-kio/audiocd-kio-4.9.80.ebuild
similarity index 93%
copy from kde-base/audiocd-kio/audiocd-kio-9999.ebuild
copy to kde-base/audiocd-kio/audiocd-kio-4.9.80.ebuild
index 0d85c85..0259851 100644
--- a/kde-base/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-base/audiocd-kio/audiocd-kio-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug encode flac vorbis"
 
 # 4 of 9 tests fail. Last checked for 4.2.88

diff --git a/kde-base/audiocd-kio/audiocd-kio-9999.ebuild b/kde-base/audiocd-kio/audiocd-kio-9999.ebuild
index 0d85c85..ba60e0f 100644
--- a/kde-base/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-base/audiocd-kio/audiocd-kio-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/blinken/blinken-9999.ebuild b/kde-base/blinken/blinken-4.9.80.ebuild
similarity index 85%
copy from kde-base/blinken/blinken-9999.ebuild
copy to kde-base/blinken/blinken-4.9.80.ebuild
index 295ffde..61cf454 100644
--- a/kde-base/blinken/blinken-9999.ebuild
+++ b/kde-base/blinken/blinken-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/blinken/blinken-9999.ebuild b/kde-base/blinken/blinken-9999.ebuild
index 295ffde..e059eec 100644
--- a/kde-base/blinken/blinken-9999.ebuild
+++ b/kde-base/blinken/blinken-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/blogilo/blogilo-9999.ebuild b/kde-base/blogilo/blogilo-4.9.80.ebuild
similarity index 84%
copy from kde-base/blogilo/blogilo-9999.ebuild
copy to kde-base/blogilo/blogilo-4.9.80.ebuild
index 93d9e5e..f770cbd 100644
--- a/kde-base/blogilo/blogilo-9999.ebuild
+++ b/kde-base/blogilo/blogilo-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KDE Blogging Client"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/blogilo/blogilo-9999.ebuild b/kde-base/blogilo/blogilo-9999.ebuild
index 93d9e5e..3fdcb33 100644
--- a/kde-base/blogilo/blogilo-9999.ebuild
+++ b/kde-base/blogilo/blogilo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/bomber/bomber-9999.ebuild b/kde-base/bomber/bomber-4.9.80.ebuild
similarity index 83%
copy from kde-base/bomber/bomber-9999.ebuild
copy to kde-base/bomber/bomber-4.9.80.ebuild
index 0769e45..1b24e89 100644
--- a/kde-base/bomber/bomber-9999.ebuild
+++ b/kde-base/bomber/bomber-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE arcade bombing game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/bomber/bomber-9999.ebuild b/kde-base/bomber/bomber-9999.ebuild
index 0769e45..519eef4 100644
--- a/kde-base/bomber/bomber-9999.ebuild
+++ b/kde-base/bomber/bomber-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/bovo/bovo-9999.ebuild b/kde-base/bovo/bovo-4.9.80.ebuild
similarity index 83%
copy from kde-base/bovo/bovo-9999.ebuild
copy to kde-base/bovo/bovo-4.9.80.ebuild
index e4da2ae..8293039 100644
--- a/kde-base/bovo/bovo-9999.ebuild
+++ b/kde-base/bovo/bovo-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Five-in-a-row Board Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/bovo/bovo-9999.ebuild b/kde-base/bovo/bovo-9999.ebuild
index e4da2ae..1df35e0 100644
--- a/kde-base/bovo/bovo-9999.ebuild
+++ b/kde-base/bovo/bovo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/cantor/cantor-9999.ebuild b/kde-base/cantor/cantor-4.9.80.ebuild
similarity index 95%
copy from kde-base/cantor/cantor-9999.ebuild
copy to kde-base/cantor/cantor-4.9.80.ebuild
index 9fe4aba..f86ca87 100644
--- a/kde-base/cantor/cantor-9999.ebuild
+++ b/kde-base/cantor/cantor-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="analitza debug postscript qalculate +R"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)

diff --git a/kde-base/cantor/cantor-9999.ebuild b/kde-base/cantor/cantor-9999.ebuild
index 9fe4aba..137dd8e 100644
--- a/kde-base/cantor/cantor-9999.ebuild
+++ b/kde-base/cantor/cantor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/cervisia/cervisia-9999.ebuild b/kde-base/cervisia/cervisia-4.9.80.ebuild
similarity index 83%
copy from kde-base/cervisia/cervisia-9999.ebuild
copy to kde-base/cervisia/cervisia-4.9.80.ebuild
index 5a5658d..9ca0cbe 100644
--- a/kde-base/cervisia/cervisia-9999.ebuild
+++ b/kde-base/cervisia/cervisia-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/cervisia/cervisia-9999.ebuild b/kde-base/cervisia/cervisia-9999.ebuild
index 5a5658d..e402fc6 100644
--- a/kde-base/cervisia/cervisia-9999.ebuild
+++ b/kde-base/cervisia/cervisia-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.9.80.ebuild
similarity index 93%
copy from kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
copy to kde-base/dolphin-plugins/dolphin-plugins-4.9.80.ebuild
index 0213a16..3537b45 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug bazaar git mercurial subversion"
 
 DEPEND="

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index 0213a16..399bbae 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KDE_SCM="svn"

diff --git a/kde-base/dolphin/dolphin-9999.ebuild b/kde-base/dolphin/dolphin-4.9.80.ebuild
similarity index 94%
copy from kde-base/dolphin/dolphin-9999.ebuild
copy to kde-base/dolphin/dolphin-4.9.80.ebuild
index 415a41b..bb801bc 100644
--- a/kde-base/dolphin/dolphin-9999.ebuild
+++ b/kde-base/dolphin/dolphin-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="

diff --git a/kde-base/dolphin/dolphin-9999.ebuild b/kde-base/dolphin/dolphin-9999.ebuild
index 415a41b..8fbb397 100644
--- a/kde-base/dolphin/dolphin-9999.ebuild
+++ b/kde-base/dolphin/dolphin-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/dragon/dragon-9999.ebuild b/kde-base/dragon/dragon-4.9.80.ebuild
similarity index 87%
copy from kde-base/dragon/dragon-9999.ebuild
copy to kde-base/dragon/dragon-4.9.80.ebuild
index 4dcbbc8..d1813ae 100644
--- a/kde-base/dragon/dragon-9999.ebuild
+++ b/kde-base/dragon/dragon-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="dragon"
 inherit kde4-base
 
 DESCRIPTION="Dragon Player is a simple video player for KDE 4"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug xine"
 
 RDEPEND="

diff --git a/kde-base/dragon/dragon-9999.ebuild b/kde-base/dragon/dragon-9999.ebuild
index 4dcbbc8..c253940 100644
--- a/kde-base/dragon/dragon-9999.ebuild
+++ b/kde-base/dragon/dragon-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="dragon"

diff --git a/kde-base/drkonqi/drkonqi-9999.ebuild b/kde-base/drkonqi/drkonqi-4.9.80.ebuild
similarity index 90%
copy from kde-base/drkonqi/drkonqi-9999.ebuild
copy to kde-base/drkonqi/drkonqi-4.9.80.ebuild
index 713f234..60bd14e 100644
--- a/kde-base/drkonqi/drkonqi-9999.ebuild
+++ b/kde-base/drkonqi/drkonqi-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/drkonqi/drkonqi-9999.ebuild b/kde-base/drkonqi/drkonqi-9999.ebuild
index 713f234..98b67cc 100644
--- a/kde-base/drkonqi/drkonqi-9999.ebuild
+++ b/kde-base/drkonqi/drkonqi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.80.ebuild
similarity index 83%
copy from kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild
copy to kde-base/ffmpegthumbs/ffmpegthumbs-4.9.80.ebuild
index 7bd8937..90c3a90 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild
index 7bd8937..a2079f5 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/filelight/filelight-9999.ebuild b/kde-base/filelight/filelight-4.9.80.ebuild
similarity index 86%
copy from kde-base/filelight/filelight-9999.ebuild
copy to kde-base/filelight/filelight-4.9.80.ebuild
index 2c5f707..bd3df3d 100644
--- a/kde-base/filelight/filelight-9999.ebuild
+++ b/kde-base/filelight/filelight-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
 
 LICENSE="GPL-3"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/filelight/filelight-9999.ebuild b/kde-base/filelight/filelight-9999.ebuild
index 2c5f707..6a024fc 100644
--- a/kde-base/filelight/filelight-9999.ebuild
+++ b/kde-base/filelight/filelight-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.9.80.ebuild
similarity index 82%
copy from kde-base/freespacenotifier/freespacenotifier-9999.ebuild
copy to kde-base/freespacenotifier/freespacenotifier-4.9.80.ebuild
index cd43949..78091c1 100644
--- a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild b/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
index cd43949..58399d3 100644
--- a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/granatier/granatier-9999.ebuild b/kde-base/granatier/granatier-4.9.80.ebuild
similarity index 85%
copy from kde-base/granatier/granatier-9999.ebuild
copy to kde-base/granatier/granatier-4.9.80.ebuild
index 3083b44..1b92eaf 100644
--- a/kde-base/granatier/granatier-9999.ebuild
+++ b/kde-base/granatier/granatier-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Bomberman game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/granatier/granatier-9999.ebuild b/kde-base/granatier/granatier-9999.ebuild
index 3083b44..027f6d7 100644
--- a/kde-base/granatier/granatier-9999.ebuild
+++ b/kde-base/granatier/granatier-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/gwenview-4.9.80.ebuild
similarity index 94%
copy from kde-base/gwenview/gwenview-9999.ebuild
copy to kde-base/gwenview/gwenview-4.9.80.ebuild
index 04a6d04..48c85d6 100644
--- a/kde-base/gwenview/gwenview-9999.ebuild
+++ b/kde-base/gwenview/gwenview-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE image viewer"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi semantic-desktop"
 
 # tests hang, last checked for 4.2.96

diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/gwenview-9999.ebuild
index 04a6d04..9985fdc 100644
--- a/kde-base/gwenview/gwenview-9999.ebuild
+++ b/kde-base/gwenview/gwenview-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/jovie/jovie-9999.ebuild b/kde-base/jovie/jovie-4.9.80.ebuild
similarity index 84%
copy from kde-base/jovie/jovie-9999.ebuild
copy to kde-base/jovie/jovie-4.9.80.ebuild
index 8c72018..4dd8837 100644
--- a/kde-base/jovie/jovie-9999.ebuild
+++ b/kde-base/jovie/jovie-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Jovie is a text to speech application"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/jovie/jovie-9999.ebuild b/kde-base/jovie/jovie-9999.ebuild
index 8c72018..b7cc4aa 100644
--- a/kde-base/jovie/jovie-9999.ebuild
+++ b/kde-base/jovie/jovie-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/juk/juk-9999.ebuild b/kde-base/juk/juk-4.9.80.ebuild
similarity index 89%
copy from kde-base/juk/juk-9999.ebuild
copy to kde-base/juk/juk-4.9.80.ebuild
index 928e981..331570a 100644
--- a/kde-base/juk/juk-9999.ebuild
+++ b/kde-base/juk/juk-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Jukebox and music manager for KDE."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/juk/juk-9999.ebuild b/kde-base/juk/juk-9999.ebuild
index 928e981..9363828 100644
--- a/kde-base/juk/juk-9999.ebuild
+++ b/kde-base/juk/juk-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kabcclient/kabcclient-9999.ebuild b/kde-base/kabcclient/kabcclient-4.9.80.ebuild
similarity index 89%
copy from kde-base/kabcclient/kabcclient-9999.ebuild
copy to kde-base/kabcclient/kabcclient-4.9.80.ebuild
index 444d8b2..23c8bb9 100644
--- a/kde-base/kabcclient/kabcclient-9999.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ KMMODULE="console/${PN}"
 inherit kde4-meta
 
 DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kabcclient/kabcclient-9999.ebuild b/kde-base/kabcclient/kabcclient-9999.ebuild
index 444d8b2..4618436 100644
--- a/kde-base/kabcclient/kabcclient-9999.ebuild
+++ b/kde-base/kabcclient/kabcclient-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kaccessible/kaccessible-9999.ebuild b/kde-base/kaccessible/kaccessible-4.9.80.ebuild
similarity index 88%
copy from kde-base/kaccessible/kaccessible-9999.ebuild
copy to kde-base/kaccessible/kaccessible-4.9.80.ebuild
index 482a38d..c15d4c6 100644
--- a/kde-base/kaccessible/kaccessible-9999.ebuild
+++ b/kde-base/kaccessible/kaccessible-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +speechd"
 
 DEPEND="speechd? ( app-accessibility/speech-dispatcher )"

diff --git a/kde-base/kaccessible/kaccessible-9999.ebuild b/kde-base/kaccessible/kaccessible-9999.ebuild
index 482a38d..706da81 100644
--- a/kde-base/kaccessible/kaccessible-9999.ebuild
+++ b/kde-base/kaccessible/kaccessible-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kactivities/kactivities-9999.ebuild b/kde-base/kactivities/kactivities-4.9.80.ebuild
similarity index 90%
copy from kde-base/kactivities/kactivities-9999.ebuild
copy to kde-base/kactivities/kactivities-4.9.80.ebuild
index 2395986..379a62d 100644
--- a/kde-base/kactivities/kactivities-9999.ebuild
+++ b/kde-base/kactivities/kactivities-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE Activity Manager"
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"

diff --git a/kde-base/kactivities/kactivities-9999.ebuild b/kde-base/kactivities/kactivities-9999.ebuild
index 2395986..63f0d44 100644
--- a/kde-base/kactivities/kactivities-9999.ebuild
+++ b/kde-base/kactivities/kactivities-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-4.9.80.ebuild
similarity index 93%
copy from kde-base/kaddressbook/kaddressbook-9999.ebuild
copy to kde-base/kaddressbook/kaddressbook-4.9.80.ebuild
index 08596de..5d8c2ff 100644
--- a/kde-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-9999.ebuild
index 08596de..bbb9349 100644
--- a/kde-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kajongg/kajongg-9999.ebuild b/kde-base/kajongg/kajongg-4.9.80.ebuild
similarity index 91%
copy from kde-base/kajongg/kajongg-9999.ebuild
copy to kde-base/kajongg/kajongg-4.9.80.ebuild
index b63ea31..d56acd3 100644
--- a/kde-base/kajongg/kajongg-9999.ebuild
+++ b/kde-base/kajongg/kajongg-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 PYTHON_DEPEND="2:2.6"
 inherit kde4-base python
 
 DESCRIPTION="The classical Mah Jongg for four players"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kajongg/kajongg-9999.ebuild b/kde-base/kajongg/kajongg-9999.ebuild
index b63ea31..331ef08 100644
--- a/kde-base/kajongg/kajongg-9999.ebuild
+++ b/kde-base/kajongg/kajongg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 PYTHON_DEPEND="2:2.6"

diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-4.9.80.ebuild
similarity index 88%
copy from kde-base/kalarm/kalarm-9999.ebuild
copy to kde-base/kalarm/kalarm-4.9.80.ebuild
index c526dd0..8b8eaa9 100644
--- a/kde-base/kalarm/kalarm-9999.ebuild
+++ b/kde-base/kalarm/kalarm-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-9999.ebuild
index c526dd0..6450c42 100644
--- a/kde-base/kalarm/kalarm-9999.ebuild
+++ b/kde-base/kalarm/kalarm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kalgebra/kalgebra-9999.ebuild b/kde-base/kalgebra/kalgebra-4.9.80.ebuild
similarity index 91%
copy from kde-base/kalgebra/kalgebra-9999.ebuild
copy to kde-base/kalgebra/kalgebra-4.9.80.ebuild
index dbbf5b3..038ffd2 100644
--- a/kde-base/kalgebra/kalgebra-9999.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="MathML-based graph calculator for KDE."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma readline"
 
 DEPEND="

diff --git a/kde-base/kalgebra/kalgebra-9999.ebuild b/kde-base/kalgebra/kalgebra-9999.ebuild
index dbbf5b3..3a2a34b 100644
--- a/kde-base/kalgebra/kalgebra-9999.ebuild
+++ b/kde-base/kalgebra/kalgebra-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"

diff --git a/kde-base/kalzium/kalzium-9999.ebuild b/kde-base/kalzium/kalzium-4.9.80.ebuild
similarity index 94%
copy from kde-base/kalzium/kalzium-9999.ebuild
copy to kde-base/kalzium/kalzium-4.9.80.ebuild
index d1f832a..5607757 100644
--- a/kde-base/kalzium/kalzium-9999.ebuild
+++ b/kde-base/kalzium/kalzium-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"
@@ -10,7 +10,7 @@ OPENGL_REQUIRED="always"
 inherit kde4-base flag-o-matic
 
 DESCRIPTION="KDE: periodic table of the elements."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="editor debug +plasma solver"
 
 RDEPEND="

diff --git a/kde-base/kalzium/kalzium-9999.ebuild b/kde-base/kalzium/kalzium-9999.ebuild
index d1f832a..c09b03b 100644
--- a/kde-base/kalzium/kalzium-9999.ebuild
+++ b/kde-base/kalzium/kalzium-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"

diff --git a/kde-base/kamera/kamera-9999.ebuild b/kde-base/kamera/kamera-4.9.80.ebuild
similarity index 83%
copy from kde-base/kamera/kamera-9999.ebuild
copy to kde-base/kamera/kamera-4.9.80.ebuild
index 708cfa2..2bfc0f6 100644
--- a/kde-base/kamera/kamera-9999.ebuild
+++ b/kde-base/kamera/kamera-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kamera/kamera-9999.ebuild b/kde-base/kamera/kamera-9999.ebuild
index 708cfa2..3b7865f 100644
--- a/kde-base/kamera/kamera-9999.ebuild
+++ b/kde-base/kamera/kamera-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kanagram/kanagram-9999.ebuild b/kde-base/kanagram/kanagram-4.9.80.ebuild
similarity index 83%
copy from kde-base/kanagram/kanagram-9999.ebuild
copy to kde-base/kanagram/kanagram-4.9.80.ebuild
index 54099ff..bdf0f9d 100644
--- a/kde-base/kanagram/kanagram-9999.ebuild
+++ b/kde-base/kanagram/kanagram-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: letter order game."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kanagram/kanagram-9999.ebuild b/kde-base/kanagram/kanagram-9999.ebuild
index 54099ff..3aa0b05 100644
--- a/kde-base/kanagram/kanagram-9999.ebuild
+++ b/kde-base/kanagram/kanagram-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kapman/kapman-9999.ebuild b/kde-base/kapman/kapman-4.9.80.ebuild
similarity index 83%
copy from kde-base/kapman/kapman-9999.ebuild
copy to kde-base/kapman/kapman-4.9.80.ebuild
index e8516ed..b4a4527 100644
--- a/kde-base/kapman/kapman-9999.ebuild
+++ b/kde-base/kapman/kapman-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Pac-Man clone for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kapman/kapman-9999.ebuild b/kde-base/kapman/kapman-9999.ebuild
index e8516ed..c1b7369 100644
--- a/kde-base/kapman/kapman-9999.ebuild
+++ b/kde-base/kapman/kapman-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kapptemplate/kapptemplate-9999.ebuild b/kde-base/kapptemplate/kapptemplate-4.9.80.ebuild
similarity index 85%
copy from kde-base/kapptemplate/kapptemplate-9999.ebuild
copy to kde-base/kapptemplate/kapptemplate-4.9.80.ebuild
index 65408fa..855c2eb 100644
--- a/kde-base/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kapptemplate/kapptemplate-9999.ebuild b/kde-base/kapptemplate/kapptemplate-9999.ebuild
index 65408fa..423eb1d 100644
--- a/kde-base/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/kate/kate-9999.ebuild b/kde-base/kate/kate-4.9.80.ebuild
similarity index 94%
copy from kde-base/kate/kate-9999.ebuild
copy to kde-base/kate/kate-4.9.80.ebuild
index 66f2533..3b04d18 100644
--- a/kde-base/kate/kate-9999.ebuild
+++ b/kde-base/kate/kate-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"
@@ -10,7 +10,7 @@ PYTHON_DEPEND="pate? 2"
 inherit python kde4-meta
 
 DESCRIPTION="Kate is an MDI texteditor."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug pate +plasma"
 
 DEPEND="

diff --git a/kde-base/kate/kate-9999.ebuild b/kde-base/kate/kate-9999.ebuild
index 66f2533..7bd2f1a 100644
--- a/kde-base/kate/kate-9999.ebuild
+++ b/kde-base/kate/kate-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"

diff --git a/kde-base/katepart/katepart-9999.ebuild b/kde-base/katepart/katepart-4.9.80.ebuild
similarity index 87%
copy from kde-base/katepart/katepart-9999.ebuild
copy to kde-base/katepart/katepart-4.9.80.ebuild
index cc5262b..b67a8b8 100644
--- a/kde-base/katepart/katepart-9999.ebuild
+++ b/kde-base/katepart/katepart-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"
@@ -10,7 +10,7 @@ KMMODULE="part"
 inherit kde4-meta
 
 DESCRIPTION="KDE Editor KPart"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT="test"

diff --git a/kde-base/katepart/katepart-9999.ebuild b/kde-base/katepart/katepart-9999.ebuild
index cc5262b..2b6b5df 100644
--- a/kde-base/katepart/katepart-9999.ebuild
+++ b/kde-base/katepart/katepart-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"

diff --git a/kde-base/katomic/katomic-9999.ebuild b/kde-base/katomic/katomic-4.9.80.ebuild
similarity index 85%
copy from kde-base/katomic/katomic-9999.ebuild
copy to kde-base/katomic/katomic-4.9.80.ebuild
index 8b15e3d..d399d9e 100644
--- a/kde-base/katomic/katomic-9999.ebuild
+++ b/kde-base/katomic/katomic-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/katomic/katomic-9999.ebuild b/kde-base/katomic/katomic-9999.ebuild
index 8b15e3d..ab34983 100644
--- a/kde-base/katomic/katomic-9999.ebuild
+++ b/kde-base/katomic/katomic-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kblackbox/kblackbox-9999.ebuild b/kde-base/kblackbox/kblackbox-4.9.80.ebuild
similarity index 84%
copy from kde-base/kblackbox/kblackbox-9999.ebuild
copy to kde-base/kblackbox/kblackbox-4.9.80.ebuild
index b895727..07088f6 100644
--- a/kde-base/kblackbox/kblackbox-9999.ebuild
+++ b/kde-base/kblackbox/kblackbox-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kblackbox/kblackbox-9999.ebuild b/kde-base/kblackbox/kblackbox-9999.ebuild
index b895727..bd929a0 100644
--- a/kde-base/kblackbox/kblackbox-9999.ebuild
+++ b/kde-base/kblackbox/kblackbox-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kblocks/kblocks-9999.ebuild b/kde-base/kblocks/kblocks-4.9.80.ebuild
similarity index 84%
copy from kde-base/kblocks/kblocks-9999.ebuild
copy to kde-base/kblocks/kblocks-4.9.80.ebuild
index b222d11..dd964e0 100644
--- a/kde-base/kblocks/kblocks-9999.ebuild
+++ b/kde-base/kblocks/kblocks-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kblocks/kblocks-9999.ebuild b/kde-base/kblocks/kblocks-9999.ebuild
index b222d11..c6a291a 100644
--- a/kde-base/kblocks/kblocks-9999.ebuild
+++ b/kde-base/kblocks/kblocks-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kbounce/kbounce-9999.ebuild b/kde-base/kbounce/kbounce-4.9.80.ebuild
similarity index 84%
copy from kde-base/kbounce/kbounce-9999.ebuild
copy to kde-base/kbounce/kbounce-4.9.80.ebuild
index 90ba6bc..b69d9cb 100644
--- a/kde-base/kbounce/kbounce-9999.ebuild
+++ b/kde-base/kbounce/kbounce-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kbounce/kbounce-9999.ebuild b/kde-base/kbounce/kbounce-9999.ebuild
index 90ba6bc..c72d3cb 100644
--- a/kde-base/kbounce/kbounce-9999.ebuild
+++ b/kde-base/kbounce/kbounce-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kbreakout/kbreakout-9999.ebuild b/kde-base/kbreakout/kbreakout-4.9.80.ebuild
similarity index 84%
copy from kde-base/kbreakout/kbreakout-9999.ebuild
copy to kde-base/kbreakout/kbreakout-4.9.80.ebuild
index af73d8f..e0ce5ee 100644
--- a/kde-base/kbreakout/kbreakout-9999.ebuild
+++ b/kde-base/kbreakout/kbreakout-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: A Breakout-like game for KDE."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kbreakout/kbreakout-9999.ebuild b/kde-base/kbreakout/kbreakout-9999.ebuild
index af73d8f..d2f277a 100644
--- a/kde-base/kbreakout/kbreakout-9999.ebuild
+++ b/kde-base/kbreakout/kbreakout-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kbruch/kbruch-9999.ebuild b/kde-base/kbruch/kbruch-4.9.80.ebuild
similarity index 81%
copy from kde-base/kbruch/kbruch-9999.ebuild
copy to kde-base/kbruch/kbruch-4.9.80.ebuild
index 7219d8b..d973c57 100644
--- a/kde-base/kbruch/kbruch-9999.ebuild
+++ b/kde-base/kbruch/kbruch-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kbruch/kbruch-9999.ebuild b/kde-base/kbruch/kbruch-9999.ebuild
index 7219d8b..5f7fa14 100644
--- a/kde-base/kbruch/kbruch-9999.ebuild
+++ b/kde-base/kbruch/kbruch-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kcachegrind/kcachegrind-9999.ebuild b/kde-base/kcachegrind/kcachegrind-4.9.80.ebuild
similarity index 83%
copy from kde-base/kcachegrind/kcachegrind-9999.ebuild
copy to kde-base/kcachegrind/kcachegrind-4.9.80.ebuild
index 917369b..af177e0 100644
--- a/kde-base/kcachegrind/kcachegrind-9999.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kcachegrind/kcachegrind-9999.ebuild b/kde-base/kcachegrind/kcachegrind-9999.ebuild
index 917369b..7da2ef9 100644
--- a/kde-base/kcachegrind/kcachegrind-9999.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/kcalc/kcalc-9999.ebuild b/kde-base/kcalc/kcalc-4.9.80.ebuild
similarity index 85%
copy from kde-base/kcalc/kcalc-9999.ebuild
copy to kde-base/kcalc/kcalc-4.9.80.ebuild
index bcff96d..47b5f3b 100644
--- a/kde-base/kcalc/kcalc-9999.ebuild
+++ b/kde-base/kcalc/kcalc-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE calculator"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kcalc/kcalc-9999.ebuild b/kde-base/kcalc/kcalc-9999.ebuild
index bcff96d..7bc9002 100644
--- a/kde-base/kcalc/kcalc-9999.ebuild
+++ b/kde-base/kcalc/kcalc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"

diff --git a/kde-base/kcharselect/kcharselect-9999.ebuild b/kde-base/kcharselect/kcharselect-4.9.80.ebuild
similarity index 80%
copy from kde-base/kcharselect/kcharselect-9999.ebuild
copy to kde-base/kcharselect/kcharselect-4.9.80.ebuild
index c28084f..8884db2 100644
--- a/kde-base/kcharselect/kcharselect-9999.ebuild
+++ b/kde-base/kcharselect/kcharselect-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE character selection utility"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kcharselect/kcharselect-9999.ebuild b/kde-base/kcharselect/kcharselect-9999.ebuild
index c28084f..09affc8 100644
--- a/kde-base/kcharselect/kcharselect-9999.ebuild
+++ b/kde-base/kcharselect/kcharselect-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheckpass/kcheckpass-4.9.80.ebuild
similarity index 91%
copy from kde-base/kcheckpass/kcheckpass-9999.ebuild
copy to kde-base/kcheckpass/kcheckpass-4.9.80.ebuild
index 9ef7ef5..387d0ca 100644
--- a/kde-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug pam"
 
 RDEPEND="

diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheckpass/kcheckpass-9999.ebuild
index 9ef7ef5..bf8a53f 100644
--- a/kde-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kcminit/kcminit-9999.ebuild b/kde-base/kcminit/kcminit-4.9.80.ebuild
similarity index 85%
copy from kde-base/kcminit/kcminit-9999.ebuild
copy to kde-base/kcminit/kcminit-4.9.80.ebuild
index 91004ad..95f81da 100644
--- a/kde-base/kcminit/kcminit-9999.ebuild
+++ b/kde-base/kcminit/kcminit-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kcminit/kcminit-9999.ebuild b/kde-base/kcminit/kcminit-9999.ebuild
index 91004ad..93b7e8d 100644
--- a/kde-base/kcminit/kcminit-9999.ebuild
+++ b/kde-base/kcminit/kcminit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kcmshell/kcmshell-9999.ebuild b/kde-base/kcmshell/kcmshell-4.9.80.ebuild
similarity index 83%
copy from kde-base/kcmshell/kcmshell-9999.ebuild
copy to kde-base/kcmshell/kcmshell-4.9.80.ebuild
index 7aef8fe..61e9beb 100644
--- a/kde-base/kcmshell/kcmshell-9999.ebuild
+++ b/kde-base/kcmshell/kcmshell-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kcmshell/kcmshell-9999.ebuild b/kde-base/kcmshell/kcmshell-9999.ebuild
index 7aef8fe..32418e1 100644
--- a/kde-base/kcmshell/kcmshell-9999.ebuild
+++ b/kde-base/kcmshell/kcmshell-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.9.80.ebuild
similarity index 78%
copy from kde-base/kcolorchooser/kcolorchooser-9999.ebuild
copy to kde-base/kcolorchooser/kcolorchooser-4.9.80.ebuild
index 6eaabed..8c0fcc5 100644
--- a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-4.9.80.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE color selector/editor"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild b/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
index 6eaabed..36b26f7 100644
--- a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/kcontrol-4.9.80.ebuild
similarity index 84%
copy from kde-base/kcontrol/kcontrol-9999.ebuild
copy to kde-base/kcontrol/kcontrol-4.9.80.ebuild
index f81fea2..18a7cbc 100644
--- a/kde-base/kcontrol/kcontrol-9999.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/kcontrol-9999.ebuild
index f81fea2..5f11170 100644
--- a/kde-base/kcontrol/kcontrol-9999.ebuild
+++ b/kde-base/kcontrol/kcontrol-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kcron/kcron-9999.ebuild b/kde-base/kcron/kcron-4.9.80.ebuild
similarity index 83%
copy from kde-base/kcron/kcron-9999.ebuild
copy to kde-base/kcron/kcron-4.9.80.ebuild
index 007f60b..106a480 100644
--- a/kde-base/kcron/kcron-9999.ebuild
+++ b/kde-base/kcron/kcron-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="!prefix? ( virtual/cron )"

diff --git a/kde-base/kcron/kcron-9999.ebuild b/kde-base/kcron/kcron-9999.ebuild
index 007f60b..f0027b3 100644
--- a/kde-base/kcron/kcron-9999.ebuild
+++ b/kde-base/kcron/kcron-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"

diff --git a/kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild b/kde-base/kde-base-artwork/kde-base-artwork-4.9.80.ebuild
similarity index 78%
copy from kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild
copy to kde-base/kde-base-artwork/kde-base-artwork-4.9.80.ebuild
index fcab4a0..deb73c2 100644
--- a/kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild
+++ b/kde-base/kde-base-artwork/kde-base-artwork-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_SCM="svn"
 inherit kde4-base
 
 DESCRIPTION="KDE base artwork"
 IUSE=""
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild b/kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild
index fcab4a0..905fb71 100644
--- a/kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild
+++ b/kde-base/kde-base-artwork/kde-base-artwork-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_SCM="svn"
 inherit kde4-base

diff --git a/kde-base/kde-env/kde-env-4.9.80.ebuild b/kde-base/kde-env/kde-env-4.9.80.ebuild
new file mode 100644
index 0000000..f72e5fe
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.9.80.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+SRC_URI=""
+ESVN_REPO_URI=""
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="aqua"
+
+add_blocker kdelibs 4.6.80
+
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_prepare() {
+	:
+}
+
+src_install() {
+	# number goes down with version
+	newenvd - 43kdepaths <<EOF
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe - 11-xdg-menu-kde-4 <<EOF
+#!/bin/sh
+
+if [ -z "\${XDG_MENU_PREFIX}" ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
+	export XDG_MENU_PREFIX="kde-4-"
+fi
+EOF
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}

diff --git a/kde-base/kde-l10n/kde-l10n-9999.ebuild b/kde-base/kde-l10n/kde-l10n-9999.ebuild
index 20fbb2c..3609b8a 100644
--- a/kde-base/kde-l10n/kde-l10n-9999.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_SCM="svn"
 inherit kde4-base

diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-4.9.80.ebuild
similarity index 94%
copy from kde-base/kde-meta/kde-meta-9999.ebuild
copy to kde-base/kde-meta/kde-meta-4.9.80.ebuild
index 390aa1e..e2cf085 100644
--- a/kde-base/kde-meta/kde-meta-9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="

diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild
index 390aa1e..d092675 100644
--- a/kde-base/kde-meta/kde-meta-9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"

diff --git a/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.9.80.ebuild
similarity index 87%
copy from kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
copy to kde-base/kde-wallpapers/kde-wallpapers-4.9.80.ebuild
index d5b3122..9dfaa01 100644
--- a/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
+++ b/kde-base/kde-wallpapers/kde-wallpapers-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-wallpapers"
 KDE_SCM="svn"
 inherit kde4-base
 
 DESCRIPTION="KDE wallpapers"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 add_blocker kdebase-wallpapers

diff --git a/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
index d5b3122..1435fa7 100644
--- a/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
+++ b/kde-base/kde-wallpapers/kde-wallpapers-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-wallpapers"
 KDE_SCM="svn"

diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.9.80.ebuild
similarity index 88%
copy from kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
copy to kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.9.80.ebuild
index 7b64f7f..5de70a4 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
index 7b64f7f..8dd07b3 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"

diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.9.80.ebuild
similarity index 86%
copy from kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
copy to kde-base/kdeadmin-meta/kdeadmin-meta-4.9.80.ebuild
index 8df9131..22d43aa 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
index 8df9131..8ceac74 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"

diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.9.80.ebuild
similarity index 85%
copy from kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
copy to kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.9.80.ebuild
index d543266..7b245c6 100644
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdeartwork"
 KMMODULE="ColorSchemes"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE extra colorschemes"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Moved here in 4.7

diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
index d543266..786389f 100644
--- a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdeartwork"
 KMMODULE="ColorSchemes"

diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.9.80.ebuild
similarity index 82%
copy from kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild
copy to kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.9.80.ebuild
index af72ace..41762b0 100644
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMMODULE="desktopthemes"
 KMNAME="kdeartwork"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Additional KDE4 Plasma themes"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild
index af72ace..90958f4 100644
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMMODULE="desktopthemes"
 KMNAME="kdeartwork"

diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.9.80.ebuild
similarity index 84%
copy from kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild
copy to kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.9.80.ebuild
index 8087e3c..7006d81 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 RESTRICT="binchecks strip"
 
@@ -12,5 +12,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild
index 8087e3c..4502c5e 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 RESTRICT="binchecks strip"
 

diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.9.80.ebuild
similarity index 87%
copy from kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
copy to kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.9.80.ebuild
index ebefbdd..90f1d3b 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdeartwork"
 KMMODULE="IconThemes"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Provides nuvola icon theme

diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
index ebefbdd..d7c2dbb 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdeartwork"
 KMMODULE="IconThemes"

diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.9.80.ebuild
similarity index 95%
copy from kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
copy to kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.9.80.ebuild
index 00b2f4a..7507a54 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMMODULE="kscreensaver"
 KMNAME="kdeartwork"
@@ -11,7 +11,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +eigen +kexiv2 opengl xscreensaver"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config

diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
index 00b2f4a..dab7723 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMMODULE="kscreensaver"
 KMNAME="kdeartwork"

diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.9.80.ebuild
similarity index 92%
copy from kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
copy to kde-base/kdeartwork-meta/kdeartwork-meta-4.9.80.ebuild
index 76f8829..b4bad60 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
index 76f8829..7c2da14 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"

diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.9.80.ebuild
similarity index 83%
copy from kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild
copy to kde-base/kdeartwork-sounds/kdeartwork-sounds-4.9.80.ebuild
index 9e8937b..f968d8d 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 RESTRICT="binchecks strip"
 
@@ -12,5 +12,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra sound themes for kde"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild
index 9e8937b..7b199c2 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 RESTRICT="binchecks strip"
 

diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.9.80.ebuild
similarity index 87%
copy from kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild
copy to kde-base/kdeartwork-styles/kdeartwork-styles-4.9.80.ebuild
index c402d2f..a00d6d4 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMMODULE="styles"
 KMNAME="kdeartwork"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Extra KWin styles and window decorations"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 add_blocker kwin '<4.5.67'

diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild
index c402d2f..103b668 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMMODULE="styles"
 KMNAME="kdeartwork"

diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.9.80.ebuild
similarity index 85%
copy from kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild
copy to kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.9.80.ebuild
index 346bfc1..f29aff5 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 RESTRICT="binchecks strip"
 
@@ -12,7 +12,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Wallpapers from kde"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 KMEXTRA="

diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild
index 346bfc1..4461158 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 RESTRICT="binchecks strip"
 

diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.9.80.ebuild
similarity index 86%
copy from kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
copy to kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.9.80.ebuild
index 3b8ddac..af6f864 100644
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdeartwork"
 KMMODULE="WeatherWallpapers"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
index 3b8ddac..cd2c972 100644
--- a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdeartwork"
 KMMODULE="WeatherWallpapers"

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.9.80.ebuild
similarity index 81%
copy from kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
copy to kde-base/kdebase-cursors/kdebase-cursors-4.9.80.ebuild
index 075b723..394043e 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="cursors"
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="oxygen cursors from kdebase"
 IUSE=""
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
index 075b723..252f7a7 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="cursors"

diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-4.9.80.ebuild
similarity index 93%
copy from kde-base/kdebase-data/kdebase-data-9999.ebuild
copy to kde-base/kdebase-data/kdebase-data-4.9.80.ebuild
index 56de604..82c4a17 100644
--- a/kde-base/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMNOMODULE="true"
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
 IUSE="+wallpapers"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )

diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-9999.ebuild
index 56de604..ffd4183 100644
--- a/kde-base/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMNOMODULE="true"

diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.9.80.ebuild
similarity index 81%
copy from kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
copy to kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.9.80.ebuild
index cd370fb..f460141 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="desktoptheme"
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="Oxygen KDE4 desktop theme."
 IUSE=""
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
index cd370fb..b4a69fc 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="desktoptheme"

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.80.ebuild
similarity index 95%
copy from kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
copy to kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.80.ebuild
index f584313..c3500b9 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
 IUSE="+bzip2 exif debug lzma openexr samba +sftp"
 

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
index f584313..08c4116 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.9.80.ebuild
similarity index 79%
copy from kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
copy to kde-base/kdebase-menu-icons/kdebase-menu-icons-4.9.80.ebuild
index f58921b..165adce 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu icons"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
index f58921b..dc9d651 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="menu"

diff --git a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.9.80.ebuild
similarity index 80%
copy from kde-base/kdebase-menu/kdebase-menu-9999.ebuild
copy to kde-base/kdebase-menu/kdebase-menu-4.9.80.ebuild
index 88a8aca..4001de0 100644
--- a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="kde-menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE Menu query tool."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
index 88a8aca..63d6f51 100644
--- a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="kde-menu"

diff --git a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.9.80.ebuild
similarity index 97%
copy from kde-base/kdebase-meta/kdebase-meta-9999.ebuild
copy to kde-base/kdebase-meta/kdebase-meta-4.9.80.ebuild
index 8ac1243..aef8b81 100644
--- a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 RDEPEND="

diff --git a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
index 8ac1243..07d0c3c 100644
--- a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-derived packages"

diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9.80.ebuild
similarity index 96%
copy from kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
copy to kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9.80.ebuild
index c207e9a..b239cb7 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+handbook semantic-desktop"
 
 RDEPEND="

diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
index c207e9a..b1c27fc 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.9.80.ebuild
similarity index 97%
copy from kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
copy to kde-base/kdebase-startkde/kdebase-startkde-4.9.80.ebuild
index 803490e..ac39ab3 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMNOMODULE="true"
 inherit kde4-meta multilib prefix
 
 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+wallpapers"
 
 # The KDE apps called from the startkde script.

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 803490e..16f02d0 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMNOMODULE="true"

diff --git a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.9.80.ebuild
similarity index 92%
copy from kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
copy to kde-base/kdebindings-meta/kdebindings-meta-4.9.80.ebuild
index bdb5670..3a7a96a 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="csharp java perl python ruby"
 
 RDEPEND="

diff --git a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
index bdb5670..ee5b1e3 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"

diff --git a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.9.80.ebuild
similarity index 83%
copy from kde-base/kdebugdialog/kdebugdialog-9999.ebuild
copy to kde-base/kdebugdialog/kdebugdialog-4.9.80.ebuild
index 1bacc47..0f0233b 100644
--- a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild b/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
index 1bacc47..761bf3d 100644
--- a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.9.80.ebuild
similarity index 94%
copy from kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
copy to kde-base/kdeedu-meta/kdeedu-meta-4.9.80.ebuild
index 1792d4c..b91daa0 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
index 1792d4c..83aee21 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"

diff --git a/kde-base/kdegames-meta/kdegames-meta-9999.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.9.80.ebuild
similarity index 96%
copy from kde-base/kdegames-meta/kdegames-meta-9999.ebuild
copy to kde-base/kdegames-meta/kdegames-meta-4.9.80.ebuild
index 753f431..1d3307b 100644
--- a/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="opengl python"
 
 RDEPEND="

diff --git a/kde-base/kdegames-meta/kdegames-meta-9999.ebuild b/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
index 753f431..fb22a64 100644
--- a/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"

diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.9.80.ebuild
similarity index 93%
copy from kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
copy to kde-base/kdegraphics-meta/kdegraphics-meta-4.9.80.ebuild
index 6ef6727..6f9bed1 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="scanner"
 
 RDEPEND="

diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
index 6ef6727..a8e5389 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"

diff --git a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.9.80.ebuild
similarity index 82%
copy from kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
copy to kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.9.80.ebuild
index 8cc05ab..630b33d 100644
--- a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
+++ b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep okular)"

diff --git a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
index 8cc05ab..9f241fa 100644
--- a/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
+++ b/kde-base/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.9.80.ebuild
similarity index 81%
copy from kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
copy to kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.9.80.ebuild
index 4aea626..5c3ae1d 100644
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="kdegraphics: strigi plugins"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
index 4aea626..95f6602 100644
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.80.ebuild
similarity index 99%
copy from kde-base/kdelibs/kdelibs-9999.ebuild
copy to kde-base/kdelibs/kdelibs-4.9.80.ebuild
index 6d09d60..635ad55 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"
@@ -17,7 +17,7 @@ EGIT_BRANCH="KDE/4.10"
 DESCRIPTION="KDE libraries needed by all KDE programs."
 SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz"
 
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma
 mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 6d09d60..4255fa5 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"

diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9.80.ebuild
similarity index 91%
copy from kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
copy to kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9.80.ebuild
index 927b2ad..ee645e0 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="ffmpeg +mplayer"
 
 RDEPEND="

diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
index 927b2ad..3d7452a 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"

diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.9.80.ebuild
similarity index 83%
copy from kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
copy to kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.9.80.ebuild
index 86ba179..f429229 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdenetwork"
 KMMODULE="filesharing"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
index 86ba179..d68f80f 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdenetwork"
 KMMODULE="filesharing"

diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.9.80.ebuild
similarity index 89%
copy from kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
copy to kde-base/kdenetwork-meta/kdenetwork-meta-4.9.80.ebuild
index ed761b2..75000aa 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="ppp"
 
 RDEPEND="

diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
index ed761b2..7850405 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"

diff --git a/kde-base/kdepasswd/kdepasswd-9999.ebuild b/kde-base/kdepasswd/kdepasswd-4.9.80.ebuild
similarity index 86%
copy from kde-base/kdepasswd/kdepasswd-9999.ebuild
copy to kde-base/kdepasswd/kdepasswd-4.9.80.ebuild
index 47f9caa..b47ec3e 100644
--- a/kde-base/kdepasswd/kdepasswd-9999.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kdepasswd/kdepasswd-9999.ebuild b/kde-base/kdepasswd/kdepasswd-9999.ebuild
index 47f9caa..e84f074 100644
--- a/kde-base/kdepasswd/kdepasswd-9999.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9.80.ebuild
similarity index 95%
copy from kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
copy to kde-base/kdepim-common-libs/kdepim-common-libs-4.9.80.ebuild
index a4de384..0f487f6 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMNOMODULE="true"
 inherit kde4-meta
 
 DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
index a4de384..d8ea4ea 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMNOMODULE="true"

diff --git a/kde-base/kdepim-icons/kdepim-icons-9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.9.80.ebuild
similarity index 82%
copy from kde-base/kdepim-icons/kdepim-icons-9999.ebuild
copy to kde-base/kdepim-icons/kdepim-icons-4.9.80.ebuild
index e297bfe..f1ffc57 100644
--- a/kde-base/kdepim-icons/kdepim-icons-9999.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMMODULE="icons"
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM icons"
 IUSE=""
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="$(add_kdebase_dep kdepimlibs)"
 RDEPEND=""

diff --git a/kde-base/kdepim-icons/kdepim-icons-9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-9999.ebuild
index e297bfe..3fa5d45 100644
--- a/kde-base/kdepim-icons/kdepim-icons-9999.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMMODULE="icons"

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.9.80.ebuild
similarity index 88%
copy from kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
copy to kde-base/kdepim-kresources/kdepim-kresources-4.9.80.ebuild
index 1710926..8c2864b 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMMODULE="kresources"
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE PIM groupware plugin collection"
 IUSE="debug"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
index 1710926..ea33e86 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMMODULE="kresources"

diff --git a/kde-base/kdepim-l10n/kdepim-l10n-9999.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-9999.ebuild
index 45bdcc3..7b43965 100644
--- a/kde-base/kdepim-l10n/kdepim-l10n-9999.ebuild
+++ b/kde-base/kdepim-l10n/kdepim-l10n-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_SCM="svn"
 inherit kde4-base

diff --git a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
similarity index 94%
copy from kde-base/kdepim-meta/kdepim-meta-9999.ebuild
copy to kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
index dff8bd9..f9cf84a 100644
--- a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="

diff --git a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild b/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
index dff8bd9..be7aafe 100644
--- a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.9.80.ebuild
similarity index 95%
copy from kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
copy to kde-base/kdepim-runtime/kdepim-runtime-4.9.80.ebuild
index c9f0d8f..3ce914d 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim-runtime"
 inherit kde4-base
 
 DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug google kolab"
 
 RESTRICT="test"

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
index c9f0d8f..a8001cd 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim-runtime"
 inherit kde4-base

diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.9.80.ebuild
similarity index 88%
copy from kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild
copy to kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.9.80.ebuild
index 093fdcd..7869e81 100644
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMMODULE="strigi-analyzer"
 inherit kde4-meta
 
 DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild
index 093fdcd..af9c312 100644
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdepim"
 KMMODULE="strigi-analyzer"

diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.9.80.ebuild
similarity index 97%
copy from kde-base/kdepimlibs/kdepimlibs-9999.ebuild
copy to kde-base/kdepimlibs/kdepimlibs-4.9.80.ebuild
index 8f8dcaf..e94c711 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE PIM apps."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="debug ldap prison semantic-desktop"
 

diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
index 8f8dcaf..ce2bae8 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.9.80.ebuild
similarity index 96%
copy from kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
copy to kde-base/kdeplasma-addons/kdeplasma-addons-4.9.80.ebuild
index 09d607c..e80f5c3 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim
 semantic-desktop"
 

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 09d607c..a1f6128 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.9.80.ebuild
similarity index 91%
copy from kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
copy to kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.9.80.ebuild
index a349561..bb0472b 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KMMODULE="kioslave"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug subversion"
 
 DEPEND="

diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
index a349561..1405399 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KMMODULE="kioslave"

diff --git a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.9.80.ebuild
similarity index 93%
copy from kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
copy to kde-base/kdesdk-meta/kdesdk-meta-4.9.80.ebuild
index 66eac69..1772bf0 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cvs"
 
 RDEPEND="

diff --git a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
index 66eac69..ed86186 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"

diff --git a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.9.80.ebuild
similarity index 92%
copy from kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
copy to kde-base/kdesdk-misc/kdesdk-misc-4.9.80.ebuild
index 0a1ee47..84f07c3 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KMNOMODULE="true"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE miscellaneous SDK tools"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug extras"
 
 DEPEND="

diff --git a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
index 0a1ee47..ab3ade5 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KMNOMODULE="true"

diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.9.80.ebuild
similarity index 88%
copy from kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
copy to kde-base/kdesdk-scripts/kdesdk-scripts-4.9.80.ebuild
index 11ff64e..769d2e8 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -11,7 +11,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE SDK Scripts"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
index 11ff64e..7f48bab 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.9.80.ebuild
similarity index 84%
copy from kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild
copy to kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.9.80.ebuild
index 73666ee..a6df7d3 100644
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KMMODULE="strigi-analyzer"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="kdesdk: strigi plugins"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild
index 73666ee..2d7f248 100644
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KMMODULE="strigi-analyzer"

diff --git a/kde-base/kdesu/kdesu-9999.ebuild b/kde-base/kdesu/kdesu-4.9.80.ebuild
similarity index 92%
copy from kde-base/kdesu/kdesu-9999.ebuild
copy to kde-base/kdesu/kdesu-4.9.80.ebuild
index b24f56d..cf98270 100644
--- a/kde-base/kdesu/kdesu-9999.ebuild
+++ b/kde-base/kdesu/kdesu-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
@@ -11,7 +11,7 @@ inherit kde4-meta
 # FIXME: Is default command ( su/sudo ) still configurable,
 # if not, USE-flag ?
 DESCRIPTION="KDE: gui for su(1)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_configure() {

diff --git a/kde-base/kdesu/kdesu-9999.ebuild b/kde-base/kdesu/kdesu-9999.ebuild
index b24f56d..60bb1e4 100644
--- a/kde-base/kdesu/kdesu-9999.ebuild
+++ b/kde-base/kdesu/kdesu-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.9.80.ebuild
similarity index 85%
copy from kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
copy to kde-base/kdetoys-meta/kdetoys-meta-4.9.80.ebuild
index 50e9241..16959ef 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
index 50e9241..f25a9c1 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"

diff --git a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.9.80.ebuild
similarity index 92%
copy from kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
copy to kde-base/kdeutils-meta/kdeutils-meta-4.9.80.ebuild
index 30b44b6..98e1050 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cups floppy"
 
 RDEPEND="

diff --git a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
index 30b44b6..0bf9360 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"

diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.9.80.ebuild
similarity index 87%
copy from kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
copy to kde-base/kdewebdev-meta/kdewebdev-meta-4.9.80.ebuild
index 2a29a3f..baa3647 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
index 2a29a3f..1fc13cf 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"

diff --git a/kde-base/kdf/kdf-9999.ebuild b/kde-base/kdf/kdf-4.9.80.ebuild
similarity index 82%
copy from kde-base/kdf/kdf-9999.ebuild
copy to kde-base/kdf/kdf-4.9.80.ebuild
index 54e8bba..317738e 100644
--- a/kde-base/kdf/kdf-9999.ebuild
+++ b/kde-base/kdf/kdf-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE free disk space utility"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_unpack() {

diff --git a/kde-base/kdf/kdf-9999.ebuild b/kde-base/kdf/kdf-9999.ebuild
index 54e8bba..2fd08b5 100644
--- a/kde-base/kdf/kdf-9999.ebuild
+++ b/kde-base/kdf/kdf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kdialog/kdialog-9999.ebuild b/kde-base/kdialog/kdialog-4.9.80.ebuild
similarity index 82%
copy from kde-base/kdialog/kdialog-9999.ebuild
copy to kde-base/kdialog/kdialog-4.9.80.ebuild
index 40a21de..92732dd 100644
--- a/kde-base/kdialog/kdialog-9999.ebuild
+++ b/kde-base/kdialog/kdialog-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kdialog/kdialog-9999.ebuild b/kde-base/kdialog/kdialog-9999.ebuild
index 40a21de..ff9c145 100644
--- a/kde-base/kdialog/kdialog-9999.ebuild
+++ b/kde-base/kdialog/kdialog-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 inherit kde4-meta

diff --git a/kde-base/kdiamond/kdiamond-9999.ebuild b/kde-base/kdiamond/kdiamond-4.9.80.ebuild
similarity index 84%
copy from kde-base/kdiamond/kdiamond-9999.ebuild
copy to kde-base/kdiamond/kdiamond-4.9.80.ebuild
index 6b8f4ff..96ff329 100644
--- a/kde-base/kdiamond/kdiamond-9999.ebuild
+++ b/kde-base/kdiamond/kdiamond-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kdiamond/kdiamond-9999.ebuild b/kde-base/kdiamond/kdiamond-9999.ebuild
index 6b8f4ff..c5a9800 100644
--- a/kde-base/kdiamond/kdiamond-9999.ebuild
+++ b/kde-base/kdiamond/kdiamond-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-4.9.80.ebuild
similarity index 98%
copy from kde-base/kdm/kdm-9999.ebuild
copy to kde-base/kdm/kdm-4.9.80.ebuild
index 7f76b66..463164d 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit kde4-meta flag-o-matic user
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+consolekit debug kerberos pam"
 
 DEPEND="

diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 7f76b66..cc9a805 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kdnssd/kdnssd-9999.ebuild b/kde-base/kdnssd/kdnssd-4.9.80.ebuild
similarity index 89%
copy from kde-base/kdnssd/kdnssd-9999.ebuild
copy to kde-base/kdnssd/kdnssd-4.9.80.ebuild
index 0f3d5f2..045a869 100644
--- a/kde-base/kdnssd/kdnssd-9999.ebuild
+++ b/kde-base/kdnssd/kdnssd-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdenetwork"
 KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug zeroconf"
 
 DEPEND="

diff --git a/kde-base/kdnssd/kdnssd-9999.ebuild b/kde-base/kdnssd/kdnssd-9999.ebuild
index 0f3d5f2..a6fd71c 100644
--- a/kde-base/kdnssd/kdnssd-9999.ebuild
+++ b/kde-base/kdnssd/kdnssd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdenetwork"
 KDE_SCM="svn"

diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.9.80.ebuild
similarity index 83%
copy from kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
copy to kde-base/kdontchangethehostname/kdontchangethehostname-4.9.80.ebuild
index 5efa35c..24557da 100644
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Tool to inform KDE about a change in hostname"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
index 5efa35c..9dc0eec 100644
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.9.80.ebuild
similarity index 85%
copy from kde-base/keditbookmarks/keditbookmarks-9999.ebuild
copy to kde-base/keditbookmarks/keditbookmarks-4.9.80.ebuild
index d0b19a4..70e0f5f 100644
--- a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild b/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
index d0b19a4..559472b 100644
--- a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 VIRTUALX_REQUIRED="test"

diff --git a/kde-base/keditfiletype/keditfiletype-9999.ebuild b/kde-base/keditfiletype/keditfiletype-4.9.80.ebuild
similarity index 83%
copy from kde-base/keditfiletype/keditfiletype-9999.ebuild
copy to kde-base/keditfiletype/keditfiletype-4.9.80.ebuild
index adce687..057624a 100644
--- a/kde-base/keditfiletype/keditfiletype-9999.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.89

diff --git a/kde-base/keditfiletype/keditfiletype-9999.ebuild b/kde-base/keditfiletype/keditfiletype-9999.ebuild
index adce687..10cac95 100644
--- a/kde-base/keditfiletype/keditfiletype-9999.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kephal/kephal-9999.ebuild b/kde-base/kephal/kephal-4.9.80.ebuild
similarity index 87%
copy from kde-base/kephal/kephal-9999.ebuild
copy to kde-base/kephal/kephal-4.9.80.ebuild
index a74c471..4cd42d9 100644
--- a/kde-base/kephal/kephal-9999.ebuild
+++ b/kde-base/kephal/kephal-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/kephal"
 inherit kde4-meta
 
 DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kephal/kephal-9999.ebuild b/kde-base/kephal/kephal-9999.ebuild
index a74c471..a298566 100644
--- a/kde-base/kephal/kephal-9999.ebuild
+++ b/kde-base/kephal/kephal-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/kephal"

diff --git a/kde-base/kfile/kfile-9999.ebuild b/kde-base/kfile/kfile-4.9.80.ebuild
similarity index 80%
copy from kde-base/kfile/kfile-9999.ebuild
copy to kde-base/kfile/kfile-4.9.80.ebuild
index 4e68a1f..e28fa87 100644
--- a/kde-base/kfile/kfile-9999.ebuild
+++ b/kde-base/kfile/kfile-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfile/kfile-9999.ebuild b/kde-base/kfile/kfile-9999.ebuild
index 4e68a1f..ad54717 100644
--- a/kde-base/kfile/kfile-9999.ebuild
+++ b/kde-base/kfile/kfile-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kfilereplace/kfilereplace-9999.ebuild b/kde-base/kfilereplace/kfilereplace-4.9.80.ebuild
similarity index 84%
copy from kde-base/kfilereplace/kfilereplace-9999.ebuild
copy to kde-base/kfilereplace/kfilereplace-4.9.80.ebuild
index 8313a34..ab14f1e 100644
--- a/kde-base/kfilereplace/kfilereplace-9999.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"
 KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE web development - powerful search and replace in multiple files"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfilereplace/kfilereplace-9999.ebuild b/kde-base/kfilereplace/kfilereplace-9999.ebuild
index 8313a34..5e092fd 100644
--- a/kde-base/kfilereplace/kfilereplace-9999.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"
 KDE_SCM="svn"

diff --git a/kde-base/kfind/kfind-9999.ebuild b/kde-base/kfind/kfind-4.9.80.ebuild
similarity index 84%
copy from kde-base/kfind/kfind-9999.ebuild
copy to kde-base/kfind/kfind-4.9.80.ebuild
index 2c6d8d1..b9986a4 100644
--- a/kde-base/kfind/kfind-9999.ebuild
+++ b/kde-base/kfind/kfind-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kfind/kfind-9999.ebuild b/kde-base/kfind/kfind-9999.ebuild
index 2c6d8d1..6769748 100644
--- a/kde-base/kfind/kfind-9999.ebuild
+++ b/kde-base/kfind/kfind-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/kfloppy/kfloppy-9999.ebuild b/kde-base/kfloppy/kfloppy-4.9.80.ebuild
similarity index 82%
copy from kde-base/kfloppy/kfloppy-9999.ebuild
copy to kde-base/kfloppy/kfloppy-4.9.80.ebuild
index ba37bd8..37d29e9 100644
--- a/kde-base/kfloppy/kfloppy-9999.ebuild
+++ b/kde-base/kfloppy/kfloppy-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-9999.ebuild b/kde-base/kfloppy/kfloppy-9999.ebuild
index ba37bd8..e805ad3 100644
--- a/kde-base/kfloppy/kfloppy-9999.ebuild
+++ b/kde-base/kfloppy/kfloppy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kfmclient/kfmclient-9999.ebuild b/kde-base/kfmclient/kfmclient-4.9.80.ebuild
similarity index 93%
copy from kde-base/kfmclient/kfmclient-9999.ebuild
copy to kde-base/kfmclient/kfmclient-4.9.80.ebuild
index c8d2097..b8f09f9 100644
--- a/kde-base/kfmclient/kfmclient-9999.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRACTONLY="

diff --git a/kde-base/kfmclient/kfmclient-9999.ebuild b/kde-base/kfmclient/kfmclient-9999.ebuild
index c8d2097..0099661 100644
--- a/kde-base/kfmclient/kfmclient-9999.ebuild
+++ b/kde-base/kfmclient/kfmclient-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"

diff --git a/kde-base/kfourinline/kfourinline-9999.ebuild b/kde-base/kfourinline/kfourinline-4.9.80.ebuild
similarity index 83%
copy from kde-base/kfourinline/kfourinline-9999.ebuild
copy to kde-base/kfourinline/kfourinline-4.9.80.ebuild
index 15255f6..b44f6e9 100644
--- a/kde-base/kfourinline/kfourinline-9999.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE four-in-a-row game."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kfourinline/kfourinline-9999.ebuild b/kde-base/kfourinline/kfourinline-9999.ebuild
index 15255f6..e6b0810 100644
--- a/kde-base/kfourinline/kfourinline-9999.ebuild
+++ b/kde-base/kfourinline/kfourinline-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kgamma/kgamma-9999.ebuild b/kde-base/kgamma/kgamma-4.9.80.ebuild
similarity index 85%
copy from kde-base/kgamma/kgamma-9999.ebuild
copy to kde-base/kgamma/kgamma-4.9.80.ebuild
index 6856c1c..a82cc4a 100644
--- a/kde-base/kgamma/kgamma-9999.ebuild
+++ b/kde-base/kgamma/kgamma-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kgamma/kgamma-9999.ebuild b/kde-base/kgamma/kgamma-9999.ebuild
index 6856c1c..95ca1ff 100644
--- a/kde-base/kgamma/kgamma-9999.ebuild
+++ b/kde-base/kgamma/kgamma-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kgeography/kgeography-9999.ebuild b/kde-base/kgeography/kgeography-4.9.80.ebuild
similarity index 80%
copy from kde-base/kgeography/kgeography-9999.ebuild
copy to kde-base/kgeography/kgeography-4.9.80.ebuild
index aae858d..a6f5c52 100644
--- a/kde-base/kgeography/kgeography-9999.ebuild
+++ b/kde-base/kgeography/kgeography-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kgeography/kgeography-9999.ebuild b/kde-base/kgeography/kgeography-9999.ebuild
index aae858d..0236b5c 100644
--- a/kde-base/kgeography/kgeography-9999.ebuild
+++ b/kde-base/kgeography/kgeography-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kget/kget-9999.ebuild b/kde-base/kget/kget-4.9.80.ebuild
similarity index 94%
copy from kde-base/kget/kget-9999.ebuild
copy to kde-base/kget/kget-4.9.80.ebuild
index 35ad430..f0ba1d0 100644
--- a/kde-base/kget/kget-9999.ebuild
+++ b/kde-base/kget/kget-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
 
 RDEPEND="

diff --git a/kde-base/kget/kget-9999.ebuild b/kde-base/kget/kget-9999.ebuild
index 35ad430..04404e9 100644
--- a/kde-base/kget/kget-9999.ebuild
+++ b/kde-base/kget/kget-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"

diff --git a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.9.80.ebuild
similarity index 88%
copy from kde-base/kglobalaccel/kglobalaccel-9999.ebuild
copy to kde-base/kglobalaccel/kglobalaccel-4.9.80.ebuild
index 2522295..cf64679 100644
--- a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 src_configure() {

diff --git a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
index 2522295..d8e8f8d 100644
--- a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kgoldrunner/kgoldrunner-9999.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.9.80.ebuild
similarity index 87%
copy from kde-base/kgoldrunner/kgoldrunner-9999.ebuild
copy to kde-base/kgoldrunner/kgoldrunner-4.9.80.ebuild
index 7bc6759..cf63465 100644
--- a/kde-base/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kgoldrunner/kgoldrunner-9999.ebuild b/kde-base/kgoldrunner/kgoldrunner-9999.ebuild
index 7bc6759..312a096 100644
--- a/kde-base/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kgpg/kgpg-9999.ebuild b/kde-base/kgpg/kgpg-4.9.80.ebuild
similarity index 90%
copy from kde-base/kgpg/kgpg-9999.ebuild
copy to kde-base/kgpg/kgpg-4.9.80.ebuild
index f622329..e9b28ae 100644
--- a/kde-base/kgpg/kgpg-9999.ebuild
+++ b/kde-base/kgpg/kgpg-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="gpg"
 inherit kde4-base
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kgpg/kgpg-9999.ebuild b/kde-base/kgpg/kgpg-9999.ebuild
index f622329..b0c2012 100644
--- a/kde-base/kgpg/kgpg-9999.ebuild
+++ b/kde-base/kgpg/kgpg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="gpg"

diff --git a/kde-base/khangman/khangman-9999.ebuild b/kde-base/khangman/khangman-4.9.80.ebuild
similarity index 83%
copy from kde-base/khangman/khangman-9999.ebuild
copy to kde-base/khangman/khangman-4.9.80.ebuild
index 6e2d930..9282b81 100644
--- a/kde-base/khangman/khangman-9999.ebuild
+++ b/kde-base/khangman/khangman-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/khangman/khangman-9999.ebuild b/kde-base/khangman/khangman-9999.ebuild
index 6e2d930..24bd9ca 100644
--- a/kde-base/khangman/khangman-9999.ebuild
+++ b/kde-base/khangman/khangman-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/khelpcenter/khelpcenter-9999.ebuild b/kde-base/khelpcenter/khelpcenter-4.9.80.ebuild
similarity index 87%
copy from kde-base/khelpcenter/khelpcenter-9999.ebuild
copy to kde-base/khelpcenter/khelpcenter-4.9.80.ebuild
index 086a3b0..4efa918 100644
--- a/kde-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="always"
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/khelpcenter/khelpcenter-9999.ebuild b/kde-base/khelpcenter/khelpcenter-9999.ebuild
index 086a3b0..00b6c6e 100644
--- a/kde-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="always"
 KMNAME="kde-runtime"

diff --git a/kde-base/khotkeys/khotkeys-9999.ebuild b/kde-base/khotkeys/khotkeys-4.9.80.ebuild
similarity index 85%
copy from kde-base/khotkeys/khotkeys-9999.ebuild
copy to kde-base/khotkeys/khotkeys-4.9.80.ebuild
index 25dc4c3..420b74d 100644
--- a/kde-base/khotkeys/khotkeys-9999.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/khotkeys/khotkeys-9999.ebuild b/kde-base/khotkeys/khotkeys-9999.ebuild
index 25dc4c3..497eb1b 100644
--- a/kde-base/khotkeys/khotkeys-9999.ebuild
+++ b/kde-base/khotkeys/khotkeys-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kiconfinder/kiconfinder-9999.ebuild b/kde-base/kiconfinder/kiconfinder-4.9.80.ebuild
similarity index 80%
copy from kde-base/kiconfinder/kiconfinder-9999.ebuild
copy to kde-base/kiconfinder/kiconfinder-4.9.80.ebuild
index 63baa99..2529185 100644
--- a/kde-base/kiconfinder/kiconfinder-9999.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Finds an icon based on its name"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kiconfinder/kiconfinder-9999.ebuild b/kde-base/kiconfinder/kiconfinder-9999.ebuild
index 63baa99..454b49f 100644
--- a/kde-base/kiconfinder/kiconfinder-9999.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-4.9.80.ebuild
similarity index 89%
copy from kde-base/kig/kig-9999.ebuild
copy to kde-base/kig/kig-4.9.80.ebuild
index 879d22a..f3c5e27 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug scripting"
 
 DEPEND="

diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
index 879d22a..d5166fd 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kigo/kigo-9999.ebuild b/kde-base/kigo/kigo-4.9.80.ebuild
similarity index 81%
copy from kde-base/kigo/kigo-9999.ebuild
copy to kde-base/kigo/kigo-4.9.80.ebuild
index 263a952..99f0c94 100644
--- a/kde-base/kigo/kigo-9999.ebuild
+++ b/kde-base/kigo/kigo-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Go game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kigo/kigo-9999.ebuild b/kde-base/kigo/kigo-9999.ebuild
index 263a952..38f1aeb 100644
--- a/kde-base/kigo/kigo-9999.ebuild
+++ b/kde-base/kigo/kigo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/killbots/killbots-9999.ebuild b/kde-base/killbots/killbots-4.9.80.ebuild
similarity index 86%
copy from kde-base/killbots/killbots-9999.ebuild
copy to kde-base/killbots/killbots-4.9.80.ebuild
index 58e67ec..355e495 100644
--- a/kde-base/killbots/killbots-9999.ebuild
+++ b/kde-base/killbots/killbots-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Kill the bots or they kill you!"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/killbots/killbots-9999.ebuild b/kde-base/killbots/killbots-9999.ebuild
index 58e67ec..8ef7795 100644
--- a/kde-base/killbots/killbots-9999.ebuild
+++ b/kde-base/killbots/killbots-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.9.80.ebuild
similarity index 83%
copy from kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild
copy to kde-base/kimagemapeditor/kimagemapeditor-4.9.80.ebuild
index 4d5d610..adf06a0 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE web development - image map editor"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild
index 4d5d610..920b4e0 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"

diff --git a/kde-base/kimono/kimono-9999.ebuild b/kde-base/kimono/kimono-4.9.80.ebuild
similarity index 94%
copy from kde-base/kimono/kimono-9999.ebuild
copy to kde-base/kimono/kimono-4.9.80.ebuild
index 1caacc5..ef369c7 100644
--- a/kde-base/kimono/kimono-9999.ebuild
+++ b/kde-base/kimono/kimono-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base mono
 
 DESCRIPTION="C# bindings for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi debug plasma semantic-desktop"
 
 DEPEND="

diff --git a/kde-base/kimono/kimono-9999.ebuild b/kde-base/kimono/kimono-9999.ebuild
index 1caacc5..8af8b27 100644
--- a/kde-base/kimono/kimono-9999.ebuild
+++ b/kde-base/kimono/kimono-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base mono
 

diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild b/kde-base/kinfocenter/kinfocenter-4.9.80.ebuild
similarity index 91%
copy from kde-base/kinfocenter/kinfocenter-9999.ebuild
copy to kde-base/kinfocenter/kinfocenter-4.9.80.ebuild
index 8d809e6..ba57dae 100644
--- a/kde-base/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
@@ -10,7 +10,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Info Center"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ieee1394"
 
 DEPEND="

diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild b/kde-base/kinfocenter/kinfocenter-9999.ebuild
index 8d809e6..c2750ca 100644
--- a/kde-base/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kioclient/kioclient-9999.ebuild b/kde-base/kioclient/kioclient-4.9.80.ebuild
similarity index 81%
copy from kde-base/kioclient/kioclient-9999.ebuild
copy to kde-base/kioclient/kioclient-4.9.80.ebuild
index eb9ab2f..90c42c1 100644
--- a/kde-base/kioclient/kioclient-9999.ebuild
+++ b/kde-base/kioclient/kioclient-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kioclient/kioclient-9999.ebuild b/kde-base/kioclient/kioclient-9999.ebuild
index eb9ab2f..d8da516 100644
--- a/kde-base/kioclient/kioclient-9999.ebuild
+++ b/kde-base/kioclient/kioclient-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kiriki/kiriki-9999.ebuild b/kde-base/kiriki/kiriki-4.9.80.ebuild
similarity index 84%
copy from kde-base/kiriki/kiriki-9999.ebuild
copy to kde-base/kiriki/kiriki-4.9.80.ebuild
index be50f00..29dda8b 100644
--- a/kde-base/kiriki/kiriki-9999.ebuild
+++ b/kde-base/kiriki/kiriki-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Kiriki - a gtali clone for KDE4"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kiriki/kiriki-9999.ebuild b/kde-base/kiriki/kiriki-9999.ebuild
index be50f00..aa0b604 100644
--- a/kde-base/kiriki/kiriki-9999.ebuild
+++ b/kde-base/kiriki/kiriki-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kiten/kiten-9999.ebuild b/kde-base/kiten/kiten-4.9.80.ebuild
similarity index 80%
copy from kde-base/kiten/kiten-9999.ebuild
copy to kde-base/kiten/kiten-4.9.80.ebuild
index c5ebd62..f54adea 100644
--- a/kde-base/kiten/kiten-9999.ebuild
+++ b/kde-base/kiten/kiten-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kiten/kiten-9999.ebuild b/kde-base/kiten/kiten-9999.ebuild
index c5ebd62..925b455 100644
--- a/kde-base/kiten/kiten-9999.ebuild
+++ b/kde-base/kiten/kiten-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kjots/kjots-9999.ebuild b/kde-base/kjots/kjots-4.9.80.ebuild
similarity index 88%
copy from kde-base/kjots/kjots-9999.ebuild
copy to kde-base/kjots/kjots-4.9.80.ebuild
index 9323733..4dc5785 100644
--- a/kde-base/kjots/kjots-9999.ebuild
+++ b/kde-base/kjots/kjots-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KDE note taking utility"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kjots/kjots-9999.ebuild b/kde-base/kjots/kjots-9999.ebuild
index 9323733..6bfc0e2 100644
--- a/kde-base/kjots/kjots-9999.ebuild
+++ b/kde-base/kjots/kjots-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kjumpingcube/kjumpingcube-9999.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.9.80.ebuild
similarity index 85%
copy from kde-base/kjumpingcube/kjumpingcube-9999.ebuild
copy to kde-base/kjumpingcube/kjumpingcube-4.9.80.ebuild
index 5d42076..68e8892 100644
--- a/kde-base/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kjumpingcube/kjumpingcube-9999.ebuild b/kde-base/kjumpingcube/kjumpingcube-9999.ebuild
index 5d42076..e55c590 100644
--- a/kde-base/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kleopatra/kleopatra-9999.ebuild b/kde-base/kleopatra/kleopatra-4.9.80.ebuild
similarity index 91%
copy from kde-base/kleopatra/kleopatra-9999.ebuild
copy to kde-base/kleopatra/kleopatra-4.9.80.ebuild
index e5ecab5..7937c7f 100644
--- a/kde-base/kleopatra/kleopatra-9999.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Kleopatra - KDE X.509 key manager"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kleopatra/kleopatra-9999.ebuild b/kde-base/kleopatra/kleopatra-9999.ebuild
index e5ecab5..999cb8a 100644
--- a/kde-base/kleopatra/kleopatra-9999.ebuild
+++ b/kde-base/kleopatra/kleopatra-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/klettres/klettres-9999.ebuild b/kde-base/klettres/klettres-4.9.80.ebuild
similarity index 84%
copy from kde-base/klettres/klettres-9999.ebuild
copy to kde-base/klettres/klettres-4.9.80.ebuild
index 2c0819b..4bfb312 100644
--- a/kde-base/klettres/klettres-9999.ebuild
+++ b/kde-base/klettres/klettres-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/klettres/klettres-9999.ebuild b/kde-base/klettres/klettres-9999.ebuild
index 2c0819b..a7f2a28 100644
--- a/kde-base/klettres/klettres-9999.ebuild
+++ b/kde-base/klettres/klettres-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/klickety/klickety-9999.ebuild b/kde-base/klickety/klickety-4.9.80.ebuild
similarity index 86%
copy from kde-base/klickety/klickety-9999.ebuild
copy to kde-base/klickety/klickety-4.9.80.ebuild
index f8bf39f..2922296 100644
--- a/kde-base/klickety/klickety-9999.ebuild
+++ b/kde-base/klickety/klickety-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="A KDE game almost the same as ksame, but a bit different."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/klickety/klickety-9999.ebuild b/kde-base/klickety/klickety-9999.ebuild
index f8bf39f..bed2401 100644
--- a/kde-base/klickety/klickety-9999.ebuild
+++ b/kde-base/klickety/klickety-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/klines/klines-9999.ebuild b/kde-base/klines/klines-4.9.80.ebuild
similarity index 86%
copy from kde-base/klines/klines-9999.ebuild
copy to kde-base/klines/klines-4.9.80.ebuild
index 555980e..d144a83 100644
--- a/kde-base/klines/klines-9999.ebuild
+++ b/kde-base/klines/klines-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/klines/klines-9999.ebuild b/kde-base/klines/klines-9999.ebuild
index 555980e..c913803 100644
--- a/kde-base/klines/klines-9999.ebuild
+++ b/kde-base/klines/klines-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/klinkstatus/klinkstatus-9999.ebuild b/kde-base/klinkstatus/klinkstatus-4.9.80.ebuild
similarity index 92%
copy from kde-base/klinkstatus/klinkstatus-9999.ebuild
copy to kde-base/klinkstatus/klinkstatus-4.9.80.ebuild
index dff762c..c883ac5 100644
--- a/kde-base/klinkstatus/klinkstatus-9999.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE web development - link validity checker"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug tidy"
 
 DEPEND="

diff --git a/kde-base/klinkstatus/klinkstatus-9999.ebuild b/kde-base/klinkstatus/klinkstatus-9999.ebuild
index dff762c..287436b 100644
--- a/kde-base/klinkstatus/klinkstatus-9999.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"

diff --git a/kde-base/klipper/klipper-9999.ebuild b/kde-base/klipper/klipper-4.9.80.ebuild
similarity index 90%
copy from kde-base/klipper/klipper-9999.ebuild
copy to kde-base/klipper/klipper-4.9.80.ebuild
index 3ac22fe..108eb9d 100644
--- a/kde-base/klipper/klipper-9999.ebuild
+++ b/kde-base/klipper/klipper-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Applet for KDE and X clipboard management"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug prison"
 
 DEPEND="

diff --git a/kde-base/klipper/klipper-9999.ebuild b/kde-base/klipper/klipper-9999.ebuild
index 3ac22fe..474484a 100644
--- a/kde-base/klipper/klipper-9999.ebuild
+++ b/kde-base/klipper/klipper-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kmag/kmag-9999.ebuild b/kde-base/kmag/kmag-4.9.80.ebuild
similarity index 82%
copy from kde-base/kmag/kmag-9999.ebuild
copy to kde-base/kmag/kmag-4.9.80.ebuild
index 867f179..5c3a94e 100644
--- a/kde-base/kmag/kmag-9999.ebuild
+++ b/kde-base/kmag/kmag-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kmag/kmag-9999.ebuild b/kde-base/kmag/kmag-9999.ebuild
index 867f179..0855a7f 100644
--- a/kde-base/kmag/kmag-9999.ebuild
+++ b/kde-base/kmag/kmag-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kmahjongg/kmahjongg-9999.ebuild b/kde-base/kmahjongg/kmahjongg-4.9.80.ebuild
similarity index 86%
copy from kde-base/kmahjongg/kmahjongg-9999.ebuild
copy to kde-base/kmahjongg/kmahjongg-4.9.80.ebuild
index 2dd230b..9af73e2 100644
--- a/kde-base/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kmahjongg/kmahjongg-9999.ebuild b/kde-base/kmahjongg/kmahjongg-9999.ebuild
index 2dd230b..0866266 100644
--- a/kde-base/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kmail/kmail-9999.ebuild b/kde-base/kmail/kmail-4.9.80.ebuild
similarity index 96%
copy from kde-base/kmail/kmail-9999.ebuild
copy to kde-base/kmail/kmail-4.9.80.ebuild
index 1146ffd..7812e8b 100644
--- a/kde-base/kmail/kmail-9999.ebuild
+++ b/kde-base/kmail/kmail-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED=test
 inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kmail/kmail-9999.ebuild b/kde-base/kmail/kmail-9999.ebuild
index 1146ffd..7f05007 100644
--- a/kde-base/kmail/kmail-9999.ebuild
+++ b/kde-base/kmail/kmail-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kmenuedit/kmenuedit-9999.ebuild b/kde-base/kmenuedit/kmenuedit-4.9.80.ebuild
similarity index 91%
copy from kde-base/kmenuedit/kmenuedit-9999.ebuild
copy to kde-base/kmenuedit/kmenuedit-4.9.80.ebuild
index 097d737..cd8b801 100644
--- a/kde-base/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu editor"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kmenuedit/kmenuedit-9999.ebuild b/kde-base/kmenuedit/kmenuedit-9999.ebuild
index 097d737..105c101 100644
--- a/kde-base/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.9.80.ebuild
similarity index 81%
copy from kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
copy to kde-base/kmimetypefinder/kmimetypefinder-4.9.80.ebuild
index ec33ea2..2b006b4 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
index ec33ea2..6fe32a8 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kmines/kmines-9999.ebuild b/kde-base/kmines/kmines-4.9.80.ebuild
similarity index 85%
copy from kde-base/kmines/kmines-9999.ebuild
copy to kde-base/kmines/kmines-4.9.80.ebuild
index 2fc5082..af076bd 100644
--- a/kde-base/kmines/kmines-9999.ebuild
+++ b/kde-base/kmines/kmines-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kmines/kmines-9999.ebuild b/kde-base/kmines/kmines-9999.ebuild
index 2fc5082..dba241a 100644
--- a/kde-base/kmines/kmines-9999.ebuild
+++ b/kde-base/kmines/kmines-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kmix/kmix-9999.ebuild b/kde-base/kmix/kmix-4.9.80.ebuild
similarity index 91%
copy from kde-base/kmix/kmix-9999.ebuild
copy to kde-base/kmix/kmix-4.9.80.ebuild
index 5095c49..bc04602 100644
--- a/kde-base/kmix/kmix-9999.ebuild
+++ b/kde-base/kmix/kmix-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE mixer gui"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug canberra pulseaudio"
 
 DEPEND="

diff --git a/kde-base/kmix/kmix-9999.ebuild b/kde-base/kmix/kmix-9999.ebuild
index 5095c49..bab009d 100644
--- a/kde-base/kmix/kmix-9999.ebuild
+++ b/kde-base/kmix/kmix-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kmousetool/kmousetool-9999.ebuild b/kde-base/kmousetool/kmousetool-4.9.80.ebuild
similarity index 83%
copy from kde-base/kmousetool/kmousetool-9999.ebuild
copy to kde-base/kmousetool/kmousetool-4.9.80.ebuild
index 4fc4f1e..87f4c2b 100644
--- a/kde-base/kmousetool/kmousetool-9999.ebuild
+++ b/kde-base/kmousetool/kmousetool-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE program that clicks the mouse for you."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kmousetool/kmousetool-9999.ebuild b/kde-base/kmousetool/kmousetool-9999.ebuild
index 4fc4f1e..0978d16 100644
--- a/kde-base/kmousetool/kmousetool-9999.ebuild
+++ b/kde-base/kmousetool/kmousetool-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kmouth/kmouth-9999.ebuild b/kde-base/kmouth/kmouth-4.9.80.ebuild
similarity index 83%
copy from kde-base/kmouth/kmouth-9999.ebuild
copy to kde-base/kmouth/kmouth-4.9.80.ebuild
index 66bd6e8..34d9c52 100644
--- a/kde-base/kmouth/kmouth-9999.ebuild
+++ b/kde-base/kmouth/kmouth-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kmouth/kmouth-9999.ebuild b/kde-base/kmouth/kmouth-9999.ebuild
index 66bd6e8..2eedf26 100644
--- a/kde-base/kmouth/kmouth-9999.ebuild
+++ b/kde-base/kmouth/kmouth-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kmplot/kmplot-9999.ebuild b/kde-base/kmplot/kmplot-4.9.80.ebuild
similarity index 83%
copy from kde-base/kmplot/kmplot-9999.ebuild
copy to kde-base/kmplot/kmplot-4.9.80.ebuild
index 652cb52..baed9a5 100644
--- a/kde-base/kmplot/kmplot-9999.ebuild
+++ b/kde-base/kmplot/kmplot-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kmplot/kmplot-9999.ebuild b/kde-base/kmplot/kmplot-9999.ebuild
index 652cb52..a2d96bd 100644
--- a/kde-base/kmplot/kmplot-9999.ebuild
+++ b/kde-base/kmplot/kmplot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/knavalbattle/knavalbattle-9999.ebuild b/kde-base/knavalbattle/knavalbattle-4.9.80.ebuild
similarity index 85%
copy from kde-base/knavalbattle/knavalbattle-9999.ebuild
copy to kde-base/knavalbattle/knavalbattle-4.9.80.ebuild
index a4dcbe6..cd85f68 100644
--- a/kde-base/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/knavalbattle/knavalbattle-9999.ebuild b/kde-base/knavalbattle/knavalbattle-9999.ebuild
index a4dcbe6..be4da8c 100644
--- a/kde-base/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-base/knavalbattle/knavalbattle-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/knetattach/knetattach-9999.ebuild b/kde-base/knetattach/knetattach-4.9.80.ebuild
similarity index 81%
copy from kde-base/knetattach/knetattach-9999.ebuild
copy to kde-base/knetattach/knetattach-4.9.80.ebuild
index d33e7b8..ffc0f46 100644
--- a/kde-base/knetattach/knetattach-9999.ebuild
+++ b/kde-base/knetattach/knetattach-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/knetattach/knetattach-9999.ebuild b/kde-base/knetattach/knetattach-9999.ebuild
index d33e7b8..0320e69 100644
--- a/kde-base/knetattach/knetattach-9999.ebuild
+++ b/kde-base/knetattach/knetattach-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/knetwalk/knetwalk-9999.ebuild b/kde-base/knetwalk/knetwalk-4.9.80.ebuild
similarity index 86%
copy from kde-base/knetwalk/knetwalk-9999.ebuild
copy to kde-base/knetwalk/knetwalk-4.9.80.ebuild
index c8f7397..37cfae2 100644
--- a/kde-base/knetwalk/knetwalk-9999.ebuild
+++ b/kde-base/knetwalk/knetwalk-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/knetwalk/knetwalk-9999.ebuild b/kde-base/knetwalk/knetwalk-9999.ebuild
index c8f7397..2b09dd0 100644
--- a/kde-base/knetwalk/knetwalk-9999.ebuild
+++ b/kde-base/knetwalk/knetwalk-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/knewstuff/knewstuff-9999.ebuild b/kde-base/knewstuff/knewstuff-4.9.80.ebuild
similarity index 81%
copy from kde-base/knewstuff/knewstuff-9999.ebuild
copy to kde-base/knewstuff/knewstuff-4.9.80.ebuild
index f3b4d8d..63b494c 100644
--- a/kde-base/knewstuff/knewstuff-9999.ebuild
+++ b/kde-base/knewstuff/knewstuff-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/knewstuff/knewstuff-9999.ebuild b/kde-base/knewstuff/knewstuff-9999.ebuild
index f3b4d8d..31c3f01 100644
--- a/kde-base/knewstuff/knewstuff-9999.ebuild
+++ b/kde-base/knewstuff/knewstuff-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/knode/knode-9999.ebuild b/kde-base/knode/knode-4.9.80.ebuild
similarity index 91%
copy from kde-base/knode/knode-9999.ebuild
copy to kde-base/knode/knode-4.9.80.ebuild
index 7aaf465..d33e473 100644
--- a/kde-base/knode/knode-9999.ebuild
+++ b/kde-base/knode/knode-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # test fails, last checked for 4.2.96

diff --git a/kde-base/knode/knode-9999.ebuild b/kde-base/knode/knode-9999.ebuild
index 7aaf465..533f218 100644
--- a/kde-base/knode/knode-9999.ebuild
+++ b/kde-base/knode/knode-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/knotes/knotes-9999.ebuild b/kde-base/knotes/knotes-4.9.80.ebuild
similarity index 87%
copy from kde-base/knotes/knotes-9999.ebuild
copy to kde-base/knotes/knotes-4.9.80.ebuild
index 3dbb896..2fc180d 100644
--- a/kde-base/knotes/knotes-9999.ebuild
+++ b/kde-base/knotes/knotes-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KDE Notes application"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/knotes/knotes-9999.ebuild b/kde-base/knotes/knotes-9999.ebuild
index 3dbb896..4c0b3b7 100644
--- a/kde-base/knotes/knotes-9999.ebuild
+++ b/kde-base/knotes/knotes-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/knotify/knotify-9999.ebuild b/kde-base/knotify/knotify-4.9.80.ebuild
similarity index 80%
copy from kde-base/knotify/knotify-9999.ebuild
copy to kde-base/knotify/knotify-4.9.80.ebuild
index 7d7ca82..2f2a6d6 100644
--- a/kde-base/knotify/knotify-9999.ebuild
+++ b/kde-base/knotify/knotify-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/knotify/knotify-9999.ebuild b/kde-base/knotify/knotify-9999.ebuild
index 7d7ca82..56a6521 100644
--- a/kde-base/knotify/knotify-9999.ebuild
+++ b/kde-base/knotify/knotify-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kolf/kolf-9999.ebuild b/kde-base/kolf/kolf-4.9.80.ebuild
similarity index 84%
copy from kde-base/kolf/kolf-9999.ebuild
copy to kde-base/kolf/kolf-4.9.80.ebuild
index 16184a2..7d2aa1c 100644
--- a/kde-base/kolf/kolf-9999.ebuild
+++ b/kde-base/kolf/kolf-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kolf/kolf-9999.ebuild b/kde-base/kolf/kolf-9999.ebuild
index 16184a2..43ff022 100644
--- a/kde-base/kolf/kolf-9999.ebuild
+++ b/kde-base/kolf/kolf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kollision/kollision-9999.ebuild b/kde-base/kollision/kollision-4.9.80.ebuild
similarity index 84%
copy from kde-base/kollision/kollision-9999.ebuild
copy to kde-base/kollision/kollision-4.9.80.ebuild
index b2f1283..7e8b41a 100644
--- a/kde-base/kollision/kollision-9999.ebuild
+++ b/kde-base/kollision/kollision-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: A simple ball dodging game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kollision/kollision-9999.ebuild b/kde-base/kollision/kollision-9999.ebuild
index b2f1283..6eb89c3 100644
--- a/kde-base/kollision/kollision-9999.ebuild
+++ b/kde-base/kollision/kollision-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kolourpaint/kolourpaint-9999.ebuild b/kde-base/kolourpaint/kolourpaint-4.9.80.ebuild
similarity index 85%
copy from kde-base/kolourpaint/kolourpaint-9999.ebuild
copy to kde-base/kolourpaint/kolourpaint-4.9.80.ebuild
index cb25078..b6ce8f8 100644
--- a/kde-base/kolourpaint/kolourpaint-9999.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD LGPL-2"
 IUSE="debug scanner"
 

diff --git a/kde-base/kolourpaint/kolourpaint-9999.ebuild b/kde-base/kolourpaint/kolourpaint-9999.ebuild
index cb25078..d9783e7 100644
--- a/kde-base/kolourpaint/kolourpaint-9999.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kommander/kommander-9999.ebuild b/kde-base/kommander/kommander-4.9.80.ebuild
similarity index 82%
copy from kde-base/kommander/kommander-9999.ebuild
copy to kde-base/kommander/kommander-4.9.80.ebuild
index 5f0ed09..ff59255 100644
--- a/kde-base/kommander/kommander-9999.ebuild
+++ b/kde-base/kommander/kommander-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kommander/kommander-9999.ebuild b/kde-base/kommander/kommander-9999.ebuild
index 5f0ed09..4a96f50 100644
--- a/kde-base/kommander/kommander-9999.ebuild
+++ b/kde-base/kommander/kommander-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdewebdev"

diff --git a/kde-base/kompare/kompare-9999.ebuild b/kde-base/kompare/kompare-4.9.80.ebuild
similarity index 83%
copy from kde-base/kompare/kompare-9999.ebuild
copy to kde-base/kompare/kompare-4.9.80.ebuild
index 53ec07f..64a82cc 100644
--- a/kde-base/kompare/kompare-9999.ebuild
+++ b/kde-base/kompare/kompare-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Kompare is a program to view the differences between files."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kompare/kompare-9999.ebuild b/kde-base/kompare/kompare-9999.ebuild
index 53ec07f..fc84501 100644
--- a/kde-base/kompare/kompare-9999.ebuild
+++ b/kde-base/kompare/kompare-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/konq-plugins/konq-plugins-9999.ebuild b/kde-base/konq-plugins/konq-plugins-4.9.80.ebuild
similarity index 90%
copy from kde-base/konq-plugins/konq-plugins-9999.ebuild
copy to kde-base/konq-plugins/konq-plugins-4.9.80.ebuild
index 04f65d4..89354f9 100644
--- a/kde-base/konq-plugins/konq-plugins-9999.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug tidy"
 
 DEPEND="

diff --git a/kde-base/konq-plugins/konq-plugins-9999.ebuild b/kde-base/konq-plugins/konq-plugins-9999.ebuild
index 04f65d4..bb72a09 100644
--- a/kde-base/konq-plugins/konq-plugins-9999.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 inherit kde4-meta

diff --git a/kde-base/konqueror/konqueror-9999.ebuild b/kde-base/konqueror/konqueror-4.9.80.ebuild
similarity index 95%
copy from kde-base/konqueror/konqueror-9999.ebuild
copy to kde-base/konqueror/konqueror-4.9.80.ebuild
index 26b461d..a40143c 100644
--- a/kde-base/konqueror/konqueror-9999.ebuild
+++ b/kde-base/konqueror/konqueror-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bookmarks debug svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"

diff --git a/kde-base/konqueror/konqueror-9999.ebuild b/kde-base/konqueror/konqueror-9999.ebuild
index 26b461d..8fc0e09 100644
--- a/kde-base/konqueror/konqueror-9999.ebuild
+++ b/kde-base/konqueror/konqueror-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/konquest/konquest-9999.ebuild b/kde-base/konquest/konquest-4.9.80.ebuild
similarity index 85%
copy from kde-base/konquest/konquest-9999.ebuild
copy to kde-base/konquest/konquest-4.9.80.ebuild
index ed75501..735fddf 100644
--- a/kde-base/konquest/konquest-9999.ebuild
+++ b/kde-base/konquest/konquest-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/konquest/konquest-9999.ebuild b/kde-base/konquest/konquest-9999.ebuild
index ed75501..03d3d34 100644
--- a/kde-base/konquest/konquest-9999.ebuild
+++ b/kde-base/konquest/konquest-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/konsole-4.9.80.ebuild
similarity index 91%
copy from kde-base/konsole/konsole-9999.ebuild
copy to kde-base/konsole/konsole-4.9.80.ebuild
index e337302..7e27349 100644
--- a/kde-base/konsole/konsole-9999.ebuild
+++ b/kde-base/konsole/konsole-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_DOC_DIRS="doc/manual"
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-base
 
 DESCRIPTION="X terminal for use with KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 COMMONDEPEND="

diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/konsole-9999.ebuild
index e337302..4fd540a 100644
--- a/kde-base/konsole/konsole-9999.ebuild
+++ b/kde-base/konsole/konsole-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_DOC_DIRS="doc/manual"

diff --git a/kde-base/konsolekalendar/konsolekalendar-9999.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.9.80.ebuild
similarity index 88%
copy from kde-base/konsolekalendar/konsolekalendar-9999.ebuild
copy to kde-base/konsolekalendar/konsolekalendar-4.9.80.ebuild
index 99bcb0e..469f6b9 100644
--- a/kde-base/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
@@ -10,7 +10,7 @@ KMMODULE="console/${PN}"
 inherit kde4-meta
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/konsolekalendar/konsolekalendar-9999.ebuild b/kde-base/konsolekalendar/konsolekalendar-9999.ebuild
index 99bcb0e..9d017e8 100644
--- a/kde-base/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kontact/kontact-9999.ebuild b/kde-base/kontact/kontact-4.9.80.ebuild
similarity index 94%
copy from kde-base/kontact/kontact-9999.ebuild
copy to kde-base/kontact/kontact-4.9.80.ebuild
index e0d149a..854eb7d 100644
--- a/kde-base/kontact/kontact-9999.ebuild
+++ b/kde-base/kontact/kontact-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kontact/kontact-9999.ebuild b/kde-base/kontact/kontact-9999.ebuild
index e0d149a..1f757f6 100644
--- a/kde-base/kontact/kontact-9999.ebuild
+++ b/kde-base/kontact/kontact-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-4.9.80.ebuild
similarity index 98%
copy from kde-base/kopete/kopete-9999.ebuild
copy to kde-base/kopete/kopete-4.9.80.ebuild
index 1dc449b..f37f784 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta multilib
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 1dc449b..d8f70bc 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"

diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-4.9.80.ebuild
similarity index 95%
copy from kde-base/korganizer/korganizer-9999.ebuild
copy to kde-base/korganizer/korganizer-4.9.80.ebuild
index c0bc41a..fffec93 100644
--- a/kde-base/korganizer/korganizer-9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild
index c0bc41a..1182242 100644
--- a/kde-base/korganizer/korganizer-9999.ebuild
+++ b/kde-base/korganizer/korganizer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/korundum/korundum-9999.ebuild b/kde-base/korundum/korundum-4.9.80.ebuild
similarity index 97%
copy from kde-base/korundum/korundum-9999.ebuild
copy to kde-base/korundum/korundum-4.9.80.ebuild
index 5e3646c..120a1ba 100644
--- a/kde-base/korundum/korundum-9999.ebuild
+++ b/kde-base/korundum/korundum-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 OPENGL_REQUIRED="always"
 
@@ -16,7 +16,7 @@ USE_RUBY="ruby18"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="KDE Ruby bindings"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi debug kate okular"
 
 # unfortunately single modules cannot be disabled with cmake defines

diff --git a/kde-base/korundum/korundum-9999.ebuild b/kde-base/korundum/korundum-9999.ebuild
index 5e3646c..06e2b98 100644
--- a/kde-base/korundum/korundum-9999.ebuild
+++ b/kde-base/korundum/korundum-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 OPENGL_REQUIRED="always"
 

diff --git a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.9.80.ebuild
similarity index 81%
copy from kde-base/kpasswdserver/kpasswdserver-9999.ebuild
copy to kde-base/kpasswdserver/kpasswdserver-4.9.80.ebuild
index 76bd46c..4813bc2 100644
--- a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT="test"

diff --git a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
index 76bd46c..bb5c5ab 100644
--- a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kpat/kpat-9999.ebuild b/kde-base/kpat/kpat-4.9.80.ebuild
similarity index 84%
copy from kde-base/kpat/kpat-9999.ebuild
copy to kde-base/kpat/kpat-4.9.80.ebuild
index f58c947..9a73846 100644
--- a/kde-base/kpat/kpat-9999.ebuild
+++ b/kde-base/kpat/kpat-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE patience game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kpat/kpat-9999.ebuild b/kde-base/kpat/kpat-9999.ebuild
index f58c947..83110a7 100644
--- a/kde-base/kpat/kpat-9999.ebuild
+++ b/kde-base/kpat/kpat-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kppp/kppp-9999.ebuild b/kde-base/kppp/kppp-4.9.80.ebuild
similarity index 84%
copy from kde-base/kppp/kppp-9999.ebuild
copy to kde-base/kppp/kppp-4.9.80.ebuild
index ff49b00..5e99469 100644
--- a/kde-base/kppp/kppp-9999.ebuild
+++ b/kde-base/kppp/kppp-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A dialer and front-end to pppd."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kppp/kppp-9999.ebuild b/kde-base/kppp/kppp-9999.ebuild
index ff49b00..894e173 100644
--- a/kde-base/kppp/kppp-9999.ebuild
+++ b/kde-base/kppp/kppp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"

diff --git a/kde-base/kquitapp/kquitapp-9999.ebuild b/kde-base/kquitapp/kquitapp-4.9.80.ebuild
similarity index 79%
copy from kde-base/kquitapp/kquitapp-9999.ebuild
copy to kde-base/kquitapp/kquitapp-4.9.80.ebuild
index 9509691..567cfec 100644
--- a/kde-base/kquitapp/kquitapp-9999.ebuild
+++ b/kde-base/kquitapp/kquitapp-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kquitapp/kquitapp-9999.ebuild b/kde-base/kquitapp/kquitapp-9999.ebuild
index 9509691..6934752 100644
--- a/kde-base/kquitapp/kquitapp-9999.ebuild
+++ b/kde-base/kquitapp/kquitapp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/krdc/krdc-9999.ebuild b/kde-base/krdc/krdc-4.9.80.ebuild
similarity index 93%
copy from kde-base/krdc/krdc-9999.ebuild
copy to kde-base/krdc/krdc-4.9.80.ebuild
index db562b7..c9cb6f4 100644
--- a/kde-base/krdc/krdc-9999.ebuild
+++ b/kde-base/krdc/krdc-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug jpeg rdesktop vnc zeroconf telepathy"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61

diff --git a/kde-base/krdc/krdc-9999.ebuild b/kde-base/krdc/krdc-9999.ebuild
index db562b7..5a3a5a0 100644
--- a/kde-base/krdc/krdc-9999.ebuild
+++ b/kde-base/krdc/krdc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"

diff --git a/kde-base/kreadconfig/kreadconfig-9999.ebuild b/kde-base/kreadconfig/kreadconfig-4.9.80.ebuild
similarity index 81%
copy from kde-base/kreadconfig/kreadconfig-9999.ebuild
copy to kde-base/kreadconfig/kreadconfig-4.9.80.ebuild
index 0069e0b..b026027 100644
--- a/kde-base/kreadconfig/kreadconfig-9999.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A command-line tool to read KConfig entries"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kreadconfig/kreadconfig-9999.ebuild b/kde-base/kreadconfig/kreadconfig-9999.ebuild
index 0069e0b..1b9ef54 100644
--- a/kde-base/kreadconfig/kreadconfig-9999.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.9.80.ebuild
similarity index 86%
copy from kde-base/kremotecontrol/kremotecontrol-9999.ebuild
copy to kde-base/kremotecontrol/kremotecontrol-4.9.80.ebuild
index 911c826..49fd0d3 100644
--- a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for remote controls"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
index 911c826..6518b2d 100644
--- a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kreversi/kreversi-9999.ebuild b/kde-base/kreversi/kreversi-4.9.80.ebuild
similarity index 84%
copy from kde-base/kreversi/kreversi-9999.ebuild
copy to kde-base/kreversi/kreversi-4.9.80.ebuild
index abf7c1a..846af48 100644
--- a/kde-base/kreversi/kreversi-9999.ebuild
+++ b/kde-base/kreversi/kreversi-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kreversi/kreversi-9999.ebuild b/kde-base/kreversi/kreversi-9999.ebuild
index abf7c1a..ed46287 100644
--- a/kde-base/kreversi/kreversi-9999.ebuild
+++ b/kde-base/kreversi/kreversi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/krfb/krfb-9999.ebuild b/kde-base/krfb/krfb-4.9.80.ebuild
similarity index 90%
copy from kde-base/krfb/krfb-9999.ebuild
copy to kde-base/krfb/krfb-4.9.80.ebuild
index a13a82d..f397083 100644
--- a/kde-base/krfb/krfb-9999.ebuild
+++ b/kde-base/krfb/krfb-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug telepathy"
 
 DEPEND="

diff --git a/kde-base/krfb/krfb-9999.ebuild b/kde-base/krfb/krfb-9999.ebuild
index a13a82d..c95229f 100644
--- a/kde-base/krfb/krfb-9999.ebuild
+++ b/kde-base/krfb/krfb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-4.9.80.ebuild
similarity index 94%
copy from kde-base/krossjava/krossjava-9999.ebuild
copy to kde-base/krossjava/krossjava-4.9.80.ebuild
index 348bcdb..8e048c3 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="java"
 inherit java-pkg-2 java-ant-2 kde4-meta multilib
 
 DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild
index 348bcdb..4d0d2ea 100644
--- a/kde-base/krossjava/krossjava-9999.ebuild
+++ b/kde-base/krossjava/krossjava-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="java"

diff --git a/kde-base/krosspython/krosspython-9999.ebuild b/kde-base/krosspython/krosspython-4.9.80.ebuild
similarity index 87%
copy from kde-base/krosspython/krosspython-9999.ebuild
copy to kde-base/krosspython/krosspython-4.9.80.ebuild
index f5212be..ee9a64e 100644
--- a/kde-base/krosspython/krosspython-9999.ebuild
+++ b/kde-base/krosspython/krosspython-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="python"
@@ -10,7 +10,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-meta
 
 DESCRIPTION="Kross scripting framework: Python interpreter"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 pkg_setup() {

diff --git a/kde-base/krosspython/krosspython-9999.ebuild b/kde-base/krosspython/krosspython-9999.ebuild
index f5212be..de7ac95 100644
--- a/kde-base/krosspython/krosspython-9999.ebuild
+++ b/kde-base/krosspython/krosspython-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="python"

diff --git a/kde-base/krossruby/krossruby-9999.ebuild b/kde-base/krossruby/krossruby-4.9.80.ebuild
similarity index 96%
copy from kde-base/krossruby/krossruby-9999.ebuild
copy to kde-base/krossruby/krossruby-4.9.80.ebuild
index 7af6535..4840872 100644
--- a/kde-base/krossruby/krossruby-9999.ebuild
+++ b/kde-base/krossruby/krossruby-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="ruby"
@@ -17,7 +17,7 @@ USE_RUBY="ruby18"
 inherit kde4-meta ruby-ng
 
 DESCRIPTION="Kross scripting framework: Ruby interpreter"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""

diff --git a/kde-base/krossruby/krossruby-9999.ebuild b/kde-base/krossruby/krossruby-9999.ebuild
index 7af6535..88a5c39 100644
--- a/kde-base/krossruby/krossruby-9999.ebuild
+++ b/kde-base/krossruby/krossruby-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="ruby"

diff --git a/kde-base/kruler/kruler-9999.ebuild b/kde-base/kruler/kruler-4.9.80.ebuild
similarity index 79%
copy from kde-base/kruler/kruler-9999.ebuild
copy to kde-base/kruler/kruler-4.9.80.ebuild
index 3556141..b427734 100644
--- a/kde-base/kruler/kruler-9999.ebuild
+++ b/kde-base/kruler/kruler-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="A screen ruler for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kruler/kruler-9999.ebuild b/kde-base/kruler/kruler-9999.ebuild
index 3556141..77861ac 100644
--- a/kde-base/kruler/kruler-9999.ebuild
+++ b/kde-base/kruler/kruler-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/krunner/krunner-9999.ebuild b/kde-base/krunner/krunner-4.9.80.ebuild
similarity index 94%
copy from kde-base/krunner/krunner-9999.ebuild
copy to kde-base/krunner/krunner-4.9.80.ebuild
index 170ce8e..e6144e1 100644
--- a/kde-base/krunner/krunner-9999.ebuild
+++ b/kde-base/krunner/krunner-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Command Runner"
 IUSE="debug"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kcheckpass)

diff --git a/kde-base/krunner/krunner-9999.ebuild b/kde-base/krunner/krunner-9999.ebuild
index 170ce8e..03b2a5c 100644
--- a/kde-base/krunner/krunner-9999.ebuild
+++ b/kde-base/krunner/krunner-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"

diff --git a/kde-base/ksaneplugin/ksaneplugin-9999.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.9.80.ebuild
similarity index 82%
copy from kde-base/ksaneplugin/ksaneplugin-9999.ebuild
copy to kde-base/ksaneplugin/ksaneplugin-4.9.80.ebuild
index 27da0aa..58278b7 100644
--- a/kde-base/ksaneplugin/ksaneplugin-9999.ebuild
+++ b/kde-base/ksaneplugin/ksaneplugin-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="SANE Plugin for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/ksaneplugin/ksaneplugin-9999.ebuild b/kde-base/ksaneplugin/ksaneplugin-9999.ebuild
index 27da0aa..2eef08d 100644
--- a/kde-base/ksaneplugin/ksaneplugin-9999.ebuild
+++ b/kde-base/ksaneplugin/ksaneplugin-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kscd/kscd-9999.ebuild b/kde-base/kscd/kscd-4.9.80.ebuild
similarity index 84%
copy from kde-base/kscd/kscd-9999.ebuild
copy to kde-base/kscd/kscd-4.9.80.ebuild
index 6e38736..bbc3af2 100644
--- a/kde-base/kscd/kscd-9999.ebuild
+++ b/kde-base/kscd/kscd-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE CD player"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kscd/kscd-9999.ebuild b/kde-base/kscd/kscd-9999.ebuild
index 6e38736..e7dc410 100644
--- a/kde-base/kscd/kscd-9999.ebuild
+++ b/kde-base/kscd/kscd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.9.80.ebuild
similarity index 92%
copy from kde-base/kscreensaver/kscreensaver-9999.ebuild
copy to kde-base/kscreensaver/kscreensaver-4.9.80.ebuild
index daabc2d..3883a99 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index daabc2d..aba8afe 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"

diff --git a/kde-base/ksecrets/ksecrets-9999.ebuild b/kde-base/ksecrets/ksecrets-9999.ebuild
index 9427e2c..39b2c6b 100644
--- a/kde-base/ksecrets/ksecrets-9999.ebuild
+++ b/kde-base/ksecrets/ksecrets-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/kshisen/kshisen-9999.ebuild b/kde-base/kshisen/kshisen-4.9.80.ebuild
similarity index 86%
copy from kde-base/kshisen/kshisen-9999.ebuild
copy to kde-base/kshisen/kshisen-4.9.80.ebuild
index 2e2ee23..5b48008 100644
--- a/kde-base/kshisen/kshisen-9999.ebuild
+++ b/kde-base/kshisen/kshisen-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kshisen/kshisen-9999.ebuild b/kde-base/kshisen/kshisen-9999.ebuild
index 2e2ee23..5e62b1f 100644
--- a/kde-base/kshisen/kshisen-9999.ebuild
+++ b/kde-base/kshisen/kshisen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/ksirk/ksirk-9999.ebuild b/kde-base/ksirk/ksirk-4.9.80.ebuild
similarity index 86%
copy from kde-base/ksirk/ksirk-9999.ebuild
copy to kde-base/ksirk/ksirk-4.9.80.ebuild
index 5075182..45e8425 100644
--- a/kde-base/ksirk/ksirk-9999.ebuild
+++ b/kde-base/ksirk/ksirk-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/ksirk/ksirk-9999.ebuild b/kde-base/ksirk/ksirk-9999.ebuild
index 5075182..78a6ba1 100644
--- a/kde-base/ksirk/ksirk-9999.ebuild
+++ b/kde-base/ksirk/ksirk-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-4.9.80.ebuild
similarity index 89%
copy from kde-base/ksmserver/ksmserver-9999.ebuild
copy to kde-base/ksmserver/ksmserver-4.9.80.ebuild
index 572bed9..292521b 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index 572bed9..b0b65d0 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/ksnakeduel/ksnakeduel-9999.ebuild b/kde-base/ksnakeduel/ksnakeduel-4.9.80.ebuild
similarity index 84%
copy from kde-base/ksnakeduel/ksnakeduel-9999.ebuild
copy to kde-base/ksnakeduel/ksnakeduel-4.9.80.ebuild
index ac9fcfb..b9fb9fa 100644
--- a/kde-base/ksnakeduel/ksnakeduel-9999.ebuild
+++ b/kde-base/ksnakeduel/ksnakeduel-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Tron game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/ksnakeduel/ksnakeduel-9999.ebuild b/kde-base/ksnakeduel/ksnakeduel-9999.ebuild
index ac9fcfb..83e095c 100644
--- a/kde-base/ksnakeduel/ksnakeduel-9999.ebuild
+++ b/kde-base/ksnakeduel/ksnakeduel-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_SELINUX_MODULE="games"
 inherit kde4-base

diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-4.9.80.ebuild
similarity index 87%
copy from kde-base/ksnapshot/ksnapshot-9999.ebuild
copy to kde-base/ksnapshot/ksnapshot-4.9.80.ebuild
index e539975..4b75564 100644
--- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug kipi"
 
 DEPEND="

diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-9999.ebuild
index e539975..c094144 100644
--- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kspaceduel/kspaceduel-9999.ebuild b/kde-base/kspaceduel/kspaceduel-4.9.80.ebuild
similarity index 84%
copy from kde-base/kspaceduel/kspaceduel-9999.ebuild
copy to kde-base/kspaceduel/kspaceduel-4.9.80.ebuild
index d19a8e0..b0ffa78 100644
--- a/kde-base/kspaceduel/kspaceduel-9999.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kspaceduel/kspaceduel-9999.ebuild b/kde-base/kspaceduel/kspaceduel-9999.ebuild
index d19a8e0..59cf287 100644
--- a/kde-base/kspaceduel/kspaceduel-9999.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/ksplash/ksplash-9999.ebuild b/kde-base/ksplash/ksplash-4.9.80.ebuild
similarity index 93%
copy from kde-base/ksplash/ksplash-9999.ebuild
copy to kde-base/ksplash/ksplash-4.9.80.ebuild
index 06e52c1..e379555 100644
--- a/kde-base/ksplash/ksplash-9999.ebuild
+++ b/kde-base/ksplash/ksplash-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="3dnow altivec debug mmx sse sse2 xinerama"
 
 COMMONDEPEND="

diff --git a/kde-base/ksplash/ksplash-9999.ebuild b/kde-base/ksplash/ksplash-9999.ebuild
index 06e52c1..57edbfe 100644
--- a/kde-base/ksplash/ksplash-9999.ebuild
+++ b/kde-base/ksplash/ksplash-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/ksquares/ksquares-9999.ebuild b/kde-base/ksquares/ksquares-4.9.80.ebuild
similarity index 85%
copy from kde-base/ksquares/ksquares-9999.ebuild
copy to kde-base/ksquares/ksquares-4.9.80.ebuild
index f17323e..ffcfe9f 100644
--- a/kde-base/ksquares/ksquares-9999.ebuild
+++ b/kde-base/ksquares/ksquares-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/ksquares/ksquares-9999.ebuild b/kde-base/ksquares/ksquares-9999.ebuild
index f17323e..a352e78 100644
--- a/kde-base/ksquares/ksquares-9999.ebuild
+++ b/kde-base/ksquares/ksquares-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kstars/kstars-9999.ebuild b/kde-base/kstars/kstars-4.9.80.ebuild
similarity index 91%
copy from kde-base/kstars/kstars-9999.ebuild
copy to kde-base/kstars/kstars-4.9.80.ebuild
index 1c8bad2..48fac66 100644
--- a/kde-base/kstars/kstars-9999.ebuild
+++ b/kde-base/kstars/kstars-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit flag-o-matic kde4-base
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug fits indi"
 
 DEPEND="

diff --git a/kde-base/kstars/kstars-9999.ebuild b/kde-base/kstars/kstars-9999.ebuild
index 1c8bad2..6d395f4 100644
--- a/kde-base/kstars/kstars-9999.ebuild
+++ b/kde-base/kstars/kstars-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit flag-o-matic kde4-base

diff --git a/kde-base/kstart/kstart-9999.ebuild b/kde-base/kstart/kstart-4.9.80.ebuild
similarity index 82%
copy from kde-base/kstart/kstart-9999.ebuild
copy to kde-base/kstart/kstart-4.9.80.ebuild
index 83ca300..b281368 100644
--- a/kde-base/kstart/kstart-9999.ebuild
+++ b/kde-base/kstart/kstart-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kstart/kstart-9999.ebuild b/kde-base/kstart/kstart-9999.ebuild
index 83ca300..989add9 100644
--- a/kde-base/kstart/kstart-9999.ebuild
+++ b/kde-base/kstart/kstart-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kstartperf/kstartperf-9999.ebuild b/kde-base/kstartperf/kstartperf-4.9.80.ebuild
similarity index 81%
copy from kde-base/kstartperf/kstartperf-9999.ebuild
copy to kde-base/kstartperf/kstartperf-4.9.80.ebuild
index 7573d2c..4143559 100644
--- a/kde-base/kstartperf/kstartperf-9999.ebuild
+++ b/kde-base/kstartperf/kstartperf-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="Measures starting performance of applications"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kstartperf/kstartperf-9999.ebuild b/kde-base/kstartperf/kstartperf-9999.ebuild
index 7573d2c..f9c8b5a 100644
--- a/kde-base/kstartperf/kstartperf-9999.ebuild
+++ b/kde-base/kstartperf/kstartperf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KDE_SCM="svn"

diff --git a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.9.80.ebuild
similarity index 82%
copy from kde-base/kstartupconfig/kstartupconfig-9999.ebuild
copy to kde-base/kstartupconfig/kstartupconfig-4.9.80.ebuild
index cc5472c..26b9fe9 100644
--- a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild b/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
index cc5472c..5071418 100644
--- a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kstyles/kstyles-9999.ebuild b/kde-base/kstyles/kstyles-4.9.80.ebuild
similarity index 85%
copy from kde-base/kstyles/kstyles-9999.ebuild
copy to kde-base/kstyles/kstyles-4.9.80.ebuild
index 2eb5aee..b3ced3b 100644
--- a/kde-base/kstyles/kstyles-9999.ebuild
+++ b/kde-base/kstyles/kstyles-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A set of different KDE styles."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kstyles/kstyles-9999.ebuild b/kde-base/kstyles/kstyles-9999.ebuild
index 2eb5aee..59ecd66 100644
--- a/kde-base/kstyles/kstyles-9999.ebuild
+++ b/kde-base/kstyles/kstyles-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/ksudoku/ksudoku-9999.ebuild b/kde-base/ksudoku/ksudoku-4.9.80.ebuild
similarity index 88%
copy from kde-base/ksudoku/ksudoku-9999.ebuild
copy to kde-base/ksudoku/ksudoku-4.9.80.ebuild
index 57bb065..3adb77c 100644
--- a/kde-base/ksudoku/ksudoku-9999.ebuild
+++ b/kde-base/ksudoku/ksudoku-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Sudoku"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/ksudoku/ksudoku-9999.ebuild b/kde-base/ksudoku/ksudoku-9999.ebuild
index 57bb065..f12fc36 100644
--- a/kde-base/ksudoku/ksudoku-9999.ebuild
+++ b/kde-base/ksudoku/ksudoku-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"

diff --git a/kde-base/ksysguard/ksysguard-9999.ebuild b/kde-base/ksysguard/ksysguard-4.9.80.ebuild
similarity index 94%
copy from kde-base/ksysguard/ksysguard-9999.ebuild
copy to kde-base/ksysguard/ksysguard-4.9.80.ebuild
index 5583d0b..83b1cfb 100644
--- a/kde-base/ksysguard/ksysguard-9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug lm_sensors test"
 
 COMMONDEPEND="

diff --git a/kde-base/ksysguard/ksysguard-9999.ebuild b/kde-base/ksysguard/ksysguard-9999.ebuild
index 5583d0b..41498fd 100644
--- a/kde-base/ksysguard/ksysguard-9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/ksystemlog/ksystemlog-9999.ebuild b/kde-base/ksystemlog/ksystemlog-4.9.80.ebuild
similarity index 93%
copy from kde-base/ksystemlog/ksystemlog-9999.ebuild
copy to kde-base/ksystemlog/ksystemlog-4.9.80.ebuild
index 015d007..87e53d7 100644
--- a/kde-base/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KDE system log viewer"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 RESTRICT=test

diff --git a/kde-base/ksystemlog/ksystemlog-9999.ebuild b/kde-base/ksystemlog/ksystemlog-9999.ebuild
index 015d007..01c09cd 100644
--- a/kde-base/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"

diff --git a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.9.80.ebuild
similarity index 82%
copy from kde-base/ksystraycmd/ksystraycmd-9999.ebuild
copy to kde-base/ksystraycmd/ksystraycmd-4.9.80.ebuild
index 8ff5e89..967a0e5 100644
--- a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild b/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
index 8ff5e89..b502354 100644
--- a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kteatime/kteatime-9999.ebuild b/kde-base/kteatime/kteatime-4.9.80.ebuild
similarity index 83%
copy from kde-base/kteatime/kteatime-9999.ebuild
copy to kde-base/kteatime/kteatime-4.9.80.ebuild
index 3aa08fd..81b8111 100644
--- a/kde-base/kteatime/kteatime-9999.ebuild
+++ b/kde-base/kteatime/kteatime-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdetoys"
@@ -10,5 +10,5 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kteatime/kteatime-9999.ebuild b/kde-base/kteatime/kteatime-9999.ebuild
index 3aa08fd..26d2f60 100644
--- a/kde-base/kteatime/kteatime-9999.ebuild
+++ b/kde-base/kteatime/kteatime-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdetoys"

diff --git a/kde-base/ktimer/ktimer-9999.ebuild b/kde-base/ktimer/ktimer-4.9.80.ebuild
similarity index 78%
copy from kde-base/ktimer/ktimer-9999.ebuild
copy to kde-base/ktimer/ktimer-4.9.80.ebuild
index 65e9446..d836965 100644
--- a/kde-base/ktimer/ktimer-9999.ebuild
+++ b/kde-base/ktimer/ktimer-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Timer"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/ktimer/ktimer-9999.ebuild b/kde-base/ktimer/ktimer-9999.ebuild
index 65e9446..84b3228 100644
--- a/kde-base/ktimer/ktimer-9999.ebuild
+++ b/kde-base/ktimer/ktimer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/ktimetracker/ktimetracker-9999.ebuild b/kde-base/ktimetracker/ktimetracker-4.9.80.ebuild
similarity index 92%
copy from kde-base/ktimetracker/ktimetracker-9999.ebuild
copy to kde-base/ktimetracker/ktimetracker-4.9.80.ebuild
index 7ffa771..b211157 100644
--- a/kde-base/ktimetracker/ktimetracker-9999.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/ktimetracker/ktimetracker-9999.ebuild b/kde-base/ktimetracker/ktimetracker-9999.ebuild
index 7ffa771..2ef2c6c 100644
--- a/kde-base/ktimetracker/ktimetracker-9999.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"

diff --git a/kde-base/ktimezoned/ktimezoned-9999.ebuild b/kde-base/ktimezoned/ktimezoned-4.9.80.ebuild
similarity index 79%
copy from kde-base/ktimezoned/ktimezoned-9999.ebuild
copy to kde-base/ktimezoned/ktimezoned-4.9.80.ebuild
index fda2f40..64faf59 100644
--- a/kde-base/ktimezoned/ktimezoned-9999.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/ktimezoned/ktimezoned-9999.ebuild b/kde-base/ktimezoned/ktimezoned-9999.ebuild
index fda2f40..61d1f57 100644
--- a/kde-base/ktimezoned/ktimezoned-9999.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/ktouch/ktouch-9999.ebuild b/kde-base/ktouch/ktouch-4.9.80.ebuild
similarity index 84%
copy from kde-base/ktouch/ktouch-9999.ebuild
copy to kde-base/ktouch/ktouch-4.9.80.ebuild
index 45f852f..b107008 100644
--- a/kde-base/ktouch/ktouch-9999.ebuild
+++ b/kde-base/ktouch/ktouch-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/ktouch/ktouch-9999.ebuild b/kde-base/ktouch/ktouch-9999.ebuild
index 45f852f..df05f6d 100644
--- a/kde-base/ktouch/ktouch-9999.ebuild
+++ b/kde-base/ktouch/ktouch-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/ktraderclient/ktraderclient-9999.ebuild b/kde-base/ktraderclient/ktraderclient-4.9.80.ebuild
similarity index 81%
copy from kde-base/ktraderclient/ktraderclient-9999.ebuild
copy to kde-base/ktraderclient/ktraderclient-4.9.80.ebuild
index a205a9a..6a189f6 100644
--- a/kde-base/ktraderclient/ktraderclient-9999.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A command-line tool for querying the KDE trader system"
 IUSE="debug"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/kde-base/ktraderclient/ktraderclient-9999.ebuild b/kde-base/ktraderclient/ktraderclient-9999.ebuild
index a205a9a..ac1b0d7 100644
--- a/kde-base/ktraderclient/ktraderclient-9999.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/ktuberling/ktuberling-9999.ebuild b/kde-base/ktuberling/ktuberling-4.9.80.ebuild
similarity index 85%
copy from kde-base/ktuberling/ktuberling-9999.ebuild
copy to kde-base/ktuberling/ktuberling-4.9.80.ebuild
index f3a23c5..8c19543 100644
--- a/kde-base/ktuberling/ktuberling-9999.ebuild
+++ b/kde-base/ktuberling/ktuberling-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/ktuberling/ktuberling-9999.ebuild b/kde-base/ktuberling/ktuberling-9999.ebuild
index f3a23c5..a8545b8 100644
--- a/kde-base/ktuberling/ktuberling-9999.ebuild
+++ b/kde-base/ktuberling/ktuberling-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/kturtle/kturtle-9999.ebuild b/kde-base/kturtle/kturtle-4.9.80.ebuild
similarity index 85%
copy from kde-base/kturtle/kturtle-9999.ebuild
copy to kde-base/kturtle/kturtle-4.9.80.ebuild
index b106d56..0e888f5 100644
--- a/kde-base/kturtle/kturtle-9999.ebuild
+++ b/kde-base/kturtle/kturtle-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kturtle/kturtle-9999.ebuild b/kde-base/kturtle/kturtle-9999.ebuild
index b106d56..180c5c3 100644
--- a/kde-base/kturtle/kturtle-9999.ebuild
+++ b/kde-base/kturtle/kturtle-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/ktux/ktux-9999.ebuild b/kde-base/ktux/ktux-4.9.80.ebuild
similarity index 88%
copy from kde-base/ktux/ktux-9999.ebuild
copy to kde-base/ktux/ktux-4.9.80.ebuild
index 3ebead4..0ed11ae 100644
--- a/kde-base/ktux/ktux-9999.ebuild
+++ b/kde-base/ktux/ktux-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdetoys"
 KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config

diff --git a/kde-base/ktux/ktux-9999.ebuild b/kde-base/ktux/ktux-9999.ebuild
index 3ebead4..cfea4e2 100644
--- a/kde-base/ktux/ktux-9999.ebuild
+++ b/kde-base/ktux/ktux-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdetoys"
 KDE_SCM="svn"

diff --git a/kde-base/kubrick/kubrick-9999.ebuild b/kde-base/kubrick/kubrick-4.9.80.ebuild
similarity index 86%
copy from kde-base/kubrick/kubrick-9999.ebuild
copy to kde-base/kubrick/kubrick-4.9.80.ebuild
index 523a1a3..94a39aa 100644
--- a/kde-base/kubrick/kubrick-9999.ebuild
+++ b/kde-base/kubrick/kubrick-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="always"
 inherit kde4-base
 
 DESCRIPTION="KDE: Kubrick is a game based on \"Rubik's Cube\" puzzle."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/kubrick/kubrick-9999.ebuild b/kde-base/kubrick/kubrick-9999.ebuild
index 523a1a3..aa59621 100644
--- a/kde-base/kubrick/kubrick-9999.ebuild
+++ b/kde-base/kubrick/kubrick-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="always"

diff --git a/kde-base/kuiserver/kuiserver-9999.ebuild b/kde-base/kuiserver/kuiserver-4.9.80.ebuild
similarity index 80%
copy from kde-base/kuiserver/kuiserver-9999.ebuild
copy to kde-base/kuiserver/kuiserver-4.9.80.ebuild
index b133f2f..1d763e6 100644
--- a/kde-base/kuiserver/kuiserver-9999.ebuild
+++ b/kde-base/kuiserver/kuiserver-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kuiserver/kuiserver-9999.ebuild b/kde-base/kuiserver/kuiserver-9999.ebuild
index b133f2f..72209d8 100644
--- a/kde-base/kuiserver/kuiserver-9999.ebuild
+++ b/kde-base/kuiserver/kuiserver-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kuiviewer/kuiviewer-9999.ebuild b/kde-base/kuiviewer/kuiviewer-4.9.80.ebuild
similarity index 83%
copy from kde-base/kuiviewer/kuiviewer-9999.ebuild
copy to kde-base/kuiviewer/kuiviewer-4.9.80.ebuild
index 581df2b..1c73c52 100644
--- a/kde-base/kuiviewer/kuiviewer-9999.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kuiviewer/kuiviewer-9999.ebuild b/kde-base/kuiviewer/kuiviewer-9999.ebuild
index 581df2b..4456b65 100644
--- a/kde-base/kuiviewer/kuiviewer-9999.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdesdk"
 KDE_SCM="svn"

diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.9.80.ebuild
similarity index 82%
copy from kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
copy to kde-base/kurifilter-plugins/kurifilter-plugins-4.9.80.ebuild
index 9a41a36..46c9864 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RESTRICT=test

diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
index 9a41a36..4b207f2 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kuser/kuser-9999.ebuild b/kde-base/kuser/kuser-4.9.80.ebuild
similarity index 88%
copy from kde-base/kuser/kuser-9999.ebuild
copy to kde-base/kuser/kuser-4.9.80.ebuild
index 20b8a7e..7f002e6 100644
--- a/kde-base/kuser/kuser-9999.ebuild
+++ b/kde-base/kuser/kuser-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE application that helps you manage system users"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kuser/kuser-9999.ebuild b/kde-base/kuser/kuser-9999.ebuild
index 20b8a7e..f7f51c1 100644
--- a/kde-base/kuser/kuser-9999.ebuild
+++ b/kde-base/kuser/kuser-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"

diff --git a/kde-base/kwallet/kwallet-9999.ebuild b/kde-base/kwallet/kwallet-4.9.80.ebuild
similarity index 80%
copy from kde-base/kwallet/kwallet-9999.ebuild
copy to kde-base/kwallet/kwallet-4.9.80.ebuild
index 36fa4dd..cecfada 100644
--- a/kde-base/kwallet/kwallet-9999.ebuild
+++ b/kde-base/kwallet/kwallet-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kwallet/kwallet-9999.ebuild b/kde-base/kwallet/kwallet-9999.ebuild
index 36fa4dd..a6765b1 100644
--- a/kde-base/kwallet/kwallet-9999.ebuild
+++ b/kde-base/kwallet/kwallet-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kwalletd/kwalletd-9999.ebuild b/kde-base/kwalletd/kwalletd-4.9.80.ebuild
similarity index 79%
copy from kde-base/kwalletd/kwalletd-9999.ebuild
copy to kde-base/kwalletd/kwalletd-4.9.80.ebuild
index d5ac1e0..0a3db46 100644
--- a/kde-base/kwalletd/kwalletd-9999.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kwalletd/kwalletd-9999.ebuild b/kde-base/kwalletd/kwalletd-9999.ebuild
index d5ac1e0..7e7e976 100644
--- a/kde-base/kwalletd/kwalletd-9999.ebuild
+++ b/kde-base/kwalletd/kwalletd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-4.9.80.ebuild
similarity index 96%
copy from kde-base/kwin/kwin-9999.ebuild
copy to kde-base/kwin/kwin-4.9.80.ebuild
index 6070a0b..c84075b 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="always"
 inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KDE window manager"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug gles opengl"
 
 COMMONDEPEND="

diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index 6070a0b..8c79eb4 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="always"

diff --git a/kde-base/kwordquiz/kwordquiz-9999.ebuild b/kde-base/kwordquiz/kwordquiz-4.9.80.ebuild
similarity index 85%
copy from kde-base/kwordquiz/kwordquiz-9999.ebuild
copy to kde-base/kwordquiz/kwordquiz-4.9.80.ebuild
index cba63b0..2ee1fe9 100644
--- a/kde-base/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kwordquiz/kwordquiz-9999.ebuild b/kde-base/kwordquiz/kwordquiz-9999.ebuild
index cba63b0..cc58ea2 100644
--- a/kde-base/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/kwrite/kwrite-9999.ebuild b/kde-base/kwrite/kwrite-4.9.80.ebuild
similarity index 84%
copy from kde-base/kwrite/kwrite-9999.ebuild
copy to kde-base/kwrite/kwrite-4.9.80.ebuild
index 1c5ef0b..2f58e3d 100644
--- a/kde-base/kwrite/kwrite-9999.ebuild
+++ b/kde-base/kwrite/kwrite-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"
@@ -10,7 +10,7 @@ KMEXTRACTONLY="doc/kate"
 inherit kde4-meta
 
 DESCRIPTION="KDE MDI editor/IDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/kwrite/kwrite-9999.ebuild b/kde-base/kwrite/kwrite-9999.ebuild
index 1c5ef0b..e5a59b1 100644
--- a/kde-base/kwrite/kwrite-9999.ebuild
+++ b/kde-base/kwrite/kwrite-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"

diff --git a/kde-base/kwrited/kwrited-9999.ebuild b/kde-base/kwrited/kwrited-4.9.80.ebuild
similarity index 86%
copy from kde-base/kwrited/kwrited-9999.ebuild
copy to kde-base/kwrited/kwrited-4.9.80.ebuild
index 45a6812..c649e2d 100644
--- a/kde-base/kwrited/kwrited-9999.ebuild
+++ b/kde-base/kwrited/kwrited-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE daemon listening for wall and write messages."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/kwrited/kwrited-9999.ebuild b/kde-base/kwrited/kwrited-9999.ebuild
index 45a6812..854a885 100644
--- a/kde-base/kwrited/kwrited-9999.ebuild
+++ b/kde-base/kwrited/kwrited-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 

diff --git a/kde-base/libkcddb/libkcddb-9999.ebuild b/kde-base/libkcddb/libkcddb-4.9.80.ebuild
similarity index 91%
copy from kde-base/libkcddb/libkcddb-9999.ebuild
copy to kde-base/libkcddb/libkcddb-4.9.80.ebuild
index bb8f540..50ad7e4 100644
--- a/kde-base/libkcddb/libkcddb-9999.ebuild
+++ b/kde-base/libkcddb/libkcddb-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data

diff --git a/kde-base/libkcddb/libkcddb-9999.ebuild b/kde-base/libkcddb/libkcddb-9999.ebuild
index bb8f540..1c33030 100644
--- a/kde-base/libkcddb/libkcddb-9999.ebuild
+++ b/kde-base/libkcddb/libkcddb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.9.80.ebuild
similarity index 85%
copy from kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild
copy to kde-base/libkcompactdisc/libkcompactdisc-4.9.80.ebuild
index 4c53f84..0eac747 100644
--- a/kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-base/libkcompactdisc/libkcompactdisc-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug"
 
 src_configure() {

diff --git a/kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild
index 4c53f84..5cb779c 100644
--- a/kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-base/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkdcraw/libkdcraw-9999.ebuild b/kde-base/libkdcraw/libkdcraw-4.9.80.ebuild
similarity index 85%
copy from kde-base/libkdcraw/libkdcraw-9999.ebuild
copy to kde-base/libkdcraw/libkdcraw-4.9.80.ebuild
index 788bafd..6347d55 100644
--- a/kde-base/libkdcraw/libkdcraw-9999.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 # needed for digikam
 KDE_OVERRIDE_MINIMAL="4.9.0"
@@ -10,7 +10,7 @@ KDE_OVERRIDE_MINIMAL="4.9.0"
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera raw image library wrapper"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/libkdcraw/libkdcraw-9999.ebuild b/kde-base/libkdcraw/libkdcraw-9999.ebuild
index 788bafd..c19a549 100644
--- a/kde-base/libkdcraw/libkdcraw-9999.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 # needed for digikam
 KDE_OVERRIDE_MINIMAL="4.9.0"

diff --git a/kde-base/libkdeedu/libkdeedu-9999.ebuild b/kde-base/libkdeedu/libkdeedu-4.9.80.ebuild
similarity index 86%
copy from kde-base/libkdeedu/libkdeedu-9999.ebuild
copy to kde-base/libkdeedu/libkdeedu-4.9.80.ebuild
index 3992362..05cc915 100644
--- a/kde-base/libkdeedu/libkdeedu-9999.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 # 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,

diff --git a/kde-base/libkdeedu/libkdeedu-9999.ebuild b/kde-base/libkdeedu/libkdeedu-9999.ebuild
index 3992362..862475e 100644
--- a/kde-base/libkdeedu/libkdeedu-9999.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkdegames/libkdegames-9999.ebuild b/kde-base/libkdegames/libkdegames-4.9.80.ebuild
similarity index 89%
copy from kde-base/libkdegames/libkdegames-9999.ebuild
copy to kde-base/libkdegames/libkdegames-4.9.80.ebuild
index 2c722b2..489fb38 100644
--- a/kde-base/libkdegames/libkdegames-9999.ebuild
+++ b/kde-base/libkdegames/libkdegames-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Base library common to many KDE games."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug openal"
 
 DEPEND="

diff --git a/kde-base/libkdegames/libkdegames-9999.ebuild b/kde-base/libkdegames/libkdegames-9999.ebuild
index 2c722b2..0ad1385 100644
--- a/kde-base/libkdegames/libkdegames-9999.ebuild
+++ b/kde-base/libkdegames/libkdegames-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkexiv2/libkexiv2-9999.ebuild b/kde-base/libkexiv2/libkexiv2-4.9.80.ebuild
similarity index 85%
copy from kde-base/libkexiv2/libkexiv2-9999.ebuild
copy to kde-base/libkexiv2/libkexiv2-4.9.80.ebuild
index 057ce8a..591e0a5 100644
--- a/kde-base/libkexiv2/libkexiv2-9999.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/libkexiv2/libkexiv2-9999.ebuild b/kde-base/libkexiv2/libkexiv2-9999.ebuild
index 057ce8a..62e0525 100644
--- a/kde-base/libkexiv2/libkexiv2-9999.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkipi/libkipi-9999.ebuild b/kde-base/libkipi/libkipi-4.9.80.ebuild
similarity index 83%
copy from kde-base/libkipi/libkipi-9999.ebuild
copy to kde-base/libkipi/libkipi-4.9.80.ebuild
index b244cb7..7bf6cc9 100644
--- a/kde-base/libkipi/libkipi-9999.ebuild
+++ b/kde-base/libkipi/libkipi-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 # needed for digikam
 KDE_OVERRIDE_MINIMAL="4.9.0"
@@ -10,5 +10,5 @@ KDE_OVERRIDE_MINIMAL="4.9.0"
 inherit kde4-base
 
 DESCRIPTION="A library for image plugins accross KDE applications."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/libkipi/libkipi-9999.ebuild b/kde-base/libkipi/libkipi-9999.ebuild
index b244cb7..976f2f3 100644
--- a/kde-base/libkipi/libkipi-9999.ebuild
+++ b/kde-base/libkipi/libkipi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 # needed for digikam
 KDE_OVERRIDE_MINIMAL="4.9.0"

diff --git a/kde-base/libkmahjongg/libkmahjongg-9999.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.9.80.ebuild
similarity index 79%
copy from kde-base/libkmahjongg/libkmahjongg-9999.ebuild
copy to kde-base/libkmahjongg/libkmahjongg-4.9.80.ebuild
index bf19700..243da4f 100644
--- a/kde-base/libkmahjongg/libkmahjongg-9999.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMLOADLIBS="libkdegames"

diff --git a/kde-base/libkmahjongg/libkmahjongg-9999.ebuild b/kde-base/libkmahjongg/libkmahjongg-9999.ebuild
index bf19700..8377d27 100644
--- a/kde-base/libkmahjongg/libkmahjongg-9999.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-4.9.80.ebuild
similarity index 86%
copy from kde-base/libkonq/libkonq-9999.ebuild
copy to kde-base/libkonq/libkonq-4.9.80.ebuild
index 7fa5e64..57f3365 100644
--- a/kde-base/libkonq/libkonq-9999.ebuild
+++ b/kde-base/libkonq/libkonq-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 KMMODULE="lib/konq"
@@ -10,7 +10,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 RESTRICT="test"
 

diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild
index 7fa5e64..50fc50d 100644
--- a/kde-base/libkonq/libkonq-9999.ebuild
+++ b/kde-base/libkonq/libkonq-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 KMMODULE="lib/konq"

diff --git a/kde-base/libksane/libksane-9999.ebuild b/kde-base/libksane/libksane-4.9.80.ebuild
similarity index 83%
copy from kde-base/libksane/libksane-9999.ebuild
copy to kde-base/libksane/libksane-4.9.80.ebuild
index c0c6532..bf07bee 100644
--- a/kde-base/libksane/libksane-9999.ebuild
+++ b/kde-base/libksane/libksane-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="SANE Library interface for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 LICENSE="LGPL-2"
 

diff --git a/kde-base/libksane/libksane-9999.ebuild b/kde-base/libksane/libksane-9999.ebuild
index c0c6532..7bcfedf 100644
--- a/kde-base/libksane/libksane-9999.ebuild
+++ b/kde-base/libksane/libksane-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/libkworkspace/libkworkspace-4.9.80.ebuild
similarity index 92%
copy from kde-base/libkworkspace/libkworkspace-9999.ebuild
copy to kde-base/libkworkspace/libkworkspace-4.9.80.ebuild
index d366d3e..304bb16 100644
--- a/kde-base/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/kworkspace"
 inherit kde4-meta
 
 DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRACTONLY="

diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/libkworkspace/libkworkspace-9999.ebuild
index d366d3e..19fa00b 100644
--- a/kde-base/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/kworkspace"

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.9.80.ebuild
similarity index 82%
copy from kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
copy to kde-base/liboxygenstyle/liboxygenstyle-4.9.80.ebuild
index 3f98e40..0fae277 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/oxygen"
 inherit kde4-meta
 
 DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
index 3f98e40..b8998dc 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/oxygen"

diff --git a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.9.80.ebuild
similarity index 90%
copy from kde-base/libplasmaclock/libplasmaclock-9999.ebuild
copy to kde-base/libplasmaclock/libplasmaclock-4.9.80.ebuild
index 20414c3..2d2ac46 100644
--- a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/plasmaclock"
 inherit kde4-meta
 
 DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +holidays"
 
 DEPEND="

diff --git a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild b/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
index 20414c3..5c82bc7 100644
--- a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/plasmaclock"

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.9.80.ebuild
similarity index 89%
copy from kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
copy to kde-base/libplasmagenericshell/libplasmagenericshell-4.9.80.ebuild
index 9a08a89..802a209 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/plasmagenericshell"
 inherit kde4-meta
 
 DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug test"
 
 DEPEND="

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
index 9a08a89..fc0ef34 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/plasmagenericshell"

diff --git a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.9.80.ebuild
similarity index 93%
copy from kde-base/libtaskmanager/libtaskmanager-9999.ebuild
copy to kde-base/libtaskmanager/libtaskmanager-4.9.80.ebuild
index f324d47..736c4a5 100644
--- a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/taskmanager"
 inherit kde4-meta
 
 DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
index f324d47..f92d4fc 100644
--- a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 KMMODULE="libs/taskmanager"

diff --git a/kde-base/lokalize/lokalize-9999.ebuild b/kde-base/lokalize/lokalize-4.9.80.ebuild
similarity index 94%
copy from kde-base/lokalize/lokalize-9999.ebuild
copy to kde-base/lokalize/lokalize-4.9.80.ebuild
index bd33f89..a60934f 100644
--- a/kde-base/lokalize/lokalize-9999.ebuild
+++ b/kde-base/lokalize/lokalize-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -11,7 +11,7 @@ PYTHON_DEPEND="2"
 inherit python kde4-meta
 
 DESCRIPTION="KDE4 translation tool"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug semantic-desktop"
 
 DEPEND="

diff --git a/kde-base/lokalize/lokalize-9999.ebuild b/kde-base/lokalize/lokalize-9999.ebuild
index bd33f89..3821df6 100644
--- a/kde-base/lokalize/lokalize-9999.ebuild
+++ b/kde-base/lokalize/lokalize-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/lskat/lskat-9999.ebuild b/kde-base/lskat/lskat-4.9.80.ebuild
similarity index 84%
copy from kde-base/lskat/lskat-9999.ebuild
copy to kde-base/lskat/lskat-4.9.80.ebuild
index e1679c2..dc7247e 100644
--- a/kde-base/lskat/lskat-9999.ebuild
+++ b/kde-base/lskat/lskat-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"
 inherit kde4-base
 
 DESCRIPTION="Skat game for KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/lskat/lskat-9999.ebuild b/kde-base/lskat/lskat-9999.ebuild
index e1679c2..5fb5706 100644
--- a/kde-base/lskat/lskat-9999.ebuild
+++ b/kde-base/lskat/lskat-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-4.9.80.ebuild
similarity index 97%
copy from kde-base/marble/marble-9999.ebuild
copy to kde-base/marble/marble-4.9.80.ebuild
index ef14a3c..931e07c 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
@@ -11,7 +11,7 @@ PYTHON_DEPEND="python? 2"
 inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index ef14a3c..1acee8d 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"

diff --git a/kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.9.80.ebuild
similarity index 88%
copy from kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild
copy to kde-base/mplayerthumbs/mplayerthumbs-4.9.80.ebuild
index a5120ee..172e62b 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild
index a5120ee..8b491af 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.9.80.ebuild
similarity index 87%
copy from kde-base/nepomuk-core/nepomuk-core-9999.ebuild
copy to kde-base/nepomuk-core/nepomuk-core-4.9.80.ebuild
index fe8780e..4e8b1c6 100644
--- a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Nepomuk core libraries"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
index fe8780e..a262b67 100644
--- a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild b/kde-base/nepomuk-widgets/nepomuk-widgets-4.9.80.ebuild
similarity index 86%
copy from kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild
copy to kde-base/nepomuk-widgets/nepomuk-widgets-4.9.80.ebuild
index 9632782..3e54832 100644
--- a/kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild
+++ b/kde-base/nepomuk-widgets/nepomuk-widgets-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Widget library for nepomuk"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild b/kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild
index 9632782..f163b6f 100644
--- a/kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild
+++ b/kde-base/nepomuk-widgets/nepomuk-widgets-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/nepomuk/nepomuk-9999.ebuild b/kde-base/nepomuk/nepomuk-4.9.80.ebuild
similarity index 90%
copy from kde-base/nepomuk/nepomuk-9999.ebuild
copy to kde-base/nepomuk/nepomuk-4.9.80.ebuild
index 6717c62..29bdcb5 100644
--- a/kde-base/nepomuk/nepomuk-9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Nepomuk KDE4 client"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/nepomuk/nepomuk-9999.ebuild b/kde-base/nepomuk/nepomuk-9999.ebuild
index 6717c62..9ae63c0 100644
--- a/kde-base/nepomuk/nepomuk-9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/nsplugins/nsplugins-9999.ebuild b/kde-base/nsplugins/nsplugins-4.9.80.ebuild
similarity index 89%
copy from kde-base/nsplugins/nsplugins-9999.ebuild
copy to kde-base/nsplugins/nsplugins-4.9.80.ebuild
index 5f0a6a9..d9c6a72 100644
--- a/kde-base/nsplugins/nsplugins-9999.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 inherit kde4-meta pax-utils
 
 DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/nsplugins/nsplugins-9999.ebuild b/kde-base/nsplugins/nsplugins-9999.ebuild
index 5f0a6a9..2266959 100644
--- a/kde-base/nsplugins/nsplugins-9999.ebuild
+++ b/kde-base/nsplugins/nsplugins-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 inherit kde4-meta pax-utils

diff --git a/kde-base/okteta/okteta-9999.ebuild b/kde-base/okteta/okteta-4.9.80.ebuild
similarity index 87%
copy from kde-base/okteta/okteta-9999.ebuild
copy to kde-base/okteta/okteta-4.9.80.ebuild
index 0903d76..3d763d2 100644
--- a/kde-base/okteta/okteta-9999.ebuild
+++ b/kde-base/okteta/okteta-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE hexeditor"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/okteta/okteta-9999.ebuild b/kde-base/okteta/okteta-9999.ebuild
index 0903d76..627a517 100644
--- a/kde-base/okteta/okteta-9999.ebuild
+++ b/kde-base/okteta/okteta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/kde-base/okular/okular-9999.ebuild b/kde-base/okular/okular-4.9.80.ebuild
similarity index 95%
copy from kde-base/okular/okular-9999.ebuild
copy to kde-base/okular/okular-4.9.80.ebuild
index c898127..419a707 100644
--- a/kde-base/okular/okular-9999.ebuild
+++ b/kde-base/okular/okular-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="chm crypt debug djvu ebook +jpeg +postscript +pdf +tiff"
 
 DEPEND="

diff --git a/kde-base/okular/okular-9999.ebuild b/kde-base/okular/okular-9999.ebuild
index c898127..ffe266d 100644
--- a/kde-base/okular/okular-9999.ebuild
+++ b/kde-base/okular/okular-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.9.80.ebuild
similarity index 92%
copy from kde-base/oxygen-icons/oxygen-icons-9999.ebuild
copy to kde-base/oxygen-icons/oxygen-icons-4.9.80.ebuild
index 5e7cc5c..cf86302 100644
--- a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == *9999 ]]; then
 	KMNAME="kdesupport"
@@ -24,7 +24,7 @@ SRC_URI="
 "
 
 LICENSE="LGPL-3"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua bindist"
 
 DEPEND=""

diff --git a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
index 5e7cc5c..3ea8e4e 100644
--- a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == *9999 ]]; then
 	KMNAME="kdesupport"

diff --git a/kde-base/pairs/pairs-9999.ebuild b/kde-base/pairs/pairs-4.9.80.ebuild
similarity index 82%
copy from kde-base/pairs/pairs-9999.ebuild
copy to kde-base/pairs/pairs-4.9.80.ebuild
index c3b2852..51aa8f6 100644
--- a/kde-base/pairs/pairs-9999.ebuild
+++ b/kde-base/pairs/pairs-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="never"
 inherit kde4-base
 
 DESCRIPTION="KDE memory and pairs game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""

diff --git a/kde-base/pairs/pairs-9999.ebuild b/kde-base/pairs/pairs-9999.ebuild
index c3b2852..cc5deb4 100644
--- a/kde-base/pairs/pairs-9999.ebuild
+++ b/kde-base/pairs/pairs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="never"
 inherit kde4-base

diff --git a/kde-base/palapeli/palapeli-9999.ebuild b/kde-base/palapeli/palapeli-4.9.80.ebuild
similarity index 83%
copy from kde-base/palapeli/palapeli-9999.ebuild
copy to kde-base/palapeli/palapeli-4.9.80.ebuild
index e509a58..30900a1 100644
--- a/kde-base/palapeli/palapeli-9999.ebuild
+++ b/kde-base/palapeli/palapeli-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE jigsaw puzzle game"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="$(add_kdebase_dep libkdegames)"

diff --git a/kde-base/palapeli/palapeli-9999.ebuild b/kde-base/palapeli/palapeli-9999.ebuild
index e509a58..9fd3e50 100644
--- a/kde-base/palapeli/palapeli-9999.ebuild
+++ b/kde-base/palapeli/palapeli-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/parley/parley-9999.ebuild b/kde-base/parley/parley-4.9.80.ebuild
similarity index 89%
copy from kde-base/parley/parley-9999.ebuild
copy to kde-base/parley/parley-4.9.80.ebuild
index 0639616..c20a3c4 100644
--- a/kde-base/parley/parley-9999.ebuild
+++ b/kde-base/parley/parley-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +plasma"
 
 DEPEND="

diff --git a/kde-base/parley/parley-9999.ebuild b/kde-base/parley/parley-9999.ebuild
index 0639616..68230f9 100644
--- a/kde-base/parley/parley-9999.ebuild
+++ b/kde-base/parley/parley-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/perlkde/perlkde-9999.ebuild b/kde-base/perlkde/perlkde-4.9.80.ebuild
similarity index 94%
copy from kde-base/perlkde/perlkde-9999.ebuild
copy to kde-base/perlkde/perlkde-4.9.80.ebuild
index e651454..46aaa05 100644
--- a/kde-base/perlkde/perlkde-9999.ebuild
+++ b/kde-base/perlkde/perlkde-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="KDE Perl bindings"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi attica debug kate okular semantic-desktop test"
 
 RDEPEND="

diff --git a/kde-base/perlkde/perlkde-9999.ebuild b/kde-base/perlkde/perlkde-9999.ebuild
index e651454..ca4350f 100644
--- a/kde-base/perlkde/perlkde-9999.ebuild
+++ b/kde-base/perlkde/perlkde-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/perlqt/perlqt-9999.ebuild b/kde-base/perlqt/perlqt-4.9.80.ebuild
similarity index 96%
copy from kde-base/perlqt/perlqt-9999.ebuild
copy to kde-base/perlqt/perlqt-4.9.80.ebuild
index a10d88c..bed4925 100644
--- a/kde-base/perlqt/perlqt-9999.ebuild
+++ b/kde-base/perlqt/perlqt-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DECLARATIVE_REQUIRED="optional"
 MULTIMEDIA_REQUIRED="optional"
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-base
 
 DESCRIPTION="Qt Perl bindings"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug phonon qimageblitz qscintilla qwt webkit"
 
 RDEPEND="

diff --git a/kde-base/perlqt/perlqt-9999.ebuild b/kde-base/perlqt/perlqt-9999.ebuild
index a10d88c..d57f123 100644
--- a/kde-base/perlqt/perlqt-9999.ebuild
+++ b/kde-base/perlqt/perlqt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DECLARATIVE_REQUIRED="optional"
 MULTIMEDIA_REQUIRED="optional"

diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-4.9.80.ebuild
similarity index 92%
copy from kde-base/phonon-kde/phonon-kde-9999.ebuild
copy to kde-base/phonon-kde/phonon-kde-4.9.80.ebuild
index 1749393..a8c0c7d 100644
--- a/kde-base/phonon-kde/phonon-kde-9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="phonon"
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Phonon KDE Integration"
 HOMEPAGE="http://phonon.kde.org"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="

diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-9999.ebuild
index 1749393..1c340dd 100644
--- a/kde-base/phonon-kde/phonon-kde-9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="phonon"

diff --git a/kde-base/plasma-apps/plasma-apps-9999.ebuild b/kde-base/plasma-apps/plasma-apps-4.9.80.ebuild
similarity index 84%
copy from kde-base/plasma-apps/plasma-apps-9999.ebuild
copy to kde-base/plasma-apps/plasma-apps-4.9.80.ebuild
index 6decb03..f7c3a4d 100644
--- a/kde-base/plasma-apps/plasma-apps-9999.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/plasma-apps/plasma-apps-9999.ebuild b/kde-base/plasma-apps/plasma-apps-9999.ebuild
index 6decb03..4050137 100644
--- a/kde-base/plasma-apps/plasma-apps-9999.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-baseapps"
 KMMODULE="plasma"

diff --git a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.9.80.ebuild
similarity index 88%
copy from kde-base/plasma-runtime/plasma-runtime-9999.ebuild
copy to kde-base/plasma-runtime/plasma-runtime-4.9.80.ebuild
index f2f6bde..beac4da 100644
--- a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="plasma"
@@ -10,7 +10,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
index f2f6bde..0ce1833 100644
--- a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="plasma"

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.9.80.ebuild
similarity index 98%
copy from kde-base/plasma-workspace/plasma-workspace-9999.ebuild
copy to kde-base/plasma-workspace/plasma-workspace-4.9.80.ebuild
index ad55073..c0f840e 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DECLARATIVE_REQUIRED="always"
 KDE_HANDBOOK="optional"
@@ -12,7 +12,7 @@ PYTHON_DEPEND="python? 2"
 inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop"
 
 COMMONDEPEND="

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index ad55073..ec19083 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DECLARATIVE_REQUIRED="always"
 KDE_HANDBOOK="optional"

diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-4.9.80.ebuild
similarity index 90%
copy from kde-base/powerdevil/powerdevil-9999.ebuild
copy to kde-base/powerdevil/powerdevil-4.9.80.ebuild
index 650089a..53cd80b 100644
--- a/kde-base/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +pm-utils"
 
 DEPEND="

diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
index 650089a..b9facf3 100644
--- a/kde-base/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-4.9.80.ebuild
similarity index 89%
copy from kde-base/print-manager/print-manager-9999.ebuild
copy to kde-base/print-manager/print-manager-4.9.80.ebuild
index 702984a..da4f4bd 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Manage print jobs and printers in KDE"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/print-manager/print-manager-9999.ebuild b/kde-base/print-manager/print-manager-9999.ebuild
index 702984a..7099b11 100644
--- a/kde-base/print-manager/print-manager-9999.ebuild
+++ b/kde-base/print-manager/print-manager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-4.9.80.ebuild
similarity index 98%
copy from kde-base/pykde4/pykde4-9999.ebuild
copy to kde-base/pykde4/pykde4-4.9.80.ebuild
index 0b7f34b..08b5bf1 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 PYTHON_DEPEND="*:2.5"
 RESTRICT_PYTHON_ABIS="*-jython 2.4 2.7-pypy-*"
@@ -13,7 +13,7 @@ OPENGL_REQUIRED="always"
 inherit python portability kde4-base multilib
 
 DESCRIPTION="Python bindings for KDE4"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples semantic-desktop"
 REQUIRED_USE="test? ( semantic-desktop )"
 

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 0b7f34b..da7d576 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 PYTHON_DEPEND="*:2.5"
 RESTRICT_PYTHON_ABIS="*-jython 2.4 2.7-pypy-*"

diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.9.80.ebuild
similarity index 82%
copy from kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
copy to kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.9.80.ebuild
index 65766f1..8fd8eeb 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
index 65766f1..5b0defe 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/qtruby/qtruby-9999.ebuild b/kde-base/qtruby/qtruby-4.9.80.ebuild
similarity index 96%
copy from kde-base/qtruby/qtruby-9999.ebuild
copy to kde-base/qtruby/qtruby-4.9.80.ebuild
index 7edcdaa..a1ad99d 100644
--- a/kde-base/qtruby/qtruby-9999.ebuild
+++ b/kde-base/qtruby/qtruby-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 OPENGL_REQUIRED="always"
 DECLARATIVE_REQUIRED="optional"
@@ -17,7 +17,7 @@ USE_RUBY="ruby18"
 inherit kde4-base ruby-ng
 
 DESCRIPTION="Qt Ruby bindings"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug phonon qscintilla qwt webkit"
 
 DEPEND="

diff --git a/kde-base/qtruby/qtruby-9999.ebuild b/kde-base/qtruby/qtruby-9999.ebuild
index 7edcdaa..f101286 100644
--- a/kde-base/qtruby/qtruby-9999.ebuild
+++ b/kde-base/qtruby/qtruby-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 OPENGL_REQUIRED="always"
 DECLARATIVE_REQUIRED="optional"

diff --git a/kde-base/qyoto/qyoto-9999.ebuild b/kde-base/qyoto/qyoto-4.9.80.ebuild
similarity index 92%
copy from kde-base/qyoto/qyoto-9999.ebuild
copy to kde-base/qyoto/qyoto-4.9.80.ebuild
index 78a7b71..f2b9e43 100644
--- a/kde-base/qyoto/qyoto-9999.ebuild
+++ b/kde-base/qyoto/qyoto-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="never"
 inherit kde4-base mono
 
 DESCRIPTION="C# bindings for Qt"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +phonon qscintilla webkit"
 
 DEPEND="

diff --git a/kde-base/qyoto/qyoto-9999.ebuild b/kde-base/qyoto/qyoto-9999.ebuild
index 78a7b71..52f240b 100644
--- a/kde-base/qyoto/qyoto-9999.ebuild
+++ b/kde-base/qyoto/qyoto-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="never"
 inherit kde4-base mono

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.9.80.ebuild
similarity index 81%
copy from kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
copy to kde-base/renamedlg-plugins/renamedlg-plugins-4.9.80.ebuild
index 74aabdd..eb2baca 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="renamedlgplugins"
 inherit kde4-meta
 
 DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
index 74aabdd..a8fc6bd 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMMODULE="renamedlgplugins"

diff --git a/kde-base/rocs/rocs-9999.ebuild b/kde-base/rocs/rocs-4.9.80.ebuild
similarity index 91%
copy from kde-base/rocs/rocs-9999.ebuild
copy to kde-base/rocs/rocs-4.9.80.ebuild
index 3c7c780..81c2efb 100644
--- a/kde-base/rocs/rocs-9999.ebuild
+++ b/kde-base/rocs/rocs-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE4 interface to work with Graph Theory"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/boost-1.43"

diff --git a/kde-base/rocs/rocs-9999.ebuild b/kde-base/rocs/rocs-9999.ebuild
index 3c7c780..77d7f8a 100644
--- a/kde-base/rocs/rocs-9999.ebuild
+++ b/kde-base/rocs/rocs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/smokegen/smokegen-9999.ebuild b/kde-base/smokegen/smokegen-4.9.80.ebuild
similarity index 85%
copy from kde-base/smokegen/smokegen-9999.ebuild
copy to kde-base/smokegen/smokegen-4.9.80.ebuild
index d6ba055..01fbdce 100644
--- a/kde-base/smokegen/smokegen-9999.ebuild
+++ b/kde-base/smokegen/smokegen-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="never"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua debug"
 
 DEPEND="

diff --git a/kde-base/smokegen/smokegen-9999.ebuild b/kde-base/smokegen/smokegen-9999.ebuild
index d6ba055..7f7f11b 100644
--- a/kde-base/smokegen/smokegen-9999.ebuild
+++ b/kde-base/smokegen/smokegen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_REQUIRED="never"
 inherit kde4-base

diff --git a/kde-base/smokekde/smokekde-9999.ebuild b/kde-base/smokekde/smokekde-4.9.80.ebuild
similarity index 94%
copy from kde-base/smokekde/smokekde-9999.ebuild
copy to kde-base/smokekde/smokekde-4.9.80.ebuild
index b7bb16d..000886d 100644
--- a/kde-base/smokekde/smokekde-9999.ebuild
+++ b/kde-base/smokekde/smokekde-4.9.80.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="attica debug kate okular semantic-desktop"
 
 DEPEND="

diff --git a/kde-base/smokekde/smokekde-9999.ebuild b/kde-base/smokekde/smokekde-9999.ebuild
index b7bb16d..0938cf5 100644
--- a/kde-base/smokekde/smokekde-9999.ebuild
+++ b/kde-base/smokekde/smokekde-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/smokeqt/smokeqt-9999.ebuild b/kde-base/smokeqt/smokeqt-4.9.80.ebuild
similarity index 96%
copy from kde-base/smokeqt/smokeqt-9999.ebuild
copy to kde-base/smokeqt/smokeqt-4.9.80.ebuild
index 2156bba..8f6c0ab 100644
--- a/kde-base/smokeqt/smokeqt-9999.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DECLARATIVE_REQUIRED="optional"
 MULTIMEDIA_REQUIRED="optional"
@@ -13,7 +13,7 @@ KDE_REQUIRED="never"
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
 
 # Maybe make more of Qt optional?

diff --git a/kde-base/smokeqt/smokeqt-9999.ebuild b/kde-base/smokeqt/smokeqt-9999.ebuild
index 2156bba..d102a3f 100644
--- a/kde-base/smokeqt/smokeqt-9999.ebuild
+++ b/kde-base/smokeqt/smokeqt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DECLARATIVE_REQUIRED="optional"
 MULTIMEDIA_REQUIRED="optional"

diff --git a/kde-base/solid-runtime/solid-runtime-9999.ebuild b/kde-base/solid-runtime/solid-runtime-4.9.80.ebuild
similarity index 89%
copy from kde-base/solid-runtime/solid-runtime-9999.ebuild
copy to kde-base/solid-runtime/solid-runtime-4.9.80.ebuild
index 554c167..794caf4 100644
--- a/kde-base/solid-runtime/solid-runtime-9999.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMNOMODULE=true
 inherit kde4-meta
 
 DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 KMEXTRA="

diff --git a/kde-base/solid-runtime/solid-runtime-9999.ebuild b/kde-base/solid-runtime/solid-runtime-9999.ebuild
index 554c167..d467747 100644
--- a/kde-base/solid-runtime/solid-runtime-9999.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-runtime"
 KMNOMODULE=true

diff --git a/kde-base/solid/solid-9999.ebuild b/kde-base/solid/solid-4.9.80.ebuild
similarity index 92%
copy from kde-base/solid/solid-9999.ebuild
copy to kde-base/solid/solid-4.9.80.ebuild
index 4928179..db996fb 100644
--- a/kde-base/solid/solid-9999.ebuild
+++ b/kde-base/solid/solid-4.9.80.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug bluetooth networkmanager wicd"
 
 DEPEND="

diff --git a/kde-base/solid/solid-9999.ebuild b/kde-base/solid/solid-9999.ebuild
index 4928179..b2e150f 100644
--- a/kde-base/solid/solid-9999.ebuild
+++ b/kde-base/solid/solid-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kde-workspace"
 CPPUNIT_REQUIRED="test"

diff --git a/kde-base/step/step-9999.ebuild b/kde-base/step/step-4.9.80.ebuild
similarity index 91%
copy from kde-base/step/step-9999.ebuild
copy to kde-base/step/step-4.9.80.ebuild
index 5e91021..a4beecd 100644
--- a/kde-base/step/step-9999.ebuild
+++ b/kde-base/step/step-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="The KDE physics simulator"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug +gsl +qalculate"
 
 DEPEND="

diff --git a/kde-base/step/step-9999.ebuild b/kde-base/step/step-9999.ebuild
index 5e91021..3aa6b24 100644
--- a/kde-base/step/step-9999.ebuild
+++ b/kde-base/step/step-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/superkaramba/superkaramba-9999.ebuild b/kde-base/superkaramba/superkaramba-4.9.80.ebuild
similarity index 91%
copy from kde-base/superkaramba/superkaramba-9999.ebuild
copy to kde-base/superkaramba/superkaramba-4.9.80.ebuild
index bb50c7e..10d15d1 100644
--- a/kde-base/superkaramba/superkaramba-9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 PYTHON_DEPEND="python? 2"
 inherit python kde4-base
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug python"
 
 DEPEND="

diff --git a/kde-base/superkaramba/superkaramba-9999.ebuild b/kde-base/superkaramba/superkaramba-9999.ebuild
index bb50c7e..0cfb388 100644
--- a/kde-base/superkaramba/superkaramba-9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 PYTHON_DEPEND="python? 2"
 inherit python kde4-base

diff --git a/kde-base/svgpart/svgpart-9999.ebuild b/kde-base/svgpart/svgpart-4.9.80.ebuild
similarity index 79%
copy from kde-base/svgpart/svgpart-9999.ebuild
copy to kde-base/svgpart/svgpart-4.9.80.ebuild
index 29a14c7..d000ae5 100644
--- a/kde-base/svgpart/svgpart-9999.ebuild
+++ b/kde-base/svgpart/svgpart-4.9.80.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 
 DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/svgpart/svgpart-9999.ebuild b/kde-base/svgpart/svgpart-9999.ebuild
index 29a14c7..9656ef5 100644
--- a/kde-base/svgpart/svgpart-9999.ebuild
+++ b/kde-base/svgpart/svgpart-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit kde4-base
 

diff --git a/kde-base/sweeper/sweeper-9999.ebuild b/kde-base/sweeper/sweeper-4.9.80.ebuild
similarity index 80%
copy from kde-base/sweeper/sweeper-9999.ebuild
copy to kde-base/sweeper/sweeper-4.9.80.ebuild
index f702435..8d55ed8 100644
--- a/kde-base/sweeper/sweeper-9999.ebuild
+++ b/kde-base/sweeper/sweeper-4.9.80.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE Privacy Settings Widget"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/sweeper/sweeper-9999.ebuild b/kde-base/sweeper/sweeper-9999.ebuild
index f702435..da02e65 100644
--- a/kde-base/sweeper/sweeper-9999.ebuild
+++ b/kde-base/sweeper/sweeper-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 inherit kde4-base

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-4.9.80.ebuild
similarity index 97%
copy from kde-base/systemsettings/systemsettings-9999.ebuild
copy to kde-base/systemsettings/systemsettings-4.9.80.ebuild
index a31da61..178698e 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"
@@ -13,7 +13,7 @@ inherit kde4-meta
 
 DESCRIPTION="System settings utility"
 IUSE="debug gtk +usb"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
 	dev-libs/glib:2

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index a31da61..b9db10b 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/thumbnailers/thumbnailers-9999.ebuild b/kde-base/thumbnailers/thumbnailers-4.9.80.ebuild
similarity index 87%
copy from kde-base/thumbnailers/thumbnailers-9999.ebuild
copy to kde-base/thumbnailers/thumbnailers-4.9.80.ebuild
index 5ae3a96..c4678b3 100644
--- a/kde-base/thumbnailers/thumbnailers-9999.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.9.80.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdegraphics-thumbnailers"
 inherit kde4-base
 
 DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="

diff --git a/kde-base/thumbnailers/thumbnailers-9999.ebuild b/kde-base/thumbnailers/thumbnailers-9999.ebuild
index 5ae3a96..cec549f 100644
--- a/kde-base/thumbnailers/thumbnailers-9999.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KMNAME="kdegraphics-thumbnailers"
 inherit kde4-base

diff --git a/kde-base/umbrello/umbrello-9999.ebuild b/kde-base/umbrello/umbrello-4.9.80.ebuild
similarity index 85%
copy from kde-base/umbrello/umbrello-9999.ebuild
copy to kde-base/umbrello/umbrello-4.9.80.ebuild
index 37c0b0d..469cb06 100644
--- a/kde-base/umbrello/umbrello-9999.ebuild
+++ b/kde-base/umbrello/umbrello-4.9.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"
@@ -10,7 +10,7 @@ KDE_SCM="svn"
 inherit kde4-meta
 
 DESCRIPTION="KDE UML Modeller"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="

diff --git a/kde-base/umbrello/umbrello-9999.ebuild b/kde-base/umbrello/umbrello-9999.ebuild
index 37c0b0d..d1120cf 100644
--- a/kde-base/umbrello/umbrello-9999.ebuild
+++ b/kde-base/umbrello/umbrello-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_HANDBOOK="optional"
 KMNAME="kdesdk"

diff --git a/profiles/package.mask b/profiles/package.mask
index 8ea0b0a..c8289ef 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -13,3 +13,293 @@
 # Dependency net-libs/libinfinity is p-masked
 net-libs/libqinfinity
 kde-misc/kobby
+
+~kde-base/akonadiconsole-4.9.80
+~kde-base/akregator-4.9.80
+~kde-base/amor-4.9.80
+~kde-base/analitza-4.9.80
+~kde-base/ark-4.9.80
+~kde-base/attica-4.9.80
+~kde-base/audiocd-kio-4.9.80
+~kde-base/blinken-4.9.80
+~kde-base/blogilo-4.9.80
+~kde-base/bomber-4.9.80
+~kde-base/bovo-4.9.80
+~kde-base/cantor-4.9.80
+~kde-base/cervisia-4.9.80
+~kde-base/dolphin-4.9.80
+~kde-base/dolphin-plugins-4.9.80
+~kde-base/dragon-4.9.80
+~kde-base/drkonqi-4.9.80
+~kde-base/ffmpegthumbs-4.9.80
+~kde-base/filelight-4.9.80
+~kde-base/freespacenotifier-4.9.80
+~kde-base/granatier-4.9.80
+~kde-base/gwenview-4.9.80
+~kde-base/jovie-4.9.80
+~kde-base/juk-4.9.80
+~kde-base/kabcclient-4.9.80
+~kde-base/kaccessible-4.9.80
+~kde-base/kactivities-4.9.80
+~kde-base/kaddressbook-4.9.80
+~kde-base/kajongg-4.9.80
+~kde-base/kalarm-4.9.80
+~kde-base/kalgebra-4.9.80
+~kde-base/kalzium-4.9.80
+~kde-base/kamera-4.9.80
+~kde-base/kanagram-4.9.80
+~kde-base/kapman-4.9.80
+~kde-base/kapptemplate-4.9.80
+~kde-base/kate-4.9.80
+~kde-base/katepart-4.9.80
+~kde-base/katomic-4.9.80
+~kde-base/kblackbox-4.9.80
+~kde-base/kblocks-4.9.80
+~kde-base/kbounce-4.9.80
+~kde-base/kbreakout-4.9.80
+~kde-base/kbruch-4.9.80
+~kde-base/kcachegrind-4.9.80
+~kde-base/kcalc-4.9.80
+~kde-base/kcharselect-4.9.80
+~kde-base/kcheckpass-4.9.80
+~kde-base/kcminit-4.9.80
+~kde-base/kcmshell-4.9.80
+~kde-base/kcolorchooser-4.9.80
+~kde-base/kcontrol-4.9.80
+~kde-base/kcron-4.9.80
+~kde-base/kdeaccessibility-meta-4.9.80
+~kde-base/kdeadmin-meta-4.9.80
+~kde-base/kdeartwork-colorschemes-4.9.80
+~kde-base/kdeartwork-desktopthemes-4.9.80
+~kde-base/kdeartwork-emoticons-4.9.80
+~kde-base/kdeartwork-iconthemes-4.9.80
+~kde-base/kdeartwork-kscreensaver-4.9.80
+~kde-base/kdeartwork-meta-4.9.80
+~kde-base/kdeartwork-sounds-4.9.80
+~kde-base/kdeartwork-styles-4.9.80
+~kde-base/kdeartwork-wallpapers-4.9.80
+~kde-base/kdeartwork-weatherwallpapers-4.9.80
+~kde-base/kde-base-artwork-4.9.80
+~kde-base/kdebase-cursors-4.9.80
+~kde-base/kdebase-data-4.9.80
+~kde-base/kdebase-desktoptheme-4.9.80
+~kde-base/kdebase-kioslaves-4.9.80
+~kde-base/kdebase-menu-4.9.80
+~kde-base/kdebase-menu-icons-4.9.80
+~kde-base/kdebase-meta-4.9.80
+~kde-base/kdebase-runtime-meta-4.9.80
+~kde-base/kdebase-startkde-4.9.80
+~kde-base/kdebindings-meta-4.9.80
+~kde-base/kdebugdialog-4.9.80
+~kde-base/kdeedu-meta-4.9.80
+~kde-base/kde-env-4.9.80
+~kde-base/kdegames-meta-4.9.80
+~kde-base/kdegraphics-meta-4.9.80
+~kde-base/kdegraphics-mobipocket-4.9.80
+~kde-base/kdegraphics-strigi-analyzer-4.9.80
+~kde-base/kdelibs-4.9.80
+~kde-base/kde-meta-4.9.80
+~kde-base/kdemultimedia-meta-4.9.80
+~kde-base/kdenetwork-filesharing-4.9.80
+~kde-base/kdenetwork-meta-4.9.80
+~kde-base/kdepasswd-4.9.80
+~kde-base/kdepim-common-libs-4.9.80
+~kde-base/kdepim-icons-4.9.80
+~kde-base/kdepim-kresources-4.9.80
+~kde-base/kdepimlibs-4.9.80
+~kde-base/kdepim-meta-4.9.80
+~kde-base/kdepim-runtime-4.9.80
+~kde-base/kdepim-strigi-analyzer-4.9.80
+~kde-base/kdeplasma-addons-4.9.80
+~kde-base/kdesdk-kioslaves-4.9.80
+~kde-base/kdesdk-meta-4.9.80
+~kde-base/kdesdk-misc-4.9.80
+~kde-base/kdesdk-scripts-4.9.80
+~kde-base/kdesdk-strigi-analyzer-4.9.80
+~kde-base/kdesu-4.9.80
+~kde-base/kdetoys-meta-4.9.80
+~kde-base/kdeutils-meta-4.9.80
+~kde-base/kde-wallpapers-4.9.80
+~kde-base/kdewebdev-meta-4.9.80
+~kde-base/kdf-4.9.80
+~kde-base/kdialog-4.9.80
+~kde-base/kdiamond-4.9.80
+~kde-base/kdm-4.9.80
+~kde-base/kdnssd-4.9.80
+~kde-base/kdontchangethehostname-4.9.80
+~kde-base/keditbookmarks-4.9.80
+~kde-base/keditfiletype-4.9.80
+~kde-base/kephal-4.9.80
+~kde-base/kfile-4.9.80
+~kde-base/kfilereplace-4.9.80
+~kde-base/kfind-4.9.80
+~kde-base/kfloppy-4.9.80
+~kde-base/kfmclient-4.9.80
+~kde-base/kfourinline-4.9.80
+~kde-base/kgamma-4.9.80
+~kde-base/kgeography-4.9.80
+~kde-base/kget-4.9.80
+~kde-base/kglobalaccel-4.9.80
+~kde-base/kgoldrunner-4.9.80
+~kde-base/kgpg-4.9.80
+~kde-base/khangman-4.9.80
+~kde-base/khelpcenter-4.9.80
+~kde-base/khotkeys-4.9.80
+~kde-base/kiconfinder-4.9.80
+~kde-base/kig-4.9.80
+~kde-base/kigo-4.9.80
+~kde-base/killbots-4.9.80
+~kde-base/kimagemapeditor-4.9.80
+~kde-base/kimono-4.9.80
+~kde-base/kinfocenter-4.9.80
+~kde-base/kioclient-4.9.80
+~kde-base/kiriki-4.9.80
+~kde-base/kiten-4.9.80
+~kde-base/kjots-4.9.80
+~kde-base/kjumpingcube-4.9.80
+~kde-base/kleopatra-4.9.80
+~kde-base/klettres-4.9.80
+~kde-base/klickety-4.9.80
+~kde-base/klines-4.9.80
+~kde-base/klinkstatus-4.9.80
+~kde-base/klipper-4.9.80
+~kde-base/kmag-4.9.80
+~kde-base/kmahjongg-4.9.80
+~kde-base/kmail-4.9.80
+~kde-base/kmenuedit-4.9.80
+~kde-base/kmimetypefinder-4.9.80
+~kde-base/kmines-4.9.80
+~kde-base/kmix-4.9.80
+~kde-base/kmousetool-4.9.80
+~kde-base/kmouth-4.9.80
+~kde-base/kmplot-4.9.80
+~kde-base/knavalbattle-4.9.80
+~kde-base/knetattach-4.9.80
+~kde-base/knetwalk-4.9.80
+~kde-base/knewstuff-4.9.80
+~kde-base/knode-4.9.80
+~kde-base/knotes-4.9.80
+~kde-base/knotify-4.9.80
+~kde-base/kolf-4.9.80
+~kde-base/kollision-4.9.80
+~kde-base/kolourpaint-4.9.80
+~kde-base/kommander-4.9.80
+~kde-base/kompare-4.9.80
+~kde-base/konq-plugins-4.9.80
+~kde-base/konqueror-4.9.80
+~kde-base/konquest-4.9.80
+~kde-base/konsole-4.9.80
+~kde-base/konsolekalendar-4.9.80
+~kde-base/kontact-4.9.80
+~kde-base/kopete-4.9.80
+~kde-base/korganizer-4.9.80
+~kde-base/korundum-4.9.80
+~kde-base/kpasswdserver-4.9.80
+~kde-base/kpat-4.9.80
+~kde-base/kppp-4.9.80
+~kde-base/kquitapp-4.9.80
+~kde-base/krdc-4.9.80
+~kde-base/kreadconfig-4.9.80
+~kde-base/kremotecontrol-4.9.80
+~kde-base/kreversi-4.9.80
+~kde-base/krfb-4.9.80
+~kde-base/krossjava-4.9.80
+~kde-base/krosspython-4.9.80
+~kde-base/krossruby-4.9.80
+~kde-base/kruler-4.9.80
+~kde-base/krunner-4.9.80
+~kde-base/ksaneplugin-4.9.80
+~kde-base/kscd-4.9.80
+~kde-base/kscreensaver-4.9.80
+~kde-base/kshisen-4.9.80
+~kde-base/ksirk-4.9.80
+~kde-base/ksmserver-4.9.80
+~kde-base/ksnakeduel-4.9.80
+~kde-base/ksnapshot-4.9.80
+~kde-base/kspaceduel-4.9.80
+~kde-base/ksplash-4.9.80
+~kde-base/ksquares-4.9.80
+~kde-base/kstars-4.9.80
+~kde-base/kstart-4.9.80
+~kde-base/kstartperf-4.9.80
+~kde-base/kstartupconfig-4.9.80
+~kde-base/kstyles-4.9.80
+~kde-base/ksudoku-4.9.80
+~kde-base/ksysguard-4.9.80
+~kde-base/ksystemlog-4.9.80
+~kde-base/ksystraycmd-4.9.80
+~kde-base/kteatime-4.9.80
+~kde-base/ktimer-4.9.80
+~kde-base/ktimetracker-4.9.80
+~kde-base/ktimezoned-4.9.80
+~kde-base/ktouch-4.9.80
+~kde-base/ktraderclient-4.9.80
+~kde-base/ktuberling-4.9.80
+~kde-base/kturtle-4.9.80
+~kde-base/ktux-4.9.80
+~kde-base/kubrick-4.9.80
+~kde-base/kuiserver-4.9.80
+~kde-base/kuiviewer-4.9.80
+~kde-base/kurifilter-plugins-4.9.80
+~kde-base/kuser-4.9.80
+~kde-base/kwallet-4.9.80
+~kde-base/kwalletd-4.9.80
+~kde-base/kwin-4.9.80
+~kde-base/kwordquiz-4.9.80
+~kde-base/kwrite-4.9.80
+~kde-base/kwrited-4.9.80
+~kde-base/libkcddb-4.9.80
+~kde-base/libkcompactdisc-4.9.80
+~kde-base/libkdcraw-4.9.80
+~kde-base/libkdeedu-4.9.80
+~kde-base/libkdegames-4.9.80
+~kde-base/libkexiv2-4.9.80
+~kde-base/libkipi-4.9.80
+~kde-base/libkmahjongg-4.9.80
+~kde-base/libkonq-4.9.80
+~kde-base/libksane-4.9.80
+~kde-base/libkworkspace-4.9.80
+~kde-base/liboxygenstyle-4.9.80
+~kde-base/libplasmaclock-4.9.80
+~kde-base/libplasmagenericshell-4.9.80
+~kde-base/libtaskmanager-4.9.80
+~kde-base/lokalize-4.9.80
+~kde-base/lskat-4.9.80
+~kde-base/marble-4.9.80
+~kde-base/mplayerthumbs-4.9.80
+~kde-base/nepomuk-4.9.80
+~kde-base/nepomuk-core-4.9.80
+~kde-base/nepomuk-widgets-4.9.80
+~kde-base/nsplugins-4.9.80
+~kde-base/okteta-4.9.80
+~kde-base/okular-4.9.80
+~kde-base/oxygen-icons-4.9.80
+~kde-base/pairs-4.9.80
+~kde-base/palapeli-4.9.80
+~kde-base/parley-4.9.80
+~kde-base/perlkde-4.9.80
+~kde-base/perlqt-4.9.80
+~kde-base/phonon-kde-4.9.80
+~kde-base/plasma-apps-4.9.80
+~kde-base/plasma-runtime-4.9.80
+~kde-base/plasma-workspace-4.9.80
+~kde-base/powerdevil-4.9.80
+~kde-base/print-manager-4.9.80
+~kde-base/pykde4-4.9.80
+~kde-base/qguiplatformplugin_kde-4.9.80
+~kde-base/qtruby-4.9.80
+~kde-base/qyoto-4.9.80
+~kde-base/renamedlg-plugins-4.9.80
+~kde-base/rocs-4.9.80
+~kde-base/smokegen-4.9.80
+~kde-base/smokekde-4.9.80
+~kde-base/smokeqt-4.9.80
+~kde-base/solid-4.9.80
+~kde-base/solid-runtime-4.9.80
+~kde-base/step-4.9.80
+~kde-base/superkaramba-4.9.80
+~kde-base/svgpart-4.9.80
+~kde-base/sweeper-4.9.80
+~kde-base/systemsettings-4.9.80
+~kde-base/thumbnailers-4.9.80
+~kde-base/umbrello-4.9.80

diff --git a/profiles/package.mask.d/kde-4.9.80 b/profiles/package.mask.d/kde-4.9.80
new file mode 100644
index 0000000..21aa1df
--- /dev/null
+++ b/profiles/package.mask.d/kde-4.9.80
@@ -0,0 +1,289 @@
+~kde-base/akonadiconsole-4.9.80
+~kde-base/akregator-4.9.80
+~kde-base/amor-4.9.80
+~kde-base/analitza-4.9.80
+~kde-base/ark-4.9.80
+~kde-base/attica-4.9.80
+~kde-base/audiocd-kio-4.9.80
+~kde-base/blinken-4.9.80
+~kde-base/blogilo-4.9.80
+~kde-base/bomber-4.9.80
+~kde-base/bovo-4.9.80
+~kde-base/cantor-4.9.80
+~kde-base/cervisia-4.9.80
+~kde-base/dolphin-4.9.80
+~kde-base/dolphin-plugins-4.9.80
+~kde-base/dragon-4.9.80
+~kde-base/drkonqi-4.9.80
+~kde-base/ffmpegthumbs-4.9.80
+~kde-base/filelight-4.9.80
+~kde-base/freespacenotifier-4.9.80
+~kde-base/granatier-4.9.80
+~kde-base/gwenview-4.9.80
+~kde-base/jovie-4.9.80
+~kde-base/juk-4.9.80
+~kde-base/kabcclient-4.9.80
+~kde-base/kaccessible-4.9.80
+~kde-base/kactivities-4.9.80
+~kde-base/kaddressbook-4.9.80
+~kde-base/kajongg-4.9.80
+~kde-base/kalarm-4.9.80
+~kde-base/kalgebra-4.9.80
+~kde-base/kalzium-4.9.80
+~kde-base/kamera-4.9.80
+~kde-base/kanagram-4.9.80
+~kde-base/kapman-4.9.80
+~kde-base/kapptemplate-4.9.80
+~kde-base/kate-4.9.80
+~kde-base/katepart-4.9.80
+~kde-base/katomic-4.9.80
+~kde-base/kblackbox-4.9.80
+~kde-base/kblocks-4.9.80
+~kde-base/kbounce-4.9.80
+~kde-base/kbreakout-4.9.80
+~kde-base/kbruch-4.9.80
+~kde-base/kcachegrind-4.9.80
+~kde-base/kcalc-4.9.80
+~kde-base/kcharselect-4.9.80
+~kde-base/kcheckpass-4.9.80
+~kde-base/kcminit-4.9.80
+~kde-base/kcmshell-4.9.80
+~kde-base/kcolorchooser-4.9.80
+~kde-base/kcontrol-4.9.80
+~kde-base/kcron-4.9.80
+~kde-base/kdeaccessibility-meta-4.9.80
+~kde-base/kdeadmin-meta-4.9.80
+~kde-base/kdeartwork-colorschemes-4.9.80
+~kde-base/kdeartwork-desktopthemes-4.9.80
+~kde-base/kdeartwork-emoticons-4.9.80
+~kde-base/kdeartwork-iconthemes-4.9.80
+~kde-base/kdeartwork-kscreensaver-4.9.80
+~kde-base/kdeartwork-meta-4.9.80
+~kde-base/kdeartwork-sounds-4.9.80
+~kde-base/kdeartwork-styles-4.9.80
+~kde-base/kdeartwork-wallpapers-4.9.80
+~kde-base/kdeartwork-weatherwallpapers-4.9.80
+~kde-base/kde-base-artwork-4.9.80
+~kde-base/kdebase-cursors-4.9.80
+~kde-base/kdebase-data-4.9.80
+~kde-base/kdebase-desktoptheme-4.9.80
+~kde-base/kdebase-kioslaves-4.9.80
+~kde-base/kdebase-menu-4.9.80
+~kde-base/kdebase-menu-icons-4.9.80
+~kde-base/kdebase-meta-4.9.80
+~kde-base/kdebase-runtime-meta-4.9.80
+~kde-base/kdebase-startkde-4.9.80
+~kde-base/kdebindings-meta-4.9.80
+~kde-base/kdebugdialog-4.9.80
+~kde-base/kdeedu-meta-4.9.80
+~kde-base/kde-env-4.9.80
+~kde-base/kdegames-meta-4.9.80
+~kde-base/kdegraphics-meta-4.9.80
+~kde-base/kdegraphics-mobipocket-4.9.80
+~kde-base/kdegraphics-strigi-analyzer-4.9.80
+~kde-base/kdelibs-4.9.80
+~kde-base/kde-meta-4.9.80
+~kde-base/kdemultimedia-meta-4.9.80
+~kde-base/kdenetwork-filesharing-4.9.80
+~kde-base/kdenetwork-meta-4.9.80
+~kde-base/kdepasswd-4.9.80
+~kde-base/kdepim-common-libs-4.9.80
+~kde-base/kdepim-icons-4.9.80
+~kde-base/kdepim-kresources-4.9.80
+~kde-base/kdepimlibs-4.9.80
+~kde-base/kdepim-meta-4.9.80
+~kde-base/kdepim-runtime-4.9.80
+~kde-base/kdepim-strigi-analyzer-4.9.80
+~kde-base/kdeplasma-addons-4.9.80
+~kde-base/kdesdk-kioslaves-4.9.80
+~kde-base/kdesdk-meta-4.9.80
+~kde-base/kdesdk-misc-4.9.80
+~kde-base/kdesdk-scripts-4.9.80
+~kde-base/kdesdk-strigi-analyzer-4.9.80
+~kde-base/kdesu-4.9.80
+~kde-base/kdetoys-meta-4.9.80
+~kde-base/kdeutils-meta-4.9.80
+~kde-base/kde-wallpapers-4.9.80
+~kde-base/kdewebdev-meta-4.9.80
+~kde-base/kdf-4.9.80
+~kde-base/kdialog-4.9.80
+~kde-base/kdiamond-4.9.80
+~kde-base/kdm-4.9.80
+~kde-base/kdnssd-4.9.80
+~kde-base/kdontchangethehostname-4.9.80
+~kde-base/keditbookmarks-4.9.80
+~kde-base/keditfiletype-4.9.80
+~kde-base/kephal-4.9.80
+~kde-base/kfile-4.9.80
+~kde-base/kfilereplace-4.9.80
+~kde-base/kfind-4.9.80
+~kde-base/kfloppy-4.9.80
+~kde-base/kfmclient-4.9.80
+~kde-base/kfourinline-4.9.80
+~kde-base/kgamma-4.9.80
+~kde-base/kgeography-4.9.80
+~kde-base/kget-4.9.80
+~kde-base/kglobalaccel-4.9.80
+~kde-base/kgoldrunner-4.9.80
+~kde-base/kgpg-4.9.80
+~kde-base/khangman-4.9.80
+~kde-base/khelpcenter-4.9.80
+~kde-base/khotkeys-4.9.80
+~kde-base/kiconfinder-4.9.80
+~kde-base/kig-4.9.80
+~kde-base/kigo-4.9.80
+~kde-base/killbots-4.9.80
+~kde-base/kimagemapeditor-4.9.80
+~kde-base/kimono-4.9.80
+~kde-base/kinfocenter-4.9.80
+~kde-base/kioclient-4.9.80
+~kde-base/kiriki-4.9.80
+~kde-base/kiten-4.9.80
+~kde-base/kjots-4.9.80
+~kde-base/kjumpingcube-4.9.80
+~kde-base/kleopatra-4.9.80
+~kde-base/klettres-4.9.80
+~kde-base/klickety-4.9.80
+~kde-base/klines-4.9.80
+~kde-base/klinkstatus-4.9.80
+~kde-base/klipper-4.9.80
+~kde-base/kmag-4.9.80
+~kde-base/kmahjongg-4.9.80
+~kde-base/kmail-4.9.80
+~kde-base/kmenuedit-4.9.80
+~kde-base/kmimetypefinder-4.9.80
+~kde-base/kmines-4.9.80
+~kde-base/kmix-4.9.80
+~kde-base/kmousetool-4.9.80
+~kde-base/kmouth-4.9.80
+~kde-base/kmplot-4.9.80
+~kde-base/knavalbattle-4.9.80
+~kde-base/knetattach-4.9.80
+~kde-base/knetwalk-4.9.80
+~kde-base/knewstuff-4.9.80
+~kde-base/knode-4.9.80
+~kde-base/knotes-4.9.80
+~kde-base/knotify-4.9.80
+~kde-base/kolf-4.9.80
+~kde-base/kollision-4.9.80
+~kde-base/kolourpaint-4.9.80
+~kde-base/kommander-4.9.80
+~kde-base/kompare-4.9.80
+~kde-base/konq-plugins-4.9.80
+~kde-base/konqueror-4.9.80
+~kde-base/konquest-4.9.80
+~kde-base/konsole-4.9.80
+~kde-base/konsolekalendar-4.9.80
+~kde-base/kontact-4.9.80
+~kde-base/kopete-4.9.80
+~kde-base/korganizer-4.9.80
+~kde-base/korundum-4.9.80
+~kde-base/kpasswdserver-4.9.80
+~kde-base/kpat-4.9.80
+~kde-base/kppp-4.9.80
+~kde-base/kquitapp-4.9.80
+~kde-base/krdc-4.9.80
+~kde-base/kreadconfig-4.9.80
+~kde-base/kremotecontrol-4.9.80
+~kde-base/kreversi-4.9.80
+~kde-base/krfb-4.9.80
+~kde-base/krossjava-4.9.80
+~kde-base/krosspython-4.9.80
+~kde-base/krossruby-4.9.80
+~kde-base/kruler-4.9.80
+~kde-base/krunner-4.9.80
+~kde-base/ksaneplugin-4.9.80
+~kde-base/kscd-4.9.80
+~kde-base/kscreensaver-4.9.80
+~kde-base/kshisen-4.9.80
+~kde-base/ksirk-4.9.80
+~kde-base/ksmserver-4.9.80
+~kde-base/ksnakeduel-4.9.80
+~kde-base/ksnapshot-4.9.80
+~kde-base/kspaceduel-4.9.80
+~kde-base/ksplash-4.9.80
+~kde-base/ksquares-4.9.80
+~kde-base/kstars-4.9.80
+~kde-base/kstart-4.9.80
+~kde-base/kstartperf-4.9.80
+~kde-base/kstartupconfig-4.9.80
+~kde-base/kstyles-4.9.80
+~kde-base/ksudoku-4.9.80
+~kde-base/ksysguard-4.9.80
+~kde-base/ksystemlog-4.9.80
+~kde-base/ksystraycmd-4.9.80
+~kde-base/kteatime-4.9.80
+~kde-base/ktimer-4.9.80
+~kde-base/ktimetracker-4.9.80
+~kde-base/ktimezoned-4.9.80
+~kde-base/ktouch-4.9.80
+~kde-base/ktraderclient-4.9.80
+~kde-base/ktuberling-4.9.80
+~kde-base/kturtle-4.9.80
+~kde-base/ktux-4.9.80
+~kde-base/kubrick-4.9.80
+~kde-base/kuiserver-4.9.80
+~kde-base/kuiviewer-4.9.80
+~kde-base/kurifilter-plugins-4.9.80
+~kde-base/kuser-4.9.80
+~kde-base/kwallet-4.9.80
+~kde-base/kwalletd-4.9.80
+~kde-base/kwin-4.9.80
+~kde-base/kwordquiz-4.9.80
+~kde-base/kwrite-4.9.80
+~kde-base/kwrited-4.9.80
+~kde-base/libkcddb-4.9.80
+~kde-base/libkcompactdisc-4.9.80
+~kde-base/libkdcraw-4.9.80
+~kde-base/libkdeedu-4.9.80
+~kde-base/libkdegames-4.9.80
+~kde-base/libkexiv2-4.9.80
+~kde-base/libkipi-4.9.80
+~kde-base/libkmahjongg-4.9.80
+~kde-base/libkonq-4.9.80
+~kde-base/libksane-4.9.80
+~kde-base/libkworkspace-4.9.80
+~kde-base/liboxygenstyle-4.9.80
+~kde-base/libplasmaclock-4.9.80
+~kde-base/libplasmagenericshell-4.9.80
+~kde-base/libtaskmanager-4.9.80
+~kde-base/lokalize-4.9.80
+~kde-base/lskat-4.9.80
+~kde-base/marble-4.9.80
+~kde-base/mplayerthumbs-4.9.80
+~kde-base/nepomuk-4.9.80
+~kde-base/nepomuk-core-4.9.80
+~kde-base/nepomuk-widgets-4.9.80
+~kde-base/nsplugins-4.9.80
+~kde-base/okteta-4.9.80
+~kde-base/okular-4.9.80
+~kde-base/oxygen-icons-4.9.80
+~kde-base/pairs-4.9.80
+~kde-base/palapeli-4.9.80
+~kde-base/parley-4.9.80
+~kde-base/perlkde-4.9.80
+~kde-base/perlqt-4.9.80
+~kde-base/phonon-kde-4.9.80
+~kde-base/plasma-apps-4.9.80
+~kde-base/plasma-runtime-4.9.80
+~kde-base/plasma-workspace-4.9.80
+~kde-base/powerdevil-4.9.80
+~kde-base/print-manager-4.9.80
+~kde-base/pykde4-4.9.80
+~kde-base/qguiplatformplugin_kde-4.9.80
+~kde-base/qtruby-4.9.80
+~kde-base/qyoto-4.9.80
+~kde-base/renamedlg-plugins-4.9.80
+~kde-base/rocs-4.9.80
+~kde-base/smokegen-4.9.80
+~kde-base/smokekde-4.9.80
+~kde-base/smokeqt-4.9.80
+~kde-base/solid-4.9.80
+~kde-base/solid-runtime-4.9.80
+~kde-base/step-4.9.80
+~kde-base/superkaramba-4.9.80
+~kde-base/svgpart-4.9.80
+~kde-base/sweeper-4.9.80
+~kde-base/systemsettings-4.9.80
+~kde-base/thumbnailers-4.9.80
+~kde-base/umbrello-4.9.80


             reply	other threads:[~2012-11-16 18:19 UTC|newest]

Thread overview: 119+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-16 18:19 Alexey Shvetsov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-05-09 21:37 [gentoo-commits] proj/kde:master commit in: kde-base/krdc/, kde-base/juk/, kde-base/libplasmagenericshell/, Johannes Huber
2014-02-06 23:33 Andreas Hüttel
2014-01-10  6:02 Michael Palimaka
2014-01-06  1:25 Chris Reffett
2013-12-03 23:09 Johannes Huber
2013-12-02 21:41 Andreas Hüttel
2013-11-05 22:34 Andreas Hüttel
2013-11-01 21:26 Johannes Huber
2013-10-10  0:21 Chris Reffett
2013-10-09 18:01 Andreas Hüttel
2013-10-09 14:55 Chris Reffett
2013-10-02 15:04 Chris Reffett
2013-09-03 19:03 Chris Reffett
2013-08-31 11:15 Andreas Hüttel
2013-08-14 22:48 Andreas Hüttel
2013-08-14  9:30 Manuel Rüger
2013-08-09  5:41 Manuel Rüger
2013-07-25 21:35 Johannes Huber
2013-07-25 17:05 Alexey Shvetsov
2013-07-18 19:23 Johannes Huber
2013-07-15 13:28 Alexey Shvetsov
2013-07-09 19:16 Johannes Huber
2013-07-02 16:51 Johannes Huber
2013-06-29 11:44 Johannes Huber
2013-06-28 20:27 Johannes Huber
2013-06-27 18:33 Johannes Huber
2013-06-13  4:47 Alexey Shvetsov
2013-06-04 18:42 Johannes Huber
2013-06-01 12:12 Johannes Huber
2013-05-06 20:29 Johannes Huber
2013-05-05  8:43 Alexey Shvetsov
2013-04-06  0:13 Andreas Hüttel
2013-03-29 21:42 Andreas Hüttel
2013-03-08 13:01 Andreas Hüttel
2013-03-02 13:05 Andreas Hüttel
2013-02-07  5:21 Alexey Shvetsov
2013-01-31 15:00 Michael Palimaka
2013-01-31  8:35 Andreas Hüttel
2013-01-18 12:04 Andreas Hüttel
2013-01-17  4:50 Alexey Shvetsov
2013-01-05 21:30 Chris Reffett
2013-01-04 13:39 Chris Reffett
2013-01-02 15:20 Michael Palimaka
2012-12-29 12:59 Andreas Hüttel
2012-12-19 19:02 Andreas Hüttel
2012-12-16 23:10 Andreas Hüttel
2012-12-05 17:06 Alexey Shvetsov
2012-12-01 21:51 Alexey Shvetsov
2012-12-01 13:13 Alexey Shvetsov
2012-11-09 15:31 Michael Palimaka
2012-11-02 16:59 Michael Palimaka
2012-10-02 18:49 Johannes Huber
2012-10-01 16:49 Johannes Huber
2012-09-04 19:04 Johannes Huber
2012-08-31 14:00 Johannes Huber
2012-08-07 13:20 Johannes Huber
2012-08-07 12:14 Johannes Huber
2012-08-01 23:18 Johannes Huber
2012-08-01 23:18 Johannes Huber
2012-08-01 10:52 Johannes Huber
2012-07-26 14:34 Johannes Huber
2012-07-14 20:14 Johannes Huber
2012-07-11 19:45 Michael Palimaka
2012-07-01 12:49 Johannes Huber
2012-06-27 19:05 Andreas Hüttel
2012-06-27 18:05 Michael Palimaka
2012-06-21 22:07 Andreas Hüttel
2012-06-19 19:41 Andreas Hüttel
2012-06-08 13:46 Jorge Manuel B. S. Vicetto
2012-06-08  1:38 Andreas Hüttel
2012-05-25 13:34 Alexey Shvetsov
2012-05-03 21:54 Johannes Huber
2012-05-01 11:08 Johannes Huber
2012-04-05  5:55 Johannes Huber
2012-04-02 20:26 Andreas Hüttel
2012-03-07  1:24 Andreas Hüttel
2012-03-04 20:48 Alexey Shvetsov
2012-01-25 21:26 Johannes Huber
2012-01-25 21:12 Johannes Huber
2012-01-20 13:24 Johannes Huber
2012-01-16 15:29 Johannes Huber
2012-01-08 13:01 Johannes Huber
2012-01-04 11:09 Johannes Huber
2012-01-03 14:29 Johannes Huber
2011-12-23  2:56 Marc Schiffbauer
2011-12-22 23:32 Johannes Huber
2011-12-22 20:51 Alexey Shvetsov
2011-12-12 15:55 Johannes Huber
2011-12-08 23:58 Johannes Huber
2011-12-03 17:09 Alexey Shvetsov
2011-12-03 16:10 Alexey Shvetsov
2011-11-18 17:48 Alexey Shvetsov
2011-11-02 22:24 Alexey Shvetsov
2011-10-31 12:08 Alexey Shvetsov
2011-10-06 19:00 Alexey Shvetsov
2011-10-04 21:30 Alexey Shvetsov
2011-09-07 20:42 Alexey Shvetsov
2011-09-06 21:20 Alexey Shvetsov
2011-07-27 14:17 Alexey Shvetsov
2011-07-23  8:15 Jorge Manuel B. S. Vicetto
2011-07-12 11:14 Alexey Shvetsov
2011-07-10 23:10 Jonathan Callen
2011-07-09 15:10 Alexey Shvetsov
2011-07-08 13:43 Alexey Shvetsov
2011-07-06 19:17 Andreas Hüttel
2011-07-01 18:54 Alexey Shvetsov
2011-06-26  3:20 Jonathan Callen
2011-06-26  0:12 Jonathan Callen
2011-06-10 18:13 Andreas Hüttel
2011-06-07  1:11 Jonathan Callen
2011-06-05 12:48 Jorge Manuel B. S. Vicetto
2011-05-07 10:50 Tomas Chvatal
2011-04-30 20:51 Alexey Shvetsov
2011-04-20  1:28 Jonathan Callen
2011-04-06 14:23 Tomas Chvatal
2011-04-01 22:26 Andreas K. Huettel
2011-03-04 18:21 Alexey Shvetsov
2011-02-26 14:22 Andreas K. Huettel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1353089878.7be3ab27c8329b5a533340da7ae8a63b06e1fa01.alexxy@gentoo \
    --to=alexxy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox