[gentoo-commits] proj/kde:master commit in: kde-base/krdc/, kde-base/juk/, kde-base/libplasmagenericshell/, ...

[Alexey Shvetsov]

commit:     3c8a54aff2bf137a7b214d125668bf7a2b0a4fa9
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 21:19:41 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 21:19:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3c8a54af

[kde-base] Bump KDE SC 4.7.1

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

---
 .../activitymanager/activitymanager-4.7.1.ebuild   |   29 ++
 .../akonadiconsole/akonadiconsole-4.7.1.ebuild     |   25 ++
 kde-base/akregator/akregator-4.7.1.ebuild          |   22 ++
 kde-base/amor/amor-4.7.1.ebuild                    |   13 +
 kde-base/ark/ark-4.7.1.ebuild                      |   41 +++
 kde-base/attica/attica-4.7.1.ebuild                |   17 +
 kde-base/blinken/blinken-4.7.1.ebuild              |   20 ++
 kde-base/blogilo/blogilo-4.7.1.ebuild              |   22 ++
 .../bomber-4.7.1.ebuild}                           |    7 +-
 .../bovo-4.7.1.ebuild}                             |    7 +-
 kde-base/cantor/cantor-4.7.1.ebuild                |   43 +++
 .../cervisia-4.7.1.ebuild}                         |   11 +-
 .../dolphin-plugins/dolphin-plugins-4.7.1.ebuild   |   42 +++
 kde-base/dolphin/dolphin-4.7.1.ebuild              |   41 +++
 kde-base/dragonplayer/dragonplayer-4.7.1.ebuild    |   32 ++
 kde-base/drkonqi/drkonqi-4.7.1.ebuild              |   20 ++
 kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild    |   17 +
 kde-base/filelight/filelight-4.7.1.ebuild          |   26 ++
 .../freespacenotifier-4.7.1.ebuild                 |   12 +
 kde-base/granatier/granatier-4.7.1.ebuild          |   19 ++
 kde-base/gwenview/gwenview-4.7.1.ebuild            |   52 +++
 kde-base/jovie/jovie-4.7.1.ebuild                  |   28 ++
 kde-base/juk/juk-4.7.1.ebuild                      |   27 ++
 kde-base/kabcclient/kabcclient-4.7.1.ebuild        |   27 ++
 kde-base/kaccessible/kaccessible-4.7.1.ebuild      |   28 ++
 kde-base/kaddressbook/kaddressbook-4.7.1.ebuild    |   44 +++
 kde-base/kajongg/kajongg-4.7.1.ebuild              |   23 ++
 kde-base/kalarm/kalarm-4.7.1.ebuild                |   25 ++
 kde-base/kalgebra/kalgebra-4.7.1.ebuild            |   50 +++
 kde-base/kalzium/kalzium-4.7.1.ebuild              |   46 +++
 .../kamera-4.7.1.ebuild}                           |   10 +-
 .../kanagram-4.7.1.ebuild}                         |    9 +-
 .../kapman-4.7.1.ebuild}                           |    7 +-
 kde-base/kapptemplate/kapptemplate-4.7.1.ebuild    |   13 +
 kde-base/kate/kate-4.7.1.ebuild                    |   41 +++
 kde-base/katepart/katepart-4.7.1.ebuild            |   25 ++
 .../katomic-4.7.1.ebuild}                          |    7 +-
 kde-base/kbattleship/kbattleship-4.7.1.ebuild      |   39 +++
 .../kblackbox-4.7.1.ebuild}                        |    7 +-
 .../kblocks-4.7.1.ebuild}                          |    7 +-
 .../kbounce-4.7.1.ebuild}                          |    7 +-
 .../kbreakout-4.7.1.ebuild}                        |    7 +-
 .../kbruch-4.7.1.ebuild}                           |    5 +-
 kde-base/kcachegrind/kcachegrind-4.7.1.ebuild      |   17 +
 kde-base/kcalc/kcalc-4.7.1.ebuild                  |   33 ++
 kde-base/kcharselect/kcharselect-4.7.1.ebuild      |   19 ++
 kde-base/kcheckpass/kcheckpass-4.7.1.ebuild        |   40 +++
 kde-base/kcminit/kcminit-4.7.1.ebuild              |   17 +
 kde-base/kcmshell/kcmshell-4.7.1.ebuild            |   12 +
 .../kcolorchooser-4.7.1.ebuild}                    |    6 +-
 kde-base/kcontrol/kcontrol-4.7.1.ebuild            |   20 ++
 .../kcron-4.7.1.ebuild}                            |    9 +-
 kde-base/kde-env/kde-env-4.7.1.ebuild              |   57 ++++
 kde-base/kde-l10n/kde-l10n-4.7.1.ebuild            |   90 ++++++
 kde-base/kde-meta/kde-meta-4.7.1.ebuild            |   36 +++
 .../kde-wallpapers/kde-wallpapers-4.7.1.ebuild     |   21 ++
 .../kdeaccessibility-meta-4.7.1.ebuild             |   18 +
 .../kdeaccounts-plugin-4.7.1.ebuild                |   17 +
 kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild  |   17 +
 .../kdeartwork-colorschemes-4.7.1.ebuild           |   16 +
 .../kdeartwork-desktopthemes-4.7.1.ebuild          |   13 +
 .../kdeartwork-emoticons-4.7.1.ebuild              |   15 +
 .../kdeartwork-iconthemes-4.7.1.ebuild             |   21 ++
 .../kdeartwork-kscreensaver-4.7.1.ebuild           |   42 +++
 .../kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild   |   22 ++
 .../kdeartwork-sounds-4.7.1.ebuild                 |   15 +
 .../kdeartwork-styles-4.7.1.ebuild                 |   25 ++
 .../kdeartwork-wallpapers-4.7.1.ebuild             |   23 ++
 .../kdeartwork-weatherwallpapers-4.7.1.ebuild      |   17 +
 .../kdebase-cursors/kdebase-cursors-4.7.1.ebuild   |   13 +
 kde-base/kdebase-data/kdebase-data-4.7.1.ebuild    |   39 +++
 .../kdebase-desktoptheme-4.7.1.ebuild              |   17 +
 .../kdebase-kioslaves-4.7.1.ebuild                 |   51 +++
 .../kdebase-menu-icons-4.7.1.ebuild                |   15 +
 kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild    |   15 +
 kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild    |   59 ++++
 .../kdebase-runtime-meta-4.7.1.ebuild              |   48 +++
 .../kdebase-startkde/kdebase-startkde-4.7.1.ebuild |   92 ++++++
 .../kdebindings-meta/kdebindings-meta-4.7.1.ebuild |   34 ++
 kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild    |   13 +
 kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild      |   34 ++
 kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild  |   53 ++++
 .../kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild |   31 ++
 .../kdegraphics-strigi-analyzer-4.7.1.ebuild       |   17 +
 kde-base/kdelibs/kdelibs-4.7.1.ebuild              |  325 ++++++++++++++++++++
 .../kdemultimedia-kioslaves-4.7.1.ebuild           |   50 +++
 .../kdemultimedia-meta-4.7.1.ebuild                |   22 ++
 .../kdenetwork-filesharing-4.7.1.ebuild            |   13 +
 .../kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild   |   20 ++
 kde-base/kdepasswd/kdepasswd-4.7.1.ebuild          |   22 ++
 .../kdepim-common-libs-4.7.1.ebuild                |   68 ++++
 kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild    |   17 +
 .../kdepim-kresources-4.7.1.ebuild                 |   36 +++
 kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild      |   33 ++
 .../kdepim-runtime/kdepim-runtime-4.7.1.ebuild     |   33 ++
 .../kdepim-strigi-analyzer-4.7.1.ebuild            |   27 ++
 .../kdepim-wizards/kdepim-wizards-4.7.1.ebuild     |   35 ++
 kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild        |   76 +++++
 .../kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild |   68 ++++
 .../kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild |   32 ++
 kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild      |   29 ++
 kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild      |   38 +++
 .../kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild     |   26 ++
 .../kdesdk-strigi-analyzer-4.7.1.ebuild            |   18 +
 kde-base/kdesu/kdesu-4.7.1.ebuild                  |   25 ++
 kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild    |   16 +
 kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild  |   26 ++
 .../kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild     |   17 +
 kde-base/kdf/kdf-4.7.1.ebuild                      |   23 ++
 kde-base/kdialog/kdialog-4.7.1.ebuild              |   12 +
 .../kdiamond-4.7.1.ebuild}                         |    7 +-
 kde-base/kdm/kdm-4.7.1.ebuild                      |  159 ++++++++++
 kde-base/kdnssd/kdnssd-4.7.1.ebuild                |   23 ++
 .../kdontchangethehostname-4.7.1.ebuild            |   19 ++
 .../keditbookmarks/keditbookmarks-4.7.1.ebuild     |   21 ++
 kde-base/keditfiletype/keditfiletype-4.7.1.ebuild  |   18 +
 kde-base/kephal/kephal-4.7.1.ebuild                |   21 ++
 kde-base/kfile/kfile-4.7.1.ebuild                  |   12 +
 kde-base/kfilereplace/kfilereplace-4.7.1.ebuild    |   12 +
 kde-base/kfind/kfind-4.7.1.ebuild                  |   18 +
 kde-base/kfloppy/kfloppy-4.7.1.ebuild              |   19 ++
 kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild        |    9 +-
 kde-base/kfmclient/kfmclient-4.7.1.ebuild          |   36 +++
 .../kfourinline-4.7.1.ebuild}                      |    7 +-
 kde-base/kgamma/kgamma-4.7.1.ebuild                |   21 ++
 .../kgeography-4.7.1.ebuild}                       |    5 +-
 kde-base/kget/kget-4.7.1.ebuild                    |   41 +++
 kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild    |   24 ++
 kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild      |   19 ++
 kde-base/kgpg/kgpg-4.7.1.ebuild                    |   34 ++
 .../khangman-4.7.1.ebuild}                         |    9 +-
 kde-base/khelpcenter/khelpcenter-4.7.1.ebuild      |   24 ++
 kde-base/khotkeys/khotkeys-4.7.1.ebuild            |   22 ++
 kde-base/kiconfinder/kiconfinder-4.7.1.ebuild      |   12 +
 kde-base/kig/kig-4.7.1.ebuild                      |   26 ++
 kde-base/kigo/kigo-4.7.1.ebuild                    |   34 ++
 kde-base/killbots/killbots-4.7.1.ebuild            |   16 +
 .../kimagemapeditor-4.7.1.ebuild}                  |    7 +-
 kde-base/kimono/kimono-4.7.1.ebuild                |   42 +++
 kde-base/kinfocenter/kinfocenter-4.7.1.ebuild      |   36 +++
 kde-base/kioclient/kioclient-4.7.1.ebuild          |   12 +
 .../kiriki-4.7.1.ebuild}                           |    7 +-
 .../kiten-4.7.1.ebuild}                            |    5 +-
 kde-base/kjots/kjots-4.7.1.ebuild                  |   25 ++
 .../kjumpingcube-4.7.1.ebuild}                     |    7 +-
 kde-base/kleopatra/kleopatra-4.7.1.ebuild          |   40 +++
 kde-base/klettres/klettres-4.7.1.ebuild            |   17 +
 kde-base/klickety/klickety-4.7.1.ebuild            |   16 +
 kde-base/klines/klines-4.7.1.ebuild                |   13 +
 kde-base/klinkstatus/klinkstatus-4.7.1.ebuild      |   36 +++
 kde-base/klipper/klipper-4.7.1.ebuild              |   20 ++
 kde-base/kmag/kmag-4.7.1.ebuild                    |   23 ++
 kde-base/kmahjongg/kmahjongg-4.7.1.ebuild          |   23 ++
 kde-base/kmail/kmail-4.7.1.ebuild                  |   83 +++++
 kde-base/kmenuedit/kmenuedit-4.7.1.ebuild          |   31 ++
 .../kmimetypefinder/kmimetypefinder-4.7.1.ebuild   |   12 +
 .../kmines-4.7.1.ebuild}                           |    7 +-
 kde-base/kmix/kmix-4.7.1.ebuild                    |   28 ++
 kde-base/kmousetool/kmousetool-4.7.1.ebuild        |   24 ++
 kde-base/kmouth/kmouth-4.7.1.ebuild                |   20 ++
 .../kmplot-4.7.1.ebuild}                           |    9 +-
 .../knetattach-4.7.1.ebuild}                       |    7 +-
 kde-base/knetwalk/knetwalk-4.7.1.ebuild            |   13 +
 kde-base/knewstuff/knewstuff-4.7.1.ebuild          |   12 +
 kde-base/knode/knode-4.7.1.ebuild                  |   42 +++
 kde-base/knotes/knotes-4.7.1.ebuild                |   22 ++
 kde-base/knotify/knotify-4.7.1.ebuild              |   12 +
 .../kolf-4.7.1.ebuild}                             |    7 +-
 .../kollision-4.7.1.ebuild}                        |    7 +-
 .../kolourpaint-4.7.1.ebuild}                      |    9 +-
 .../kommander-4.7.1.ebuild}                        |    7 +-
 kde-base/kompare/kompare-4.7.1.ebuild              |   13 +
 kde-base/konq-plugins/konq-plugins-4.7.1.ebuild    |   35 ++
 kde-base/konqueror/konqueror-4.7.1.ebuild          |   51 +++
 .../konquest-4.7.1.ebuild}                         |    7 +-
 kde-base/konsole/konsole-4.7.1.ebuild              |   39 +++
 .../konsolekalendar/konsolekalendar-4.7.1.ebuild   |   23 ++
 kde-base/kontact/kontact-4.7.1.ebuild              |   51 +++
 kde-base/kopete/kopete-4.7.1.ebuild                |  164 ++++++++++
 kde-base/korganizer/korganizer-4.7.1.ebuild        |   73 +++++
 kde-base/korundum/korundum-4.7.1.ebuild            |   77 +++++
 kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild  |   12 +
 .../kpat-4.7.1.ebuild}                             |    7 +-
 .../kppp-4.7.1.ebuild}                             |   11 +-
 kde-base/kquitapp/kquitapp-4.7.1.ebuild            |   12 +
 kde-base/krdc/krdc-4.7.1.ebuild                    |   42 +++
 kde-base/kreadconfig/kreadconfig-4.7.1.ebuild      |   12 +
 .../kremotecontrol/kremotecontrol-4.7.1.ebuild     |   29 ++
 kde-base/kreversi/kreversi-4.7.1.ebuild            |   39 +++
 kde-base/krfb/krfb-4.7.1.ebuild                    |   20 ++
 kde-base/krossjava/krossjava-4.7.1.ebuild          |   59 ++++
 kde-base/krosspython/krosspython-4.7.1.ebuild      |   20 ++
 kde-base/krossruby/krossruby-4.7.1.ebuild          |   66 ++++
 .../kruler-4.7.1.ebuild}                           |    5 +-
 kde-base/krunner/krunner-4.7.1.ebuild              |   57 ++++
 kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild      |   20 ++
 kde-base/kscd/kscd-4.7.1.ebuild                    |   30 ++
 kde-base/kscreensaver/kscreensaver-4.7.1.ebuild    |   41 +++
 kde-base/kshisen/kshisen-4.7.1.ebuild              |   18 +
 kde-base/ksirk/ksirk-4.7.1.ebuild                  |   18 +
 kde-base/ksmserver/ksmserver-4.7.1.ebuild          |   27 ++
 kde-base/ksnapshot/ksnapshot-4.7.1.ebuild          |   28 ++
 .../kspaceduel-4.7.1.ebuild}                       |    7 +-
 kde-base/ksplash/ksplash-4.7.1.ebuild              |   36 +++
 kde-base/ksquares/ksquares-4.7.1.ebuild            |   39 +++
 kde-base/kstars/kstars-4.7.1.ebuild                |   37 +++
 kde-base/kstart/kstart-4.7.1.ebuild                |   12 +
 kde-base/kstartperf/kstartperf-4.7.1.ebuild        |   12 +
 .../kstartupconfig/kstartupconfig-4.7.1.ebuild     |   12 +
 kde-base/kstyles/kstyles-4.7.1.ebuild              |   21 ++
 kde-base/ksudoku/ksudoku-4.7.1.ebuild              |   18 +
 kde-base/ksysguard/ksysguard-4.7.1.ebuild          |   44 +++
 kde-base/ksystemlog/ksystemlog-4.7.1.ebuild        |   33 ++
 kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild      |   12 +
 .../kteatime-4.7.1.ebuild}                         |    7 +-
 kde-base/ktimer/ktimer-4.7.1.ebuild                |   19 ++
 kde-base/ktimetracker/ktimetracker-4.7.1.ebuild    |   38 +++
 kde-base/ktimezoned/ktimezoned-4.7.1.ebuild        |   12 +
 kde-base/ktouch/ktouch-4.7.1.ebuild                |   17 +
 kde-base/ktraderclient/ktraderclient-4.7.1.ebuild  |   12 +
 .../ktron-4.7.1.ebuild}                            |    8 +-
 .../ktuberling-4.7.1.ebuild}                       |    7 +-
 kde-base/kturtle/kturtle-4.7.1.ebuild              |   17 +
 kde-base/ktux/ktux-4.7.1.ebuild                    |   19 ++
 kde-base/kubrick/kubrick-4.7.1.ebuild              |   14 +
 kde-base/kuiserver/kuiserver-4.7.1.ebuild          |   12 +
 kde-base/kuiviewer/kuiviewer-4.7.1.ebuild          |   13 +
 .../kurifilter-plugins-4.7.1.ebuild                |   13 +
 kde-base/kuser/kuser-4.7.1.ebuild                  |   22 ++
 kde-base/kwallet/kwallet-4.7.1.ebuild              |   19 ++
 kde-base/kwalletd/kwalletd-4.7.1.ebuild            |   12 +
 kde-base/kwin/kwin-4.7.1.ebuild                    |   66 ++++
 kde-base/kwordquiz/kwordquiz-4.7.1.ebuild          |   17 +
 kde-base/kwrite/kwrite-4.7.1.ebuild                |   18 +
 kde-base/kwrited/kwrited-4.7.1.ebuild              |   16 +
 kde-base/libkcddb/libkcddb-4.7.1.ebuild            |   31 ++
 .../libkcompactdisc/libkcompactdisc-4.7.1.ebuild   |   19 ++
 kde-base/libkdcraw/libkdcraw-4.7.1.ebuild          |   21 ++
 kde-base/libkdeedu/libkdeedu-4.7.1.ebuild          |   18 +
 kde-base/libkdegames/libkdegames-4.7.1.ebuild      |   23 ++
 kde-base/libkexiv2/libkexiv2-4.7.1.ebuild          |   22 ++
 kde-base/libkipi/libkipi-4.7.1.ebuild              |   15 +
 kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild    |   14 +
 kde-base/libkonq/libkonq-4.7.1.ebuild              |   19 ++
 kde-base/libksane/libksane-4.7.1.ebuild            |   19 ++
 kde-base/libkworkspace/libkworkspace-4.7.1.ebuild  |   33 ++
 .../liboxygenstyle/liboxygenstyle-4.7.1.ebuild     |   13 +
 .../libplasmaclock/libplasmaclock-4.7.1.ebuild     |   34 ++
 .../libplasmagenericshell-4.7.1.ebuild             |   27 ++
 .../libtaskmanager/libtaskmanager-4.7.1.ebuild     |   26 ++
 kde-base/lokalize/lokalize-4.7.1.ebuild            |   45 +++
 .../lskat-4.7.1.ebuild}                            |    7 +-
 kde-base/marble/marble-4.7.1.ebuild                |   78 +++++
 kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild  |   31 ++
 kde-base/nepomuk/nepomuk-4.7.1.ebuild              |   25 ++
 kde-base/nsplugins/nsplugins-4.7.1.ebuild          |   25 ++
 kde-base/okteta/okteta-4.7.1.ebuild                |   21 ++
 kde-base/okular/okular-4.7.1.ebuild                |   44 +++
 ....7.49.9999.ebuild => oxygen-icons-4.7.1.ebuild} |    4 +-
 .../oxygen-icons/oxygen-icons-4.7.49.9999.ebuild   |    2 +-
 .../palapeli-4.7.1.ebuild}                         |    7 +-
 kde-base/parley/parley-4.7.1.ebuild                |   29 ++
 kde-base/perlkde/perlkde-4.7.1.ebuild              |   38 +++
 kde-base/perlqt/perlqt-4.7.1.ebuild                |   44 +++
 kde-base/phonon-kde/phonon-kde-4.7.1.ebuild        |   38 +++
 kde-base/plasma-apps/plasma-apps-4.7.1.ebuild      |   18 +
 .../plasma-runtime/plasma-runtime-4.7.1.ebuild     |   18 +
 .../plasma-workspace/plasma-workspace-4.7.1.ebuild |  142 +++++++++
 kde-base/powerdevil/powerdevil-4.7.1.ebuild        |   29 ++
 .../printer-applet/printer-applet-4.7.1.ebuild     |   52 +++
 kde-base/pykde4/pykde4-4.7.1.ebuild                |  159 ++++++++++
 .../qguiplatformplugin_kde-4.7.1.ebuild            |   12 +
 kde-base/qtruby/qtruby-4.7.1.ebuild                |   76 +++++
 kde-base/qyoto/qyoto-4.7.1.ebuild                  |   31 ++
 .../renamedlg-plugins-4.7.1.ebuild                 |   13 +
 kde-base/rocs/rocs-4.7.1.ebuild                    |   22 ++
 kde-base/smokegen/smokegen-4.7.1.ebuild            |   20 ++
 kde-base/smokekde/smokekde-4.7.1.ebuild            |   38 +++
 kde-base/smokeqt/smokeqt-4.7.1.ebuild              |   57 ++++
 kde-base/solid-runtime/solid-runtime-4.7.1.ebuild  |   29 ++
 kde-base/solid/solid-4.7.1.ebuild                  |   36 +++
 kde-base/step/step-4.7.1.ebuild                    |   34 ++
 kde-base/superkaramba/superkaramba-4.7.1.ebuild    |   42 +++
 .../svgpart-4.7.1.ebuild}                          |    6 +-
 kde-base/sweeper/sweeper-4.7.1.ebuild              |   19 ++
 .../system-config-printer-kde-4.7.1.ebuild         |   36 +++
 .../systemsettings/systemsettings-4.7.1.ebuild     |   93 ++++++
 kde-base/thumbnailers/thumbnailers-4.7.1.ebuild    |   24 ++
 kde-base/umbrello/umbrello-4.7.1.ebuild            |   22 ++
 289 files changed, 8076 insertions(+), 116 deletions(-)

diff --git a/kde-base/activitymanager/activitymanager-4.7.1.ebuild b/kde-base/activitymanager/activitymanager-4.7.1.ebuild
new file mode 100644
index 0000000..cdb80d1
--- /dev/null
+++ b/kde-base/activitymanager/activitymanager-4.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Activity manager"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug semantic-desktop"
+
+DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
+RDEPEND=${DEPEND}
+
+KMEXTRACTONLY="
+	nepomuk/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		# $(cmake-utils_use_with zeitgeist QtZeitgeist)
+		-DWITH_QtZeitgeist=NO
+	)
+	kde4-meta_src_configure
+}

diff --git a/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild
new file mode 100644
index 0000000..f04805b
--- /dev/null
+++ b/kde-base/akonadiconsole/akonadiconsole-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	messageviewer/
+"

diff --git a/kde-base/akregator/akregator-4.7.1.ebuild b/kde-base/akregator/akregator-4.7.1.ebuild
new file mode 100644
index 0000000..95d756b
--- /dev/null
+++ b/kde-base/akregator/akregator-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE news feed aggregator."
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-base/amor/amor-4.7.1.ebuild b/kde-base/amor/amor-4.7.1.ebuild
new file mode 100644
index 0000000..bef178f
--- /dev/null
+++ b/kde-base/amor/amor-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdetoys"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/ark/ark-4.7.1.ebuild b/kde-base/ark/ark-4.7.1.ebuild
new file mode 100644
index 0000000..3f9943b
--- /dev/null
+++ b/kde-base/ark/ark-4.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE Archiving tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+archive +bzip2 debug lzma"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+	sys-libs/zlib
+	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
+	lzma? ( app-arch/xz-utils )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with archive LibArchive)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with lzma LibLZMA)
+	)
+	${kde_eclass}_src_configure
+}
+
+pkg_postinst() {
+	${kde_eclass}_pkg_postinst
+	elog "For creating rar archives, install app-arch/rar"
+}

diff --git a/kde-base/attica/attica-4.7.1.ebuild b/kde-base/attica/attica-4.7.1.ebuild
new file mode 100644
index 0000000..0af093d
--- /dev/null
+++ b/kde-base/attica/attica-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Open Collaboration Services provider management"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/libattica-0.1.4
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/blinken/blinken-4.7.1.ebuild b/kde-base/blinken/blinken-4.7.1.ebuild
new file mode 100644
index 0000000..f212b2e
--- /dev/null
+++ b/kde-base/blinken/blinken-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE version of the Simon Says game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/blogilo/blogilo-4.7.1.ebuild b/kde-base/blogilo/blogilo-4.7.1.ebuild
new file mode 100644
index 0000000..737f587
--- /dev/null
+++ b/kde-base/blogilo/blogilo-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blogging Client"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/bilbo
+	!kde-misc/blogilo
+"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/bomber/bomber-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/bomber/bomber-4.7.1.ebuild
index 769eff0..07225dc 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/bomber/bomber-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE arcade bombing game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/bovo/bovo-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/bovo/bovo-4.7.1.ebuild
index 769eff0..3ed3ee7 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/bovo/bovo-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Five-in-a-row Board Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/cantor/cantor-4.7.1.ebuild b/kde-base/cantor/cantor-4.7.1.ebuild
new file mode 100644
index 0000000..279176b
--- /dev/null
+++ b/kde-base/cantor/cantor-4.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ps +R"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+RDEPEND="
+	ps? ( app-text/libspectre )
+	R? ( dev-lang/R )
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+src_configure() {
+	mycmakeargs+="
+		$(cmake-utils_use_with ps LibSpectre)
+		$(cmake-utils_use_with R)
+	"
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! use R; then
+		echo
+		ewarn "You have decided to build ${PN} with no backend."
+		ewarn "To have this application functional, please do one of below:"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'R' USE flag enabled"
+		ewarn "    # emerge -vaDu sci-mathematics/maxima"
+		echo
+	fi
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/cervisia/cervisia-4.7.1.ebuild
similarity index 50%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/cervisia/cervisia-4.7.1.ebuild
index 769eff0..2057132 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/cervisia/cervisia-4.7.1.ebuild
@@ -5,8 +5,13 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdesdk"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Cervisia - A KDE CVS frontend"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+RDEPEND="
+	dev-vcs/cvs
+"

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild
new file mode 100644
index 0000000..5d814a3
--- /dev/null
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Extra Dolphin plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +git +subversion"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kompare)
+	git? ( dev-vcs/git )
+	subversion? ( dev-vcs/subversion )
+"
+
+# SCM plugins moved from dolphin somewhere before 4.4.75
+add_blocker dolphin '<4.4.75'
+
+KMLOADLIBS="libkonq"
+
+#
+# See bug 351147 for why this is necessary
+#
+src_prepare() {
+	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
+	echo > dolphin-plugins/CMakeLists.txt || die
+	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
+	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	{ use git || use subversion; } && kde4-meta_src_install
+}

diff --git a/kde-base/dolphin/dolphin-4.7.1.ebuild b/kde-base/dolphin/dolphin-4.7.1.ebuild
new file mode 100644
index 0000000..c7d2b83
--- /dev/null
+++ b/kde-base/dolphin/dolphin-4.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="A KDE filemanager focusing on usability"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep libkonq)
+	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kfind)
+"
+PDEPEND="
+	thumbnail? (
+		$(add_kdebase_dep thumbnailers)
+		|| (
+			$(add_kdebase_dep ffmpegthumbs)
+			$(add_kdebase_dep mplayerthumbs)
+		)
+	)
+"
+
+KMLOADLIBS="libkonq"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild b/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild
new file mode 100644
index 0000000..31d5571
--- /dev/null
+++ b/kde-base/dragonplayer/dragonplayer-4.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="Dragon Player is a simple video player for KDE 4"
+HOMEPAGE="http://www.dragonplayer.net/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="debug xine"
+
+RDEPEND="
+	>=media-libs/phonon-4.4.3
+	xine? ( media-libs/xine-lib[xcb] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with xine)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/drkonqi/drkonqi-4.7.1.ebuild b/kde-base/drkonqi/drkonqi-4.7.1.ebuild
new file mode 100644
index 0000000..9751d00
--- /dev/null
+++ b/kde-base/drkonqi/drkonqi-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing following packages:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}

diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild
new file mode 100644
index 0000000..0b17c80
--- /dev/null
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	virtual/ffmpeg
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/filelight/filelight-4.7.1.ebuild b/kde-base/filelight/filelight-4.7.1.ebuild
new file mode 100644
index 0000000..744b834
--- /dev/null
+++ b/kde-base/filelight/filelight-4.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	!kde-misc/filelight
+	x11-apps/xdpyinfo
+"

diff --git a/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild
new file mode 100644
index 0000000..e867c3e
--- /dev/null
+++ b/kde-base/freespacenotifier/freespacenotifier-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A module that monitors free disk space on the home dir"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/granatier/granatier-4.7.1.ebuild b/kde-base/granatier/granatier-4.7.1.ebuild
new file mode 100644
index 0000000..0c8144e
--- /dev/null
+++ b/kde-base/granatier/granatier-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE Bomberman game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/gwenview/gwenview-4.7.1.ebuild b/kde-base/gwenview/gwenview-4.7.1.ebuild
new file mode 100644
index 0000000..48e5d35
--- /dev/null
+++ b/kde-base/gwenview/gwenview-4.7.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE image viewer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kipi semantic-desktop"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep libkonq)
+	>=media-gfx/exiv2-0.19
+	virtual/jpeg
+	kipi? ( $(add_kdebase_dep libkipi) )
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="libkonq"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with kipi)
+	)
+
+	if use semantic-desktop; then
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk)
+	else
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+	fi
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "For SVG support, emerge -va kde-base/svgpart"
+	echo
+	use kipi && elog "The plugins for the KIPI inteface can be found in media-plugins/kipi-plugins"
+	use kipi && echo
+}

diff --git a/kde-base/jovie/jovie-4.7.1.ebuild b/kde-base/jovie/jovie-4.7.1.ebuild
new file mode 100644
index 0000000..076ecb6
--- /dev/null
+++ b/kde-base/jovie/jovie-4.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeaccessibility"
+	kde_eclass="kde4-meta"
+fi
+
+inherit ${kde_eclass}
+
+DESCRIPTION="Jovie is a text to speech application"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-accessibility/speech-dispatcher
+"
+RDEPEND="${DEPEND}"
+
+# Renamed from kttsd just after 4.4.80
+add_blocker kttsd

diff --git a/kde-base/juk/juk-4.7.1.ebuild b/kde-base/juk/juk-4.7.1.ebuild
new file mode 100644
index 0000000..50ed8f2
--- /dev/null
+++ b/kde-base/juk/juk-4.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="Jukebox and music manager for KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug musicbrainz"
+
+DEPEND="
+	>=media-libs/taglib-1.6
+	musicbrainz? ( media-libs/tunepimp )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with musicbrainz TunePimp)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kabcclient/kabcclient-4.7.1.ebuild b/kde-base/kabcclient/kabcclient-4.7.1.ebuild
new file mode 100644
index 0000000..a610008
--- /dev/null
+++ b/kde-base/kabcclient/kabcclient-4.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A command line client for accessing the KDE addressbook"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde4-meta_src_install
+
+	# work around NULL DT_RPATH in kabc2mutt
+	dosym kabcclient ${PREFIX}/bin/kabc2mutt
+}

diff --git a/kde-base/kaccessible/kaccessible-4.7.1.ebuild b/kde-base/kaccessible/kaccessible-4.7.1.ebuild
new file mode 100644
index 0000000..172b78d
--- /dev/null
+++ b/kde-base/kaccessible/kaccessible-4.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeaccessibility"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="Provides accessibility services like focus tracking"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +speechd"
+
+DEPEND="app-accessibility/speech-dispatcher"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with speechd Speechd)
+	)
+	${kde_eclass}_src_configure
+}

diff --git a/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild
new file mode 100644
index 0000000..55fb6e1
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.1.4
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	libkleo/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}

diff --git a/kde-base/kajongg/kajongg-4.7.1.ebuild b/kde-base/kajongg/kajongg-4.7.1.ebuild
new file mode 100644
index 0000000..9f330b9
--- /dev/null
+++ b/kde-base/kajongg/kajongg-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta python
+
+DESCRIPTION="The classical Mah Jongg for four players"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	dev-db/sqlite:3
+	$(add_kdebase_dep libkdegames)
+	$(add_kdebase_dep pykde4)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep libkmahjongg)
+	>=dev-python/twisted-8.2.0
+"

diff --git a/kde-base/kalarm/kalarm-4.7.1.ebuild b/kde-base/kalarm/kalarm-4.7.1.ebuild
new file mode 100644
index 0000000..f988376
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	media-libs/phonon
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+"

diff --git a/kde-base/kalgebra/kalgebra-4.7.1.ebuild b/kde-base/kalgebra/kalgebra-4.7.1.ebuild
new file mode 100644
index 0000000..c7490af
--- /dev/null
+++ b/kde-base/kalgebra/kalgebra-4.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="MathML-based graph calculator for KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +plasma readline"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+	readline? ( sys-libs/readline )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkdeedu/kdeeduui/
+"
+KMEXTRA="
+	libkdeedu/qtmmlwidget/
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.73-solaris-graph2d.patch
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with readline)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-base_src_configure
+}
+
+src_test() {
+	# disable broken test
+	sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \
+		"${S}"/analitza/tests/CMakeLists.txt || \
+		die "sed to disable mathmlpresentationtest failed."
+
+	kde4-base_src_test
+}

diff --git a/kde-base/kalzium/kalzium-4.7.1.ebuild b/kde-base/kalzium/kalzium-4.7.1.ebuild
new file mode 100644
index 0000000..e555ea7
--- /dev/null
+++ b/kde-base/kalzium/kalzium-4.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base flag-o-matic
+
+DESCRIPTION="KDE: periodic table of the elements."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="editor debug +plasma solver"
+
+RDEPEND="
+	$(add_kdebase_dep libkdeedu)
+	editor? ( >=sci-chemistry/openbabel-2.2 )
+"
+DEPEND="${RDEPEND}
+	editor? ( >=dev-cpp/eigen-2.0.3:2 )
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+
+KMEXTRACTONLY="
+	libkdeedu/kdeeduui/
+	libkdeedu/libscience/
+"
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	mycmakeargs=(
+		$(cmake-utils_use_with editor Eigen2)
+		$(cmake-utils_use_with editor OpenBabel2)
+		$(cmake-utils_use_with editor OpenGL)
+		$(cmake-utils_use_with solver OCaml)
+		$(cmake-utils_use_with solver Libfacile)
+	)
+
+	kde4-base_src_configure
+}
+
+src_test(){ :; } #see bug 376911

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kamera/kamera-4.7.1.ebuild
similarity index 52%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kamera/kamera-4.7.1.ebuild
index 769eff0..740aeaa 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kamera/kamera-4.7.1.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE digital camera manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+DEPEND="
+	media-libs/libgphoto2
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kanagram/kanagram-4.7.1.ebuild
similarity index 54%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kanagram/kanagram-4.7.1.ebuild
index 769eff0..71d93e4 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kanagram/kanagram-4.7.1.ebuild
@@ -5,8 +5,13 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: letter order game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kapman/kapman-4.7.1.ebuild
similarity index 56%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kapman/kapman-4.7.1.ebuild
index 769eff0..edd6365 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kapman/kapman-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Pac-Man clone for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild b/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild
new file mode 100644
index 0000000..3092fb6
--- /dev/null
+++ b/kde-base/kapptemplate/kapptemplate-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KAppTemplate - A shell script to create the necessary framework to develop KDE applications."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kate/kate-4.7.1.ebuild b/kde-base/kate/kate-4.7.1.ebuild
new file mode 100644
index 0000000..c366bbd
--- /dev/null
+++ b/kde-base/kate/kate-4.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Kate is an MDI texteditor."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +plasma"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep katepart)
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kaddressbook:${SLOT}; then
+		echo
+		elog "File templates plugin requires kde-base/kaddressbook:${SLOT}."
+		elog "Please install it if you plan to use this plugin."
+		echo
+	fi
+}

diff --git a/kde-base/katepart/katepart-4.7.1.ebuild b/kde-base/katepart/katepart-4.7.1.ebuild
new file mode 100644
index 0000000..32c2b3d
--- /dev/null
+++ b/kde-base/katepart/katepart-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+KMMODULE="part"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE Editor KPart"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+add_blocker kdelibs 4.6.50
+
+src_configure() {
+	local mycmakeargs=(
+		"-DKDE4_BUILD_TESTS=OFF"
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/katomic/katomic-4.7.1.ebuild
similarity index 54%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/katomic/katomic-4.7.1.ebuild
index 769eff0..6508eb5 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/katomic/katomic-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Atomic Entertainment Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kbattleship/kbattleship-4.7.1.ebuild b/kde-base/kbattleship/kbattleship-4.7.1.ebuild
new file mode 100644
index 0000000..ca91137
--- /dev/null
+++ b/kde-base/kbattleship/kbattleship-4.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="The KDE Battleship clone"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_prepare() {
+	# cmake is doing this really weird
+	sed -i \
+		-e "s:register_ggz_module:#register_ggz_module:g" \
+		"${PN}"/src/CMakeLists.txt || die "ggz removal failed"
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/src/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kblackbox/kblackbox-4.7.1.ebuild
similarity index 56%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kblackbox/kblackbox-4.7.1.ebuild
index 769eff0..f6562f8 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kblackbox/kblackbox-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Blackbox Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kblocks/kblocks-4.7.1.ebuild
similarity index 51%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kblocks/kblocks-4.7.1.ebuild
index 769eff0..1e4e338 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kblocks/kblocks-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: Kblocks is a single-player Tetris-like game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kbounce/kbounce-4.7.1.ebuild
similarity index 56%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kbounce/kbounce-4.7.1.ebuild
index 769eff0..5d70099 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kbounce/kbounce-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Bounce Ball Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kbreakout/kbreakout-4.7.1.ebuild
similarity index 53%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kbreakout/kbreakout-4.7.1.ebuild
index 769eff0..abd6343 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kbreakout/kbreakout-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: A Breakout-like game for KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kbruch/kbruch-4.7.1.ebuild
similarity index 57%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kbruch/kbruch-4.7.1.ebuild
index 769eff0..d4648b2 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kbruch/kbruch-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Educational: Learn calculating with fractions"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild b/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild
new file mode 100644
index 0000000..53d7a1f
--- /dev/null
+++ b/kde-base/kcachegrind/kcachegrind-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KDE Frontend for Cachegrind"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	media-gfx/graphviz
+"

diff --git a/kde-base/kcalc/kcalc-4.7.1.ebuild b/kde-base/kcalc/kcalc-4.7.1.ebuild
new file mode 100644
index 0000000..9ea8c1a
--- /dev/null
+++ b/kde-base/kcalc/kcalc-4.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE calculator"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/gmp
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
+)
+
+src_test() {
+	LANG=C ${kde_eclass}_src_test
+}

diff --git a/kde-base/kcharselect/kcharselect-4.7.1.ebuild b/kde-base/kcharselect/kcharselect-4.7.1.ebuild
new file mode 100644
index 0000000..4563e16
--- /dev/null
+++ b/kde-base/kcharselect/kcharselect-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE character selection utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild b/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild
new file mode 100644
index 0000000..975c598
--- /dev/null
+++ b/kde-base/kcheckpass/kcheckpass-4.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pam"
+
+RDEPEND="
+	pam? (
+		>=kde-base/kdebase-pam-7
+		virtual/pam
+	)
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxkbfile
+"
+
+PATCHES=(
+	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+)
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pam)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kcminit/kcminit-4.7.1.ebuild b/kde-base/kcminit/kcminit-4.7.1.ebuild
new file mode 100644
index 0000000..6bcdd4e
--- /dev/null
+++ b/kde-base/kcminit/kcminit-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep ksplash)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kcmshell/kcmshell-4.7.1.ebuild b/kde-base/kcmshell/kcmshell-4.7.1.ebuild
new file mode 100644
index 0000000..4e321d7
--- /dev/null
+++ b/kde-base/kcmshell/kcmshell-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild
similarity index 57%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild
index 769eff0..6663dd8 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-4.7.1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=4
 
-KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE color selector/editor"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kcontrol/kcontrol-4.7.1.ebuild b/kde-base/kcontrol/kcontrol-4.7.1.ebuild
new file mode 100644
index 0000000..5a13855
--- /dev/null
+++ b/kde-base/kcontrol/kcontrol-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Control Center"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdnssd)
+	$(add_kdebase_dep khotkeys)
+"
+
+add_blocker systemsettings '<4.2.91'

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kcron/kcron-4.7.1.ebuild
similarity index 50%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kcron/kcron-4.7.1.ebuild
index 769eff0..8a4b8f5 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kcron/kcron-4.7.1.ebuild
@@ -5,8 +5,11 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdeadmin"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Task Scheduler"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+RDEPEND="!prefix? ( virtual/cron )"

diff --git a/kde-base/kde-env/kde-env-4.7.1.ebuild b/kde-base/kde-env/kde-env-4.7.1.ebuild
new file mode 100644
index 0000000..5c133e9
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+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 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="as-is"
+IUSE="aqua"
+
+add_blocker kdelibs 4.6.80 '<3.5.10-r3:3.5'
+
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_prepare() {
+	:
+}
+
+src_install() {
+	# number goes down with version
+	cat <<-EOF > 43kdepaths
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+	doenvd 43kdepaths
+
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	cat <<EOF > 11-xdg-menu-kde-4
+#!/bin/sh
+
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
+	export XDG_MENU_PREFIX="kde-4-"
+fi
+EOF
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe 11-xdg-menu-kde-4 || die "doexe failed"
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}

diff --git a/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild b/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild
new file mode 100644
index 0000000..fea9455
--- /dev/null
+++ b/kde-base/kde-l10n/kde-l10n-4.7.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.7.0-r2.ebuild,v 1.1 2011/07/30 11:39:40 dilfridge Exp $
+
+EAPI="3"
+
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="!<kde-misc/konq-plugins-4.6"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.bz2::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl he hr
+hu ia id is it ja kk km kn ko lt lv nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
+sv th tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local LNG DIR
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepim-runtime *):# no kdepim-runtime:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepim *):# no kdepim:g' {} +
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}

diff --git a/kde-base/kde-meta/kde-meta-4.7.1.ebuild b/kde-base/kde-meta/kde-meta-4.7.1.ebuild
new file mode 100644
index 0000000..25e6cfb
--- /dev/null
+++ b/kde-base/kde-meta/kde-meta-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="accessibility nls oldpim sdk semantic-desktop"
+
+RDEPEND="
+	$(add_kdebase_dep kate)
+	$(add_kdebase_dep kdeadmin-meta)
+	$(add_kdebase_dep kdeartwork-meta)
+	$(add_kdebase_dep kdebase-meta)
+	$(add_kdebase_dep kdeedu-meta)
+	$(add_kdebase_dep kdegames-meta)
+	$(add_kdebase_dep kdegraphics-meta)
+	$(add_kdebase_dep kdemultimedia-meta)
+	$(add_kdebase_dep kdenetwork-meta)
+	$(add_kdebase_dep kdeplasma-addons)
+	$(add_kdebase_dep kdetoys-meta)
+	$(add_kdebase_dep kdeutils-meta)
+	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
+	nls? ( $(add_kdebase_dep kde-l10n) )
+	sdk? (
+		$(add_kdebase_dep kdebindings-meta)
+		$(add_kdebase_dep kdesdk-meta)
+		$(add_kdebase_dep kdewebdev-meta)
+	)
+	semantic-desktop? (
+		!oldpim? ( $(add_kdebase_dep kdepim-meta) )
+		oldpim? ( $(add_kdebase_dep kdepim-meta "" 4.4.11.1) )
+	)
+"

diff --git a/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild b/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild
new file mode 100644
index 0000000..fbbd037
--- /dev/null
+++ b/kde-base/kde-wallpapers/kde-wallpapers-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KMNAME="kde-wallpapers"
+KDE_SCM="svn"
+inherit kde4-base
+
+DESCRIPTION="KDE wallpapers"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+add_blocker kdebase-wallpapers
+
+src_configure() {
+	mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild
new file mode 100644
index 0000000..d5275a2
--- /dev/null
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep jovie)
+	$(add_kdebase_dep kaccessible)
+	$(add_kdebase_dep kmag)
+	$(add_kdebase_dep kmousetool)
+	$(add_kdebase_dep kmouth)
+"

diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild
new file mode 100644
index 0000000..8400284
--- /dev/null
+++ b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild
new file mode 100644
index 0000000..5b033f9
--- /dev/null
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups"
+
+RDEPEND="
+	$(add_kdebase_dep kcron)
+	$(add_kdebase_dep ksystemlog)
+	$(add_kdebase_dep kuser)
+	cups? ( $(add_kdebase_dep system-config-printer-kde) )
+"

diff --git a/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild
new file mode 100644
index 0000000..3547ebe
--- /dev/null
+++ b/kde-base/kdeartwork-colorschemes/kdeartwork-colorschemes-4.7.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdeartwork"
+KMMODULE="ColorSchemes"
+inherit kde4-meta
+
+DESCRIPTION="KDE extra colorschemes"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Moved here in 4.7
+add_blocker kdeaccessibility-colorschemes

diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild
new file mode 100644
index 0000000..6be7e7a
--- /dev/null
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMMODULE="desktopthemes"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Additional KDE4 Plasma themes"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""

diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild
new file mode 100644
index 0000000..5c066a6
--- /dev/null
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-4.7.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+RESTRICT="binchecks strip"
+
+KMMODULE="emoticons"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""

diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild
new file mode 100644
index 0000000..caf1131
--- /dev/null
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdeartwork"
+KMMODULE="IconThemes"
+inherit kde4-meta
+
+DESCRIPTION="Icon themes for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Provides nuvola icon theme
+RDEPEND="
+	!x11-themes/nuvola
+"
+
+# Moved here in 4.7
+add_blocker kdeaccessibility-iconthemes

diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild
new file mode 100644
index 0000000..9893abe
--- /dev/null
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMMODULE="kscreensaver"
+KMNAME="kdeartwork"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Extra screensavers for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +eigen +kexiv2 opengl xscreensaver"
+
+# libkworkspace - only as a stub to provide KDE4Workspace config
+RDEPEND="
+	$(add_kdebase_dep kscreensaver 'opengl?')
+	$(add_kdebase_dep libkworkspace)
+	media-libs/libart_lgpl
+	opengl? ( virtual/opengl )
+	xscreensaver? ( x11-misc/xscreensaver )
+"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:2 )
+	kexiv2? ( $(add_kdebase_dep libkexiv2) )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
+	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		-DKSCREENSAVER_SOUND_SUPPORT=ON
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with kexiv2 Kexiv2)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with xscreensaver)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild
new file mode 100644
index 0000000..fabaea6
--- /dev/null
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep kdeartwork-colorschemes)
+	$(add_kdebase_dep kdeartwork-desktopthemes)
+	$(add_kdebase_dep kdeartwork-emoticons)
+	$(add_kdebase_dep kdeartwork-iconthemes)
+	$(add_kdebase_dep kdeartwork-kscreensaver)
+	$(add_kdebase_dep kdeartwork-sounds)
+	$(add_kdebase_dep kdeartwork-styles)
+	$(add_kdebase_dep kdeartwork-wallpapers)
+	$(add_kdebase_dep kdeartwork-weatherwallpapers)
+"

diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild
new file mode 100644
index 0000000..005cdb7
--- /dev/null
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-4.7.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+RESTRICT="binchecks strip"
+
+KMMODULE="sounds"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Extra sound themes for kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""

diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild
new file mode 100644
index 0000000..1dc15b0
--- /dev/null
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMMODULE="styles"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Extra KWin styles and window decorations"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+add_blocker kwin '<4.5.67'
+
+DEPEND="
+		$(add_kdebase_dep kwin)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	aurorae/
+	kwin-styles/
+"

diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild
new file mode 100644
index 0000000..a39d7a3
--- /dev/null
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+RESTRICT="binchecks strip"
+
+KMMODULE="wallpapers"
+KMNAME="kdeartwork"
+inherit kde4-meta
+
+DESCRIPTION="Wallpapers from kde"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Please bump this as needed (probably at least for every minor version)
+add_blocker kdebase-wallpapers '<4.6.0'
+add_blocker kdeartwork-weatherwallpapers '<4.6.0'
+
+KMEXTRA="
+	HighResolutionWallpapers/
+"

diff --git a/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild
new file mode 100644
index 0000000..b5bbe8e
--- /dev/null
+++ b/kde-base/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdeartwork"
+KMMODULE="WeatherWallpapers"
+inherit kde4-meta
+
+DESCRIPTION="Weather aware wallpapers. Changes with weather outside."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep kdeartwork-wallpapers)
+"

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild
new file mode 100644
index 0000000..7ddba15
--- /dev/null
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="cursors"
+inherit kde4-meta
+
+DESCRIPTION="oxygen cursors from kdebase"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild b/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild
new file mode 100644
index 0000000..ff5f11f
--- /dev/null
+++ b/kde-base/kdebase-data/kdebase-data-4.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Icons, localization data and various .desktop files from kdebase."
+IUSE="+wallpapers"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep oxygen-icons)
+	x11-themes/hicolor-icon-theme
+"
+
+KMEXTRA="
+	l10n/
+	localization/
+	pics/
+"
+# Note that the eclass doesn't do this for us, because of KMNOMODULE="true".
+KMEXTRACTONLY="
+	config-runtime.h.cmake
+	kde4
+"
+
+src_configure() {
+	# Remove remnants of hicolor-icon-theme
+	sed -e "s:add_subdirectory[[:space:]]*([[:space:]]*hicolor[[:space:]]*):#donotwant:g" \
+		-i pics/CMakeLists.txt \
+		|| die "failed to remove remnants of hicolor-icon-theme"
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild
new file mode 100644
index 0000000..d5e6a07
--- /dev/null
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="desktoptheme"
+inherit kde4-meta
+
+DESCRIPTION="Oxygen KDE4 desktop theme."
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!<=kde-misc/knetworkmanager-4.4.0_p20100820
+"

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild
new file mode 100644
index 0000000..2c43f64
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	!aqua? ( x11-libs/libXcursor )
+	bzip2? ( app-arch/bzip2 )
+	exif? ( media-gfx/exiv2 )
+	lzma? ( app-arch/xz-utils )
+	openexr? ( media-libs/openexr )
+	samba? ( net-fs/samba[smbclient] )
+	sftp? ( >=net-libs/libssh-0.4.0[sftp] )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdebase_dep kdialog)
+	virtual/ssh
+	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
+"
+
+KMEXTRA="
+	kioexec
+	kdeeject
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_SLP=OFF
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with samba)
+		$(cmake-utils_use_with sftp LibSSH)
+	)
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild
new file mode 100644
index 0000000..66b5194
--- /dev/null
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.7.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="menu"
+inherit kde4-meta
+
+DESCRIPTION="KDE menu icons"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+add_blocker kde-menu-icons

diff --git a/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild
new file mode 100644
index 0000000..5183b0c
--- /dev/null
+++ b/kde-base/kdebase-menu/kdebase-menu-4.7.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="kde-menu"
+inherit kde4-meta
+
+DESCRIPTION="KDE Menu query tool."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+add_blocker kde-menu

diff --git a/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild
new file mode 100644
index 0000000..9b66f36
--- /dev/null
+++ b/kde-base/kdebase-meta/kdebase-meta-4.7.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-derived packages"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+wallpapers"
+
+RDEPEND="
+	$(add_kdebase_dep dolphin)
+	$(add_kdebase_dep freespacenotifier)
+	$(add_kdebase_dep kcheckpass)
+	$(add_kdebase_dep kcminit)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep kdebase-cursors)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	$(add_kdebase_dep kdebase-startkde)
+	$(add_kdebase_dep kdepasswd)
+	$(add_kdebase_dep kdialog)
+	$(add_kdebase_dep keditbookmarks)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep khotkeys)
+	$(add_kdebase_dep kinfocenter)
+	$(add_kdebase_dep klipper)
+	$(add_kdebase_dep kmenuedit)
+	$(add_kdebase_dep konq-plugins)
+	$(add_kdebase_dep konqueror)
+	$(add_kdebase_dep konsole)
+	$(add_kdebase_dep kscreensaver)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksplash)
+	$(add_kdebase_dep kstartupconfig)
+	$(add_kdebase_dep kstyles)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep ksystraycmd)
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep kwrite)
+	$(add_kdebase_dep kwrited)
+	$(add_kdebase_dep libkonq)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	$(add_kdebase_dep libplasmaclock)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep nsplugins)
+	$(add_kdebase_dep phonon-kde)
+	$(add_kdebase_dep plasma-apps)
+	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep powerdevil)
+	$(add_kdebase_dep qguiplatformplugin_kde)
+	$(add_kdebase_dep solid)
+	$(add_kdebase_dep systemsettings)
+	!prefix? ( $(add_kdebase_dep kdm) )
+"

diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild
new file mode 100644
index 0000000..8473d7d
--- /dev/null
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.7.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook semantic-desktop"
+
+RDEPEND="
+	$(add_kdebase_dep activitymanager)
+	$(add_kdebase_dep attica)
+	$(add_kdebase_dep drkonqi)
+	$(add_kdebase_dep kcmshell)
+	$(add_kdebase_dep kcontrol)
+	$(add_kdebase_dep kdebase-data)
+	$(add_kdebase_dep kdebase-desktoptheme)
+	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdebase_dep kdebase-menu)
+	$(add_kdebase_dep kdebase-menu-icons)
+	$(add_kdebase_dep kdebugdialog)
+	$(add_kdebase_dep kdesu)
+	$(add_kdebase_dep kdontchangethehostname)
+	$(add_kdebase_dep keditfiletype)
+	$(add_kdebase_dep kfile)
+	$(add_kdebase_dep kglobalaccel)
+	$(add_kdebase_dep kiconfinder)
+	$(add_kdebase_dep kioclient)
+	$(add_kdebase_dep kmimetypefinder)
+	$(add_kdebase_dep knetattach)
+	$(add_kdebase_dep knewstuff)
+	$(add_kdebase_dep kpasswdserver)
+	$(add_kdebase_dep kquitapp)
+	$(add_kdebase_dep kstart)
+	$(add_kdebase_dep ktimezoned)
+	$(add_kdebase_dep ktraderclient)
+	$(add_kdebase_dep kuiserver)
+	$(add_kdebase_dep kurifilter-plugins)
+	$(add_kdebase_dep kwallet)
+	$(add_kdebase_dep kwalletd)
+	$(add_kdebase_dep plasma-runtime)
+	$(add_kdebase_dep renamedlg-plugins)
+	$(add_kdebase_dep solid-runtime)
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild
new file mode 100644
index 0000000..3e0628a
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.7.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMNOMODULE="true"
+inherit kde4-meta multilib prefix
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+wallpapers"
+
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep kfmclient)
+	$(add_kdebase_dep knotify)
+	$(add_kdebase_dep kreadconfig)
+	$(add_kdebase_dep krunner)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksplash)
+	$(add_kdebase_dep kstartupconfig)
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep phonon-kde)
+	$(add_kdebase_dep plasma-apps)
+	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep systemsettings)
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	x11-apps/xset
+"
+
+KMEXTRACTONLY="
+	ConfigureChecks.cmake
+	kdm/
+	startkde.cmake
+"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	cp "${FILESDIR}/KDE-4" "${T}"
+
+	# fix ${EPREFIX}
+	eprefixify startkde.cmake "${T}/KDE-4"
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/kde/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/kde/shutdown
+	doins "${FILESDIR}/agent-shutdown.sh"
+
+	# x11 session script
+	exeinto /etc/X11/Sessions
+	doexe "${T}/KDE-4"
+
+	# freedesktop compliant session script
+	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
+		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/KDE-4.desktop"
+}
+
+pkg_postinst () {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
+	echo
+	elog "The name of the session script has changed."
+	elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
+	elog "configuration files, you will need to change it to"
+	elog "XSESSION=\"KDE-4\""
+}

diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild
new file mode 100644
index 0000000..7ad9f2e
--- /dev/null
+++ b/kde-base/kdebindings-meta/kdebindings-meta-4.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE bindings - merge this to pull in all kdebindings-derived packages"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="csharp java perl python ruby"
+
+RDEPEND="
+	$(add_kdebase_dep smokegen)
+	$(add_kdebase_dep smokekde)
+	$(add_kdebase_dep smokeqt)
+	csharp? (
+		$(add_kdebase_dep kimono)
+		$(add_kdebase_dep qyoto)
+	)
+	java? ( $(add_kdebase_dep krossjava) )
+	perl? (
+		$(add_kdebase_dep perlkde)
+		$(add_kdebase_dep perlqt)
+	)
+	python? (
+		$(add_kdebase_dep krosspython)
+		$(add_kdebase_dep pykde4)
+	)
+	ruby? (
+		$(add_kdebase_dep korundum)
+		$(add_kdebase_dep krossruby)
+		$(add_kdebase_dep qtruby)
+	)
+"

diff --git a/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild
new file mode 100644
index 0000000..736317d
--- /dev/null
+++ b/kde-base/kdebugdialog/kdebugdialog-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild
new file mode 100644
index 0000000..dab11e0
--- /dev/null
+++ b/kde-base/kdeedu-meta/kdeedu-meta-4.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep blinken)
+	$(add_kdebase_dep cantor)
+	$(add_kdebase_dep kalgebra)
+	$(add_kdebase_dep kalzium)
+	$(add_kdebase_dep kanagram)
+	$(add_kdebase_dep kbruch)
+	$(add_kdebase_dep kgeography)
+	$(add_kdebase_dep khangman)
+	$(add_kdebase_dep kig)
+	$(add_kdebase_dep kiten)
+	$(add_kdebase_dep klettres)
+	$(add_kdebase_dep kmplot)
+	$(add_kdebase_dep kstars)
+	$(add_kdebase_dep ktouch)
+	$(add_kdebase_dep kturtle)
+	$(add_kdebase_dep kwordquiz)
+	$(add_kdebase_dep libkdeedu)
+	$(add_kdebase_dep marble)
+	$(add_kdebase_dep parley)
+	$(add_kdebase_dep rocs)
+	$(add_kdebase_dep step)
+"

diff --git a/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild
new file mode 100644
index 0000000..866f17e
--- /dev/null
+++ b/kde-base/kdegames-meta/kdegames-meta-4.7.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="opengl python"
+
+RDEPEND="
+	$(add_kdebase_dep bomber)
+	$(add_kdebase_dep bovo)
+	$(add_kdebase_dep granatier)
+	$(add_kdebase_dep kapman)
+	$(add_kdebase_dep katomic)
+	$(add_kdebase_dep kbattleship)
+	$(add_kdebase_dep kblackbox)
+	$(add_kdebase_dep kblocks)
+	$(add_kdebase_dep kbounce)
+	$(add_kdebase_dep kbreakout)
+	$(add_kdebase_dep kdiamond)
+	$(add_kdebase_dep kfourinline)
+	$(add_kdebase_dep kgoldrunner)
+	$(add_kdebase_dep killbots)
+	$(add_kdebase_dep kigo)
+	$(add_kdebase_dep kiriki)
+	$(add_kdebase_dep kjumpingcube)
+	$(add_kdebase_dep klickety)
+	$(add_kdebase_dep klines)
+	$(add_kdebase_dep kmahjongg)
+	$(add_kdebase_dep kmines)
+	$(add_kdebase_dep knetwalk)
+	$(add_kdebase_dep kolf)
+	$(add_kdebase_dep kollision)
+	$(add_kdebase_dep konquest)
+	$(add_kdebase_dep kpat)
+	$(add_kdebase_dep kreversi)
+	$(add_kdebase_dep kshisen)
+	$(add_kdebase_dep ksirk)
+	$(add_kdebase_dep kspaceduel)
+	$(add_kdebase_dep ksquares)
+	$(add_kdebase_dep ktron)
+	$(add_kdebase_dep ktuberling)
+	$(add_kdebase_dep kubrick)
+	$(add_kdebase_dep libkdegames)
+	$(add_kdebase_dep libkmahjongg)
+	$(add_kdebase_dep lskat)
+	$(add_kdebase_dep palapeli)
+	opengl? ( $(add_kdebase_dep ksudoku) )
+	python? ( $(add_kdebase_dep kajongg) )
+"

diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild
new file mode 100644
index 0000000..bff3dbe
--- /dev/null
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-4.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="scanner"
+
+RDEPEND="
+	$(add_kdebase_dep gwenview)
+	$(add_kdebase_dep kamera)
+	$(add_kdebase_dep kcolorchooser)
+	$(add_kdebase_dep kdegraphics-strigi-analyzer)
+	$(add_kdebase_dep kgamma)
+	$(add_kdebase_dep kolourpaint)
+	$(add_kdebase_dep kruler)
+	$(add_kdebase_dep ksnapshot)
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep okular)
+	$(add_kdebase_dep svgpart)
+	$(add_kdebase_dep thumbnailers)
+	scanner? (
+		$(add_kdebase_dep ksaneplugin)
+		$(add_kdebase_dep libksane)
+	)
+"

diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild
new file mode 100644
index 0000000..9b93ac0
--- /dev/null
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="kdegraphics: strigi plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kdelibs/kdelibs-4.7.1.ebuild b/kde-base/kdelibs/kdelibs-4.7.1.ebuild
new file mode 100644
index 0000000..cddcd32
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.7.1.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base fdo-mime toolchain-funcs
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
++udisks +upower upnp zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.6.3
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.1.90
+	>=dev-libs/libdbusmenu-qt-0.3.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	>=media-libs/phonon-4.4.3
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lzma? ( app-arch/xz-utils )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.99 )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.6.50
+		>=dev-libs/soprano-2.6.51[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( sys-fs/udev )
+	upnp? ( media-libs/herqq )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-libs/conversion
+	!dev-libs/kunitconversion
+	!x11-libs/qt-phonon
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
+	!<=kde-misc/knetworkmanager-4.4.0_p20100820
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		udisks? ( sys-fs/udisks )
+		upower? ( sys-power/upower )
+	)
+"
+PDEPEND="
+	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? (
+		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+		>=sys-auth/polkit-kde-agent-0.99
+	)
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Blockers added due to packages from old versions, removed in the meanwhile
+# as well as for file collisions
+add_blocker libknotificationitem
+add_blocker libkworkspace '<4.3.66'
+add_blocker kcontrol '<4.5.80'
+# @since 4.4 - kpilot is gone (blocker added to help upgrades)
+add_blocker kpilot
+# Block some old versions of KDE-3.5 packages that don't work well with KDE-4
+add_blocker kdebase 0 3.5.9-r4:3.5
+add_blocker kdebase-startkde 0 3.5.10:3.5
+add_blocker kdelibs 0 '<3.5.10:3.5'
+# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
+add_blocker plasma-workspace '<4.3.75'
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with policykit PolkitQt-1)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with upnp HUpnp)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	elog "Your homedir is set to \${HOME}/.kde4"
+	echo
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}

diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild
new file mode 100644
index 0000000..e2f5790
--- /dev/null
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+DESCRIPTION="KDE kioslaves from the kdemultimedia package"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug encode flac vorbis"
+
+# 4 of 9 tests fail. Last checked for 4.2.88
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
+	media-sound/cdparanoia
+	encode? (
+		flac? ( >=media-libs/flac-1.1.2 )
+		vorbis? ( media-libs/libvorbis )
+	)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkcompactdisc/
+"
+KMCOMPILEONLY="
+	libkcddb/
+"
+
+KMLOADLIBS="libkcddb"
+
+src_configure() {
+	if use encode; then
+		mycmakeargs=(
+			$(cmake-utils_use_with flac)
+			$(cmake-utils_use_with vorbis OggVorbis)
+		)
+	else
+		mycmakeargs=(-DWITH_OggVorbis=OFF -DWITH_Flac=OFF)
+	fi
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild
new file mode 100644
index 0000000..e628a61
--- /dev/null
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="ffmpeg +mplayer"
+
+RDEPEND="
+	$(add_kdebase_dep dragonplayer)
+	$(add_kdebase_dep juk)
+	$(add_kdebase_dep kdemultimedia-kioslaves)
+	$(add_kdebase_dep kmix)
+	$(add_kdebase_dep kscd)
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
+	mplayer? ( $(add_kdebase_dep mplayerthumbs) )
+	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
+"

diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild
new file mode 100644
index 0000000..52956cb
--- /dev/null
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdenetwork"
+KMMODULE="filesharing"
+inherit kde4-meta
+
+DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild
new file mode 100644
index 0000000..e88fead
--- /dev/null
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="ppp"
+
+RDEPEND="
+	$(add_kdebase_dep kdenetwork-filesharing)
+	$(add_kdebase_dep kdnssd)
+	$(add_kdebase_dep kget)
+	$(add_kdebase_dep kopete)
+	$(add_kdebase_dep krdc)
+	$(add_kdebase_dep krfb)
+	ppp? ( $(add_kdebase_dep kppp) )
+"

diff --git a/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild b/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild
new file mode 100644
index 0000000..f957ab6
--- /dev/null
+++ b/kde-base/kdepasswd/kdepasswd-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDE GUI for passwd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdesu)
+"
+
+KMLOADLIBS="libkonq"

diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild
new file mode 100644
index 0000000..92db31b
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	>=app-office/akonadi-server-1.3.60
+	>=dev-libs/shared-desktop-ontologies-0.6.50
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+# @Since >4.4.76 merged here
+add_blocker akonadi
+add_blocker libkdepim
+add_blocker libkleo
+add_blocker libkpgp
+add_blocker messagecomposer
+add_blocker messagecore
+add_blocker messagelist
+add_blocker messageviewer
+add_blocker templateparser
+add_blocker kaddressbook '<4.4.90'
+add_blocker kmail '<4.4.80'
+add_blocker korganizer '<4.5.67'
+
+KMEXTRA="
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	incidenceeditor-ng/
+	libkdepim/
+	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
+	kdgantt2/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	nepomuk_email_feeder/
+	ontologies/
+	templateparser/
+"
+
+KMEXTRACTONLY="
+	kleopatra/
+	kmail/
+	knode/org.kde.knode.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/org.kde.korganizer.Korganizer.xml
+"
+
+KMSAVELIBS="true"

diff --git a/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild
new file mode 100644
index 0000000..d786804
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="icons"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="$(add_kdebase_dep kdepimlibs)"
+RDEPEND=""

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild
new file mode 100644
index 0000000..45c2d65
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+IUSE="debug"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	korganizer/version.h
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_install() {
+	kde4-meta_src_install
+
+	# Install headers needed by kdepim-wizards, egroupware and slox stuff gone
+	insinto "${PREFIX}"/include/${PN}
+	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/groupwise/*.h
+}

diff --git a/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild
new file mode 100644
index 0000000..9bc8894
--- /dev/null
+++ b/kde-base/kdepim-meta/kdepim-meta-4.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep akonadiconsole)
+	$(add_kdebase_dep akregator)
+	$(add_kdebase_dep blogilo)
+	$(add_kdebase_dep kabcclient)
+	$(add_kdebase_dep kaddressbook)
+	$(add_kdebase_dep kalarm)
+	$(add_kdebase_dep kdepim-icons)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepim-runtime)
+	$(add_kdebase_dep kdepim-strigi-analyzer)
+	$(add_kdebase_dep kdepim-wizards)
+	$(add_kdebase_dep kjots)
+	$(add_kdebase_dep kleopatra)
+	$(add_kdebase_dep kmail)
+	$(add_kdebase_dep knode)
+	$(add_kdebase_dep knotes)
+	$(add_kdebase_dep konsolekalendar)
+	$(add_kdebase_dep kontact)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep ktimetracker)
+"

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild
new file mode 100644
index 0000000..1fd344b
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim-runtime"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+	app-misc/strigi
+	>=app-office/akonadi-server-1.3.60
+	dev-libs/boost
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-libs/shared-desktop-ontologies-0.6.51
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-icons)
+"
+
+add_blocker kdemaildir '<4.3.0'
+add_blocker akonadi '<4.3.90'

diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild
new file mode 100644
index 0000000..1117a4a
--- /dev/null
+++ b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="strigi-analyzer"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="kdepim: strigi plugins"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messageviewer/
+"

diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild
new file mode 100644
index 0000000..ff71f68
--- /dev/null
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="wizards"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM wizards"
+IUSE="debug"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	kresources/groupwise/
+"
+
+src_prepare() {
+	ln -s "${EPREFIX}"/usr/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
+		kresources/groupwise/ \
+		|| die "Failed to link extra_headers."
+
+	kde4-meta_src_prepare
+}

diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild
new file mode 100644
index 0000000..28de0cd
--- /dev/null
+++ b/kde-base/kdepimlibs/kdepimlibs-4.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap semantic-desktop"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.1.6
+	dev-libs/libgpg-error
+	>=dev-libs/libical-0.43
+	dev-libs/cyrus-sasl
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	semantic-desktop? (
+		>=app-office/akonadi-server-1.5.80
+		media-libs/phonon
+		x11-misc/shared-mime-info
+	)
+	ldap? ( net-nds/openldap )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.35.0-r5
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# libakonadi-kcal moved here from akonadi in 4.3.86
+add_blocker akonadi '<4.3.86'
+# @since 4.3 - libkholidays is in kdepimlibs now
+add_blocker libkholidays
+# @since 4.4 - kontactinterfaces is in kdepimlibs now
+add_blocker kontactinterfaces
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Disable hardcoded checks
+	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
+		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
+		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+		-i CMakeLists.txt || die
+	if ! use semantic-desktop; then
+		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
+			-i CMakeLists.txt || die
+		# More reliable than -DBUILD_akonadi=OFF
+		rm -r akonadi mailtransport || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_with ldap)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with prison)
+		-DWITH_Prison=NO
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild
new file mode 100644
index 0000000..304f1a0
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Extra Plasma applets and engines."
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2 LGPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
+
+# krunner is only needed to generate dbus interface for lancelot
+COMMON_DEPEND="
+	app-crypt/qca:2
+	app-crypt/qca-ossl:2
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep krunner)
+	$(add_kdebase_dep plasma-workspace 'semantic-desktop=')
+	x11-misc/shared-mime-info
+	attica? ( dev-libs/libattica )
+	desktopglobe? ( $(add_kdebase_dep marble) )
+	exif? ( $(add_kdebase_dep libkexiv2) )
+	qalculate? ( sci-libs/libqalculate )
+	qwt? ( x11-libs/qwt:5 )
+	scim? ( app-i18n/scim )
+	semantic-desktop? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+		$(add_kdebase_dep plasma-workspace 'rss')
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:2
+"
+# kde-misc/plasmaboard: moved here in 4.3.65
+# kde-misc/qalculate-applet: since 4.4.0
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/plasmaboard
+	!kde-misc/qalculate-applet
+"
+
+# kdebase-data: some svg icons moved from data directly here.
+add_blocker kdebase-data '<4.2.88'
+
+src_prepare() {
+	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with desktopglobe Marble)
+		$(cmake-utils_use_with exif Kexiv2)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with scim)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild
new file mode 100644
index 0000000..a938f2c
--- /dev/null
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug subversion"
+
+DEPEND="
+	subversion? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+"
+RDEPEND="${DEPEND}
+	subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 )
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DAPRCONFIG_EXECUTABLE="${EPREFIX}"/usr/bin/apr-1-config
+		$(cmake-utils_use_with subversion SVN)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild
new file mode 100644
index 0000000..265207d
--- /dev/null
+++ b/kde-base/kdesdk-meta/kdesdk-meta-4.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cvs"
+
+RDEPEND="
+	cvs? ( $(add_kdebase_dep cervisia) )
+	$(add_kdebase_dep dolphin-plugins)
+	$(add_kdebase_dep kapptemplate)
+	$(add_kdebase_dep kate)
+	$(add_kdebase_dep kcachegrind)
+	$(add_kdebase_dep kdeaccounts-plugin)
+	$(add_kdebase_dep kdesdk-kioslaves)
+	$(add_kdebase_dep kdesdk-misc)
+	$(add_kdebase_dep kdesdk-scripts)
+	$(add_kdebase_dep kdesdk-strigi-analyzer)
+	$(add_kdebase_dep kompare)
+	$(add_kdebase_dep kstartperf)
+	$(add_kdebase_dep kuiviewer)
+	$(add_kdebase_dep lokalize)
+	$(add_kdebase_dep okteta)
+	$(add_kdebase_dep umbrello)
+"

diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild
new file mode 100644
index 0000000..6f647a5
--- /dev/null
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="KDE miscellaneous SDK tools"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug extras"
+
+DEPEND="
+	extras? ( >=dev-java/antlr-2.7.7:0[cxx,script] )
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	doc/kmtrace/
+	doc/poxml/
+	kmtrace/
+	kpartloader/
+	kprofilemethod/
+	kspy/
+	kunittest/
+	poxml/
+	scheck/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with extras Antlr2)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild
new file mode 100644
index 0000000..e55a305
--- /dev/null
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-4.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+KMMODULE="scripts"
+inherit kde4-meta
+
+DESCRIPTION="KDE SDK Scripts"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/advancecomp
+	media-gfx/optipng
+"
+
+src_prepare() {
+	# bug 275069
+	sed -ie 's:colorsvn::' scripts/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}

diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild
new file mode 100644
index 0000000..1f3a2bd
--- /dev/null
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+KMMODULE="strigi-analyzer"
+inherit kde4-meta
+
+DESCRIPTION="kdesdk: strigi plugins"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kdesu/kdesu-4.7.1.ebuild b/kde-base/kdesu/kdesu-4.7.1.ebuild
new file mode 100644
index 0000000..681bc95
--- /dev/null
+++ b/kde-base/kdesu/kdesu-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+# FIXME: Is default command ( su/sudo ) still configurable,
+# if not, USE-flag ?
+DESCRIPTION="KDE: gui for su(1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_configure() {
+	# Upstream moved kdesu to libexec first, then decided to move it back
+	# to /${PREFIX}/bin/ , so I'm doing that now already.
+	sed -e '/kdesu_executable/s:LIBEXEC_INSTALL_DIR:BIN_INSTALL_DIR:' \
+		-i "${S}"/kdesu/kdesu/CMakeLists.txt || \
+		die "Moving kdesu from libexec to bin failed."
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild
new file mode 100644
index 0000000..df7571f
--- /dev/null
+++ b/kde-base/kdetoys-meta/kdetoys-meta-4.7.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE toys - merge this to pull in all kdetoys-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep amor)
+	$(add_kdebase_dep kteatime)
+	$(add_kdebase_dep ktux)
+"

diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild
new file mode 100644
index 0000000..eaca792
--- /dev/null
+++ b/kde-base/kdeutils-meta/kdeutils-meta-4.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups floppy"
+
+RDEPEND="
+	$(add_kdebase_dep ark)
+	$(add_kdebase_dep filelight)
+	$(add_kdebase_dep kcalc)
+	$(add_kdebase_dep kcharselect)
+	$(add_kdebase_dep kdf)
+	$(add_kdebase_dep kgpg)
+	$(add_kdebase_dep kremotecontrol)
+	$(add_kdebase_dep ktimer)
+	$(add_kdebase_dep kwallet)
+	$(add_kdebase_dep superkaramba)
+	$(add_kdebase_dep sweeper)
+	cups? ( $(add_kdebase_dep printer-applet) )
+	floppy? ( $(add_kdebase_dep kfloppy) )
+"

diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild
new file mode 100644
index 0000000..4d6ea2b
--- /dev/null
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_kdebase_dep kfilereplace)
+	$(add_kdebase_dep kimagemapeditor)
+	$(add_kdebase_dep klinkstatus)
+	$(add_kdebase_dep kommander)
+"

diff --git a/kde-base/kdf/kdf-4.7.1.ebuild b/kde-base/kdf/kdf-4.7.1.ebuild
new file mode 100644
index 0000000..78cca67
--- /dev/null
+++ b/kde-base/kdf/kdf-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE free disk space utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_unpack() {
+	${kde_eclass}_src_unpack
+}

diff --git a/kde-base/kdialog/kdialog-4.7.1.ebuild b/kde-base/kdialog/kdialog-4.7.1.ebuild
new file mode 100644
index 0000000..a7e8bb8
--- /dev/null
+++ b/kde-base/kdialog/kdialog-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kdiamond/kdiamond-4.7.1.ebuild
similarity index 52%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kdiamond/kdiamond-4.7.1.ebuild
index 769eff0..e8624d5 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kdiamond/kdiamond-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: KDiamond is a three-in-a-row game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kdm/kdm-4.7.1.ebuild b/kde-base/kdm/kdm-4.7.1.ebuild
new file mode 100644
index 0000000..2feb693
--- /dev/null
+++ b/kde-base/kdm/kdm-4.7.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta flag-o-matic
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+consolekit debug kerberos pam"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
+	kerberos? ( virtual/krb5 )
+	pam? (
+		$(add_kdebase_dep kcheckpass)
+		virtual/pam
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepasswd)
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+"
+
+add_blocker systemsettings '<4.5.80'
+
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=(
+	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+)
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+
+	# Create kdm:kdm user
+	KDM_HOME=/var/lib/kdm
+	enewgroup kdm
+	enewuser kdm -1 -1 "${KDM_HOME}" kdm
+}
+
+src_configure() {
+	# genkdmconf breaks with -O3
+	# last checked in 4.2.95
+	replace-flags -O3 -O2
+
+	mycmakeargs=(
+		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
+		$(cmake-utils_use_with pam)
+		$(cmake-utils_use_with consolekit CkConnector)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+	kde4-meta_src_install
+
+	# Customize the kdmrc configuration:
+	# - SessionDirs set to /usr/share/xsessions
+	# - increase server timeout to 30s
+	# - TerminateServer=true to workaround X server regen bug, bug 278473
+	# - DataDir set to /var/lib/kdm
+	# - FaceDir set to /var/lib/kdm/faces
+	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
+		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
+		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
+		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
+		-e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
+		-i "${ED}"/usr/share/config/kdm/kdmrc \
+		|| die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
+
+	# Don't install empty dir
+	rmdir "${ED}"/usr/share/config/kdm/sessions
+
+	# Set up permissions to kdm work directory
+	keepdir "${KDM_HOME}"
+	fowners root:kdm "${KDM_HOME}"
+	fperms 1770 "${KDM_HOME}"
+
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kdm-logrotate kdm
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	local file src dest dir old_dirs=(
+		/var/lib/kdm-live
+		/var/lib/kdm-4.6
+		/var/lib/kdm-4.5
+		/var/lib/kdm-4.4
+		/usr/share/apps/kdm
+		/usr/kde/4.4/share/apps/kdm
+		/usr/kde/4.3/share/apps/kdm
+		/usr/kde/4.2/share/apps/kdm
+	)
+
+	mkdir -p "${EROOT}${KDM_HOME}/faces"
+	# Set the default kdm face icon if it's not already set by the system admin
+	# because this is user-overrideable in that way, it's not in src_install
+	for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+		src=${file#*:}
+		dest=${file%:*}
+		if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+			for dir in "${old_dirs[@]}"; do
+				if [[ -e ${EROOT}${dir}/${dest} ]]; then
+					cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+					break 2
+				fi
+			done
+			if [[ -n ${src} ]]; then
+				cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
+					"${EROOT}${KDM_HOME}/${dest}"
+			fi
+		fi
+	done
+	for dir in "${old_dirs[@]}"; do
+		if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+			echo
+			elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+			elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+			echo
+			elog "After doing so, you may delete the directory."
+			echo
+		fi
+	done
+
+	# Make sure permissions are correct -- old installations may have
+	# gotten this wrong
+	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+	chmod 1770 "${EROOT}${KDM_HOME}"
+
+	if use consolekit; then
+		echo
+		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
+		elog "make sure consolekit daemon is running and started at login time"
+		elog
+		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+		echo
+	fi
+}

diff --git a/kde-base/kdnssd/kdnssd-4.7.1.ebuild b/kde-base/kdnssd/kdnssd-4.7.1.ebuild
new file mode 100644
index 0000000..075c210
--- /dev/null
+++ b/kde-base/kdnssd/kdnssd-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug zeroconf"
+
+DEPEND="
+	zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild
new file mode 100644
index 0000000..7eb1727
--- /dev/null
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Tool to inform KDE about a change in hostname"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-apps/xauth
+"
+
+# moved from kdelibs
+add_blocker kdelibs 4.4.68

diff --git a/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild
new file mode 100644
index 0000000..e4a3ca4
--- /dev/null
+++ b/kde-base/keditbookmarks/keditbookmarks-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDE's bookmarks editor"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	lib/konq/
+"

diff --git a/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild b/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild
new file mode 100644
index 0000000..b608ac5
--- /dev/null
+++ b/kde-base/keditfiletype/keditfiletype-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE mime/file type assocciation editor"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.89
+RESTRICT=test
+
+# @Since 4.2.68 - split from konqueror
+add_blocker konqueror 4.2.67

diff --git a/kde-base/kephal/kephal-4.7.1.ebuild b/kde-base/kephal/kephal-4.7.1.ebuild
new file mode 100644
index 0000000..735207c
--- /dev/null
+++ b/kde-base/kephal/kephal-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/kephal"
+inherit kde4-meta
+
+DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+"

diff --git a/kde-base/kfile/kfile-4.7.1.ebuild b/kde-base/kfile/kfile-4.7.1.ebuild
new file mode 100644
index 0000000..a36a068
--- /dev/null
+++ b/kde-base/kfile/kfile-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="A commandline frontend to KFileMetaInfo"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild b/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild
new file mode 100644
index 0000000..b64c391
--- /dev/null
+++ b/kde-base/kfilereplace/kfilereplace-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - powerful search and replace in multiple files"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfind/kfind-4.7.1.ebuild b/kde-base/kfind/kfind-4.7.1.ebuild
new file mode 100644
index 0000000..d354f3e
--- /dev/null
+++ b/kde-base/kfind/kfind-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="KDE file finder utility"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kfloppy/kfloppy-4.7.1.ebuild b/kde-base/kfloppy/kfloppy-4.7.1.ebuild
new file mode 100644
index 0000000..9cf340c
--- /dev/null
+++ b/kde-base/kfloppy/kfloppy-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
index 769eff0..f6d2847 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
@@ -5,7 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
 KEYWORDS=""

diff --git a/kde-base/kfmclient/kfmclient-4.7.1.ebuild b/kde-base/kfmclient/kfmclient-4.7.1.ebuild
new file mode 100644
index 0000000..044aa3b
--- /dev/null
+++ b/kde-base/kfmclient/kfmclient-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+KMMODULE="konqueror/client"
+inherit kde4-meta
+
+DESCRIPTION="KDE tool for opening URLs from the command line"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Moved from kde-base/konqueror in 4.3.65-r1
+add_blocker konqueror 4.3.65
+
+KMEXTRACTONLY="
+	konqueror/kfmclient.desktop
+	konqueror/kfmclient_dir.desktop
+	konqueror/kfmclient_html.desktop
+	konqueror/kfmclient_war.desktop
+	konqueror/src/org.kde.Konqueror.Main.xml
+	konqueror/src/org.kde.Konqueror.MainWindow.xml
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install non-kfmclient *.desktop files
+	sed -e "/konqbrowser\.desktop/d" \
+		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
+		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		-i konqueror/CMakeLists.txt \
+		|| die "Failed to omit .desktop files"
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kfourinline/kfourinline-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kfourinline/kfourinline-4.7.1.ebuild
index 769eff0..6544d05 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE four-in-a-row game."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kgamma/kgamma-4.7.1.ebuild b/kde-base/kgamma/kgamma-4.7.1.ebuild
new file mode 100644
index 0000000..757b797
--- /dev/null
+++ b/kde-base/kgamma/kgamma-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+
+inherit kde4-base
+
+DESCRIPTION="KDE screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kgeography/kgeography-4.7.1.ebuild
similarity index 61%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kgeography/kgeography-4.7.1.ebuild
index 769eff0..2924226 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kgeography/kgeography-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: a geography learning tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kget/kget-4.7.1.ebuild b/kde-base/kget/kget-4.7.1.ebuild
new file mode 100644
index 0000000..3a84f4f
--- /dev/null
+++ b/kde-base/kget/kget-4.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="An advanced download manager for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
+
+RDEPEND="
+	app-crypt/qca:2
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep libkonq)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with bittorrent KTorrent)
+		$(cmake-utils_use_with mms LibMms)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with sqlite)
+		$(cmake-utils_use_with webkit KWebKitPart)
+	)
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild
new file mode 100644
index 0000000..023f9f0
--- /dev/null
+++ b/kde-base/kglobalaccel/kglobalaccel-4.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE's Global Shortcut Daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Module renamed upstream
+add_blocker kdedglobalaccel
+
+src_configure() {
+	mycmakeargs=(
+		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_DESKTOP_FILE=NOTFOUND
+		-DKDEBASE_KGLOBALACCEL_REMOVE_OBSOLETE_KDED_PLUGIN=NOTFOUND
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild b/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild
new file mode 100644
index 0000000..e9dcdb7
--- /dev/null
+++ b/kde-base/kgoldrunner/kgoldrunner-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kgpg/kgpg-4.7.1.ebuild b/kde-base/kgpg/kgpg-4.7.1.ebuild
new file mode 100644
index 0000000..b9cc871
--- /dev/null
+++ b/kde-base/kgpg/kgpg-4.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE gpg keyring manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+pkg_postinst() {
+	${kde_eclass}_pkg_postinst
+
+	if ! has_version app-crypt/dirmngr ; then
+		elog "For improved key search functionality, install app-crypt/dirmngr."
+	fi
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/khangman/khangman-4.7.1.ebuild
similarity index 53%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/khangman/khangman-4.7.1.ebuild
index 769eff0..0f689d3 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/khangman/khangman-4.7.1.ebuild
@@ -5,8 +5,13 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Classical hangman game for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"

diff --git a/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild b/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild
new file mode 100644
index 0000000..e836a50
--- /dev/null
+++ b/kde-base/khelpcenter/khelpcenter-4.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="always"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Help Center"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdesu)
+	>=www-misc/htdig-3.2.0_beta6-r1
+"
+
+KMEXTRA="
+	doc/documentationnotfound/
+	doc/glossary/
+	doc/onlinehelp/
+"

diff --git a/kde-base/khotkeys/khotkeys-4.7.1.ebuild b/kde-base/khotkeys/khotkeys-4.7.1.ebuild
new file mode 100644
index 0000000..b8c5c3d
--- /dev/null
+++ b/kde-base/khotkeys/khotkeys-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE: hotkey daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libs/kworkspace/
+"

diff --git a/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild b/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild
new file mode 100644
index 0000000..53a81fe
--- /dev/null
+++ b/kde-base/kiconfinder/kiconfinder-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Finds an icon based on its name"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kig/kig-4.7.1.ebuild b/kde-base/kig/kig-4.7.1.ebuild
new file mode 100644
index 0000000..0753aaf
--- /dev/null
+++ b/kde-base/kig/kig-4.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Interactive Geometry tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kig-scripting"
+
+DEPEND="
+	kig-scripting? ( >=dev-libs/boost-1.32 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with kig-scripting BoostPython)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kigo/kigo-4.7.1.ebuild b/kde-base/kigo/kigo-4.7.1.ebuild
new file mode 100644
index 0000000..2b3d262
--- /dev/null
+++ b/kde-base/kigo/kigo-4.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="KDE Go game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	games-board/gnugo
+"
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/src/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}

diff --git a/kde-base/killbots/killbots-4.7.1.ebuild b/kde-base/killbots/killbots-4.7.1.ebuild
new file mode 100644
index 0000000..59bbada
--- /dev/null
+++ b/kde-base/killbots/killbots-4.7.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Kill the bots or they kill you!"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Tests hang, last checked in 4.3.3
+RESTRICT="test"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild
similarity index 52%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild
index 769eff0..182d446 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdewebdev"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE web development - image map editor"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kimono/kimono-4.7.1.ebuild b/kde-base/kimono/kimono-4.7.1.ebuild
new file mode 100644
index 0000000..02f6772
--- /dev/null
+++ b/kde-base/kimono/kimono-4.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base mono
+
+DESCRIPTION="C# bindings for KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE="akonadi debug plasma semantic-desktop"
+
+DEPEND="
+	dev-lang/mono
+	$(add_kdebase_dep qyoto 'webkit')
+	$(add_kdebase_dep smokeqt)
+	$(add_kdebase_dep smokekde 'akonadi?,semantic-desktop=')
+	plasma? ( $(add_kdebase_dep smokeqt 'webkit') )
+	semantic-desktop? ( >=dev-libs/soprano-2.6.51[clucene] )
+"
+RDEPEND="${DEPEND}"
+
+# Split from kdebindings-csharp in 4.7
+add_blocker kdebindings-csharp
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	sed -i "/add_subdirectory( examples )/ s:^:#:" plasma/CMakeLists.txt
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_disable plasma)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild b/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild
new file mode 100644
index 0000000..c5e1509
--- /dev/null
+++ b/kde-base/kinfocenter/kinfocenter-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Info Center"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ieee1394"
+
+DEPEND="
+	$(add_kdebase_dep solid)
+	sys-apps/pciutils
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+"
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with ieee1394 RAW1394)
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kioclient/kioclient-4.7.1.ebuild b/kde-base/kioclient/kioclient-4.7.1.ebuild
new file mode 100644
index 0000000..8e470b6
--- /dev/null
+++ b/kde-base/kioclient/kioclient-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Command-line tool for network-transparent operations"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kiriki/kiriki-4.7.1.ebuild
similarity index 54%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kiriki/kiriki-4.7.1.ebuild
index 769eff0..1470cb0 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kiriki/kiriki-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Kiriki - a gtali clone for KDE4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kiten/kiten-4.7.1.ebuild
similarity index 59%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kiten/kiten-4.7.1.ebuild
index 769eff0..9f705b9 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kiten/kiten-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Japanese dictionary and reference"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kjots/kjots-4.7.1.ebuild b/kde-base/kjots/kjots-4.7.1.ebuild
new file mode 100644
index 0000000..9eeaee2
--- /dev/null
+++ b/kde-base/kjots/kjots-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE note taking utility"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.1
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild
similarity index 53%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild
index 769eff0..96fef63 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: Tactical one or two player game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kleopatra/kleopatra-4.7.1.ebuild b/kde-base/kleopatra/kleopatra-4.7.1.ebuild
new file mode 100644
index 0000000..2bfb2d6
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	dev-libs/boost
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+	libkleo/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}

diff --git a/kde-base/klettres/klettres-4.7.1.ebuild b/kde-base/klettres/klettres-4.7.1.ebuild
new file mode 100644
index 0000000..e85e9fa
--- /dev/null
+++ b/kde-base/klettres/klettres-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/klickety/klickety-4.7.1.ebuild b/kde-base/klickety/klickety-4.7.1.ebuild
new file mode 100644
index 0000000..f4afc60
--- /dev/null
+++ b/kde-base/klickety/klickety-4.7.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="A KDE game almost the same as ksame, but a bit different."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Replaced ksame around 4.5.74
+add_blocker ksame

diff --git a/kde-base/klines/klines-4.7.1.ebuild b/kde-base/klines/klines-4.7.1.ebuild
new file mode 100644
index 0000000..094ae8d
--- /dev/null
+++ b/kde-base/klines/klines-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild b/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild
new file mode 100644
index 0000000..c3b92d9
--- /dev/null
+++ b/kde-base/klinkstatus/klinkstatus-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - link validity checker"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug tidy"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	tidy? ( app-text/htmltidy )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_KdepimLibs=ON
+		$(cmake-utils_use_with tidy LibTidy)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To use scripting in ${PN}, install dev-lang/ruby."
+	echo
+}

diff --git a/kde-base/klipper/klipper-4.7.1.ebuild b/kde-base/klipper/klipper-4.7.1.ebuild
new file mode 100644
index 0000000..cd3f5b8
--- /dev/null
+++ b/kde-base/klipper/klipper-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Applet for KDE and X clipboard management"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libtaskmanager)
+	!aqua? ( x11-libs/libXfixes )
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kmag/kmag-4.7.1.ebuild b/kde-base/kmag/kmag-4.7.1.ebuild
new file mode 100644
index 0000000..1e17231
--- /dev/null
+++ b/kde-base/kmag/kmag-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeaccessibility"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE screen magnifier"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kaccessible)
+"

diff --git a/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild b/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild
new file mode 100644
index 0000000..ce68c1b
--- /dev/null
+++ b/kde-base/kmahjongg/kmahjongg-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Mahjongg for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkmahjongg)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkdegames/
+	libkmahjongg/
+"

diff --git a/kde-base/kmail/kmail-4.7.1.ebuild b/kde-base/kmail/kmail-4.7.1.ebuild
new file mode 100644
index 0000000..8c9f09e
--- /dev/null
+++ b/kde-base/kmail/kmail-4.7.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+add_blocker kmailcvt
+add_blocker libksieve
+add_blocker mimelib
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	mailcommon/
+	ontologies/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}

diff --git a/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild b/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild
new file mode 100644
index 0000000..942a2e0
--- /dev/null
+++ b/kde-base/kmenuedit/kmenuedit-4.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE menu editor"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep khotkeys)
+"
+DEPEND=${RDEPEND}
+
+KMEXTRACTONLY="
+	libs/kworkspace/
+"
+
+src_configure() {
+	sed -i -e \
+		"s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
+		kmenuedit/CMakeLists.txt \
+		|| die "sed failed"
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild
new file mode 100644
index 0000000..f8fc853
--- /dev/null
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE application to report the mimetype for a given file"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kmines/kmines-4.7.1.ebuild
similarity index 53%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kmines/kmines-4.7.1.ebuild
index 769eff0..8d87e56 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kmines/kmines-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KMines is a classic mine sweeper game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kmix/kmix-4.7.1.ebuild b/kde-base/kmix/kmix-4.7.1.ebuild
new file mode 100644
index 0000000..f4a8184
--- /dev/null
+++ b/kde-base/kmix/kmix-4.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE mixer gui"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa debug pulseaudio"
+
+DEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+		$(cmake-utils_use_with alsa)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kmousetool/kmousetool-4.7.1.ebuild b/kde-base/kmousetool/kmousetool-4.7.1.ebuild
new file mode 100644
index 0000000..b30823e
--- /dev/null
+++ b/kde-base/kmousetool/kmousetool-4.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeaccessibility"
+	kde_eclass="kde4-meta"
+fi
+
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE program that clicks the mouse for you."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/kmouth/kmouth-4.7.1.ebuild b/kde-base/kmouth/kmouth-4.7.1.ebuild
new file mode 100644
index 0000000..af072b6
--- /dev/null
+++ b/kde-base/kmouth/kmouth-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeaccessibility"
+	kde_eclass="kde4-meta"
+fi
+
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE application that reads what you type out loud. Doesn't include a speech synthesizer."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kmplot/kmplot-4.7.1.ebuild
similarity index 52%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kmplot/kmplot-4.7.1.ebuild
index 769eff0..1c6267d 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kmplot/kmplot-4.7.1.ebuild
@@ -5,8 +5,13 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Mathematical function plotter for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/knetattach/knetattach-4.7.1.ebuild
similarity index 53%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/knetattach/knetattach-4.7.1.ebuild
index 769eff0..5b9c65e 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/knetattach/knetattach-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kde-runtime"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE network wizard"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/knetwalk/knetwalk-4.7.1.ebuild b/kde-base/knetwalk/knetwalk-4.7.1.ebuild
new file mode 100644
index 0000000..ef52732
--- /dev/null
+++ b/kde-base/knetwalk/knetwalk-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Knetwalk is the kde version of the popular NetWalk game for system administrators"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/knewstuff/knewstuff-4.7.1.ebuild b/kde-base/knewstuff/knewstuff-4.7.1.ebuild
new file mode 100644
index 0000000..7c6064c
--- /dev/null
+++ b/kde-base/knewstuff/knewstuff-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE4 software to download and upload 'new stuff'"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/knode/knode-4.7.1.ebuild b/kde-base/knode/knode-4.7.1.ebuild
new file mode 100644
index 0000000..95fd192
--- /dev/null
+++ b/kde-base/knode/knode-4.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kioslave/news
+		"
+	fi
+
+	kde4-meta_src_unpack
+}

diff --git a/kde-base/knotes/knotes-4.7.1.ebuild b/kde-base/knotes/knotes-4.7.1.ebuild
new file mode 100644
index 0000000..b1f0ab9
--- /dev/null
+++ b/kde-base/knotes/knotes-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE Notes application"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-base/knotify/knotify-4.7.1.ebuild b/kde-base/knotify/knotify-4.7.1.ebuild
new file mode 100644
index 0000000..12794be
--- /dev/null
+++ b/kde-base/knotify/knotify-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="The KDE notification daemon."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kolf/kolf-4.7.1.ebuild
similarity index 56%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kolf/kolf-4.7.1.ebuild
index 769eff0..79a86a4 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kolf/kolf-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Minigolf Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kollision/kollision-4.7.1.ebuild
similarity index 54%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kollision/kollision-4.7.1.ebuild
index 769eff0..b9f4e2f 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kollision/kollision-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: A simple ball dodging game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kolourpaint/kolourpaint-4.7.1.ebuild
similarity index 50%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kolourpaint/kolourpaint-4.7.1.ebuild
index 769eff0..ade5a4e 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-4.7.1.ebuild
@@ -5,8 +5,13 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Paint Program for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD LGPL-2"
 IUSE="debug"
+
+DEPEND="media-libs/qimageblitz"
+RDEPEND=${DEPEND}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kommander/kommander-4.7.1.ebuild
similarity index 54%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kommander/kommander-4.7.1.ebuild
index 769eff0..e74b617 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kommander/kommander-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdewebdev"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE dialog system for scripting"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kompare/kompare-4.7.1.ebuild b/kde-base/kompare/kompare-4.7.1.ebuild
new file mode 100644
index 0000000..cb0542d
--- /dev/null
+++ b/kde-base/kompare/kompare-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Kompare is a program to view the differences between files."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild b/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild
new file mode 100644
index 0000000..37c6999
--- /dev/null
+++ b/kde-base/konq-plugins/konq-plugins-4.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="Various plugins for konqueror"
+HOMEPAGE="http://kde.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tidy"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+	tidy? ( app-text/htmltidy )
+"
+RDEPEND="${DEPEND}
+	!kde-misc/konq-plugins
+	$(add_kdebase_dep kcmshell)
+	$(add_kdebase_dep konqueror)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKdeWebKit=OFF
+		-DWebKitPart=OFF
+		$(cmake-utils_use_with tidy LibTidy)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/konqueror/konqueror-4.7.1.ebuild b/kde-base/konqueror/konqueror-4.7.1.ebuild
new file mode 100644
index 0000000..6e4f2bd
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bookmarks debug svg"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
+	svg? ( $(add_kdebase_dep svgpart) )
+"
+
+KMEXTRACTONLY="
+	konqueror/client/
+	lib/konq/
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
+		|| die "Failed to omit .desktop files"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+	elog "emerge -1 kde-base/dolphin:${SLOT}"
+	elog
+	elog "To use Java on webpages: emerge jre"
+	echo
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/konquest/konquest-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/konquest/konquest-4.7.1.ebuild
index 769eff0..0fb4252 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/konquest/konquest-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Galactic Strategy KDE Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/konsole/konsole-4.7.1.ebuild b/kde-base/konsole/konsole-4.7.1.ebuild
new file mode 100644
index 0000000..fbe5e8f
--- /dev/null
+++ b/kde-base/konsole/konsole-4.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+
+KDE_DOC_DIRS="doc/manual"
+
+inherit kde4-base
+
+DESCRIPTION="X terminal for use with KDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+COMMONDEPEND="
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libxklavier-3.2
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
+"
+DEPEND="${COMMONDEPEND}
+	!aqua? (
+		x11-apps/bdftopcf
+		x11-proto/kbproto
+		x11-proto/renderproto
+	)
+"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.4-imagesize.patch"
+	"${FILESDIR}/${PN}-4.7.0-tests.patch"
+)

diff --git a/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild
new file mode 100644
index 0000000..1343ef0
--- /dev/null
+++ b/kde-base/konsolekalendar/konsolekalendar-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"

diff --git a/kde-base/kontact/kontact-4.7.1.ebuild b/kde-base/kontact/kontact-4.7.1.ebuild
new file mode 100644
index 0000000..e0181ab
--- /dev/null
+++ b/kde-base/kontact/kontact-4.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+KMEXTRACTONLY="
+	kontact/plugins/akregator/
+	kontact/plugins/kaddressbook/
+	kontact/plugins/kjots/
+	kontact/plugins/kmail/
+	kontact/plugins/knode/
+	kontact/plugins/knotes/
+	kontact/plugins/korganizer/
+	kontact/plugins/ktimetracker/
+	kontact/plugins/planner/
+	kontact/plugins/specialdates/
+	libkdepimdbusinterfaces/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kontact-admin/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}

diff --git a/kde-base/kopete/kopete-4.7.1.ebuild b/kde-base/kopete/kopete-4.7.1.ebuild
new file mode 100644
index 0000000..f675764
--- /dev/null
+++ b/kde-base/kopete/kopete-4.7.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ssl v4l2"
+
+# tests hang, last checked for 4.2.96
+RESTRICT=test
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
++nowlistening otr +pipes +privacy +statistics +texteffect +translator
++urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	oscar: NO DEPS
+#	qq: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=x11-libs/qt-gui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	jingle? (
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/ortp
+	)
+	meanwhile? ( net-libs/meanwhile )
+	msn? ( >=net-libs/libmsn-4.1 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l2? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
+	yahoo? ( media-libs/jasper )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( app-crypt/qca-ossl )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_prepare() {
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	mycmakeargs=(
+		$(cmake-utils_use_with jingle GOOGLETALK)
+		$(cmake-utils_use_with jingle LiboRTP)
+		$(cmake-utils_use_with jingle Mediastreamer)
+		$(cmake-utils_use_with jingle Speex)
+		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=Libmsn ;;
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	#if use telepathy; then
+	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
+	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
+	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
+	#fi
+
+	if ! use ssl; then
+		if use xmpp || use msn; then # || use irc; then
+			echo
+			elog "In order to use ssl in xmpp and msn you'll need to"
+			elog "install app-crypt/qca-ossl package."
+			echo
+		fi
+	fi
+}

diff --git a/kde-base/korganizer/korganizer-4.7.1.ebuild b/kde-base/korganizer/korganizer-4.7.1.ebuild
new file mode 100644
index 0000000..eeac7fd
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+# Moved after 4.3.90
+add_blocker kontact-specialdates
+
+KMLOADLIBS="kdepim-common-libs"
+
+# xml targets from kmail are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarviews/
+	kdgantt2/
+	kmail/
+	knode/org.kde.knode.xml
+	libkdepimdbusinterfaces/
+"
+
+KMCOMPILEONLY="
+	incidenceeditor-ng/
+	calendarsupport/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.64_missing_header.patch"
+)
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA}
+			kontact/plugins/planner/
+			kontact/plugins/specialdates/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_install() {
+	kde4-meta_src_install
+	# colliding with kdepim-common-libs
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}

diff --git a/kde-base/korundum/korundum-4.7.1.ebuild b/kde-base/korundum/korundum-4.7.1.ebuild
new file mode 100644
index 0000000..8200fb9
--- /dev/null
+++ b/kde-base/korundum/korundum-4.7.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+OPENGL_REQUIRED="always"
+KDE_SCM="git"
+
+USE_RUBY="ruby18"
+# No ruby19 for three reasons:
+# 1) it does not build (yet) - will likely be solved soon
+# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-base ruby-ng
+
+DESCRIPTION="KDE Ruby bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="akonadi debug kate okular semantic-desktop"
+
+DEPEND="
+	$(add_kdebase_dep qtruby)
+	$(add_kdebase_dep smokekde 'akonadi?,kate?,okular?,semantic-desktop=')
+	$(add_kdebase_dep smokeqt)
+"
+RDEPEND="${DEPEND}
+	!dev-ruby/qt4-qtruby
+"
+
+# Split from kdebindings-ruby in 4.7
+add_blocker kdebindings-ruby
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-base_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-base_src_prepare
+}
+
+each_ruby_configure() {
+	CMAKE_USE_DIR=${S}
+	mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}
+
+each_ruby_compile() {
+	CMAKE_USE_DIR=${S}
+	kde4-base_src_compile
+}
+
+each_ruby_install() {
+	CMAKE_USE_DIR=${S}
+	kde4-base_src_install
+}

diff --git a/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild
new file mode 100644
index 0000000..8627194
--- /dev/null
+++ b/kde-base/kpasswdserver/kpasswdserver-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDED Password Module"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kpat/kpat-4.7.1.ebuild
similarity index 56%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kpat/kpat-4.7.1.ebuild
index 769eff0..f21b034 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kpat/kpat-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE patience game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kppp/kppp-4.7.1.ebuild
similarity index 52%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kppp/kppp-4.7.1.ebuild
index 769eff0..f94b96b 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kppp/kppp-4.7.1.ebuild
@@ -5,8 +5,13 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdenetwork"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: A dialer and front-end to pppd."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+RDEPEND="
+	net-dialup/ppp
+"

diff --git a/kde-base/kquitapp/kquitapp-4.7.1.ebuild b/kde-base/kquitapp/kquitapp-4.7.1.ebuild
new file mode 100644
index 0000000..0b050b4
--- /dev/null
+++ b/kde-base/kquitapp/kquitapp-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="A CLI application quitter"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/krdc/krdc-4.7.1.ebuild b/kde-base/krdc/krdc-4.7.1.ebuild
new file mode 100644
index 0000000..a957836
--- /dev/null
+++ b/kde-base/krdc/krdc-4.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug jpeg rdesktop vnc zeroconf"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
+#telepathy? ( >=net-libs/telepathy-qt4-0.18 ) not yet in portage/overlay
+
+DEPEND="
+	jpeg? ( virtual/jpeg )
+	vnc? ( >=net-libs/libvncserver-0.9 )
+	zeroconf? (
+		|| (
+			net-dns/avahi
+			net-misc/mDNSResponder
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	rdesktop? ( net-misc/rdesktop )
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_TelepathyQt4=OFF
+		$(cmake-utils_use_with jpeg)
+		# $(cmake-utils_use_with telepathy TelepathyQt4)
+		$(cmake-utils_use_with vnc LibVNCServer)
+		$(cmake-utils_use_with zeroconf DNSSD)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild b/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild
new file mode 100644
index 0000000..47f4f4d
--- /dev/null
+++ b/kde-base/kreadconfig/kreadconfig-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A command-line tool to read KConfig entries"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild
new file mode 100644
index 0000000..c1e55d9
--- /dev/null
+++ b/kde-base/kremotecontrol/kremotecontrol-4.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE frontend for remote controls"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	${kde_eclass}_src_unpack
+}

diff --git a/kde-base/kreversi/kreversi-4.7.1.ebuild b/kde-base/kreversi/kreversi-4.7.1.ebuild
new file mode 100644
index 0000000..023c4cd
--- /dev/null
+++ b/kde-base/kreversi/kreversi-4.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="KDE Board Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_prepare() {
+	# cmake is doing this really weird
+	sed -i \
+		-e "s:register_ggz_module:#register_ggz_module:g" \
+		${PN}/CMakeLists.txt || die "ggz removal failed"
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}

diff --git a/kde-base/krfb/krfb-4.7.1.ebuild b/kde-base/krfb/krfb-4.7.1.ebuild
new file mode 100644
index 0000000..445e8ae
--- /dev/null
+++ b/kde-base/krfb/krfb-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="VNC-compatible server to share KDE desktops"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	sys-libs/zlib
+	virtual/jpeg
+	!aqua? ( x11-libs/libXdamage )
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/krossjava/krossjava-4.7.1.ebuild b/kde-base/krossjava/krossjava-4.7.1.ebuild
new file mode 100644
index 0000000..32b467c
--- /dev/null
+++ b/kde-base/krossjava/krossjava-4.7.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kross-interpreters"
+KMMODULE="java"
+KDE_SCM="git"
+inherit java-pkg-2 java-ant-2 kde4-meta eutils
+
+DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=virtual/jdk-1.5
+"
+RDEPEND="
+	>=virtual/jre-1.5
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	find "${S}" -iname '*.jar' | xargs rm -v
+	kde4-meta_src_prepare
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	kde4-meta_src_configure
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile
+	cd "${S}/java/${PN}/java/" || die
+	eant makejar
+}
+
+src_install() {
+	kde4-meta_src_install
+	java-pkg_dojar "${ED}/usr/$(get_libdir)/kde4/kross/kross.jar"
+
+	dosym ../../../share/${PN}-${SLOT}/lib/kross.jar \
+		/usr/$(get_libdir)/kde4/kross/kross.jar
+	java-pkg_regso "${ED}/usr/$(get_libdir)/kde4/krossjava.so"
+}
+
+pkg_preinst() {
+	kde4-meta_pkg_preinst
+	java-pkg-2_pkg_preinst
+}

diff --git a/kde-base/krosspython/krosspython-4.7.1.ebuild b/kde-base/krosspython/krosspython-4.7.1.ebuild
new file mode 100644
index 0000000..839c2f8
--- /dev/null
+++ b/kde-base/krosspython/krosspython-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KDE_SCM="git"
+KMNAME="kross-interpreters"
+KMMODULE="python"
+PYTHON_DEPEND="2"
+inherit python kde4-meta
+
+DESCRIPTION="Kross scripting framework: Python interpreter"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}

diff --git a/kde-base/krossruby/krossruby-4.7.1.ebuild b/kde-base/krossruby/krossruby-4.7.1.ebuild
new file mode 100644
index 0000000..8aa4f91
--- /dev/null
+++ b/kde-base/krossruby/krossruby-4.7.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kross-interpreters"
+KMMODULE="ruby"
+KDE_SCM="git"
+
+USE_RUBY="ruby18"
+# No ruby19 for three reasons:
+# 1) it does not build (yet) - will likely be solved soon
+# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-meta ruby-ng
+
+DESCRIPTION="Kross scripting framework: Ruby interpreter"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND=""
+
+# Split from kdebindings-ruby in 4.7
+add_blocker kdebindings-ruby
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-meta_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-meta_src_prepare
+}
+
+each_ruby_configure() {
+	local CMAKE_USE_DIR=${S}
+	local mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_DIR=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+	)
+	kde4-meta_src_configure
+}
+
+each_ruby_compile() {
+	local CMAKE_USE_DIR=${S}
+	kde4-meta_src_compile
+}
+
+each_ruby_install() {
+	local CMAKE_USE_DIR=${S}
+	kde4-meta_src_install
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kruler/kruler-4.7.1.ebuild
similarity index 62%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kruler/kruler-4.7.1.ebuild
index 769eff0..2a459e1 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kruler/kruler-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="A screen ruler for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/krunner/krunner-4.7.1.ebuild b/kde-base/krunner/krunner-4.7.1.ebuild
new file mode 100644
index 0000000..6d77d5d
--- /dev/null
+++ b/kde-base/krunner/krunner-4.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE Command Runner"
+IUSE="debug"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kcheckpass)
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksmserver)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	!aqua? (
+		x11-libs/libXcursor
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${COMMONDEPEND}
+	!aqua? (
+		x11-libs/libXcursor
+		x11-proto/scrnsaverproto
+	)
+"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
+
+KMEXTRACTONLY="
+	libs/kdm/
+	libs/kephal/
+	libs/ksysguard/
+	libs/kworkspace/
+	libs/plasmagenericshell/
+	kcheckpass/
+	ksmserver/org.kde.KSMServerInterface.xml
+	ksysguard/
+	plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
+"
+
+KMLOADLIBS="libkworkspace"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild
new file mode 100644
index 0000000..b5b9461
--- /dev/null
+++ b/kde-base/ksaneplugin/ksaneplugin-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="SANE Plugin for KDE"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libksane)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kscd/kscd-4.7.1.ebuild b/kde-base/kscd/kscd-4.7.1.ebuild
new file mode 100644
index 0000000..973f546
--- /dev/null
+++ b/kde-base/kscd/kscd-4.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE CD player"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
+	media-libs/musicbrainz:3
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkcompactdisc/
+"
+
+src_unpack() {
+	use handbook && KMEXTRA="doc/kcontrol/cddbretrieval"
+
+	kde4-meta_src_unpack
+}

diff --git a/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild b/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild
new file mode 100644
index 0000000..d1ed932
--- /dev/null
+++ b/kde-base/kscreensaver/kscreensaver-4.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE screensaver framework"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pam"
+
+RDEPEND="
+	dev-libs/glib:2
+	$(add_kdebase_dep kcheckpass)
+	>=x11-libs/libxklavier-3.2
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	pam? ( >=kde-base/kdebase-pam-7 )
+"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+"
+
+PATCHES=(
+	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4.5.95-nsfw.patch"
+	"${FILESDIR}/${PN}-4.6.4-xf86misc.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pam)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kshisen/kshisen-4.7.1.ebuild b/kde-base/kshisen/kshisen-4.7.1.ebuild
new file mode 100644
index 0000000..716c3f7
--- /dev/null
+++ b/kde-base/kshisen/kshisen-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="A KDE game similiar to Mahjongg"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkmahjongg)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/ksirk/ksirk-4.7.1.ebuild b/kde-base/ksirk/ksirk-4.7.1.ebuild
new file mode 100644
index 0000000..f57b43a
--- /dev/null
+++ b/kde-base/ksirk/ksirk-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/qca:2
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/ksmserver/ksmserver-4.7.1.ebuild b/kde-base/ksmserver/ksmserver-4.7.1.ebuild
new file mode 100644
index 0000000..50819d7
--- /dev/null
+++ b/kde-base/ksmserver/ksmserver-4.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kcminit/main.h
+	libs/kworkspace/
+	solid/
+"
+
+KMLOADLIBS="libkworkspace"

diff --git a/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild b/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild
new file mode 100644
index 0000000..4f1d38e
--- /dev/null
+++ b/kde-base/ksnapshot/ksnapshot-4.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Screenshot Utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kipi"
+
+DEPEND="
+	kipi? ( $(add_kdebase_dep libkipi) )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7-kipi.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with kipi)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kspaceduel/kspaceduel-4.7.1.ebuild
similarity index 57%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kspaceduel/kspaceduel-4.7.1.ebuild
index 769eff0..49b8180 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Space Game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/ksplash/ksplash-4.7.1.ebuild b/kde-base/ksplash/ksplash-4.7.1.ebuild
new file mode 100644
index 0000000..1a51f3d
--- /dev/null
+++ b/kde-base/ksplash/ksplash-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="3dnow altivec debug mmx sse sse2 xinerama"
+
+COMMONDEPEND="
+	media-libs/libpng
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/ksquares/ksquares-4.7.1.ebuild b/kde-base/ksquares/ksquares-4.7.1.ebuild
new file mode 100644
index 0000000..b1c11fc
--- /dev/null
+++ b/kde-base/ksquares/ksquares-4.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+inherit games-ggz kde4-meta
+
+DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+src_prepare() {
+	# cmake is doing this really weird
+	sed -i \
+		-e "s:register_ggz_module:#register_ggz_module:g" \
+		${PN}/src/CMakeLists.txt || die "ggz removal failed"
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+	# and also we have to prepare the ggz dir
+	insinto "${GGZ_MODDIR}"
+	newins ${PN}/src/module.dsc ${P}.dsc
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	games-ggz_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+	games-ggz_pkg_postrm
+}

diff --git a/kde-base/kstars/kstars-4.7.1.ebuild b/kde-base/kstars/kstars-4.7.1.ebuild
new file mode 100644
index 0000000..0593faf
--- /dev/null
+++ b/kde-base/kstars/kstars-4.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Desktop Planetarium"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug fits indi"
+
+DEPEND="
+	dev-cpp/eigen:2
+	$(add_kdebase_dep libkdeedu)
+	fits? ( >=sci-libs/cfitsio-0.390 )
+	indi? ( >=sci-libs/indilib-0.6.2[fits?] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.65-solaris.patch
+)
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		$(cmake-utils_use_with fits CFitsio)
+		$(cmake-utils_use_with indi)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/kstart/kstart-4.7.1.ebuild b/kde-base/kstart/kstart-4.7.1.ebuild
new file mode 100644
index 0000000..ff99052
--- /dev/null
+++ b/kde-base/kstart/kstart-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Utility to launch applications with special window properties"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kstartperf/kstartperf-4.7.1.ebuild b/kde-base/kstartperf/kstartperf-4.7.1.ebuild
new file mode 100644
index 0000000..27d270c
--- /dev/null
+++ b/kde-base/kstartperf/kstartperf-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="Measures starting performance of applications"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild
new file mode 100644
index 0000000..15f1013
--- /dev/null
+++ b/kde-base/kstartupconfig/kstartupconfig-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Utility to launch applications with special window properties"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kstyles/kstyles-4.7.1.ebuild b/kde-base/kstyles/kstyles-4.7.1.ebuild
new file mode 100644
index 0000000..3be649d
--- /dev/null
+++ b/kde-base/kstyles/kstyles-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE: A set of different KDE styles."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep liboxygenstyle)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libs/oxygen
+"

diff --git a/kde-base/ksudoku/ksudoku-4.7.1.ebuild b/kde-base/ksudoku/ksudoku-4.7.1.ebuild
new file mode 100644
index 0000000..ad8e460
--- /dev/null
+++ b/kde-base/ksudoku/ksudoku-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+OPENGL_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="KDE Sudoku"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	!games-puzzle/ksudoku
+"

diff --git a/kde-base/ksysguard/ksysguard-4.7.1.ebuild b/kde-base/ksysguard/ksysguard-4.7.1.ebuild
new file mode 100644
index 0000000..07f3859
--- /dev/null
+++ b/kde-base/ksysguard/ksysguard-4.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+CPPUNIT_REQUIRED="optional"
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug lm_sensors test"
+
+COMMONDEPEND="
+	x11-libs/libXrender
+	x11-libs/libXres
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}"
+
+KMEXTRA="
+	libs/ksysguard/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with lm_sensors Sensors)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
+	ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
+	ewarn "from untrusted sources!"
+}

diff --git a/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild b/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild
new file mode 100644
index 0000000..67f2194
--- /dev/null
+++ b/kde-base/ksystemlog/ksystemlog-4.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdeadmin"
+
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KDE system log viewer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug test"
+
+RESTRICT=test
+# bug 378101
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	if use test; then
+		# beat this stupid test into shape: the test files contain no year, so
+		# comparison succeeds only in 2007 !!!
+		local theyear=$(date +%Y)
+		einfo Setting the current year as ${theyear} in the test files
+		sed -e "s:2007:${theyear}:g" -i ksystemlog/tests/systemAnalyzerTest.cpp
+
+		# one test consistently fails, so comment it out for the moment
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+	fi
+}

diff --git a/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild
new file mode 100644
index 0000000..f42664f
--- /dev/null
+++ b/kde-base/ksystraycmd/ksystraycmd-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/kteatime/kteatime-4.7.1.ebuild
similarity index 52%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/kteatime/kteatime-4.7.1.ebuild
index 769eff0..14b5ef8 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/kteatime/kteatime-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdetoys"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE utility for making a fine cup of tea"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/ktimer/ktimer-4.7.1.ebuild b/kde-base/ktimer/ktimer-4.7.1.ebuild
new file mode 100644
index 0000000..3dd913c
--- /dev/null
+++ b/kde-base/ktimer/ktimer-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE Timer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild b/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild
new file mode 100644
index 0000000..be16643
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks."
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+	kresources/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+	fi
+
+	kde4-meta_src_unpack
+}

diff --git a/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild b/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild
new file mode 100644
index 0000000..871d461
--- /dev/null
+++ b/kde-base/ktimezoned/ktimezoned-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Timezone daemon"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/ktouch/ktouch-4.7.1.ebuild b/kde-base/ktouch/ktouch-4.7.1.ebuild
new file mode 100644
index 0000000..3af1c5f
--- /dev/null
+++ b/kde-base/ktouch/ktouch-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild b/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild
new file mode 100644
index 0000000..9d21099
--- /dev/null
+++ b/kde-base/ktraderclient/ktraderclient-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="A command-line tool for querying the KDE trader system"
+IUSE="debug"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/ktron/ktron-4.7.1.ebuild
similarity index 51%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/ktron/ktron-4.7.1.ebuild
index 769eff0..d4567d1 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/ktron/ktron-4.7.1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=4
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE Tron game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/ktuberling/ktuberling-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/ktuberling/ktuberling-4.7.1.ebuild
index 769eff0..c533caf 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/ktuberling/ktuberling-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE: potato game for kids"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/kturtle/kturtle-4.7.1.ebuild b/kde-base/kturtle/kturtle-4.7.1.ebuild
new file mode 100644
index 0000000..5cd6569
--- /dev/null
+++ b/kde-base/kturtle/kturtle-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/ktux/ktux-4.7.1.ebuild b/kde-base/ktux/ktux-4.7.1.ebuild
new file mode 100644
index 0000000..be8d272
--- /dev/null
+++ b/kde-base/ktux/ktux-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdetoys"
+inherit kde4-meta
+
+DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# libkworkspace - only as a stub to provide KDE4Workspace config
+DEPEND="
+	$(add_kdebase_dep kscreensaver)
+	$(add_kdebase_dep libkworkspace)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/kubrick/kubrick-4.7.1.ebuild b/kde-base/kubrick/kubrick-4.7.1.ebuild
new file mode 100644
index 0000000..bc322ec
--- /dev/null
+++ b/kde-base/kubrick/kubrick-4.7.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdegames"
+OPENGL_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Kubrick is a game based on \"Rubik's Cube\" puzzle."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kuiserver/kuiserver-4.7.1.ebuild b/kde-base/kuiserver/kuiserver-4.7.1.ebuild
new file mode 100644
index 0000000..89e1f60
--- /dev/null
+++ b/kde-base/kuiserver/kuiserver-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Progress Info UI server"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild b/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild
new file mode 100644
index 0000000..5d4a2ce
--- /dev/null
+++ b/kde-base/kuiviewer/kuiviewer-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdesdk"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE utility that displays and tests UI files generated by Qt Designer."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild
new file mode 100644
index 0000000..8941255
--- /dev/null
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Plugins to manage filtering URIs."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+RESTRICT="test" # Tests segfault. Last checked on 4.0.3.

diff --git a/kde-base/kuser/kuser-4.7.1.ebuild b/kde-base/kuser/kuser-4.7.1.ebuild
new file mode 100644
index 0000000..3ec4f18
--- /dev/null
+++ b/kde-base/kuser/kuser-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdeadmin"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE application that helps you manage system users"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+# notify is needed for dialogs
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep knotify)
+"

diff --git a/kde-base/kwallet/kwallet-4.7.1.ebuild b/kde-base/kwallet/kwallet-4.7.1.ebuild
new file mode 100644
index 0000000..59503b0
--- /dev/null
+++ b/kde-base/kwallet/kwallet-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE Wallet Management Tool"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kwalletd/kwalletd-4.7.1.ebuild b/kde-base/kwalletd/kwalletd-4.7.1.ebuild
new file mode 100644
index 0000000..2e7fd23
--- /dev/null
+++ b/kde-base/kwalletd/kwalletd-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE Password Server"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/kwin/kwin-4.7.1.ebuild b/kde-base/kwin/kwin-4.7.1.ebuild
new file mode 100644
index 0000000..2d89ff9
--- /dev/null
+++ b/kde-base/kwin/kwin-4.7.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gles xinerama"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	opengl? ( >=media-libs/mesa-7.10 )
+	gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	x11-apps/scripts
+"
+
+KMEXTRACTONLY="
+	ksmserver/
+	libs/kephal/
+	libs/oxygen/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
+# you can use just gles or opengl or none
+REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
+
+src_configure() {
+	# FIXME Remove when activity API moved away from libkworkspace
+	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
+
+	mycmakeargs=(
+		$(cmake-utils_use_with gles OpenGLES)
+		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+		-DWITH_X11_Xcomposite=ON
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild b/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild
new file mode 100644
index 0000000..44c0d8e
--- /dev/null
+++ b/kde-base/kwordquiz/kwordquiz-4.7.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"

diff --git a/kde-base/kwrite/kwrite-4.7.1.ebuild b/kde-base/kwrite/kwrite-4.7.1.ebuild
new file mode 100644
index 0000000..e032477
--- /dev/null
+++ b/kde-base/kwrite/kwrite-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE MDI editor/IDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep katepart)
+"

diff --git a/kde-base/kwrited/kwrited-4.7.1.ebuild b/kde-base/kwrited/kwrited-4.7.1.ebuild
new file mode 100644
index 0000000..94fcedf
--- /dev/null
+++ b/kde-base/kwrited/kwrited-4.7.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE daemon listening for wall and write messages."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=sys-libs/libutempter-1.1.5
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/libkcddb/libkcddb-4.7.1.ebuild b/kde-base/libkcddb/libkcddb-4.7.1.ebuild
new file mode 100644
index 0000000..aacf77f
--- /dev/null
+++ b/kde-base/libkcddb/libkcddb-4.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for CDDB"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT=test
+
+DEPEND="
+	musicbrainz? ( media-libs/musicbrainz:3 )
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with musicbrainz MusicBrainz3)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild b/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild
new file mode 100644
index 0000000..deb18c6
--- /dev/null
+++ b/kde-base/libkcompactdisc/libkcompactdisc-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for playing & ripping CDs"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa debug"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with alsa)
+	)
+	kde4-meta_src_configure
+}

diff --git a/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild b/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild
new file mode 100644
index 0000000..3877b2f
--- /dev/null
+++ b/kde-base/libkdcraw/libkdcraw-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE digital camera raw image library wrapper"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	media-libs/lcms:0
+	virtual/jpeg
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild b/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild
new file mode 100644
index 0000000..32b17a0
--- /dev/null
+++ b/kde-base/libkdeedu/libkdeedu-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE educational apps"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
+# see bug 258857 for details.
+RESTRICT=test
+
+add_blocker kvtml-data

diff --git a/kde-base/libkdegames/libkdegames-4.7.1.ebuild b/kde-base/libkdegames/libkdegames-4.7.1.ebuild
new file mode 100644
index 0000000..8712a9a
--- /dev/null
+++ b/kde-base/libkdegames/libkdegames-4.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Base library common to many KDE games."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-games/ggz-client-libs-0.0.14
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0-darwin.patch
+)

diff --git a/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild b/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild
new file mode 100644
index 0000000..1982de5
--- /dev/null
+++ b/kde-base/libkexiv2/libkexiv2-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=media-gfx/exiv2-0.20
+	media-libs/lcms:0
+	virtual/jpeg
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/libkipi/libkipi-4.7.1.ebuild b/kde-base/libkipi/libkipi-4.7.1.ebuild
new file mode 100644
index 0000000..cf64d6d
--- /dev/null
+++ b/kde-base/libkipi/libkipi-4.7.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="A library for image plugins accross KDE applications."
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild
new file mode 100644
index 0000000..fea7a2f
--- /dev/null
+++ b/kde-base/libkmahjongg/libkmahjongg-4.7.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="LibKMahjongg for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+KMLOADLIBS="libkdegames"

diff --git a/kde-base/libkonq/libkonq-4.7.1.ebuild b/kde-base/libkonq/libkonq-4.7.1.ebuild
new file mode 100644
index 0000000..efa001b
--- /dev/null
+++ b/kde-base/libkonq/libkonq-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+KMMODULE="lib/konq"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="The embeddable part of konqueror"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+RESTRICT="test"
+
+KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/${PN}-4.5.56-cmake.patch" )

diff --git a/kde-base/libksane/libksane-4.7.1.ebuild b/kde-base/libksane/libksane-4.7.1.ebuild
new file mode 100644
index 0000000..b7d383c
--- /dev/null
+++ b/kde-base/libksane/libksane-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="SANE Library interface for KDE"
+HOMEPAGE="http://www.kipi-plugins.org"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+LICENSE="LGPL-2"
+
+DEPEND="
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild b/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild
new file mode 100644
index 0000000..bde64f2
--- /dev/null
+++ b/kde-base/libkworkspace/libkworkspace-4.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/kworkspace"
+inherit kde4-meta
+
+DESCRIPTION="A library for KDE desktop applications"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+KMEXTRACTONLY="
+	ksmserver/org.kde.KSMServerInterface.xml
+	kwin/org.kde.KWin.xml
+"
+
+KMSAVELIBS="true"
+
+DEPEND="
+	x11-libs/libxkbfile
+	x11-libs/libXcomposite
+"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
+		libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
+
+	kde4-meta_src_prepare
+}

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild
new file mode 100644
index 0000000..3b0609f
--- /dev/null
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/oxygen"
+inherit kde4-meta
+
+DESCRIPTION="Library to support the Oxygen style in KDE"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild
new file mode 100644
index 0000000..4faf972
--- /dev/null
+++ b/kde-base/libplasmaclock/libplasmaclock-4.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/plasmaclock"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Libraries for KDE Plasma's clocks"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +holidays"
+
+DEPEND="
+	$(add_kdebase_dep kephal)
+	holidays? ( $(add_kdebase_dep kdepimlibs) )
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libs/kephal/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with holidays KdepimLibs)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild
new file mode 100644
index 0000000..0176fdf
--- /dev/null
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/plasmagenericshell"
+inherit kde4-meta
+
+DESCRIPTION="Libraries for the KDE Plasma shell"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug test"
+
+DEPEND="
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+"
+
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libs/kephal/kephal/
+	plasma/desktop/shell/data/
+"

diff --git a/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild
new file mode 100644
index 0000000..d68af8a
--- /dev/null
+++ b/kde-base/libtaskmanager/libtaskmanager-4.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+KMMODULE="libs/taskmanager"
+inherit kde4-meta
+
+DESCRIPTION="A library that provides basic taskmanager functionality"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+KMEXTRACTONLY="
+	libs/kephal/
+	libs/kworkspace/
+"

diff --git a/kde-base/lokalize/lokalize-4.7.1.ebuild b/kde-base/lokalize/lokalize-4.7.1.ebuild
new file mode 100644
index 0000000..3dd5aee
--- /dev/null
+++ b/kde-base/lokalize/lokalize-4.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+PYTHON_DEPEND="2"
+inherit python kde4-meta
+
+DESCRIPTION="KDE4 translation tool"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Althrought they are purely runtime, its too useless without them
+DEPEND="
+	>=app-text/hunspell-1.2.8
+	>=x11-libs/qt-sql-4.5.0:4[sqlite]
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdesdk-strigi-analyzer)
+	$(add_kdebase_dep krosspython)
+	$(add_kdebase_dep pykde4)
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.6.5-hunspell.patch )
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	echo
+	elog "To be able to autofetch KDE translations in new project wizard, install subversion client:"
+	elog "	emerge -vau subversion"
+	echo
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/lskat/lskat-4.7.1.ebuild
similarity index 56%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/lskat/lskat-4.7.1.ebuild
index 769eff0..7d279d1 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/lskat/lskat-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Skat game for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/marble/marble-4.7.1.ebuild b/kde-base/marble/marble-4.7.1.ebuild
new file mode 100644
index 0000000..10b5362
--- /dev/null
+++ b/kde-base/marble/marble-4.7.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+KDE_SCM="git"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +kde plasma python"
+
+# tests fail / segfault. Last checked for 4.2.88
+RESTRICT=test
+
+DEPEND="
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		kde? ( $(add_kdebase_dep pykde4) )
+	)
+"
+RDEPEND="${DEPEND}
+	!sci-geosciences/marble
+"
+
+PATCHES=(
+			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	python_convert_shebangs -r $(python_get_version) .
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		-DWITH_liblocation=0
+	)
+	use kde || mycmakeargs=(
+		-DQTONLY=ON
+		${mycmakeargs[@]}
+	)
+	use kde && mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with python PyKDE4)
+		${mycmakeargs[@]}
+	)
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	if use plasma; then
+		insinto /usr/share/apps/cmake/modules
+		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
+	fi
+	kde4-base_src_install
+}

diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild b/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild
new file mode 100644
index 0000000..3c8ca23
--- /dev/null
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kdemultimedia"
+inherit kde4-meta
+
+DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers."
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=41180"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	!media-video/mplayerthumbs
+	|| (
+		$(add_kdebase_dep dolphin)
+		$(add_kdebase_dep konqueror)
+	)
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_PHONON_SUPPORT=ON
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/nepomuk/nepomuk-4.7.1.ebuild b/kde-base/nepomuk/nepomuk-4.7.1.ebuild
new file mode 100644
index 0000000..29f2b20
--- /dev/null
+++ b/kde-base/nepomuk/nepomuk-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="Nepomuk KDE4 client"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=app-misc/strigi-0.6.3[dbus,qt4]
+	>=dev-libs/soprano-2.6.51[dbus,raptor,redland,virtuoso]
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	!kde-misc/nepomukcontroller
+"
+RDEPEND="${DEPEND}"
+
+# BLOCKS:
+# kde-base/akonadi: installed nepomuk ontologies, which were supposed to be here
+add_blocker akonadi '<4.2.60'

diff --git a/kde-base/nsplugins/nsplugins-4.7.1.ebuild b/kde-base/nsplugins/nsplugins-4.7.1.ebuild
new file mode 100644
index 0000000..d2a4651
--- /dev/null
+++ b/kde-base/nsplugins/nsplugins-4.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="Netscape plugins support for Konqueror."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	x11-libs/libXt
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep konqueror)
+"
+
+KMEXTRACTONLY="
+	konqueror/settings/
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )

diff --git a/kde-base/okteta/okteta-4.7.1.ebuild b/kde-base/okteta/okteta-4.7.1.ebuild
new file mode 100644
index 0000000..4335970
--- /dev/null
+++ b/kde-base/okteta/okteta-4.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KDE hexeditor"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/qca:2
+"
+RDEPEND="${DEPEND}"
+
+# Tests hang, last checked in 4.3.3
+RESTRICT="test"

diff --git a/kde-base/okular/okular-4.7.1.ebuild b/kde-base/okular/okular-4.7.1.ebuild
new file mode 100644
index 0000000..325572b
--- /dev/null
+++ b/kde-base/okular/okular-4.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/qimageblitz
+	sys-libs/zlib
+	chm? ( dev-libs/chmlib )
+	crypt? ( app-crypt/qca:2 )
+	djvu? ( app-text/djvu )
+	ebook? ( app-text/ebook-tools )
+	jpeg? ( virtual/jpeg:0 )
+	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions] )
+	ps? ( app-text/libspectre )
+	tiff? ( media-libs/tiff )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with chm)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with djvu DjVuLibre)
+		$(cmake-utils_use_with ebook EPub)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with ps LibSpectre)
+		$(cmake-utils_use_with pdf PopplerQt4)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with tiff)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild
similarity index 91%
copy from kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild
copy to kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild
index 7d171d4..69d0f47 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.7.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	KMNAME="kdesupport"
 else
 	# Upstream does not ship releases properly so we dont want all versions
-	MY_PV="4.6.2"
+	MY_PV="4.7.0"
 	MY_P="${PN}-${MY_PV}"
 fi
 KDE_REQUIRED="never"
@@ -26,7 +26,7 @@ SRC_URI="
 "
 
 LICENSE="LGPL-3"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="aqua bindist"
 
 DEPEND="

diff --git a/kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild
index 7d171d4..27d9e7d 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.7.49.9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	KMNAME="kdesupport"
 else
 	# Upstream does not ship releases properly so we dont want all versions
-	MY_PV="4.6.2"
+	MY_PV="4.7.0"
 	MY_P="${PN}-${MY_PV}"
 fi
 KDE_REQUIRED="never"

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/palapeli/palapeli-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/palapeli/palapeli-4.7.1.ebuild
index 769eff0..f179c3d 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/palapeli/palapeli-4.7.1.ebuild
@@ -5,8 +5,9 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-inherit kde4-base
+KMNAME="kdegames"
+inherit kde4-meta
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="KDE jigsaw puzzle game"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/parley/parley-4.7.1.ebuild b/kde-base/parley/parley-4.7.1.ebuild
new file mode 100644
index 0000000..9fbba24
--- /dev/null
+++ b/kde-base/parley/parley-4.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Educational: vocabulary trainer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +plasma"
+
+DEPEND="
+	$(add_kdebase_dep libkdeedu)
+"
+
+KMEXTRACTONLY="
+	libkdeedu/keduvocdocument
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with plasma)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-base/perlkde/perlkde-4.7.1.ebuild b/kde-base/perlkde/perlkde-4.7.1.ebuild
new file mode 100644
index 0000000..c84f4e8
--- /dev/null
+++ b/kde-base/perlkde/perlkde-4.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Perl bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="akonadi attica debug kate okular semantic-desktop test"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep perlqt)
+	$(add_kdebase_dep smokekde 'akonadi?,attica?,kate?,okular?,semantic-desktop=')
+	semantic-desktop? ( >=dev-libs/soprano-2.6.51 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/List-MoreUtils )
+"
+
+# Split from kdebindings-perl in 4.7
+add_blocker kdebindings-perl
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/perlqt/perlqt-4.7.1.ebuild b/kde-base/perlqt/perlqt-4.7.1.ebuild
new file mode 100644
index 0000000..762a6f8
--- /dev/null
+++ b/kde-base/perlqt/perlqt-4.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DECLARATIVE_REQUIRED="optional"
+MULTIMEDIA_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
+KDE_REQUIRED="never"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Qt Perl bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug phonon qimageblitz qscintilla qwt webkit"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/List-MoreUtils )
+"
+
+# Split from kdebindings-perl in 4.7
+add_blocker kdebindings-perl
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_Qt3Support=ON
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_disable qthelp QtHelp)
+		$(cmake-utils_use_disable qwt)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild b/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild
new file mode 100644
index 0000000..da1bc67
--- /dev/null
+++ b/kde-base/phonon-kde/phonon-kde-4.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="phonon"
+inherit kde4-meta
+
+DESCRIPTION="Phonon KDE Integration"
+HOMEPAGE="http://phonon.kde.org"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="alsa debug xine pulseaudio"
+
+DEPEND="
+	>=media-libs/phonon-4.4.3[xine?]
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_tests=OFF
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with xine)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild b/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild
new file mode 100644
index 0000000..0e49c0f
--- /dev/null
+++ b/kde-base/plasma-apps/plasma-apps-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-baseapps"
+KMMODULE="plasma"
+inherit kde4-meta
+
+DESCRIPTION="Additional Applets for Plasma"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild
new file mode 100644
index 0000000..4ce2fc0
--- /dev/null
+++ b/kde-base/plasma-runtime/plasma-runtime-4.7.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="plasma"
+DECLARATIVE_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="Script engine and package tool for plasma"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# cloned from workspace thus introduce collisions.
+add_blocker plasma-workspace '<4.5.60'
+add_blocker kdelibs '<4.5.60'

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild
new file mode 100644
index 0000000..09f4032
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		>=dev-python/sip-4.7.1
+		$(add_kdebase_dep pykde4)
+	)
+	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	rss? ( dev-libs/boost )
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep activitymanager)
+	$(add_kdebase_dep plasma-runtime)
+"
+
+KMEXTRA="
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	rm -f \
+		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+		"${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4 \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			PyKDE4 \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}

diff --git a/kde-base/powerdevil/powerdevil-4.7.1.ebuild b/kde-base/powerdevil/powerdevil-4.7.1.ebuild
new file mode 100644
index 0000000..4a760b1
--- /dev/null
+++ b/kde-base/powerdevil/powerdevil-4.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
+HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +pm-utils"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}
+	!sys-power/powerdevil
+	pm-utils? ( sys-power/pm-utils )
+"
+
+KMEXTRACTONLY="
+	krunner/
+	ksmserver/org.kde.KSMServerInterface.xml
+"

diff --git a/kde-base/printer-applet/printer-applet-4.7.1.ebuild b/kde-base/printer-applet/printer-applet-4.7.1.ebuild
new file mode 100644
index 0000000..74db717
--- /dev/null
+++ b/kde-base/printer-applet/printer-applet-4.7.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+PYTHON_DEPEND="2"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit python ${kde_eclass}
+
+DESCRIPTION="KDE printer system tray utility"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=app-admin/system-config-printer-common-1.2.2
+	$(add_kdebase_dep pykde4)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	${kde_eclass}_pkg_setup
+	python_set_active_version 2
+}
+
+src_prepare() {
+	${kde_eclass}_src_prepare
+
+	# Rename printer-applet -> printer-applet-kde
+	local newname="printer-applet-kde"
+	sed -e "/PYKDE4_ADD_EXECUTABLE/s/ printer-applet[[:space:]]*)/ ${newname})/" \
+		-e "/install/s/)/ RENAME ${newname}.desktop)/" \
+		-i CMakeLists.txt || die "failed to rename printer-applet executable"
+	sed -e "/Exec/s/printer-applet/${newname}/" \
+		-i printer-applet.desktop || die "failed to patch .desktop file"
+}
+
+src_install() {
+	${kde_eclass}_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${PREFIX}share/apps/${PN}"
+}

diff --git a/kde-base/pykde4/pykde4-4.7.1.ebuild b/kde-base/pykde4/pykde4-4.7.1.ebuild
new file mode 100644
index 0000000..25bf51a
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.7.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
+KDE_SCM="git"
+inherit python portability kde4-base
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="
+	!dev-python/pykde
+	>=dev-python/sip-4.12.3-r2
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
+)
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-base_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
+}
+
+src_install() {
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
+	}
+	python_execute_function installation
+
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+}

diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild
new file mode 100644
index 0000000..de6b5b6
--- /dev/null
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.7.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/qtruby/qtruby-4.7.1.ebuild b/kde-base/qtruby/qtruby-4.7.1.ebuild
new file mode 100644
index 0000000..68b3da8
--- /dev/null
+++ b/kde-base/qtruby/qtruby-4.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+OPENGL_REQUIRED="always"
+DECLARATIVE_REQUIRED="optional"
+KDE_REQUIRED="never"
+KDE_SCM="git"
+USE_RUBY="ruby18"
+# No ruby19 for three reasons:
+# 1) it does not build (yet) - will likely be solved soon
+# 2) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 3) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-base ruby-ng
+
+DESCRIPTION="Qt Ruby bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug phonon qscintilla qwt webkit"
+
+DEPEND="
+	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
+"
+
+RDEPEND="${DEPEND}
+	!dev-ruby/qt4-qtruby
+"
+
+# Split from kdebindings-ruby in 4.7
+add_blocker kdebindings-ruby
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-base_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-base_src_prepare
+}
+
+each_ruby_configure() {
+	local CMAKE_USE_DIR=${S}
+	mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
+
+each_ruby_compile() {
+	local CMAKE_USE_DIR=${S}
+	kde4-base_src_compile
+}
+
+each_ruby_install() {
+	local CMAKE_USE_DIR=${S}
+	kde4-base_src_install
+}

diff --git a/kde-base/qyoto/qyoto-4.7.1.ebuild b/kde-base/qyoto/qyoto-4.7.1.ebuild
new file mode 100644
index 0000000..75e905a
--- /dev/null
+++ b/kde-base/qyoto/qyoto-4.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_REQUIRED="never"
+KDE_SCM="git"
+inherit kde4-base mono
+
+DESCRIPTION="C# bindings for Qt"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +phonon qscintilla webkit"
+
+DEPEND="
+	dev-lang/mono
+	$(add_kdebase_dep smokeqt 'opengl,phonon?,qscintilla?,webkit?')
+"
+RDEPEND="${DEPEND}"
+
+# Split from kdebindings-csharp in 4.7
+add_blocker kdebindings-csharp
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_disable qscintilla QScintilla)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild
new file mode 100644
index 0000000..1b8c765
--- /dev/null
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMMODULE="renamedlgplugins"
+inherit kde4-meta
+
+DESCRIPTION="KDE RenameDlg plugins"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/rocs/rocs-4.7.1.ebuild b/kde-base/rocs/rocs-4.7.1.ebuild
new file mode 100644
index 0000000..87f5857
--- /dev/null
+++ b/kde-base/rocs/rocs-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE4 interface to work with Graph Theory"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="dev-libs/boost"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+RESTRICT="test"
+# bug 376909

diff --git a/kde-base/smokegen/smokegen-4.7.1.ebuild b/kde-base/smokegen/smokegen-4.7.1.ebuild
new file mode 100644
index 0000000..2074738
--- /dev/null
+++ b/kde-base/smokegen/smokegen-4.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_REQUIRED="never"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Scripting Meta Object Kompiler Engine - generators"
+KEYWORDS="~amd64 ~x86"
+IUSE="aqua debug"
+
+DEPEND="
+	x11-libs/qt-core:4[aqua=]
+"
+RDEPEND="${DEPEND}"
+
+add_blocker smoke

diff --git a/kde-base/smokekde/smokekde-4.7.1.ebuild b/kde-base/smokekde/smokekde-4.7.1.ebuild
new file mode 100644
index 0000000..6a5936c
--- /dev/null
+++ b/kde-base/smokekde/smokekde-4.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+
+inherit kde4-base
+
+DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="akonadi attica debug kate okular semantic-desktop"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep smokeqt)
+	akonadi? ( $(add_kdebase_dep kdepimlibs) )
+	attica? ( dev-libs/libattica )
+	kate? ( $(add_kdebase_dep kate) )
+	okular? ( $(add_kdebase_dep okular) )
+"
+RDEPEND="${DEPEND}"
+
+add_blocker smoke
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/smokeqt/smokeqt-4.7.1.ebuild b/kde-base/smokeqt/smokeqt-4.7.1.ebuild
new file mode 100644
index 0000000..898a31f
--- /dev/null
+++ b/kde-base/smokeqt/smokeqt-4.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DECLARATIVE_REQUIRED="optional"
+MULTIMEDIA_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+KDE_REQUIRED="never"
+
+KDE_SCM="git"
+
+inherit kde4-base
+
+DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +phonon qimageblitz qscintilla qwt webkit"
+
+# Maybe make more of Qt optional?
+DEPEND="
+	$(add_kdebase_dep smokegen)
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-script:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-test:4
+	phonon? ( >=media-libs/phonon-4.4.3 )
+	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
+	qscintilla? ( x11-libs/qscintilla )
+	qwt? ( x11-libs/qwt:5 )
+	webkit? ( x11-libs/qt-webkit:4 )
+"
+RDEPEND="${DEPEND}"
+
+# Split in 4.7
+add_blocker smoke
+
+src_configure() {
+	mycmakeargs=(
+		-DDISABLE_Qt3Support=ON
+		-DWITH_QT3_SUPPORT=OFF
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_disable qthelp QtHelp)
+		$(cmake-utils_use_disable qwt Qwt5)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild b/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild
new file mode 100644
index 0000000..0a8e24d
--- /dev/null
+++ b/kde-base/solid-runtime/solid-runtime-4.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-runtime"
+KMNOMODULE=true
+inherit kde4-meta
+
+DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# Packages merged around 4.3.77
+add_blocker solidautoeject
+add_blocker solid-device-automounter
+add_blocker solid-hardware
+add_blocker soliduiserver
+# Moved away from workspace
+add_blocker solid '<4.5.69'
+
+KMEXTRA="
+	solid-device-automounter/
+	solid-hardware/
+	solid-networkstatus/
+	solidautoeject/
+	soliduiserver/
+"

diff --git a/kde-base/solid/solid-4.7.1.ebuild b/kde-base/solid/solid-4.7.1.ebuild
new file mode 100644
index 0000000..8841576
--- /dev/null
+++ b/kde-base/solid/solid-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+CPPUNIT_REQUIRED="test"
+inherit kde4-meta
+
+DESCRIPTION="Solid: the KDE hardware library"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug bluetooth networkmanager wicd"
+
+DEPEND="
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	wicd? ( net-misc/wicd )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep solid-runtime)
+"
+
+PDEPEND="bluetooth? ( net-wireless/bluedevil )"
+
+KMEXTRA="
+	libs/solid/
+"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with networkmanager NetworkManager)
+		$(cmake-utils_use_build wicd)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/step/step-4.7.1.ebuild b/kde-base/step/step-4.7.1.ebuild
new file mode 100644
index 0000000..be7a4fe
--- /dev/null
+++ b/kde-base/step/step-4.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="The KDE physics simulator"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +gsl +qalculate"
+
+DEPEND="
+	>=dev-cpp/eigen-2.0.3:2
+	sci-libs/cln
+	>=sci-mathematics/gmm-3.0
+	gsl? ( >=sci-libs/gsl-1.9-r1 )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.2-solaris.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with gsl)
+		$(cmake-utils_use_with qalculate)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-base/superkaramba/superkaramba-4.7.1.ebuild b/kde-base/superkaramba/superkaramba-4.7.1.ebuild
new file mode 100644
index 0000000..3bed0ad
--- /dev/null
+++ b/kde-base/superkaramba/superkaramba-4.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit python ${kde_eclass}
+
+DESCRIPTION="A tool to create interactive applets for the KDE desktop."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug python"
+
+DEPEND="
+	media-libs/qimageblitz
+	python? ( $(add_kdebase_dep pykde4) )
+"
+RDEPEND="${DEPEND}
+	python? ( $(add_kdebase_dep krosspython) )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
+
+pkg_setup() {
+	${kde_eclass}_pkg_setup
+	python_set_active_version 2
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with python PythonLibs)
+	)
+
+	${kde_eclass}_src_configure
+}

diff --git a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild b/kde-base/svgpart/svgpart-4.7.1.ebuild
similarity index 55%
copy from kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
copy to kde-base/svgpart/svgpart-4.7.1.ebuild
index 769eff0..cef709d 100644
--- a/kde-base/kfloppy/kfloppy-4.7.49.9999.ebuild
+++ b/kde-base/svgpart/svgpart-4.7.1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=4
 
-KDE_HANDBOOK="optional"
+KDE_SCM="git"
 inherit kde4-base
 
-DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS=""
+DESCRIPTION="Svgpart is a kpart for viewing SVGs"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

diff --git a/kde-base/sweeper/sweeper-4.7.1.ebuild b/kde-base/sweeper/sweeper-4.7.1.ebuild
new file mode 100644
index 0000000..a9d1f41
--- /dev/null
+++ b/kde-base/sweeper/sweeper-4.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="KDE Privacy Settings Widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"

diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild
new file mode 100644
index 0000000..eef77c1
--- /dev/null
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+KMNAME="kdeadmin"
+PYTHON_DEPEND="2"
+inherit python kde4-meta
+
+DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=app-admin/system-config-printer-common-1.2.2
+	>=dev-python/pycups-1.9.49
+	$(add_kdebase_dep pykde4)
+"
+RDEPEND="${DEPEND}
+	net-print/cups[dbus]
+"
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${PREFIX}share/apps/${PN}"
+}

diff --git a/kde-base/systemsettings/systemsettings-4.7.1.ebuild b/kde-base/systemsettings/systemsettings-4.7.1.ebuild
new file mode 100644
index 0000000..8e8243b
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.7.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug gtk +usb xinerama"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	dev-libs/glib:2
+	$(add_kdebase_dep libkworkspace)
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( =virtual/libusb-0* )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	sys-libs/timezone-data
+	x11-apps/setxkbmap
+	x11-misc/xkeyboard-config
+	gtk? ( kde-misc/kcm-gtk-config )
+"
+
+KMEXTRA="
+	kcontrol/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.kde.krunner.App.xml
+	krunner/dbus/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/
+"
+
+add_blocker kcontrol '<4.3.98'
+add_blocker konqueror '<4.4.70'
+add_blocker kdeaccessibility-colorschemes '<4.6.50'
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kcontrol
+			doc/kfontview
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
+		systemsettings/CMakeLists.txt \
+		|| die "Failed to fix systemsettingsrc install location"
+
+	kde4-meta_src_prepare
+}
+
+# FIXME: is have_openglxvisual found without screensaver
+src_configure() {
+	# Old keyboard-detection code is unmaintained,
+	# so we force the new stuff, using libxklavier.
+	mycmakeargs=(
+		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with usb)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+	)
+
+	kde4-meta_src_configure
+}

diff --git a/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild b/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild
new file mode 100644
index 0000000..2038eb3
--- /dev/null
+++ b/kde-base/thumbnailers/thumbnailers-4.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+KMNAME="kdegraphics-thumbnailers"
+inherit kde4-base
+
+DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	media-libs/lcms:0
+"
+RDEPEND="${DEPEND}"
+
+add_blocker kdegraphics-strigi-analyzer '<4.2.91'
+
+S="${WORKDIR}/${KMNAME}-${PV}"

diff --git a/kde-base/umbrello/umbrello-4.7.1.ebuild b/kde-base/umbrello/umbrello-4.7.1.ebuild
new file mode 100644
index 0000000..6ad5b57
--- /dev/null
+++ b/kde-base/umbrello/umbrello-4.7.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdesdk"
+
+inherit kde4-meta
+
+DESCRIPTION="KDE UML Modeller"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"