public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-apps/kleopatra/, kde-apps/kig/, kde-apps/akonadi-calendar/, ...
@ 2016-03-25 14:00 Michael Palimaka
  0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-03-25 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     29f1bba8540d704ff85472599b57c5f3f90697d9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 20 19:48:11 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 13:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=29f1bba8

kde-apps: Add 16.04 stable branch

With a few exceptions:
- kde-runtime: No commits since 15.12
- kde-baseapps: No commits since 15.12
- kdeaccessibility-meta: No commits since 15.12
- kdewebdev-meta: No commits in years
- libkdeedu:4: Slated for removal in 16.08 but already unused

Package-Manager: portage-2.2.27

 ...build => akonadi-calendar-16.04.49.9999.ebuild} |   4 +-
 .../akonadi-calendar/akonadi-calendar-9999.ebuild  |   4 +-
 .../akonadi-contact-16.04.49.9999.ebuild}          |  47 +++---
 .../akonadi-mime-16.04.49.9999.ebuild}             |  38 ++---
 .../akonadi-notes-16.04.49.9999.ebuild             |  37 +++++
 .../akonadi-search-16.04.49.9999.ebuild}           |  26 +---
 .../akonadi-socialutils-16.04.49.9999.ebuild       |  39 +++++
 kde-apps/akonadi/akonadi-16.04.49.9999.ebuild      | 125 +++++++++++++++
 .../akonadiconsole-16.04.49.9999.ebuild            |  64 ++++++++
 kde-apps/akregator/akregator-16.04.49.9999.ebuild  |  75 +++++++++
 ...a-9999.ebuild => analitza-16.04.49.9999.ebuild} |   2 +-
 kde-apps/analitza/analitza-9999.ebuild             |   2 +-
 kde-apps/ark/ark-16.04.49.9999.ebuild              |  59 ++++++++
 .../artikulate/artikulate-16.04.49.9999.ebuild     |  44 ++++++
 .../audiocd-kio/audiocd-kio-16.04.49.9999.ebuild   |  33 ++++
 ...9.ebuild => baloo-widgets-16.04.49.9999.ebuild} |   1 +
 kde-apps/baloo-widgets/baloo-widgets-9999.ebuild   |   1 +
 .../blinken-16.04.49.9999.ebuild}                  |  19 ++-
 kde-apps/blogilo/blogilo-16.04.49.9999.ebuild      |  62 ++++++++
 ...ber-9999.ebuild => bomber-16.04.49.9999.ebuild} |   3 +-
 kde-apps/bomber/bomber-9999.ebuild                 |   3 +-
 ...{bovo-9999.ebuild => bovo-16.04.49.9999.ebuild} |   3 +-
 kde-apps/bovo/bovo-9999.ebuild                     |   3 +-
 .../calendarjanitor-16.04.49.9999.ebuild           |  58 +++++++
 .../calendarsupport-16.04.49.9999.ebuild}          |  18 ++-
 ...tor-9999.ebuild => cantor-16.04.49.9999.ebuild} |  26 +++-
 kde-apps/cantor/cantor-9999.ebuild                 |  26 +++-
 kde-apps/cantor/files/cantor-15.12.3-tests.patch   |  49 ++++++
 kde-apps/cervisia/cervisia-16.04.49.9999.ebuild    |  17 +++
 .../dolphin-plugins-16.04.49.9999.ebuild           |  75 +++++++++
 kde-apps/dolphin/dolphin-16.04.49.9999.ebuild      |  85 +++++++++++
 .../dragon-16.04.49.9999.ebuild}                   |  21 ++-
 ...9999.ebuild => eventviews-16.04.49.9999.ebuild} |   2 +-
 kde-apps/eventviews/eventviews-9999.ebuild         |   2 +-
 .../ffmpegthumbs/ffmpegthumbs-16.04.49.9999.ebuild |  22 +++
 .../filelight-16.04.49.9999.ebuild}                |  12 +-
 .../gpgmepp-16.04.49.9999.ebuild}                  |  13 +-
 ...-9999.ebuild => granatier-16.04.49.9999.ebuild} |   3 +-
 kde-apps/granatier/granatier-9999.ebuild           |   3 +-
 .../grantleetheme-16.04.49.9999.ebuild}            |  18 ++-
 kde-apps/gwenview/gwenview-16.04.49.9999.ebuild    |  89 +++++++++++
 .../incidenceeditor-16.04.49.9999.ebuild}          |  16 +-
 kde-apps/juk/juk-16.04.49.9999.ebuild              |  27 ++++
 .../kaccounts-integration-16.04.49.9999.ebuild     |  39 +++++
 .../kaccounts-mobile/kaccounts-mobile-9999.ebuild  |   2 +-
 ...ld => kaccounts-providers-16.04.49.9999.ebuild} |   2 +-
 .../kaccounts-providers-9999.ebuild                |   2 +-
 .../kaddressbook-16.04.49.9999.ebuild}             |  61 +++++---
 kde-apps/kajongg/kajongg-16.04.49.9999.ebuild      |  36 +++++
 kde-apps/kalarmcal/kalarmcal-16.04.49.9999.ebuild  |  24 +++
 kde-apps/kalgebra/kalgebra-16.04.49.9999.ebuild    |  47 ++++++
 .../kalzium/files/kalzium-15.12.3-plasmoids.patch  |  23 +++
 ...um-9999.ebuild => kalzium-16.04.49.9999.ebuild} |  18 +--
 kde-apps/kalzium/kalzium-9999.ebuild               |  16 +-
 ...era-9999.ebuild => kamera-16.04.49.9999.ebuild} |   5 +-
 kde-apps/kamera/kamera-9999.ebuild                 |   5 +-
 ...m-9999.ebuild => kanagram-16.04.49.9999.ebuild} |   6 +-
 kde-apps/kanagram/kanagram-9999.ebuild             |   2 +-
 ...man-9999.ebuild => kapman-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kapman/kapman-9999.ebuild                 |   2 +-
 ...99.ebuild => kapptemplate-16.04.49.9999.ebuild} |   1 -
 kde-apps/kapptemplate/kapptemplate-9999.ebuild     |   1 -
 kde-apps/kate/kate-16.04.49.9999.ebuild            |  63 ++++++++
 ...ic-9999.ebuild => katomic-16.04.49.9999.ebuild} |   2 +-
 kde-apps/katomic/katomic-9999.ebuild               |   2 +-
 ...-9999.ebuild => kblackbox-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kblackbox/kblackbox-9999.ebuild           |   2 +-
 ...ks-9999.ebuild => kblocks-16.04.49.9999.ebuild} |   4 +-
 kde-apps/kblocks/kblocks-9999.ebuild               |   4 +-
 .../kblog-16.04.49.9999.ebuild}                    |   8 +-
 ...ce-9999.ebuild => kbounce-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kbounce/kbounce-9999.ebuild               |   2 +-
 ...-9999.ebuild => kbreakout-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kbreakout/kbreakout-9999.ebuild           |   2 +-
 .../kbruch-16.04.49.9999.ebuild}                   |  14 +-
 .../kcachegrind/kcachegrind-16.04.49.9999.ebuild   |  18 +++
 .../kcalc-16.04.49.9999.ebuild}                    |  28 ++--
 .../kcalcore-16.04.49.9999.ebuild}                 |  20 +--
 ...-9999.ebuild => kcalutils-16.04.49.9999.ebuild} |   7 +-
 kde-apps/kcalutils/kcalutils-9999.ebuild           |   7 +-
 .../kcharselect-16.04.49.9999.ebuild}              |  16 +-
 .../kcolorchooser-16.04.49.9999.ebuild}            |  13 +-
 .../kcontacts-16.04.49.9999.ebuild}                |  23 ++-
 .../kcron-16.04.49.9999.ebuild}                    |  12 +-
 ...9.ebuild => kde-apps-meta-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild   |   2 +-
 .../kde-dev-scripts-16.04.49.9999.ebuild           |  26 ++++
 .../kde-dev-utils-16.04.49.9999.ebuild             |  11 ++
 ...a-9999.ebuild => kde-meta-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kde-meta/kde-meta-9999.ebuild             |   2 +-
 .../kdeadmin-meta-16.04.49.9999.ebuild             |  18 +++
 .../kdebugsettings-16.04.49.9999.ebuild}           |  15 +-
 ...99.ebuild => kdecore-meta-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kdecore-meta/kdecore-meta-9999.ebuild     |   2 +-
 ...999.ebuild => kdeedu-data-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kdeedu-data/kdeedu-data-9999.ebuild       |   2 +-
 ...999.ebuild => kdeedu-meta-16.04.49.9999.ebuild} |   1 -
 kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild       |   1 -
 .../kdegames-meta-16.04.49.9999.ebuild             |  58 +++++++
 .../kdegraphics-meta-16.04.49.9999.ebuild          |  32 ++++
 .../kdegraphics-mobipocket-16.04.49.9999.ebuild    |  11 ++
 .../kdemultimedia-meta-16.04.49.9999.ebuild        |  29 ++++
 .../kdenetwork-filesharing-16.04.49.9999.ebuild}   |  19 ++-
 ...ebuild => kdenetwork-meta-16.04.49.9999.ebuild} |   6 +-
 .../kdenetwork-meta/kdenetwork-meta-9999.ebuild    |   6 +-
 kde-apps/kdenetwork-meta/metadata.xml              |   1 +
 kde-apps/kdenlive/kdenlive-16.04.49.9999.ebuild    |  66 ++++++++
 .../kdepim-addons-16.04.49.9999.ebuild             |  79 ++++++++++
 ...build => kdepim-apps-libs-16.04.49.9999.ebuild} |   4 +-
 .../kdepim-apps-libs/kdepim-apps-libs-9999.ebuild  |   4 +-
 .../kdepim-kioslaves-16.04.49.9999.ebuild          |  50 ++++++
 .../kdepim-meta/kdepim-meta-16.04.49.9999.ebuild   |  70 +++++++++
 .../kdepim-runtime-16.04.49.9999.ebuild            |  81 ++++++++++
 kde-apps/kdepim/kdepim-16.04.49.9999.ebuild        | 159 ++++++++++++++++++++
 .../kdesdk-kioslaves-16.04.49.9999.ebuild          |  31 ++++
 .../kdesdk-meta/kdesdk-meta-16.04.49.9999.ebuild   |  29 ++++
 .../kdesdk-thumbnailers-16.04.49.9999.ebuild}      |  11 +-
 .../kdeutils-meta-16.04.49.9999.ebuild             |  30 ++++
 kde-apps/kdf/kdf-16.04.49.9999.ebuild              |  13 ++
 .../kdgantt2-16.04.49.9999.ebuild}                 |  20 +--
 ...d-9999.ebuild => kdiamond-16.04.49.9999.ebuild} |   3 +-
 kde-apps/kdiamond/kdiamond-9999.ebuild             |   3 +-
 .../kfloppy-16.04.49.9999.ebuild}                  |  15 +-
 ...999.ebuild => kfourinline-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kfourinline/kfourinline-9999.ebuild       |   2 +-
 ...9999.ebuild => kgeography-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kgeography/kgeography-9999.ebuild         |   2 +-
 kde-apps/kget/kget-16.04.49.9999.ebuild            |  40 +++++
 .../kgoldrunner/kgoldrunner-16.04.49.9999.ebuild   |  24 +++
 kde-apps/kgpg/kgpg-16.04.49.9999.ebuild            |  30 ++++
 ...n-9999.ebuild => khangman-16.04.49.9999.ebuild} |   2 +-
 kde-apps/khangman/khangman-9999.ebuild             |   2 +-
 .../kholidays-16.04.49.9999.ebuild}                |   6 +-
 .../kidentitymanagement-16.04.49.9999.ebuild}      |  11 +-
 .../{kig-9999.ebuild => kig-16.04.49.9999.ebuild}  |   3 +-
 kde-apps/kig/kig-9999.ebuild                       |   3 +-
 kde-apps/kigo/kigo-16.04.49.9999.ebuild            |  18 +++
 ...s-9999.ebuild => killbots-16.04.49.9999.ebuild} |   2 +-
 kde-apps/killbots/killbots-9999.ebuild             |   2 +-
 .../kimap-16.04.49.9999.ebuild}                    |  11 +-
 .../kio-extras/kio-extras-16.04.49.9999.ebuild     |  77 ++++++++++
 ...iki-9999.ebuild => kiriki-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kiriki/kiriki-9999.ebuild                 |   2 +-
 ...iten-9999.ebuild => kiten-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kiten/kiten-9999.ebuild                   |   2 +-
 ...99.ebuild => kjumpingcube-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kjumpingcube/kjumpingcube-9999.ebuild     |   2 +-
 ...ldap-9999.ebuild => kldap-16.04.49.9999.ebuild} |   4 +-
 kde-apps/kldap/kldap-9999.ebuild                   |   4 +-
 kde-apps/kleopatra/kleopatra-16.04.49.9999.ebuild  |  50 ++++++
 .../klettres-16.04.49.9999.ebuild}                 |  12 +-
 ...y-9999.ebuild => klickety-16.04.49.9999.ebuild} |   3 +-
 kde-apps/klickety/klickety-9999.ebuild             |   3 +-
 ...nes-9999.ebuild => klines-16.04.49.9999.ebuild} |   3 +-
 kde-apps/klines/klines-9999.ebuild                 |   3 +-
 ...-9999.ebuild => kmahjongg-16.04.49.9999.ebuild} |   3 +-
 kde-apps/kmahjongg/kmahjongg-9999.ebuild           |   3 +-
 .../kmailtransport-16.04.49.9999.ebuild}           |  20 ++-
 ...mbox-9999.ebuild => kmbox-16.04.49.9999.ebuild} |   4 +-
 kde-apps/kmbox/kmbox-9999.ebuild                   |   4 +-
 .../kmime-16.04.49.9999.ebuild}                    |  15 +-
 .../kmines-16.04.49.9999.ebuild}                   |  11 +-
 kde-apps/kmix/kmix-16.04.49.9999.ebuild            |  54 +++++++
 ...lot-9999.ebuild => kmplot-16.04.49.9999.ebuild} |   4 +-
 kde-apps/kmplot/kmplot-9999.ebuild                 |   4 +-
 ...99.ebuild => knavalbattle-16.04.49.9999.ebuild} |   3 +-
 kde-apps/knavalbattle/knavalbattle-9999.ebuild     |   3 +-
 .../knetwalk-16.04.49.9999.ebuild}                 |  12 +-
 kde-apps/knotes/knotes-16.04.49.9999.ebuild        |  83 ++++++++++
 kde-apps/kolf/kolf-16.04.49.9999.ebuild            |  20 +++
 .../kollision-16.04.49.9999.ebuild}                |  12 +-
 .../kolourpaint/kolourpaint-16.04.49.9999.ebuild   |  30 ++++
 ...re-9999.ebuild => kompare-16.04.49.9999.ebuild} |   3 +-
 kde-apps/kompare/kompare-9999.ebuild               |   3 +-
 kde-apps/konquest/konquest-16.04.49.9999.ebuild    |  20 +++
 .../konsole-16.04.49.9999.ebuild}                  |  42 +++---
 .../konsolekalendar-16.04.49.9999.ebuild           |  58 +++++++
 ...build => kontactinterface-16.04.49.9999.ebuild} |   4 +-
 .../kontactinterface/kontactinterface-9999.ebuild  |   4 +-
 kde-apps/kopete/kopete-16.04.49.9999.ebuild        | 167 +++++++++++++++++++++
 ...{kpat-9999.ebuild => kpat-16.04.49.9999.ebuild} |   1 -
 kde-apps/kpat/kpat-9999.ebuild                     |   1 -
 kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild     |   2 +-
 ...99.ebuild => kpimtextedit-16.04.49.9999.ebuild} |   6 +-
 kde-apps/kpimtextedit/kpimtextedit-9999.ebuild     |   6 +-
 kde-apps/kppp/kppp-16.04.49.9999.ebuild            |  17 +++
 .../kqtquickcharts-16.04.49.9999.ebuild            |  14 ++
 .../krdc-16.04.49.9999.ebuild}                     |  35 +++--
 .../kremotecontrol-16.04.49.9999.ebuild            |  18 +++
 kde-apps/kreversi/kreversi-16.04.49.9999.ebuild    |  20 +++
 .../krfb-16.04.49.9999.ebuild}                     |  29 ++--
 .../kross-interpreters-16.04.49.9999.ebuild        |  26 ++++
 .../kruler-16.04.49.9999.ebuild}                   |  27 ++--
 .../ksaneplugin-16.04.49.9999.ebuild}              |  10 +-
 kde-apps/kscd/kscd-16.04.49.9999.ebuild            |  19 +++
 ...en-9999.ebuild => kshisen-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kshisen/kshisen-9999.ebuild               |   2 +-
 kde-apps/ksirk/ksirk-16.04.49.9999.ebuild          |  23 +++
 .../ksnakeduel/ksnakeduel-16.04.49.9999.ebuild     |  16 ++
 .../kspaceduel/kspaceduel-16.04.49.9999.ebuild     |  20 +++
 .../ksquares-16.04.49.9999.ebuild}                 |  12 +-
 kde-apps/kstars/kstars-16.04.49.9999.ebuild        |  66 ++++++++
 kde-apps/ksudoku/ksudoku-16.04.49.9999.ebuild      |  30 ++++
 ...9999.ebuild => ksystemlog-16.04.49.9999.ebuild} |   1 -
 kde-apps/ksystemlog/ksystemlog-9999.ebuild         |   1 -
 .../kteatime-16.04.49.9999.ebuild}                 |  15 +-
 .../ktimer-16.04.49.9999.ebuild}                   |  15 +-
 kde-apps/ktnef/ktnef-16.04.49.9999.ebuild          |  52 +++++++
 kde-apps/ktouch/ktouch-16.04.49.9999.ebuild        |  19 +++
 .../ktp-accounts-kcm-16.04.49.9999.ebuild          |  60 ++++++++
 ...99.ebuild => ktp-approver-16.04.49.9999.ebuild} |   4 +-
 kde-apps/ktp-approver/ktp-approver-9999.ebuild     |   4 +-
 .../ktp-auth-handler-16.04.49.9999.ebuild          |  40 +++++
 .../ktp-call-ui-16.04.49.9999.ebuild}              |  32 ++--
 .../ktp-common-internals-16.04.49.9999.ebuild      |  80 ++++++++++
 .../ktp-contact-list-16.04.49.9999.ebuild}         |  34 +++--
 .../ktp-contact-runner-16.04.49.9999.ebuild}       |  22 +--
 .../ktp-desktop-applets-16.04.49.9999.ebuild       |  25 +++
 .../ktp-filetransfer-handler-16.04.49.9999.ebuild} |  16 +-
 .../ktp-kded-module-16.04.49.9999.ebuild           |  41 +++++
 .../ktp-send-file-16.04.49.9999.ebuild}            |  24 +--
 .../ktp-text-ui-16.04.49.9999.ebuild}              |  28 ++--
 ...9999.ebuild => ktuberling-16.04.49.9999.ebuild} |   3 +-
 kde-apps/ktuberling/ktuberling-9999.ebuild         |   3 +-
 .../kturtle-16.04.49.9999.ebuild}                  |  14 +-
 kde-apps/kubrick/kubrick-16.04.49.9999.ebuild      |  21 +++
 kde-apps/kuser/kuser-16.04.49.9999.ebuild          |  21 +++
 ....ebuild => kwalletmanager-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kwalletmanager/kwalletmanager-9999.ebuild |   2 +-
 ...-9999.ebuild => kwordquiz-16.04.49.9999.ebuild} |   2 +-
 kde-apps/kwordquiz/kwordquiz-9999.ebuild           |   2 +-
 .../kwrite-16.04.49.9999.ebuild}                   |  30 ++--
 .../libgravatar-16.04.49.9999.ebuild}              |  19 ++-
 kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild    |  41 +++++
 ...ebuild => libkcompactdisc-16.04.49.9999.ebuild} |   8 +-
 .../libkcompactdisc/libkcompactdisc-9999.ebuild    |   8 +-
 .../libkdcraw-16.04.49.9999.ebuild}                |  12 +-
 .../libkdegames-16.04.49.9999.ebuild}              |  32 ++--
 kde-apps/libkdepim/libkdepim-16.04.49.9999.ebuild  |  48 ++++++
 .../libkeduvocdocument-16.04.49.9999.ebuild        |  31 ++++
 .../libkexiv2-16.04.49.9999.ebuild}                |  12 +-
 kde-apps/libkface/libkface-16.04.49.9999.ebuild    |  34 +++++
 .../libkgeomap-16.04.49.9999.ebuild}               |  24 +--
 ...pi-9999.ebuild => libkipi-16.04.49.9999.ebuild} |   1 -
 kde-apps/libkipi/libkipi-9999.ebuild               |   1 -
 .../libkleo-16.04.49.9999.ebuild}                  |  24 +--
 .../libkmahjongg-16.04.49.9999.ebuild}             |  15 +-
 .../libkomparediff2-16.04.49.9999.ebuild}          |  16 +-
 .../libksane-16.04.49.9999.ebuild}                 |  17 +--
 kde-apps/libksieve/libksieve-16.04.49.9999.ebuild  |  39 +++++
 kde-apps/libktnef/libktnef-16.04.49.9999.ebuild    |  27 ++++
 kde-apps/lokalize/lokalize-16.04.49.9999.ebuild    |  64 ++++++++
 kde-apps/lskat/lskat-16.04.49.9999.ebuild          |  20 +++
 .../mailcommon-16.04.49.9999.ebuild}               |  43 +++---
 .../mailimporter-16.04.49.9999.ebuild}             |  24 +--
 kde-apps/marble/marble-16.04.49.9999.ebuild        |  68 +++++++++
 .../messagelib/messagelib-16.04.49.9999.ebuild     |  92 ++++++++++++
 .../okteta-16.04.49.9999.ebuild}                   |  34 +++--
 kde-apps/okular/okular-16.04.49.9999.ebuild        |  59 ++++++++
 kde-apps/palapeli/palapeli-16.04.49.9999.ebuild    |  16 ++
 .../parley-16.04.49.9999.ebuild}                   |  25 ++-
 ...icmi-9999.ebuild => picmi-16.04.49.9999.ebuild} |   2 +-
 kde-apps/picmi/picmi-9999.ebuild                   |   2 +-
 .../pimcommon-16.04.49.9999.ebuild}                |  38 ++---
 ... => plasma-telepathy-meta-16.04.49.9999.ebuild} |   4 +-
 .../plasma-telepathy-meta-9999.ebuild              |   4 +-
 .../poxml-16.04.49.9999.ebuild}                    |  12 +-
 .../print-manager-16.04.49.9999.ebuild             |  54 +++++++
 kde-apps/rocs/rocs-16.04.49.9999.ebuild            |  47 ++++++
 ... signon-kwallet-extension-16.04.49.9999.ebuild} |   2 +-
 .../signon-kwallet-extension-9999.ebuild           |   2 +-
 kde-apps/spectacle/spectacle-16.04.49.9999.ebuild  |  49 ++++++
 kde-apps/step/step-16.04.49.9999.ebuild            |  62 ++++++++
 kde-apps/svgpart/svgpart-16.04.49.9999.ebuild      |  11 ++
 kde-apps/sweeper/sweeper-16.04.49.9999.ebuild      |  14 ++
 ...999.ebuild => syndication-16.04.49.9999.ebuild} |   4 +-
 kde-apps/syndication/syndication-9999.ebuild       |   4 +-
 .../thumbnailers/thumbnailers-16.04.49.9999.ebuild |  20 +++
 ...o-9999.ebuild => umbrello-16.04.49.9999.ebuild} |   4 +-
 kde-apps/umbrello/umbrello-9999.ebuild             |   4 +-
 .../zeroconf-ioslave-16.04.49.9999.ebuild          |  11 ++
 281 files changed, 5043 insertions(+), 836 deletions(-)

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-16.04.49.9999.ebuild
similarity index 97%
copy from kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
copy to kde-apps/akonadi-calendar/akonadi-calendar-16.04.49.9999.ebuild
index 3a0e149..e8797e3 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-16.04.49.9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -40,6 +40,6 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 RESTRICT="test"

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index 3a0e149..e8797e3 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -40,6 +40,6 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 RESTRICT="test"

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-16.04.49.9999.ebuild
similarity index 59%
copy from kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
copy to kde-apps/akonadi-contact/akonadi-contact-16.04.49.9999.ebuild
index d6f21bd..e4bd7d1 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/akonadi-contact/akonadi-contact-16.04.49.9999.ebuild
@@ -2,67 +2,64 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST="false"
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="forceoptional"
+KMNAME="kdepimlibs"
 inherit kde5
 
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="LGPL-2+"
+DESCRIPTION="Library for akonadi contact integration"
 KEYWORDS=""
+LICENSE="LGPL-2.1"
 IUSE="prison"
 
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
 COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	dev-libs/grantlee:5
-	$(add_qt_dep designer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 	prison? ( media-libs/prison:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/composereditor:5
-	!kde-apps/kaddressbookgrantlee:5
-	!kde-apps/libfollowupreminder:5
-	!kde-apps/libkdepimdbusinterfaces:5
-	!kde-apps/libsendlater:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kmail:4
+	!<kde-apps/kdepim-15.12.50
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
 
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${PN}"
+fi
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package prison KF5Prison)
 	)
-
 	kde5_src_configure
 }

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-16.04.49.9999.ebuild
similarity index 51%
copy from kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
copy to kde-apps/akonadi-mime/akonadi-mime-16.04.49.9999.ebuild
index 3a0e149..e0a6ed7 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-16.04.49.9999.ebuild
@@ -4,42 +4,44 @@
 
 EAPI=6
 
+FRAMEWORKS_MINIMAL="5.19.0"
 KDE_TEST="true"
+KMNAME="kdepimlibs"
 inherit kde5
 
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+"
+DESCRIPTION="Library for akonadi mime types"
 KEYWORDS=""
+LICENSE="LGPL-2.1"
 IUSE=""
 
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	x11-misc/shared-mime-info
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
 "
-DEPEND="${RDEPEND}"
 
-RESTRICT="test"
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${PN}"
+fi

diff --git a/kde-apps/akonadi-notes/akonadi-notes-16.04.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-16.04.49.9999.ebuild
new file mode 100644
index 0000000..357368e
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-16.04.49.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
+inherit kde5
+
+DESCRIPTION="Library for akonadi notes integration"
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep akonadi)
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${PN}"
+fi

diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-16.04.49.9999.ebuild
similarity index 52%
copy from kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
copy to kde-apps/akonadi-search/akonadi-search-16.04.49.9999.ebuild
index 3a0e149..ae8b3a0 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-16.04.49.9999.ebuild
@@ -4,42 +4,32 @@
 
 EAPI=6
 
-KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+"
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep krunner)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contact)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
+	>=dev-libs/xapian-1.3:=[chert]
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"

diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-16.04.49.9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-16.04.49.9999.ebuild
new file mode 100644
index 0000000..f4c10c0
--- /dev/null
+++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-16.04.49.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
+inherit kde5
+
+DESCRIPTION="Library for social utils integration"
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_kdeapps_dep akonadi)
+	$(add_qt_dep qtgui)
+	x11-misc/shared-mime-info
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${PN}"
+fi

diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
new file mode 100644
index 0000000..6eec273
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DOXYGEN=true
+KDE_TEST=true
+VIRTUALDBUS_TEST=true
+VIRTUALX_REQUIRED=test
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://pim.kde.org/akonadi"
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE="designer +mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	designer? ( $(add_qt_dep designer) )
+	sqlite? ( dev-db/sqlite:3 )
+	tools? ( xml? ( dev-libs/libxml2 ) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	!app-office/akonadi-server
+	!kde-apps/kdepimlibs
+	!kde-apps/libakonadi
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+		$(cmake-utils_use_find_package xml LibXml2)
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}

diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild
new file mode 100644
index 0000000..f46d941
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="Akonadi developer console"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/akregator/akregator-16.04.49.9999.ebuild b/kde-apps/akregator/akregator-16.04.49.9999.ebuild
new file mode 100644
index 0000000..f2447a3
--- /dev/null
+++ b/kde-apps/akregator/akregator-16.04.49.9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_HANDBOOK="false"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_TEST="false"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+KEYWORDS=""
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/analitza/analitza-9999.ebuild b/kde-apps/analitza/analitza-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/analitza/analitza-9999.ebuild
copy to kde-apps/analitza/analitza-16.04.49.9999.ebuild
index 406b803..0a406a3 100644
--- a/kde-apps/analitza/analitza-9999.ebuild
+++ b/kde-apps/analitza/analitza-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"

diff --git a/kde-apps/analitza/analitza-9999.ebuild b/kde-apps/analitza/analitza-9999.ebuild
index 406b803..0a406a3 100644
--- a/kde-apps/analitza/analitza-9999.ebuild
+++ b/kde-apps/analitza/analitza-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"

diff --git a/kde-apps/ark/ark-16.04.49.9999.ebuild b/kde-apps/ark/ark-16.04.49.9999.ebuild
new file mode 100644
index 0000000..52d5ead
--- /dev/null
+++ b/kde-apps/ark/ark-16.04.49.9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+inherit kde5
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://www.kde.org/applications/utilities/ark
+https://utils.kde.org/projects/ark"
+KEYWORDS=""
+IUSE="bzip2 lzma zlib"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?]
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+		$(cmake-utils_use_find_package zlib ZLIB)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version app-arch/unar ; then
+		elog "For handling rar archives, install app-arch/unar"
+	fi
+}

diff --git a/kde-apps/artikulate/artikulate-16.04.49.9999.ebuild b/kde-apps/artikulate/artikulate-16.04.49.9999.ebuild
new file mode 100644
index 0000000..baa60a3
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-16.04.49.9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
+KEYWORDS=""
+IUSE="+gstreamer qtmedia"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
+		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/audiocd-kio/audiocd-kio-16.04.49.9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-16.04.49.9999.ebuild
new file mode 100644
index 0000000..51c0a9b
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-16.04.49.9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE kioslaves from the kdemultimedia package"
+KEYWORDS=""
+IUSE="debug flac vorbis"
+
+DEPEND="
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	media-sound/cdparanoia
+	flac? ( >=media-libs/flac-1.1.2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with vorbis OggVorbis)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-16.04.49.9999.ebuild
similarity index 95%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/baloo-widgets/baloo-widgets-16.04.49.9999.ebuild
index 4231873..56fd53c 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-16.04.49.9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+FRAMEWORKS_MINIMAL="5.19.0"
 KDE_TEST="forceoptional"
 inherit kde5
 

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
index 4231873..56fd53c 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+FRAMEWORKS_MINIMAL="5.19.0"
 KDE_TEST="forceoptional"
 inherit kde5
 

diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/blinken/blinken-16.04.49.9999.ebuild
similarity index 62%
copy from kde-apps/bomber/bomber-9999.ebuild
copy to kde-apps/blinken/blinken-16.04.49.9999.ebuild
index 3b47b37..80bd9dd 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/blinken/blinken-16.04.49.9999.ebuild
@@ -2,29 +2,34 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE arcade bombing game"
-HOMEPAGE="https://www.kde.org/applications/games/bomber/"
+DESCRIPTION="KDE version of the Simon Says game"
+HOMEPAGE="https://www.kde.org/applications/education/blinken
+https://edu.kde.org/blinken"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+
+	rm "${ED}"usr/share/${PN}/README.packagers || die
+}

diff --git a/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild b/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild
new file mode 100644
index 0000000..410781e
--- /dev/null
+++ b/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="KDE Blogging Client"
+HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
+KEYWORDS=""
+
+IUSE="google"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	google? ( net-libs/libkgapi:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+		$(cmake-utils_use_find_package google KF5GAPI)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/bomber/bomber-9999.ebuild
copy to kde-apps/bomber/bomber-16.04.49.9999.ebuild
index 3b47b37..d06ab70 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -26,5 +26,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-9999.ebuild
index 3b47b37..d06ab70 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -26,5 +26,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/bovo/bovo-9999.ebuild b/kde-apps/bovo/bovo-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/bovo/bovo-9999.ebuild
copy to kde-apps/bovo/bovo-16.04.49.9999.ebuild
index ab8cfaf..a9ec375 100644
--- a/kde-apps/bovo/bovo-9999.ebuild
+++ b/kde-apps/bovo/bovo-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -26,7 +26,6 @@ DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS HISTORY TODO )

diff --git a/kde-apps/bovo/bovo-9999.ebuild b/kde-apps/bovo/bovo-9999.ebuild
index ab8cfaf..a9ec375 100644
--- a/kde-apps/bovo/bovo-9999.ebuild
+++ b/kde-apps/bovo/bovo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -26,7 +26,6 @@ DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS HISTORY TODO )

diff --git a/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild
new file mode 100644
index 0000000..fbd527a
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="false"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A tool to scan calendar data for buggy instances"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+PATCHES=( "${FILESDIR}/kdepim-console.patch" )
+
+src_prepare() {
+
+	mv console/calendarjanitor calendarjanitor || die "Failed to move calendarjanitor"
+	mv console/konsolekalendar konsolekalendar || die "Failed to move konsolekalendar"
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-16.04.49.9999.ebuild
similarity index 76%
copy from kde-apps/eventviews/eventviews-9999.ebuild
copy to kde-apps/calendarsupport/calendarsupport-16.04.49.9999.ebuild
index 5e32c89..7dbdd2f 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-16.04.49.9999.ebuild
@@ -4,10 +4,11 @@
 
 EAPI=6
 
-KDE_TEST="true"
+KDE_DOXYGEN="true"
+KDE_TEST="false"
 inherit kde5
 
-DESCRIPTION="Calendar viewer for KDE PIM"
+DESCRIPTION="Calendar support library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
@@ -16,28 +17,29 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdgantt2)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
 	dev-libs/libical
 	$(add_qt_dep designer)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
similarity index 80%
copy from kde-apps/cantor/cantor-9999.ebuild
copy to kde-apps/cantor/cantor-16.04.49.9999.ebuild
index ee20328..3cdcedc 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
@@ -28,6 +28,7 @@ RDEPEND="
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kpty)
@@ -55,15 +56,26 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" )
+
 pkg_setup() {
 	use python && python_setup
 	kde5_pkg_setup
 }
 
 src_prepare() {
+	kde5_src_prepare
+
 	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
-	sed -e '/^find_package(PythonLibs3)/ s/^/#/' \
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
 		-i src/backends/CMakeLists.txt || die
+
+	if ! use test ; then
+		sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
+			-i src/lib/CMakeLists.txt || die
+		sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i src/backends/python3/CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
@@ -72,8 +84,8 @@ src_configure() {
 		$(cmake-utils_use_find_package lua LuaJIT)
 		$(cmake-utils_use_find_package postscript LibSpectre)
 		$(cmake-utils_use_find_package python PythonLibs)
-		$(cmake-utils_use_find_package qalculate)
-		$(cmake-utils_use_find_package R)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
 	)
 	kde5_src_configure
 }

diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index ee20328..3cdcedc 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
@@ -28,6 +28,7 @@ RDEPEND="
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kpty)
@@ -55,15 +56,26 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" )
+
 pkg_setup() {
 	use python && python_setup
 	kde5_pkg_setup
 }
 
 src_prepare() {
+	kde5_src_prepare
+
 	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
-	sed -e '/^find_package(PythonLibs3)/ s/^/#/' \
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
 		-i src/backends/CMakeLists.txt || die
+
+	if ! use test ; then
+		sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
+			-i src/lib/CMakeLists.txt || die
+		sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i src/backends/python3/CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
@@ -72,8 +84,8 @@ src_configure() {
 		$(cmake-utils_use_find_package lua LuaJIT)
 		$(cmake-utils_use_find_package postscript LibSpectre)
 		$(cmake-utils_use_find_package python PythonLibs)
-		$(cmake-utils_use_find_package qalculate)
-		$(cmake-utils_use_find_package R)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
 	)
 	kde5_src_configure
 }

diff --git a/kde-apps/cantor/files/cantor-15.12.3-tests.patch b/kde-apps/cantor/files/cantor-15.12.3-tests.patch
new file mode 100644
index 0000000..5cea78d
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-15.12.3-tests.patch
@@ -0,0 +1,49 @@
+--- a/src/backends/maxima/CMakeLists.txt	2016-03-21 02:16:05.549024821 +0100
++++ b/src/backends/maxima/CMakeLists.txt	2016-03-21 02:22:07.951014021 +0100
+@@ -21,12 +21,14 @@
+   target_link_libraries(cantor_maximabackend KF5::Pty)
+ endif(NOT WIN32)
+ 
++if (BUILD_TESTING)
+ add_executable( testmaxima testmaxima.cpp)
+ target_link_libraries( testmaxima
+   cantorlibs
+   cantortest
+   ${QTTEST_LIBRARY}
+ )
++endif()
+ 
+ install( FILES cantor_maxima.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
+ install( FILES keywords.xml cantor-initmaxima.lisp DESTINATION ${KDE_INSTALL_DATADIR}/cantor/maximabackend)
+--- a/src/backends/sage/CMakeLists.txt	2016-03-21 01:23:19.251791138 +0100
++++ b/src/backends/sage/CMakeLists.txt	2016-03-21 01:27:16.300827617 +0100
+@@ -17,12 +17,14 @@
+ 
+ target_link_libraries( cantor_sagebackend KF5::Pty)
+ 
++if (BUILD_TESTING)
+ add_executable( testsage testsage.cpp)
+ target_link_libraries( testsage
+   ${QT_QTTEST_LIBRARY}
+   cantorlibs
+   cantortest
+ )
++endif()
+ 
+ install( FILES cantor_sage.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
+ install( FILES keywords.xml DESTINATION ${KDE_INSTALL_DATADIR}/cantor/sagebackend)
+--- a/src/backends/python2/CMakeLists.txt	2016-03-21 01:28:39.055793038 +0100
++++ b/src/backends/python2/CMakeLists.txt	2016-03-21 01:35:01.451012440 +0100
+@@ -20,10 +20,12 @@
+     cantor_pythonbackend
+     )
+ 
++if (BUILD_TESTING)
+ add_executable(testpython2 testpython2.cpp)
+ target_link_libraries(testpython2 ${QT_QTTEST_LIBRARY} cantorlibs cantortest)
+ 
+ add_test(NAME testpython2 COMMAND testpython2)
++endif()
+ 
+ install(FILES cantor_python2.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR})
+ install(FILES python2backend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})

diff --git a/kde-apps/cervisia/cervisia-16.04.49.9999.ebuild b/kde-apps/cervisia/cervisia-16.04.49.9999.ebuild
new file mode 100644
index 0000000..29c1597
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-16.04.49.9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A KDE CVS frontend"
+HOMEPAGE="https://www.kde.org/applications/development/cervisia"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	dev-vcs/cvs
+"

diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-16.04.49.9999.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-16.04.49.9999.ebuild
new file mode 100644
index 0000000..9cfe7a5
--- /dev/null
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-16.04.49.9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+inherit kde5
+
+DESCRIPTION="Extra Dolphin plugins"
+KEYWORDS=""
+IUSE="bazaar dropbox git mercurial subversion"
+
+# FIXME: required in root CMakeLists.txt, but:
+# kdelibs4support only required by git?
+# kxmlgui, qtnetwork only required by dropbox?
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	git? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep ktextwidgets)
+	)
+	mercurial? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep ktexteditor)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kompare)
+	bazaar? ( dev-vcs/bzr )
+	dropbox? ( net-misc/dropbox-cli )
+	git? ( dev-vcs/git )
+	subversion? ( dev-vcs/subversion )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_bazaar=$(usex bazaar)
+		-DBUILD_dropbox=$(usex dropbox)
+		-DBUILD_git=$(usex git)
+		-DBUILD_hg=$(usex mercurial)
+		-DBUILD_svn=$(usex subversion)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	{ use bazaar || use dropbox || use git || use subversion || use mercurial; } && kde5_src_install
+}
+
+pkg_postinst() {
+	if ! use bazaar && ! use dropbox && ! use git && ! use subversion && ! use mercurial; then
+		einfo
+		einfo "You have disabled all plugin use flags. If you want to have vcs"
+		einfo "integration in dolphin, enable those of your needs."
+		einfo
+	fi
+}

diff --git a/kde-apps/dolphin/dolphin-16.04.49.9999.ebuild b/kde-apps/dolphin/dolphin-16.04.49.9999.ebuild
new file mode 100644
index 0000000..db5be2d
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-16.04.49.9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
+KEYWORDS=""
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		|| ( $(add_kdeapps_dep ffmpegthumbs) media-video/ffmpegthumbnailer )
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_KF5Baloo=$(usex semantic-desktop)
+		-DWITH_KF5BalooWidgets=$(usex semantic-desktop)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		echo
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+		echo
+	fi
+}

diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/dragon/dragon-16.04.49.9999.ebuild
similarity index 60%
copy from kde-apps/kiten/kiten-9999.ebuild
copy to kde-apps/dragon/dragon-16.04.49.9999.ebuild
index 7a9b946..cb3d2c5 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/dragon/dragon-16.04.49.9999.ebuild
@@ -2,31 +2,36 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
+DESCRIPTION="A simple video player"
+HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
 "
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-16.04.49.9999.ebuild
similarity index 100%
copy from kde-apps/eventviews/eventviews-9999.ebuild
copy to kde-apps/eventviews/eventviews-16.04.49.9999.ebuild
index 5e32c89..c45ecc7 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-16.04.49.9999.ebuild
@@ -35,10 +35,10 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
-	dev-libs/libical
 	$(add_qt_dep designer)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/libical
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
index 5e32c89..c45ecc7 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-9999.ebuild
@@ -35,10 +35,10 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
-	dev-libs/libical
 	$(add_qt_dep designer)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/libical
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.49.9999.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.49.9999.ebuild
new file mode 100644
index 0000000..81a1c7d
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.49.9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+KEYWORDS=""
+IUSE="libav"
+
+RDEPEND="
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"

diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/filelight/filelight-16.04.49.9999.ebuild
similarity index 68%
copy from kde-apps/kiten/kiten-9999.ebuild
copy to kde-apps/filelight/filelight-16.04.49.9999.ebuild
index 7a9b946..091a4e0 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/filelight/filelight-16.04.49.9999.ebuild
@@ -2,30 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://utils.kde.org/projects/filelight"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
+	$(add_frameworks_dep solid)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "

diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/gpgmepp/gpgmepp-16.04.49.9999.ebuild
similarity index 53%
copy from kde-apps/kmbox/kmbox-9999.ebuild
copy to kde-apps/gpgmepp/gpgmepp-16.04.49.9999.ebuild
index b0abe4e..a38d23e 100644
--- a/kde-apps/kmbox/kmbox-9999.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-16.04.49.9999.ebuild
@@ -4,14 +4,17 @@
 
 EAPI=6
 
-KDE_DOXYGEN="true"
-KDE_TEST="true"
+KDE_BLOCK_SLOT4="false"
 inherit kde5
 
-DESCRIPTION="Library for accessing MBox format mail storages"
+DESCRIPTION="C++ bindings for gpgme"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="$(add_kdeapps_dep kmime)"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	app-crypt/gpgme:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"

diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/granatier/granatier-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/granatier/granatier-9999.ebuild
copy to kde-apps/granatier/granatier-16.04.49.9999.ebuild
index 0cf18e9..7fe27f3 100644
--- a/kde-apps/granatier/granatier-9999.ebuild
+++ b/kde-apps/granatier/granatier-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -28,5 +28,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/granatier/granatier-9999.ebuild
index 0cf18e9..7fe27f3 100644
--- a/kde-apps/granatier/granatier-9999.ebuild
+++ b/kde-apps/granatier/granatier-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -28,5 +28,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-16.04.49.9999.ebuild
similarity index 63%
copy from kde-apps/kamera/kamera-9999.ebuild
copy to kde-apps/grantleetheme/grantleetheme-16.04.49.9999.ebuild
index 7cd9c98..883e6f4 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-16.04.49.9999.ebuild
@@ -4,26 +4,30 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Plasma integration for gphoto2 cameras"
+DESCRIPTION="Library for Grantlee plugins"
+LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-libs/grantlee:5
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
 "
 DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtnetwork)
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/gwenview/gwenview-16.04.49.9999.ebuild b/kde-apps/gwenview/gwenview-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d228f7e
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-16.04.49.9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE image viewer"
+HOMEPAGE="
+	https://www.kde.org/applications/graphics/gwenview/
+	https://userbase.kde.org/Gwenview
+"
+KEYWORDS=""
+IUSE="kipi raw semantic-desktop X"
+
+# requires running environment
+RESTRICT="test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/phonon[qt5]
+	virtual/jpeg:0
+	kipi? ( $(add_kdeapps_dep libkipi) )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kimageformats)
+	$(add_qt_dep qtimageformats)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	# Workaround for bug #479510
+	if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
+		mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
+	fi
+
+	if use semantic-desktop; then
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
+	else
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+	fi
+
+	kde5_src_configure
+}

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-16.04.49.9999.ebuild
similarity index 72%
copy from kde-apps/eventviews/eventviews-9999.ebuild
copy to kde-apps/incidenceeditor/incidenceeditor-16.04.49.9999.ebuild
index 5e32c89..b3f6ae3 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.04.49.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Calendar viewer for KDE PIM"
+DESCRIPTION="Incidence editor for korganizer"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
@@ -19,25 +19,35 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
 	$(add_kdeapps_dep kdgantt2)
 	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
-	dev-libs/libical
 	$(add_qt_dep designer)
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/juk/juk-16.04.49.9999.ebuild b/kde-apps/juk/juk-16.04.49.9999.ebuild
new file mode 100644
index 0000000..0c5b62e
--- /dev/null
+++ b/kde-apps/juk/juk-16.04.49.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Jukebox and music manager for KDE"
+HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	>=media-libs/taglib-1.6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# https://bugs.gentoo.org/410551 for disabling deprecated TunePimp support
+	local mycmakeargs=(
+		-DWITH_TunePimp=OFF
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-16.04.49.9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-16.04.49.9999.ebuild
new file mode 100644
index 0000000..3f514ef
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-16.04.49.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	>=net-libs/libaccounts-glib-1.21
+	net-libs/signond
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# bug #549444
+RESTRICT="test"

diff --git a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
index cf19a25..1940e88 100644
--- a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
+++ b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
copy to kde-apps/kaccounts-providers/kaccounts-providers-16.04.49.9999.ebuild
index 68b3afb..be7d378 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
index 68b3afb..be7d378 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
copy to kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
index d6f21bd..60b9a99 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
@@ -2,65 +2,80 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TEST="false"
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_HANDBOOK="false"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_TEST="true"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="LGPL-2+"
+DESCRIPTION="The KDE Address Book"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
 KEYWORDS=""
+
 IUSE="prison"
 
 COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep pimcommon)
-	dev-libs/grantlee:5
-	$(add_qt_dep designer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
 	prison? ( media-libs/prison:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	test? (
+		$(add_kdeapps_dep akonadi 'sqlite,tools')
+		$(add_qt_dep qtsql 'sqlite')
+	)
 "
 RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/composereditor:5
-	!kde-apps/kaddressbookgrantlee:5
-	!kde-apps/libfollowupreminder:5
-	!kde-apps/libkdepimdbusinterfaces:5
-	!kde-apps/libsendlater:5
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kmail:4
+	!<kde-apps/kdepim-15.12.2:5
+	$(add_kdeapps_dep kdepim)
+	$(add_kdeapps_dep kdepim-runtime)
 "
 
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
 		$(cmake-utils_use_find_package prison KF5Prison)
 	)
 

diff --git a/kde-apps/kajongg/kajongg-16.04.49.9999.ebuild b/kde-apps/kajongg/kajongg-16.04.49.9999.ebuild
new file mode 100644
index 0000000..03004f1
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-16.04.49.9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde4-base
+
+DESCRIPTION="The classical Mah Jongg for four players"
+HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
+KEYWORDS=""
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	dev-db/sqlite:3
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep libkmahjongg)
+	>=dev-python/twisted-core-8.2.0
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	kde4-base_src_prepare
+}

diff --git a/kde-apps/kalarmcal/kalarmcal-16.04.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-16.04.49.9999.ebuild
new file mode 100644
index 0000000..29d61a2
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-16.04.49.9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"

diff --git a/kde-apps/kalgebra/kalgebra-16.04.49.9999.ebuild b/kde-apps/kalgebra/kalgebra-16.04.49.9999.ebuild
new file mode 100644
index 0000000..4a39b48
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-16.04.49.9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="MathML-based graph calculator for KDE"
+HOMEPAGE="https://www.kde.org/applications/education/kalgebra
+https://edu.kde.org/kalgebra"
+KEYWORDS=""
+IUSE="opengl readline"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep analitza 'opengl?')
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		$(add_qt_dep qtprintsupport)
+		virtual/glu
+	)
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}
+	!kde-apps/analitza:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package readline Readline)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kalzium/files/kalzium-15.12.3-plasmoids.patch b/kde-apps/kalzium/files/kalzium-15.12.3-plasmoids.patch
new file mode 100644
index 0000000..686a6ef
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-15.12.3-plasmoids.patch
@@ -0,0 +1,23 @@
+commit 456205fc98f4eb2762c11fac2abedf618e0deb8f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Fri Mar 25 13:38:55 2016 +0100
+
+    Make plasmoids optional
+    
+    They are not useable in a Plasma-5 workspace.
+    
+    REVIEW: 127491
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f4ab27b..93ae845 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,7 +50,7 @@ endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
+ add_subdirectory(doc)
+ add_subdirectory(src)
+ add_subdirectory(data)
+-add_subdirectory(plasmoid)
++macro_optional_add_subdirectory(plasmoid)
+ add_subdirectory(libscience)
+ add_subdirectory(qml)
+ 

diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-16.04.49.9999.ebuild
similarity index 75%
copy from kde-apps/kalzium/kalzium-9999.ebuild
copy to kde-apps/kalzium/kalzium-16.04.49.9999.ebuild
index a86324a..c5712f5 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-16.04.49.9999.ebuild
@@ -13,32 +13,32 @@ DESCRIPTION="KDE: periodic table of the elements"
 HOMEPAGE="https://www.kde.org/applications/education/kalzium
 https://edu.kde.org/kalzium"
 KEYWORDS=""
-IUSE="editor debug solver"
+IUSE="debug editor +plasma solver"
 
 DEPEND="
 	editor? (
-		>=dev-cpp/eigen-2.0.3:2
+		dev-cpp/eigen:3
 		sci-chemistry/avogadro
 		>=sci-chemistry/openbabel-2.2
+		dev-qt/qtopengl:4
 	)
 	solver? ( dev-ml/facile[ocamlopt] )
 "
-RDEPEND=${DEPEND}
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/libscience/
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.12.3-plasmoids.patch" )
+
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
-		$(cmake-utils_use_with editor Eigen2)
+		$(cmake-utils_use_build plasma plasmoid)
+		$(cmake-utils_use_with editor Eigen3)
 		$(cmake-utils_use_with editor Avogadro)
 		$(cmake-utils_use_with editor OpenBabel2)
-		$(cmake-utils_use_with editor OpenGL)
 		$(cmake-utils_use_with solver OCaml)
 		$(cmake-utils_use_with solver Libfacile)
 	)

diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index a86324a..4362503 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -13,21 +13,19 @@ DESCRIPTION="KDE: periodic table of the elements"
 HOMEPAGE="https://www.kde.org/applications/education/kalzium
 https://edu.kde.org/kalzium"
 KEYWORDS=""
-IUSE="editor debug solver"
+IUSE="debug editor +plasma solver"
 
 DEPEND="
 	editor? (
-		>=dev-cpp/eigen-2.0.3:2
+		dev-cpp/eigen:3
 		sci-chemistry/avogadro
 		>=sci-chemistry/openbabel-2.2
+		dev-qt/qtopengl:4
 	)
 	solver? ( dev-ml/facile[ocamlopt] )
 "
-RDEPEND=${DEPEND}
-
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/libscience/
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
 "
 
 src_configure(){
@@ -35,10 +33,10 @@ src_configure(){
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
-		$(cmake-utils_use_with editor Eigen2)
+		$(cmake-utils_use_build plasma plasmoid)
+		$(cmake-utils_use_with editor Eigen3)
 		$(cmake-utils_use_with editor Avogadro)
 		$(cmake-utils_use_with editor OpenBabel2)
-		$(cmake-utils_use_with editor OpenGL)
 		$(cmake-utils_use_with solver OCaml)
 		$(cmake-utils_use_with solver Libfacile)
 	)

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/kamera/kamera-16.04.49.9999.ebuild
similarity index 89%
copy from kde-apps/kamera/kamera-9999.ebuild
copy to kde-apps/kamera/kamera-16.04.49.9999.ebuild
index 7cd9c98..5642b38 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/kamera/kamera-16.04.49.9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Plasma integration for gphoto2 cameras"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -23,7 +23,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/libgphoto2:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/kamera/kamera-9999.ebuild
index 7cd9c98..5642b38 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/kamera/kamera-9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Plasma integration for gphoto2 cameras"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -23,7 +23,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/libgphoto2:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"

diff --git a/kde-apps/kanagram/kanagram-9999.ebuild b/kde-apps/kanagram/kanagram-16.04.49.9999.ebuild
similarity index 90%
copy from kde-apps/kanagram/kanagram-9999.ebuild
copy to kde-apps/kanagram/kanagram-16.04.49.9999.ebuild
index 1a1424e..843320b 100644
--- a/kde-apps/kanagram/kanagram-9999.ebuild
+++ b/kde-apps/kanagram/kanagram-16.04.49.9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 inherit kde5
 
-DESCRIPTION="Game based on anagrams of works"
+DESCRIPTION="Game based on anagrams of words"
 HOMEPAGE="https://www.kde.org/applications/education/kanagram
 https://edu.kde.org/kanagram"
 KEYWORDS=""
@@ -32,6 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtmultimedia 'qml')
 	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwebkit 'qml')
 "

diff --git a/kde-apps/kanagram/kanagram-9999.ebuild b/kde-apps/kanagram/kanagram-9999.ebuild
index 1a1424e..08459a8 100644
--- a/kde-apps/kanagram/kanagram-9999.ebuild
+++ b/kde-apps/kanagram/kanagram-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 inherit kde5

diff --git a/kde-apps/kapman/kapman-9999.ebuild b/kde-apps/kapman/kapman-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/kapman/kapman-9999.ebuild
copy to kde-apps/kapman/kapman-16.04.49.9999.ebuild
index 7f380ed..3d76932 100644
--- a/kde-apps/kapman/kapman-9999.ebuild
+++ b/kde-apps/kapman/kapman-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kapman/kapman-9999.ebuild b/kde-apps/kapman/kapman-9999.ebuild
index 7f380ed..3d76932 100644
--- a/kde-apps/kapman/kapman-9999.ebuild
+++ b/kde-apps/kapman/kapman-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kapptemplate/kapptemplate-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kapptemplate/kapptemplate-9999.ebuild
copy to kde-apps/kapptemplate/kapptemplate-16.04.49.9999.ebuild
index 290b6ff..796fee1 100644
--- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-16.04.49.9999.ebuild
@@ -25,5 +25,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
index 290b6ff..796fee1 100644
--- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
@@ -25,5 +25,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kate/kate-16.04.49.9999.ebuild b/kde-apps/kate/kate-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d14019c
--- /dev/null
+++ b/kde-apps/kate/kate-16.04.49.9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate http://kate-editor.org"
+KEYWORDS=""
+IUSE="+addons"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	addons? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kwallet)
+		$(add_frameworks_dep plasma)
+		$(add_frameworks_dep threadweaver)
+		$(add_qt_dep qtsql)
+		>=dev-libs/libgit2-0.22.0:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONS=$(usex addons)
+		-DBUILD_kwrite=FALSE
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/katomic/katomic-9999.ebuild b/kde-apps/katomic/katomic-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/katomic/katomic-9999.ebuild
copy to kde-apps/katomic/katomic-16.04.49.9999.ebuild
index 236f646..d4094f5 100644
--- a/kde-apps/katomic/katomic-9999.ebuild
+++ b/kde-apps/katomic/katomic-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/katomic/katomic-9999.ebuild b/kde-apps/katomic/katomic-9999.ebuild
index 236f646..d4094f5 100644
--- a/kde-apps/katomic/katomic-9999.ebuild
+++ b/kde-apps/katomic/katomic-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kblackbox/kblackbox-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kblackbox/kblackbox-9999.ebuild
copy to kde-apps/kblackbox/kblackbox-16.04.49.9999.ebuild
index 7bf051c..f7a0d25 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/kblackbox/kblackbox-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kblackbox/kblackbox-9999.ebuild
index 7bf051c..f7a0d25 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/kblackbox/kblackbox-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/kblocks/kblocks-9999.ebuild b/kde-apps/kblocks/kblocks-16.04.49.9999.ebuild
similarity index 95%
copy from kde-apps/kblocks/kblocks-9999.ebuild
copy to kde-apps/kblocks/kblocks-16.04.49.9999.ebuild
index 23c78e7..89354e9 100644
--- a/kde-apps/kblocks/kblocks-9999.ebuild
+++ b/kde-apps/kblocks/kblocks-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -25,7 +25,5 @@ DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kblocks/kblocks-9999.ebuild b/kde-apps/kblocks/kblocks-9999.ebuild
index 23c78e7..89354e9 100644
--- a/kde-apps/kblocks/kblocks-9999.ebuild
+++ b/kde-apps/kblocks/kblocks-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -25,7 +25,5 @@ DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/kblog/kblog-16.04.49.9999.ebuild
similarity index 55%
copy from kde-apps/syndication/syndication-9999.ebuild
copy to kde-apps/kblog/kblog-16.04.49.9999.ebuild
index a0a9e9f..a5929d7 100644
--- a/kde-apps/syndication/syndication-9999.ebuild
+++ b/kde-apps/kblog/kblog-16.04.49.9999.ebuild
@@ -8,15 +8,19 @@ KDE_DOXYGEN="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Library for parsing RSS and Atom feeds"
+DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_frameworks_dep kcodecs)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep syndication)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlrpcclient)
 	$(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-apps/kbounce/kbounce-9999.ebuild b/kde-apps/kbounce/kbounce-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kbounce/kbounce-9999.ebuild
copy to kde-apps/kbounce/kbounce-16.04.49.9999.ebuild
index f7c4602..59dd58b 100644
--- a/kde-apps/kbounce/kbounce-9999.ebuild
+++ b/kde-apps/kbounce/kbounce-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/kbounce/kbounce-9999.ebuild b/kde-apps/kbounce/kbounce-9999.ebuild
index f7c4602..59dd58b 100644
--- a/kde-apps/kbounce/kbounce-9999.ebuild
+++ b/kde-apps/kbounce/kbounce-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/kbreakout/kbreakout-9999.ebuild b/kde-apps/kbreakout/kbreakout-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kbreakout/kbreakout-9999.ebuild
copy to kde-apps/kbreakout/kbreakout-16.04.49.9999.ebuild
index 02c25c5..5acdac5 100644
--- a/kde-apps/kbreakout/kbreakout-9999.ebuild
+++ b/kde-apps/kbreakout/kbreakout-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kbreakout/kbreakout-9999.ebuild b/kde-apps/kbreakout/kbreakout-9999.ebuild
index 02c25c5..5acdac5 100644
--- a/kde-apps/kbreakout/kbreakout-9999.ebuild
+++ b/kde-apps/kbreakout/kbreakout-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/kbruch/kbruch-16.04.49.9999.ebuild
similarity index 69%
copy from kde-apps/kamera/kamera-9999.ebuild
copy to kde-apps/kbruch/kbruch-16.04.49.9999.ebuild
index 7cd9c98..8e88297 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/kbruch/kbruch-16.04.49.9999.ebuild
@@ -7,23 +7,19 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="Plasma integration for gphoto2 cameras"
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kcachegrind/kcachegrind-16.04.49.9999.ebuild b/kde-apps/kcachegrind/kcachegrind-16.04.49.9999.ebuild
new file mode 100644
index 0000000..492be67
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-16.04.49.9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Frontend for Cachegrind"
+HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
+http://kcachegrind.sourceforge.net"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	media-gfx/graphviz
+"

diff --git a/kde-apps/kdiamond/kdiamond-9999.ebuild b/kde-apps/kcalc/kcalc-16.04.49.9999.ebuild
similarity index 58%
copy from kde-apps/kdiamond/kdiamond-9999.ebuild
copy to kde-apps/kcalc/kcalc-16.04.49.9999.ebuild
index 66046ff..26b9e70 100644
--- a/kde-apps/kdiamond/kdiamond-9999.ebuild
+++ b/kde-apps/kcalc/kcalc-16.04.49.9999.ebuild
@@ -2,33 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_DOXYGEN="true"
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="A KDE three-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kdiamond/
-	https://games.kde.org/game.php?game=kdiamond
-"
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
+https://utils.kde.org/projects/kcalc"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
+	dev-libs/gmp:0=
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kinit)
+	dev-libs/mpfr:0
+	sys-devel/gettext
 "
-
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalcore/kcalcore-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/kcalutils/kcalutils-9999.ebuild
copy to kde-apps/kcalcore/kcalcore-16.04.49.9999.ebuild
index 36d0c69..a118695 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalcore/kcalcore-16.04.49.9999.ebuild
@@ -9,26 +9,20 @@ KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
+DESCRIPTION="Library for handling calendar data"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	dev-libs/grantlee:5
+	dev-libs/libical:=
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	sys-apps/util-linux
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # multiple tests fail or hang indefinitely

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-16.04.49.9999.ebuild
similarity index 91%
copy from kde-apps/kcalutils/kcalutils-9999.ebuild
copy to kde-apps/kcalutils/kcalutils-16.04.49.9999.ebuild
index 36d0c69..83e7c8b 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-16.04.49.9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
@@ -24,11 +24,10 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kidentitymanagement)
-	dev-libs/grantlee:5
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
index 36d0c69..83e7c8b 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
@@ -24,11 +24,10 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kidentitymanagement)
-	dev-libs/grantlee:5
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/kcharselect/kcharselect-16.04.49.9999.ebuild
similarity index 68%
copy from kde-apps/kamera/kamera-9999.ebuild
copy to kde-apps/kcharselect/kcharselect-16.04.49.9999.ebuild
index 7cd9c98..91c7454 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/kcharselect/kcharselect-16.04.49.9999.ebuild
@@ -4,26 +4,24 @@
 
 EAPI=6
 
+KDE_DOXYGEN="true"
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="Plasma integration for gphoto2 cameras"
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
+https://utils.kde.org/projects/kcharselect"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/kcolorchooser/kcolorchooser-16.04.49.9999.ebuild
similarity index 57%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/kcolorchooser/kcolorchooser-16.04.49.9999.ebuild
index 4231873..dfacbe7 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-16.04.49.9999.ebuild
@@ -4,24 +4,19 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional"
 inherit kde5
 
-DESCRIPTION="Widget library for baloo"
+DESCRIPTION="KDE color selector/editor"
+HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!kde-base/baloo-widgets
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kcontacts/kcontacts-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
copy to kde-apps/kcontacts/kcontacts-16.04.49.9999.ebuild
index d82fd85..85c11a5 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kcontacts/kcontacts-16.04.49.9999.ebuild
@@ -9,27 +9,26 @@ KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="A textedit with PIM-specific features"
+DESCRIPTION="Address book API for KDE"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
 	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-libs/grantlee:5
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Fails test because access to /dev/dri/card0 is denied
+	sed -i \
+		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
+		autotests/CMakeLists.txt || die
+}

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/kcron/kcron-16.04.49.9999.ebuild
similarity index 65%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/kcron/kcron-16.04.49.9999.ebuild
index 4231873..f57b9af 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/kcron/kcron-16.04.49.9999.ebuild
@@ -4,24 +4,24 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional"
+KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="Widget library for baloo"
+DESCRIPTION="KDE Task Scheduler"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
-	!kde-base/baloo-widgets
+	!prefix? ( virtual/cron )
 "

diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-16.04.49.9999.ebuild
similarity index 92%
copy from kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
copy to kde-apps/kde-apps-meta/kde-apps-meta-16.04.49.9999.ebuild
index 15b4deb..a29e061 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-16.04.49.9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	$(add_kdeapps_dep kdemultimedia-meta)
 	$(add_kdeapps_dep kdenetwork-meta)
 	$(add_kdeapps_dep kdeutils-meta)
-	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta '' 15.12.3) )
 	nls? (
 		$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
 		$(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})

diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
index 15b4deb..a29e061 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	$(add_kdeapps_dep kdemultimedia-meta)
 	$(add_kdeapps_dep kdenetwork-meta)
 	$(add_kdeapps_dep kdeutils-meta)
-	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta '' 15.12.3) )
 	nls? (
 		$(add_kdeapps_dep kde-l10n '' ${L10N_MINIMAL})
 		$(add_kdeapps_dep kde4-l10n 'minimal' ${L10N_MINIMAL})

diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.49.9999.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.49.9999.ebuild
new file mode 100644
index 0000000..54ff3e9
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.49.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Development Scripts"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="$(add_frameworks_dep kdoctools)" # to use ECM instead of kdelibs4
+RDEPEND="
+	app-arch/advancecomp
+	media-gfx/optipng
+	dev-perl/XML-DOM
+"
+
+src_prepare() {
+	# bug 275069
+	sed -ie 's:colorsvn::' CMakeLists.txt || die
+
+	kde5_src_prepare
+}

diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-16.04.49.9999.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-16.04.49.9999.ebuild
new file mode 100644
index 0000000..5350dfe
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-16.04.49.9999.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE Development Utilities"
+KEYWORDS=""
+IUSE="debug"

diff --git a/kde-apps/kde-meta/kde-meta-9999.ebuild b/kde-apps/kde-meta/kde-meta-16.04.49.9999.ebuild
similarity index 97%
copy from kde-apps/kde-meta/kde-meta-9999.ebuild
copy to kde-apps/kde-meta/kde-meta-16.04.49.9999.ebuild
index 5c9bf0f..567b01f 100644
--- a/kde-apps/kde-meta/kde-meta-9999.ebuild
+++ b/kde-apps/kde-meta/kde-meta-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5-meta-pkg
 

diff --git a/kde-apps/kde-meta/kde-meta-9999.ebuild b/kde-apps/kde-meta/kde-meta-9999.ebuild
index 5c9bf0f..567b01f 100644
--- a/kde-apps/kde-meta/kde-meta-9999.ebuild
+++ b/kde-apps/kde-meta/kde-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5-meta-pkg
 

diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.49.9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..9fece36
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.49.9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+KEYWORDS=""
+IUSE="+cron"
+
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kuser)
+RDEPEND="
+	$(add_kdeapps_dep ksystemlog)
+	cron? ( $(add_kdeapps_dep kcron) )
+"

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/kdebugsettings/kdebugsettings-16.04.49.9999.ebuild
similarity index 63%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/kdebugsettings/kdebugsettings-16.04.49.9999.ebuild
index 4231873..0c0e438 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-16.04.49.9999.ebuild
@@ -5,23 +5,24 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Widget library for baloo"
+DESCRIPTION="Application to enable/disable qCDebug"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!kde-base/baloo-widgets
-"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"

diff --git a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-16.04.49.9999.ebuild
similarity index 86%
copy from kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
copy to kde-apps/kdecore-meta/kdecore-meta-16.04.49.9999.ebuild
index e1ad203..aff1bc7 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-16.04.49.9999.ebuild
@@ -14,6 +14,6 @@ RDEPEND="
 	$(add_kdeapps_dep dolphin)
 	$(add_kdeapps_dep konsole)
 	$(add_kdeapps_dep kwrite)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3-r1) )
 	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta '' 15.08.3-r1) )
 "

diff --git a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
index e1ad203..aff1bc7 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
@@ -14,6 +14,6 @@ RDEPEND="
 	$(add_kdeapps_dep dolphin)
 	$(add_kdeapps_dep konsole)
 	$(add_kdeapps_dep kwrite)
-	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) )
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3-r1) )
 	!minimal? ( $(add_kdeapps_dep kdebase-runtime-meta '' 15.08.3-r1) )
 "

diff --git a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild
similarity index 97%
copy from kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
copy to kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild
index beaf206..0f1131f 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_AUTODEPS="false"
 inherit kde5

diff --git a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
index beaf206..0f1131f 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_AUTODEPS="false"
 inherit kde5

diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild
similarity index 97%
copy from kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
copy to kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild
index d5bf320..e9c399e 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-16.04.49.9999.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	$(add_kdeapps_dep ktouch)
 	$(add_kdeapps_dep kturtle)
 	$(add_kdeapps_dep kwordquiz)
-	$(add_kdeapps_dep libkdeedu)
 	$(add_kdeapps_dep libkeduvocdocument)
 	$(add_kdeapps_dep marble)
 	$(add_kdeapps_dep parley)

diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
index d5bf320..e9c399e 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	$(add_kdeapps_dep ktouch)
 	$(add_kdeapps_dep kturtle)
 	$(add_kdeapps_dep kwordquiz)
-	$(add_kdeapps_dep libkdeedu)
 	$(add_kdeapps_dep libkeduvocdocument)
 	$(add_kdeapps_dep marble)
 	$(add_kdeapps_dep parley)

diff --git a/kde-apps/kdegames-meta/kdegames-meta-16.04.49.9999.ebuild b/kde-apps/kdegames-meta/kdegames-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..849167b
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-16.04.49.9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+HOMEPAGE="https://games.kde.org/"
+KEYWORDS=""
+IUSE="opengl python"
+
+RDEPEND="
+	$(add_kdeapps_dep bomber)
+	$(add_kdeapps_dep bovo)
+	$(add_kdeapps_dep granatier)
+	$(add_kdeapps_dep kapman)
+	$(add_kdeapps_dep katomic)
+	$(add_kdeapps_dep kblackbox)
+	$(add_kdeapps_dep kblocks)
+	$(add_kdeapps_dep kbounce)
+	$(add_kdeapps_dep kbreakout)
+	$(add_kdeapps_dep kdiamond)
+	$(add_kdeapps_dep kfourinline)
+	$(add_kdeapps_dep kgoldrunner)
+	$(add_kdeapps_dep kigo)
+	$(add_kdeapps_dep killbots)
+	$(add_kdeapps_dep kiriki)
+	$(add_kdeapps_dep kjumpingcube)
+	$(add_kdeapps_dep klickety)
+	$(add_kdeapps_dep klines)
+	$(add_kdeapps_dep kmahjongg)
+	$(add_kdeapps_dep kmines)
+	$(add_kdeapps_dep knavalbattle)
+	$(add_kdeapps_dep knetwalk)
+	$(add_kdeapps_dep kolf)
+	$(add_kdeapps_dep kollision)
+	$(add_kdeapps_dep konquest)
+	$(add_kdeapps_dep kpat)
+	$(add_kdeapps_dep kreversi)
+	$(add_kdeapps_dep kshisen)
+	$(add_kdeapps_dep ksirk)
+	$(add_kdeapps_dep ksnakeduel)
+	$(add_kdeapps_dep kspaceduel)
+	$(add_kdeapps_dep ksquares)
+	$(add_kdeapps_dep ktuberling)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_kdeapps_dep lskat)
+	$(add_kdeapps_dep palapeli)
+	$(add_kdeapps_dep picmi)
+	opengl? (
+		$(add_kdeapps_dep ksudoku)
+		$(add_kdeapps_dep kubrick)
+	)
+	python? ( $(add_kdeapps_dep kajongg) )
+"

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.49.9999.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..3a714f9
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.49.9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+HOMEPAGE="https://www.kde.org/applications/graphics/"
+KEYWORDS=""
+IUSE="scanner"
+
+RDEPEND="
+	$(add_kdeapps_dep gwenview)
+	$(add_kdeapps_dep kamera)
+	$(add_kdeapps_dep kcolorchooser)
+	$(add_kdeapps_dep kdegraphics-mobipocket)
+	$(add_kdeapps_dep kolourpaint)
+	$(add_kdeapps_dep kruler)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+	$(add_kdeapps_dep libkipi)
+	$(add_kdeapps_dep okular)
+	$(add_kdeapps_dep spectacle)
+	$(add_kdeapps_dep svgpart)
+	$(add_kdeapps_dep thumbnailers)
+	scanner? (
+		$(add_kdeapps_dep ksaneplugin)
+		$(add_kdeapps_dep libksane)
+	)
+"

diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.49.9999.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.49.9999.ebuild
new file mode 100644
index 0000000..08c8b44
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.49.9999.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Library to support mobipocket ebooks"
+KEYWORDS=""
+IUSE="debug"

diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.49.9999.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..9c7d5d9
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.49.9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+KEYWORDS=""
+IUSE="+ffmpeg"
+
+# Add back whenever it is ported - no change since 4.10
+# 	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
+RDEPEND="
+	$(add_kdeapps_dep audiocd-kio)
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep kdenlive)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kscd)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
+"

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.49.9999.ebuild
similarity index 60%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.49.9999.ebuild
index 4231873..888430b 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.49.9999.ebuild
@@ -4,24 +4,27 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional"
 inherit kde5
 
-DESCRIPTION="Widget library for baloo"
+DESCRIPTION="kcontrol filesharing config module for SMB"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!kde-base/baloo-widgets
-"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.49.9999.ebuild
similarity index 78%
copy from kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
copy to kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.49.9999.ebuild
index ad8e9c6..22ec27f 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.49.9999.ebuild
@@ -8,15 +8,15 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
 KEYWORDS=""
-IUSE="ppp"
+IUSE="ppp +telepathy"
 
 RDEPEND="
 	$(add_kdeapps_dep kdenetwork-filesharing)
 	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep kopete)
 	$(add_kdeapps_dep krdc)
 	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep plasma-telepathy-meta)
 	$(add_kdeapps_dep zeroconf-ioslave)
 	ppp? ( $(add_kdeapps_dep kppp) )
+	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+	!telepathy? ( $(add_kdeapps_dep kopete) )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
index ad8e9c6..22ec27f 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
@@ -8,15 +8,15 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
 KEYWORDS=""
-IUSE="ppp"
+IUSE="ppp +telepathy"
 
 RDEPEND="
 	$(add_kdeapps_dep kdenetwork-filesharing)
 	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep kopete)
 	$(add_kdeapps_dep krdc)
 	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep plasma-telepathy-meta)
 	$(add_kdeapps_dep zeroconf-ioslave)
 	ppp? ( $(add_kdeapps_dep kppp) )
+	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+	!telepathy? ( $(add_kdeapps_dep kopete) )
 "

diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index b6d27d5..e9ae825 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="ppp">Enable support for <pkg>net-dialup/ppp</pkg>.</flag>
+		<flag name="telepathy">Enable build of <pkg>kde-apps/plasma-telepathy-meta</pkg>, otherwise <pkg>kde-apps/kopete</pkg>.</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-apps/kdenlive/kdenlive-16.04.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-16.04.49.9999.ebuild
new file mode 100644
index 0000000..cf825e2
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-16.04.49.9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="gles2 v4l semantic-desktop"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml]
+	virtual/ffmpeg[encode,sdl,X]
+	virtual/opengl
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package v4l LibV4L2)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepim-addons/kdepim-addons-16.04.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-16.04.49.9999.ebuild
new file mode 100644
index 0000000..71877d6
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-16.04.49.9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+KEYWORDS=""
+
+PIM_FTS="kaddressbook kmail korganizer"
+IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep gpgmepp)
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.12.50:5
+	!kde-apps/messageviewer:5
+	!<kde-apps/pimcommon-15.12.50:5
+	!kde-apps/kaddressbook:4
+	!kde-apps/kmail:4
+	!kde-apps/korganizer:4
+	$(add_kdeapps_dep kdepim)
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	for pim_ft in ${PIM_FTS}; do
+		use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
copy to kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.49.9999.ebuild
index d6f21bd..751809d 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 inherit kde5
@@ -36,13 +36,13 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep pimcommon)
-	dev-libs/grantlee:5
 	$(add_qt_dep designer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 	prison? ( media-libs/prison:5 )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
index d6f21bd..751809d 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 inherit kde5
@@ -36,13 +36,13 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep pimcommon)
-	dev-libs/grantlee:5
 	$(add_qt_dep designer)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 	prison? ( media-libs/prison:5 )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-16.04.49.9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-16.04.49.9999.ebuild
new file mode 100644
index 0000000..2445cec
--- /dev/null
+++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-16.04.49.9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Kioslave plugins for various PIM apps"
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE="ssl"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmbox)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	ssl? ( dev-libs/cyrus-sasl )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepimlibs:4
+	!kde-apps/kdepimlibs:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/kioslave"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/kioslave"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ssl Sasl2)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.04.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..ea7b2fd
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.04.49.9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS=""
+IUSE="nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadiconsole)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep akregator)
+	$(add_kdeapps_dep blogilo)
+	$(add_kdeapps_dep calendarjanitor)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbook)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kdepim-kioslaves)
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kdgantt2)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kleopatra)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep knotes)
+	$(add_kdeapps_dep konsolekalendar)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep ktnef)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	nls? (
+		$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})
+	)
+"

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.04.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.04.49.9999.ebuild
new file mode 100644
index 0000000..3aa5772
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.04.49.9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.19.0"
+inherit kde5
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS=""
+IUSE="google"
+
+# TODO kolab, Qt5TextToSpeech
+
+CDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libical:=
+"
+DEPEND="${CDEPEND}
+	$(add_frameworks_dep kross)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+	google? ( >=net-libs/libkgapi-5.1.0:5 )
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-runtime:4
+	$(add_frameworks_dep oxygen-icons)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package google KF5GAPI)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
new file mode 100644
index 0000000..8b524f7
--- /dev/null
+++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PIM_FTS="kalarm kmail kontact korganizer"
+
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_HANDBOOK="true"
+KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard agents grantleeeditor importwizard korgac
+mboximporter pimsettingexporter plugins sieveeditor storageservicemanager"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+KEYWORDS=""
+
+IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kdepim-kioslaves)
+	$(add_kdeapps_dep kdgantt2)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	media-libs/phonon[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	test? (
+		$(add_kdeapps_dep akonadi 'sqlite,tools')
+		$(add_qt_dep qtsql 'sqlite')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kabcclient:4
+	!kde-apps/kalarm:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-runtime:4
+	!kde-apps/kjots:4
+	!kde-apps/kmail:4
+	!kde-apps/knode:4
+	!kde-apps/kontact:4
+	!kde-apps/korganizer:4
+	!kde-apps/ktimetracker:4
+	$(add_kdeapps_dep kdepim-runtime)
+"
+# kontact: summary plugin; kalarm: email scheduler
+REQUIRED_USE="
+	kdepim_features_kontact? ( kdepim_features_kmail )
+	kdepim_features_kalarm? ( kdepim_features_kmail )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -i \
+		-e "/akregator/ s/^/#DONT/" \
+		-e "/blogilo/ s/^/#DONT/" \
+		-e "/knotes/ s/^/#DONT/" \
+		-e "/konsolekalendar/ s/^/#DONT/" \
+		-e "/ktnef/ s/^/#DONT/" \
+		doc/CMakeLists.txt || die "Failed to disable split docs"
+
+	# applications
+	for pim_ft in ${PIM_FTS}; do
+		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.49.9999.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.49.9999.ebuild
new file mode 100644
index 0000000..10442f5
--- /dev/null
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.49.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS=""
+IUSE="debug subversion"
+KMNAME="kdesdk-kioslaves"
+
+DEPEND="
+	subversion? (
+		dev-libs/apr
+		=dev-vcs/subversion-1.8*
+	)
+"
+RDEPEND="${DEPEND}
+	subversion? ( !>=dev-vcs/kdesvn-1.5.2:4 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPRCONFIG_EXECUTABLE="${EPREFIX}"/usr/bin/apr-1-config
+		$(cmake-utils_use_with subversion SVN)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-16.04.49.9999.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..5eb57a8
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-16.04.49.9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS=""
+IUSE="cvs"
+
+RDEPEND="
+	$(add_kdeapps_dep dolphin-plugins)
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kate)
+	$(add_kdeapps_dep kcachegrind)
+	$(add_kdeapps_dep kde-dev-scripts)
+	$(add_kdeapps_dep kde-dev-utils)
+	$(add_kdeapps_dep kdesdk-kioslaves)
+	$(add_kdeapps_dep kompare)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_kdeapps_dep lokalize)
+	$(add_kdeapps_dep okteta)
+	$(add_kdeapps_dep poxml)
+	$(add_kdeapps_dep umbrello)
+	cvs? ( $(add_kdeapps_dep cervisia) )
+"

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.49.9999.ebuild
similarity index 61%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.49.9999.ebuild
index 4231873..8c91557 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.49.9999.ebuild
@@ -4,24 +4,19 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional"
 inherit kde5
 
-DESCRIPTION="Widget library for baloo"
+DESCRIPTION="Thumbnail generator for PO files"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep baloo)
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	sys-devel/gettext
 "
-RDEPEND="${DEPEND}
-	!kde-base/baloo-widgets
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-16.04.49.9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-16.04.49.9999.ebuild
new file mode 100644
index 0000000..5f700e5
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-16.04.49.9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+KEYWORDS=""
+IUSE="cups floppy lirc"
+
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kgpg)
+RDEPEND="
+	$(add_kdeapps_dep ark)
+	$(add_kdeapps_dep filelight)
+	$(add_kdeapps_dep kcalc)
+	$(add_kdeapps_dep kcharselect)
+	$(add_kdeapps_dep kdebugsettings)
+	$(add_kdeapps_dep kdf)
+	$(add_kdeapps_dep kteatime)
+	$(add_kdeapps_dep ktimer)
+	$(add_kdeapps_dep kwalletmanager)
+	$(add_kdeapps_dep sweeper)
+	cups? ( $(add_kdeapps_dep print-manager) )
+	floppy? ( $(add_kdeapps_dep kfloppy) )
+	lirc? ( $(add_kdeapps_dep kremotecontrol) )
+"

diff --git a/kde-apps/kdf/kdf-16.04.49.9999.ebuild b/kde-apps/kdf/kdf-16.04.49.9999.ebuild
new file mode 100644
index 0000000..2309627
--- /dev/null
+++ b/kde-apps/kdf/kdf-16.04.49.9999.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE free disk space utility"
+HOMEPAGE="https://utils.kde.org/projects/kdf"
+KEYWORDS=""
+IUSE="debug"

diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kdgantt2/kdgantt2-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/kldap/kldap-9999.ebuild
copy to kde-apps/kdgantt2/kdgantt2-16.04.49.9999.ebuild
index dac319f..59fb519 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kdgantt2/kdgantt2-16.04.49.9999.ebuild
@@ -5,21 +5,23 @@
 EAPI=6
 
 KDE_DOXYGEN="true"
-KDE_TEST="true"
+KDE_TEST="false"
 inherit kde5
 
-DESCRIPTION="Library for interacting with LDAP servers"
+DESCRIPTION="KDGantt library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
+COMMON_DEPEND="
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-	net-nds/openldap
 "
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/kdiamond/kdiamond-9999.ebuild b/kde-apps/kdiamond/kdiamond-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/kdiamond/kdiamond-9999.ebuild
copy to kde-apps/kdiamond/kdiamond-16.04.49.9999.ebuild
index 66046ff..24150a6 100644
--- a/kde-apps/kdiamond/kdiamond-9999.ebuild
+++ b/kde-apps/kdiamond/kdiamond-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -30,5 +30,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kdiamond/kdiamond-9999.ebuild b/kde-apps/kdiamond/kdiamond-9999.ebuild
index 66046ff..24150a6 100644
--- a/kde-apps/kdiamond/kdiamond-9999.ebuild
+++ b/kde-apps/kdiamond/kdiamond-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -30,5 +30,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kfloppy/kfloppy-16.04.49.9999.ebuild
similarity index 67%
copy from kde-apps/kiten/kiten-9999.ebuild
copy to kde-apps/kfloppy/kfloppy-16.04.49.9999.ebuild
index 7a9b946..952a530 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/kfloppy/kfloppy-16.04.49.9999.ebuild
@@ -2,27 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
+DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+HOMEPAGE="
+	https://www.kde.org/applications/utilities/kfloppy/
+	https://utils.kde.org/projects/kfloppy/
+"
+
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)

diff --git a/kde-apps/kfourinline/kfourinline-9999.ebuild b/kde-apps/kfourinline/kfourinline-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kfourinline/kfourinline-9999.ebuild
copy to kde-apps/kfourinline/kfourinline-16.04.49.9999.ebuild
index d98c460..8052a20 100644
--- a/kde-apps/kfourinline/kfourinline-9999.ebuild
+++ b/kde-apps/kfourinline/kfourinline-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_PUNT_BOGUS_DEPS="true"

diff --git a/kde-apps/kfourinline/kfourinline-9999.ebuild b/kde-apps/kfourinline/kfourinline-9999.ebuild
index d98c460..8052a20 100644
--- a/kde-apps/kfourinline/kfourinline-9999.ebuild
+++ b/kde-apps/kfourinline/kfourinline-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_PUNT_BOGUS_DEPS="true"

diff --git a/kde-apps/kgeography/kgeography-9999.ebuild b/kde-apps/kgeography/kgeography-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kgeography/kgeography-9999.ebuild
copy to kde-apps/kgeography/kgeography-16.04.49.9999.ebuild
index 74204ec..ca1a29b 100644
--- a/kde-apps/kgeography/kgeography-9999.ebuild
+++ b/kde-apps/kgeography/kgeography-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kgeography/kgeography-9999.ebuild b/kde-apps/kgeography/kgeography-9999.ebuild
index 74204ec..ca1a29b 100644
--- a/kde-apps/kgeography/kgeography-9999.ebuild
+++ b/kde-apps/kgeography/kgeography-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kget/kget-16.04.49.9999.ebuild b/kde-apps/kget/kget-16.04.49.9999.ebuild
new file mode 100644
index 0000000..73b26d7
--- /dev/null
+++ b/kde-apps/kget/kget-16.04.49.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="An advanced download manager for KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/kget/"
+KEYWORDS=""
+IUSE="debug bittorrent gpg mms sqlite webkit"
+
+RDEPEND="
+	$(add_kdeapps_dep libkonq)
+	$(add_kdebase_dep libkworkspace '' 4.11)
+	app-crypt/qca:2[qt4]
+	bittorrent? ( >=net-libs/libktorrent-1.0.3:4 )
+	gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+	webkit? ( >=kde-misc/kwebkitpart-0.9.6:4 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NepomukCore=OFF
+		-DWITH_NepomukWidgets=OFF
+		$(cmake-utils_use_with bittorrent KTorrent)
+		$(cmake-utils_use_with gpg QGpgme)
+		$(cmake-utils_use_with mms LibMms)
+		$(cmake-utils_use_with sqlite)
+		$(cmake-utils_use_with webkit KWebKitPart)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-apps/kgoldrunner/kgoldrunner-16.04.49.9999.ebuild b/kde-apps/kgoldrunner/kgoldrunner-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d63e29e
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-16.04.49.9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Game of action and puzzle solving by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kgoldrunner/
+	https://games.kde.org/game.php?game=kgoldrunner
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kgpg/kgpg-16.04.49.9999.ebuild b/kde-apps/kgpg/kgpg-16.04.49.9999.ebuild
new file mode 100644
index 0000000..08e6a46
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-16.04.49.9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde4-base
+
+DESCRIPTION="KDE gpg keyring manager"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! has_version 'app-crypt/dirmngr' && ! has_version '>=app-crypt/gnupg-2.1'; then
+		elog "For improved key search functionality, install app-crypt/dirmngr."
+	fi
+}

diff --git a/kde-apps/khangman/khangman-9999.ebuild b/kde-apps/khangman/khangman-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/khangman/khangman-9999.ebuild
copy to kde-apps/khangman/khangman-16.04.49.9999.ebuild
index 05fcef4..da3b22c 100644
--- a/kde-apps/khangman/khangman-9999.ebuild
+++ b/kde-apps/khangman/khangman-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 inherit kde5

diff --git a/kde-apps/khangman/khangman-9999.ebuild b/kde-apps/khangman/khangman-9999.ebuild
index 05fcef4..da3b22c 100644
--- a/kde-apps/khangman/khangman-9999.ebuild
+++ b/kde-apps/khangman/khangman-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 inherit kde5

diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/kholidays/kholidays-16.04.49.9999.ebuild
similarity index 64%
copy from kde-apps/kmbox/kmbox-9999.ebuild
copy to kde-apps/kholidays/kholidays-16.04.49.9999.ebuild
index b0abe4e..f63961c 100644
--- a/kde-apps/kmbox/kmbox-9999.ebuild
+++ b/kde-apps/kholidays/kholidays-16.04.49.9999.ebuild
@@ -8,10 +8,10 @@ KDE_DOXYGEN="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Library for accessing MBox format mail storages"
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="$(add_kdeapps_dep kmime)"
-DEPEND="${RDEPEND}"
+DEPEND=""
+RDEPEND=""

diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-16.04.49.9999.ebuild
similarity index 71%
copy from kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
copy to kde-apps/kidentitymanagement/kidentitymanagement-16.04.49.9999.ebuild
index d82fd85..a648169 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-16.04.49.9999.ebuild
@@ -4,32 +4,29 @@
 
 EAPI=6
 
-KDE_DOXYGEN="true"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="A textedit with PIM-specific features"
+DESCRIPTION="Library for managing identitites"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
+	$(add_kdeapps_dep kpimtextedit)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-libs/grantlee:5
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-apps/kig/kig-9999.ebuild b/kde-apps/kig/kig-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/kig/kig-9999.ebuild
copy to kde-apps/kig/kig-16.04.49.9999.ebuild
index 0de3d76..d4af132 100644
--- a/kde-apps/kig/kig-9999.ebuild
+++ b/kde-apps/kig/kig-16.04.49.9999.ebuild
@@ -15,8 +15,7 @@ IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
-	${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)

diff --git a/kde-apps/kig/kig-9999.ebuild b/kde-apps/kig/kig-9999.ebuild
index 0de3d76..d4af132 100644
--- a/kde-apps/kig/kig-9999.ebuild
+++ b/kde-apps/kig/kig-9999.ebuild
@@ -15,8 +15,7 @@ IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
-	${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)

diff --git a/kde-apps/kigo/kigo-16.04.49.9999.ebuild b/kde-apps/kigo/kigo-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d0e616f
--- /dev/null
+++ b/kde-apps/kigo/kigo-16.04.49.9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kigo/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}
+	games-board/gnugo
+"

diff --git a/kde-apps/killbots/killbots-9999.ebuild b/kde-apps/killbots/killbots-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/killbots/killbots-9999.ebuild
copy to kde-apps/killbots/killbots-16.04.49.9999.ebuild
index d960d9c..bcb5d9b 100644
--- a/kde-apps/killbots/killbots-9999.ebuild
+++ b/kde-apps/killbots/killbots-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/killbots/killbots-9999.ebuild b/kde-apps/killbots/killbots-9999.ebuild
index d960d9c..bcb5d9b 100644
--- a/kde-apps/killbots/killbots-9999.ebuild
+++ b/kde-apps/killbots/killbots-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/kimap/kimap-16.04.49.9999.ebuild
similarity index 62%
copy from kde-apps/syndication/syndication-9999.ebuild
copy to kde-apps/kimap/kimap-16.04.49.9999.ebuild
index a0a9e9f..a3ac0ea 100644
--- a/kde-apps/syndication/syndication-9999.ebuild
+++ b/kde-apps/kimap/kimap-16.04.49.9999.ebuild
@@ -8,15 +8,18 @@ KDE_DOXYGEN="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Library for parsing RSS and Atom feeds"
+DESCRIPTION="Library for interacting with IMAP servers"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
+	$(add_kdeapps_dep kmime)
+	dev-libs/cyrus-sasl
+	$(add_qt_dep qtgui)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild
new file mode 100644
index 0000000..dcc759f
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-16.04.49.9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.20.0"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
+KEYWORDS=""
+IUSE="exif mtp openexr phonon samba +sftp slp"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive 'bzip2,lzma')
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	virtual/jpeg:0
+	exif? ( media-gfx/exiv2:= )
+	mtp? ( media-libs/libmtp:= )
+	openexr? ( media-libs/openexr )
+	phonon? ( media-libs/phonon[qt5] )
+	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
+	sftp? ( >=net-libs/libssh-0.6.0:=[sftp] )
+	slp? ( net-libs/openslp )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	!<kde-apps/kcontrol-15.08.0-r1:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package mtp Mtp)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package samba Samba)
+		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_find_package slp SLP)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kiriki/kiriki-9999.ebuild b/kde-apps/kiriki/kiriki-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kiriki/kiriki-9999.ebuild
copy to kde-apps/kiriki/kiriki-16.04.49.9999.ebuild
index 3df50fe..c42eb17 100644
--- a/kde-apps/kiriki/kiriki-9999.ebuild
+++ b/kde-apps/kiriki/kiriki-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_PUNT_BOGUS_DEPS="true"

diff --git a/kde-apps/kiriki/kiriki-9999.ebuild b/kde-apps/kiriki/kiriki-9999.ebuild
index 3df50fe..c42eb17 100644
--- a/kde-apps/kiriki/kiriki-9999.ebuild
+++ b/kde-apps/kiriki/kiriki-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_PUNT_BOGUS_DEPS="true"

diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kiten/kiten-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kiten/kiten-9999.ebuild
copy to kde-apps/kiten/kiten-16.04.49.9999.ebuild
index 7a9b946..ed484b1 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/kiten/kiten-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kiten/kiten-9999.ebuild
index 7a9b946..ed484b1 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/kiten/kiten-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild b/kde-apps/kjumpingcube/kjumpingcube-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
copy to kde-apps/kjumpingcube/kjumpingcube-16.04.49.9999.ebuild
index 3e1d38c..1ac6d47 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"

diff --git a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
index 3e1d38c..1ac6d47 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"

diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-16.04.49.9999.ebuild
similarity index 93%
copy from kde-apps/kldap/kldap-9999.ebuild
copy to kde-apps/kldap/kldap-16.04.49.9999.ebuild
index dac319f..f096e74 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kldap/kldap-16.04.49.9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
@@ -22,4 +22,4 @@ RDEPEND="
 	dev-libs/cyrus-sasl
 	net-nds/openldap
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
index dac319f..f096e74 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kldap/kldap-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
@@ -22,4 +22,4 @@ RDEPEND="
 	dev-libs/cyrus-sasl
 	net-nds/openldap
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kleopatra/kleopatra-16.04.49.9999.ebuild b/kde-apps/kleopatra/kleopatra-16.04.49.9999.ebuild
new file mode 100644
index 0000000..54d24ca
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-16.04.49.9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+KEYWORDS=""
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.3.2
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim[kdepim_features_kleopatra]
+	!<kde-apps/kdepim-15.12.2-r1
+	>=app-crypt/gnupg-2.1
+"

diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/klettres/klettres-16.04.49.9999.ebuild
similarity index 73%
copy from kde-apps/granatier/granatier-9999.ebuild
copy to kde-apps/klettres/klettres-16.04.49.9999.ebuild
index 0cf18e9..52382a9 100644
--- a/kde-apps/granatier/granatier-9999.ebuild
+++ b/kde-apps/klettres/klettres-16.04.49.9999.ebuild
@@ -2,31 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://www.kde.org/applications/games/granatier/"
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://www.kde.org/applications/education/klettres
+https://edu.kde.org/klettres"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/klickety/klickety-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/klickety/klickety-9999.ebuild
copy to kde-apps/klickety/klickety-16.04.49.9999.ebuild
index 48cf231..4b244af 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/klickety/klickety-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -28,7 +28,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=()

diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/klickety/klickety-9999.ebuild
index 48cf231..4b244af 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/klickety/klickety-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -28,7 +28,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=()

diff --git a/kde-apps/klines/klines-9999.ebuild b/kde-apps/klines/klines-16.04.49.9999.ebuild
similarity index 98%
copy from kde-apps/klines/klines-9999.ebuild
copy to kde-apps/klines/klines-16.04.49.9999.ebuild
index 9afd59c..1c91a26 100644
--- a/kde-apps/klines/klines-9999.ebuild
+++ b/kde-apps/klines/klines-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -29,7 +29,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS )

diff --git a/kde-apps/klines/klines-9999.ebuild b/kde-apps/klines/klines-9999.ebuild
index 9afd59c..1c91a26 100644
--- a/kde-apps/klines/klines-9999.ebuild
+++ b/kde-apps/klines/klines-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -29,7 +29,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS )

diff --git a/kde-apps/kmahjongg/kmahjongg-9999.ebuild b/kde-apps/kmahjongg/kmahjongg-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kmahjongg/kmahjongg-9999.ebuild
copy to kde-apps/kmahjongg/kmahjongg-16.04.49.9999.ebuild
index 893d502..4c5e40c 100644
--- a/kde-apps/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -34,5 +34,4 @@ DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmahjongg/kmahjongg-9999.ebuild b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
index 893d502..4c5e40c 100644
--- a/kde-apps/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -34,5 +34,4 @@ DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-16.04.49.9999.ebuild
similarity index 57%
copy from kde-apps/kapptemplate/kapptemplate-9999.ebuild
copy to kde-apps/kmailtransport/kmailtransport-16.04.49.9999.ebuild
index 290b6ff..f15f415 100644
--- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-16.04.49.9999.ebuild
@@ -4,26 +4,34 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
+DESCRIPTION="Mail transport service"
+LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
+RDEPEND="${DEPEND}
+	!kde-apps/kdepimlibs:4
+"
 
-RDEPEND="${DEPEND}"
+RESTRICT="test"

diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/kmbox/kmbox-16.04.49.9999.ebuild
similarity index 83%
copy from kde-apps/kmbox/kmbox-9999.ebuild
copy to kde-apps/kmbox/kmbox-16.04.49.9999.ebuild
index b0abe4e..4ae7aad 100644
--- a/kde-apps/kmbox/kmbox-9999.ebuild
+++ b/kde-apps/kmbox/kmbox-16.04.49.9999.ebuild
@@ -13,5 +13,5 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="$(add_kdeapps_dep kmime)"
-DEPEND="${RDEPEND}"
+DEPEND="$(add_kdeapps_dep kmime)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/kmbox/kmbox-9999.ebuild
index b0abe4e..4ae7aad 100644
--- a/kde-apps/kmbox/kmbox-9999.ebuild
+++ b/kde-apps/kmbox/kmbox-9999.ebuild
@@ -13,5 +13,5 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="$(add_kdeapps_dep kmime)"
-DEPEND="${RDEPEND}"
+DEPEND="$(add_kdeapps_dep kmime)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/kmime/kmime-16.04.49.9999.ebuild
similarity index 52%
copy from kde-apps/syndication/syndication-9999.ebuild
copy to kde-apps/kmime/kmime-16.04.49.9999.ebuild
index a0a9e9f..b845b31 100644
--- a/kde-apps/syndication/syndication-9999.ebuild
+++ b/kde-apps/kmime/kmime-16.04.49.9999.ebuild
@@ -8,15 +8,18 @@ KDE_DOXYGEN="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Library for parsing RSS and Atom feeds"
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
+	$(add_frameworks_dep ki18n)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# kmime-dateformattertest fails because of PM
+	LC_TIME=en_US kde5_src_test
+}

diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kmines/kmines-16.04.49.9999.ebuild
similarity index 80%
copy from kde-apps/kblackbox/kblackbox-9999.ebuild
copy to kde-apps/kmines/kmines-16.04.49.9999.ebuild
index 7bf051c..fe481fb 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/kmines/kmines-16.04.49.9999.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="KDE Blackbox Game"
+DESCRIPTION="Classic mine sweeper game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmines/
+	https://games.kde.org/game.php?game=kmines
+"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -25,8 +28,6 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmix/kmix-16.04.49.9999.ebuild b/kde-apps/kmix/kmix-16.04.49.9999.ebuild
new file mode 100644
index 0000000..c962bd8
--- /dev/null
+++ b/kde-apps/kmix/kmix-16.04.49.9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
+KEYWORDS=""
+IUSE="alsa pulseaudio"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKMIX_KF5_BUILD=ON
+		$(cmake-utils_use_find_package alsa Alsa)
+		$(cmake-utils_use_find_package pulseaudio Canberra)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kmplot/kmplot-9999.ebuild b/kde-apps/kmplot/kmplot-16.04.49.9999.ebuild
similarity index 96%
copy from kde-apps/kmplot/kmplot-9999.ebuild
copy to kde-apps/kmplot/kmplot-16.04.49.9999.ebuild
index 63cbb07..be2ea85 100644
--- a/kde-apps/kmplot/kmplot-9999.ebuild
+++ b/kde-apps/kmplot/kmplot-16.04.49.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -33,4 +33,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmplot/kmplot-9999.ebuild b/kde-apps/kmplot/kmplot-9999.ebuild
index 63cbb07..be2ea85 100644
--- a/kde-apps/kmplot/kmplot-9999.ebuild
+++ b/kde-apps/kmplot/kmplot-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -33,4 +33,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/knavalbattle/knavalbattle-9999.ebuild
copy to kde-apps/knavalbattle/knavalbattle-16.04.49.9999.ebuild
index a430243..0d4e83d 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -33,7 +33,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS )

diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
index a430243..0d4e83d 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
@@ -33,7 +33,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS )

diff --git a/kde-apps/kbreakout/kbreakout-9999.ebuild b/kde-apps/knetwalk/knetwalk-16.04.49.9999.ebuild
similarity index 69%
copy from kde-apps/kbreakout/kbreakout-9999.ebuild
copy to kde-apps/knetwalk/knetwalk-16.04.49.9999.ebuild
index 02c25c5..2c23790 100644
--- a/kde-apps/kbreakout/kbreakout-9999.ebuild
+++ b/kde-apps/knetwalk/knetwalk-16.04.49.9999.ebuild
@@ -2,15 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="A Breakout-like game for KDE"
+DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
 HOMEPAGE="
-	https://www.kde.org/applications/games/kbreakout/
-	https://games.kde.org/game.php?game=kbreakout
+	https://www.kde.org/applications/games/knetwalk/
+	https://games.kde.org/game.php?game=knetwalk
 "
 KEYWORDS=""
 IUSE=""
@@ -22,12 +24,12 @@ DEPEND="
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/knotes/knotes-16.04.49.9999.ebuild b/kde-apps/knotes/knotes-16.04.49.9999.ebuild
new file mode 100644
index 0000000..c978008
--- /dev/null
+++ b/kde-apps/knotes/knotes-16.04.49.9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PIM_KEEP_SUBDIR="noteshared"
+KDE_PIM_KONTACTPLUGIN="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="KDE Notes application"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+	kontact? (
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kparts)
+		$(add_kdeapps_dep kcalcore)
+		$(add_kdeapps_dep kcalutils)
+		$(add_kdeapps_dep kcontacts)
+		$(add_kdeapps_dep libkdepim)
+	)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+	!kde-apps/noteshared:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+	)
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kolf/kolf-16.04.49.9999.ebuild b/kde-apps/kolf/kolf-16.04.49.9999.ebuild
new file mode 100644
index 0000000..605bdb4
--- /dev/null
+++ b/kde-apps/kolf/kolf-16.04.49.9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="KDE Minigolf Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kolf/
+	https://games.kde.org/game.php?game=kolf
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/kollision/kollision-16.04.49.9999.ebuild
similarity index 75%
copy from kde-apps/bomber/bomber-9999.ebuild
copy to kde-apps/kollision/kollision-16.04.49.9999.ebuild
index 3b47b37..be22168 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/kollision/kollision-16.04.49.9999.ebuild
@@ -2,19 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE arcade bombing game"
-HOMEPAGE="https://www.kde.org/applications/games/bomber/"
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kollision/
+	https://games.kde.org/game.php?game=kollision
+"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
@@ -24,7 +26,5 @@ DEPEND="
 	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kolourpaint/kolourpaint-16.04.49.9999.ebuild b/kde-apps/kolourpaint/kolourpaint-16.04.49.9999.ebuild
new file mode 100644
index 0000000..0e93748
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-16.04.49.9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Paint Program for KDE"
+HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
+KEYWORDS=""
+LICENSE="BSD LGPL-2"
+IUSE="debug scanner"
+
+DEPEND="
+	media-libs/qimageblitz
+	scanner? ( $(add_kdeapps_dep libksane) )
+"
+RDEPEND="${DEPEND}
+	scanner? ( $(add_kdeapps_dep ksaneplugin) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package scanner KSane)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kompare/kompare-9999.ebuild
copy to kde-apps/kompare/kompare-16.04.49.9999.ebuild
index 5434469..5c27d4d 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kompare/kompare-16.04.49.9999.ebuild
@@ -19,8 +19,8 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kparts)
@@ -33,5 +33,4 @@ DEPEND="
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-9999.ebuild
index 5434469..5c27d4d 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kompare/kompare-9999.ebuild
@@ -19,8 +19,8 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kparts)
@@ -33,5 +33,4 @@ DEPEND="
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/konquest/konquest-16.04.49.9999.ebuild b/kde-apps/konquest/konquest-16.04.49.9999.ebuild
new file mode 100644
index 0000000..c3528ab
--- /dev/null
+++ b/kde-apps/konquest/konquest-16.04.49.9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/konquest/
+	https://games.kde.org/game.php?game=konquest
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/konsole/konsole-16.04.49.9999.ebuild
similarity index 51%
copy from kde-apps/umbrello/umbrello-9999.ebuild
copy to kde-apps/konsole/konsole-16.04.49.9999.ebuild
index a6f3233..0510cda 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/konsole/konsole-16.04.49.9999.ebuild
@@ -5,46 +5,52 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="
-	https://www.kde.org/applications/development/umbrello
-	https://umbrello.kde.org
-"
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
 KEYWORDS=""
-IUSE=""
+IUSE="X"
 
-RDEPEND="
-	$(add_frameworks_dep karchive)
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtscript)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
+	X? ( x11-libs/libX11 )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_unittests=$(usex test)
+		$(cmake-utils_use_find_package X X11)
 	)
 
 	kde5_src_configure

diff --git a/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild
new file mode 100644
index 0000000..c43ae9c
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+PATCHES=( "${FILESDIR}/kdepim-console.patch" )
+
+src_prepare() {
+	mv console/calendarjanitor calendarjanitor || die "Failed to move calendarjanitor"
+	mv console/konsolekalendar konsolekalendar || die "Failed to move konsolekalendar"
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-16.04.49.9999.ebuild
similarity index 94%
copy from kde-apps/kontactinterface/kontactinterface-9999.ebuild
copy to kde-apps/kontactinterface/kontactinterface-16.04.49.9999.ebuild
index c7786a5..0a5410b 100644
--- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-16.04.49.9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -24,4 +24,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
index c7786a5..0a5410b 100644
--- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -24,4 +24,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kopete/kopete-16.04.49.9999.ebuild b/kde-apps/kopete/kopete-16.04.49.9999.ebuild
new file mode 100644
index 0000000..ea8ef2f
--- /dev/null
+++ b/kde-apps/kopete/kopete-16.04.49.9999.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS=""
+IUSE="debug ssl v4l"
+
+# 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
+#	oscar: 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 oscar skype
+sms testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+#   msn: net-libs/libmsn
+#	qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kdelibs 'zeroconf?')
+	$(add_kdeapps_dep kdepimlibs)
+	dev-libs/libpcre
+	>=dev-qt/qtgui-4.4.0:4[mng]
+	media-libs/phonon[qt4]
+	media-libs/qimageblitz
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt4(+)]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	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:2[openssl] )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	jingle? ( dev-libs/jsoncpp )
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local 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 v4l VIDEOSUPPORT)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_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 ; then # || use irc; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=openssl."
+			fi
+		fi
+	fi
+}

diff --git a/kde-apps/kpat/kpat-9999.ebuild b/kde-apps/kpat/kpat-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kpat/kpat-9999.ebuild
copy to kde-apps/kpat/kpat-16.04.49.9999.ebuild
index ae5b3f3..8632307 100644
--- a/kde-apps/kpat/kpat-9999.ebuild
+++ b/kde-apps/kpat/kpat-16.04.49.9999.ebuild
@@ -32,5 +32,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	x11-misc/shared-mime-info
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kpat/kpat-9999.ebuild b/kde-apps/kpat/kpat-9999.ebuild
index ae5b3f3..8632307 100644
--- a/kde-apps/kpat/kpat-9999.ebuild
+++ b/kde-apps/kpat/kpat-9999.ebuild
@@ -32,5 +32,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	x11-misc/shared-mime-info
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild b/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild
index 97121d3..a9272aa 100644
--- a/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild
+++ b/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-16.04.49.9999.ebuild
similarity index 96%
copy from kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
copy to kde-apps/kpimtextedit/kpimtextedit-16.04.49.9999.ebuild
index d82fd85..6cd7fe9 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-16.04.49.9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -27,9 +27,9 @@ RDEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
-	dev-libs/grantlee:5
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index d82fd85..6cd7fe9 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -27,9 +27,9 @@ RDEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
-	dev-libs/grantlee:5
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kppp/kppp-16.04.49.9999.ebuild b/kde-apps/kppp/kppp-16.04.49.9999.ebuild
new file mode 100644
index 0000000..1e87a3d
--- /dev/null
+++ b/kde-apps/kppp/kppp-16.04.49.9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A dialer and front-end to pppd"
+HOMEPAGE="https://www.kde.org/applications/internet/kppp"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	net-dialup/ppp
+"

diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-16.04.49.9999.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-16.04.49.9999.ebuild
new file mode 100644
index 0000000..6b4e0ce
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-16.04.49.9999.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="$(add_kdeapps_dep plasma-runtime)"

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/krdc/krdc-16.04.49.9999.ebuild
similarity index 53%
copy from kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
copy to kde-apps/krdc/krdc-16.04.49.9999.ebuild
index 97884a5..366963f 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/krdc/krdc-16.04.49.9999.ebuild
@@ -2,41 +2,48 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_BLOCK_SLOT4="false"
-KDE_DOXYGEN="true"
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Wallet management tool"
+DESCRIPTION="Remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
 KEYWORDS=""
-IUSE=""
+IUSE="+rdesktop vnc"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	net-dns/avahi
+	vnc? ( >=net-libs/libvncserver-0.9 )
 "
 RDEPEND="${DEPEND}
-	!kde-apps/kwalletmanager:4[-minimal(-)]
+	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] )
 "
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LibVNCServer=$(usex vnc)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kremotecontrol/kremotecontrol-16.04.49.9999.ebuild b/kde-apps/kremotecontrol/kremotecontrol-16.04.49.9999.ebuild
new file mode 100644
index 0000000..3cf74e5
--- /dev/null
+++ b/kde-apps/kremotecontrol/kremotecontrol-16.04.49.9999.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
+HOMEPAGE="https://www.kde.org/applications/utilities/kremotecontrol
+https://utils.kde.org/projects/kremotecontrol"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	app-misc/lirc
+"

diff --git a/kde-apps/kreversi/kreversi-16.04.49.9999.ebuild b/kde-apps/kreversi/kreversi-16.04.49.9999.ebuild
new file mode 100644
index 0000000..92dca11
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-16.04.49.9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="KDE Board Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kreversi/
+	https://games.kde.org/game.php?game=kreversi
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/krfb/krfb-16.04.49.9999.ebuild
similarity index 57%
copy from kde-apps/knavalbattle/knavalbattle-9999.ebuild
copy to kde-apps/krfb/krfb-16.04.49.9999.ebuild
index a430243..f3e7b4b 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/krfb/krfb-16.04.49.9999.ebuild
@@ -2,38 +2,41 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_DOXYGEN="true"
 KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/navalbattle/
-	https://games.kde.org/game.php?game=kbattleship
-"
+DESCRIPTION="VNC-compatible server to share KDE desktops"
+HOMEPAGE="https://www.kde.org/applications/system/krfb/"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdnssd)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	$(add_qt_dep qtx11extras)
+	>=net-libs/libvncserver-0.9.9
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXtst
 "
-
 RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )

diff --git a/kde-apps/kross-interpreters/kross-interpreters-16.04.49.9999.ebuild b/kde-apps/kross-interpreters/kross-interpreters-16.04.49.9999.ebuild
new file mode 100644
index 0000000..007b5ca
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-16.04.49.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+KEYWORDS=""
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kross)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}

diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/kruler/kruler-16.04.49.9999.ebuild
similarity index 61%
copy from kde-apps/klickety/klickety-9999.ebuild
copy to kde-apps/kruler/kruler-16.04.49.9999.ebuild
index 48cf231..9883a58 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/kruler/kruler-16.04.49.9999.ebuild
@@ -2,33 +2,38 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
 KEYWORDS=""
-IUSE=""
+IUSE="X"
 
 DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
 "
-
 RDEPEND="${DEPEND}"
 
-DOCS=()
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/ksaneplugin/ksaneplugin-16.04.49.9999.ebuild
similarity index 51%
copy from kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
copy to kde-apps/ksaneplugin/ksaneplugin-16.04.49.9999.ebuild
index e3a7892..fd512c2 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-16.04.49.9999.ebuild
@@ -4,15 +4,13 @@
 
 EAPI=5
 
-inherit kde5
+inherit kde4-base
 
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
+DESCRIPTION="SANE Plugin for KDE"
 KEYWORDS=""
-LICENSE="LGPL-2.1"
+IUSE="debug"
 
 DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
+	$(add_kdeapps_dep libksane)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kscd/kscd-16.04.49.9999.ebuild b/kde-apps/kscd/kscd-16.04.49.9999.ebuild
new file mode 100644
index 0000000..1dd94ba
--- /dev/null
+++ b/kde-apps/kscd/kscd-16.04.49.9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE CD player"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	media-libs/musicbrainz:3
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kshisen/kshisen-9999.ebuild b/kde-apps/kshisen/kshisen-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kshisen/kshisen-9999.ebuild
copy to kde-apps/kshisen/kshisen-16.04.49.9999.ebuild
index b7daea8..d1db8a0 100644
--- a/kde-apps/kshisen/kshisen-9999.ebuild
+++ b/kde-apps/kshisen/kshisen-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/kshisen/kshisen-9999.ebuild b/kde-apps/kshisen/kshisen-9999.ebuild
index b7daea8..d1db8a0 100644
--- a/kde-apps/kshisen/kshisen-9999.ebuild
+++ b/kde-apps/kshisen/kshisen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"

diff --git a/kde-apps/ksirk/ksirk-16.04.49.9999.ebuild b/kde-apps/ksirk/ksirk-16.04.49.9999.ebuild
new file mode 100644
index 0000000..db9fe1e
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-16.04.49.9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A KDE port of the board game risk"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksirk/
+	https://games.kde.org/game.php?game=ksirk
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+	app-crypt/qca:2[qt4]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksnakeduel/ksnakeduel-16.04.49.9999.ebuild b/kde-apps/ksnakeduel/ksnakeduel-16.04.49.9999.ebuild
new file mode 100644
index 0000000..1b14d52
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-16.04.49.9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kspaceduel/kspaceduel-16.04.49.9999.ebuild b/kde-apps/kspaceduel/kspaceduel-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d840065
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-16.04.49.9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="KDE Space Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kspaceduel/
+	https://games.kde.org/game.php?game=kspaceduel
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/killbots/killbots-9999.ebuild b/kde-apps/ksquares/ksquares-16.04.49.9999.ebuild
similarity index 75%
copy from kde-apps/killbots/killbots-9999.ebuild
copy to kde-apps/ksquares/ksquares-16.04.49.9999.ebuild
index d960d9c..179d753 100644
--- a/kde-apps/killbots/killbots-9999.ebuild
+++ b/kde-apps/ksquares/ksquares-16.04.49.9999.ebuild
@@ -2,13 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
+KDE_PUNT_BOGUS_DEPS="true"
 inherit kde5
 
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://www.kde.org/applications/games/killbots/"
+DESCRIPTION="KDE clone of the game squares"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksquares/
+	https://games.kde.org/game.php?game=ksquares
+"
 KEYWORDS=""
 IUSE=""
 
@@ -27,5 +31,3 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"
-
-DOCS=()

diff --git a/kde-apps/kstars/kstars-16.04.49.9999.ebuild b/kde-apps/kstars/kstars-16.04.49.9999.ebuild
new file mode 100644
index 0000000..5179839
--- /dev/null
+++ b/kde-apps/kstars/kstars-16.04.49.9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_PUNT_BOGUS_DEPS="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
+KEYWORDS=""
+IUSE="indi wcs xplanet"
+
+# TODO: AstrometryNet requires new package
+# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=sci-libs/cfitsio-0.390
+	sys-libs/zlib
+	indi? (
+		$(add_frameworks_dep knotifications)
+		>=sci-libs/indilib-1.1.0
+	)
+	wcs? ( sci-astronomy/wcslib )
+	xplanet? ( x11-misc/xplanet )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		$(add_qt_dep qtopengl)
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package indi INDI)
+		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake-utils_use_find_package xplanet Xplanet)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/ksudoku/ksudoku-16.04.49.9999.ebuild b/kde-apps/ksudoku/ksudoku-16.04.49.9999.ebuild
new file mode 100644
index 0000000..a8f2794
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-16.04.49.9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Sudoku"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksudoku/
+	https://games.kde.org/game.php?game=ksudoku
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+	opengl? ( virtual/glu )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with opengl OpenGL)
+	)
+	kde4-base_src_configure
+}

diff --git a/kde-apps/ksystemlog/ksystemlog-9999.ebuild b/kde-apps/ksystemlog/ksystemlog-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/ksystemlog/ksystemlog-9999.ebuild
copy to kde-apps/ksystemlog/ksystemlog-16.04.49.9999.ebuild
index 5aecad6..2f78560 100644
--- a/kde-apps/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-16.04.49.9999.ebuild
@@ -37,7 +37,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	systemd? ( sys-apps/systemd )
 "
-
 RDEPEND="${DEPEND}"
 
 src_prepare() {

diff --git a/kde-apps/ksystemlog/ksystemlog-9999.ebuild b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
index 5aecad6..2f78560 100644
--- a/kde-apps/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
@@ -37,7 +37,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	systemd? ( sys-apps/systemd )
 "
-
 RDEPEND="${DEPEND}"
 
 src_prepare() {

diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/kteatime/kteatime-16.04.49.9999.ebuild
similarity index 67%
copy from kde-apps/klickety/klickety-9999.ebuild
copy to kde-apps/kteatime/kteatime-16.04.49.9999.ebuild
index 48cf231..83abce4 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/kteatime/kteatime-16.04.49.9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+DESCRIPTION="KDE timer for making a fine cup of tea"
+HOMEPAGE="https://www.kde.org/applications/games/kteatime"
 KEYWORDS=""
 IUSE=""
 
@@ -17,18 +17,13 @@ DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
-
-DOCS=()

diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/ktimer/ktimer-16.04.49.9999.ebuild
similarity index 68%
copy from kde-apps/klickety/klickety-9999.ebuild
copy to kde-apps/ktimer/ktimer-16.04.49.9999.ebuild
index 48cf231..30f98a8 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/ktimer/ktimer-16.04.49.9999.ebuild
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_DOXYGEN="true"
 KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+DESCRIPTION="KDE Timer"
+HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
+https://utils.kde.org/projects/ktimer"
 KEYWORDS=""
 IUSE=""
 
@@ -16,19 +18,12 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
-
-DOCS=()

diff --git a/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild b/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild
new file mode 100644
index 0000000..2069821
--- /dev/null
+++ b/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KMNAME="kdepim"
+inherit kde5
+
+DESCRIPTION="A viewer for TNEF attachments"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libktnef)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-15.12.1-r2:5
+"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/ktouch/ktouch-16.04.49.9999.ebuild b/kde-apps/ktouch/ktouch-16.04.49.9999.ebuild
new file mode 100644
index 0000000..f5ba410
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-16.04.49.9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
+HOMEPAGE="https://edu.kde.org/applications/miscellaneous/ktouch"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep knotify)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep plasma-runtime)
+"

diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.49.9999.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.49.9999.ebuild
new file mode 100644
index 0000000..085662f
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.49.9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy account management kcm"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE="experimental"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kio)
+	net-libs/libaccounts-glib
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kaccounts-providers)
+	net-im/telepathy-connection-managers
+	!net-im/ktp-accounts-kcm
+"
+
+src_prepare() {
+	if use experimental; then
+		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
+	fi
+	kde5_src_prepare
+}
+
+pkg_postinst() {
+	if use experimental; then
+		ewarn "Experimental providers are enabled."
+		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
+		ewarn "Use at your own risk!"
+	fi
+}

diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-approver/ktp-approver-16.04.49.9999.ebuild
similarity index 95%
copy from kde-apps/ktp-approver/ktp-approver-9999.ebuild
copy to kde-apps/ktp-approver/ktp-approver-16.04.49.9999.ebuild
index 289bdda..9b21682 100644
--- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-16.04.49.9999.ebuild
@@ -23,8 +23,8 @@ DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5]"
-
+	net-libs/telepathy-qt[qt5]
+"
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep ktp-contact-list)
 	!net-im/ktp-approver

diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-approver/ktp-approver-9999.ebuild
index 289bdda..9b21682 100644
--- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-9999.ebuild
@@ -23,8 +23,8 @@ DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5]"
-
+	net-libs/telepathy-qt[qt5]
+"
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep ktp-contact-list)
 	!net-im/ktp-approver

diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.49.9999.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.49.9999.ebuild
new file mode 100644
index 0000000..f4e81f0
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.49.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy authentication handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	app-crypt/qca:2[qt5]
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdewebkit)
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/qca:2[openssl]
+	!net-im/ktp-auth-handler
+"

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-16.04.49.9999.ebuild
similarity index 54%
copy from kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
copy to kde-apps/ktp-call-ui/ktp-call-ui-16.04.49.9999.ebuild
index 97884a5..0a61ff0 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-16.04.49.9999.ebuild
@@ -2,41 +2,41 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_BLOCK_SLOT4="false"
-KDE_DOXYGEN="true"
-KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Wallet management tool"
+DESCRIPTION="KDE Telepathy audio/video conferencing ui"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	dev-libs/boost
+	dev-libs/glib:2
+	media-libs/phonon[qt5]
+	media-libs/qt-gstreamer[qt5]
+	net-libs/farstream:0.2
+	net-libs/telepathy-farstream
+	net-libs/telepathy-qt[farstream,qt5]
 "
+
 RDEPEND="${DEPEND}
-	!kde-apps/kwalletmanager:4[-minimal(-)]
+	!net-im/ktp-call-ui
 "

diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-16.04.49.9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-16.04.49.9999.ebuild
new file mode 100644
index 0000000..e8978ed
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-16.04.49.9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DOXYGEN="true"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE="otr +sso"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	net-libs/telepathy-logger-qt:5
+	>=net-libs/telepathy-qt-0.9.5[qt5]
+	otr? (
+		dev-libs/libgcrypt:0=
+		>=net-libs/libotr-4.0.0
+	)
+	sso? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+		net-libs/telepathy-accounts-signon
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-im/ktp-common-internals
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package sso KAccounts)
+		$(cmake-utils_use_find_package sso AccountsQt5)
+		$(cmake-utils_use_find_package otr Libgcrypt)
+		$(cmake-utils_use_find_package otr LibOTR)
+	)
+
+	kde5_src_configure
+}
+
+src_compile() {
+	kde5_src_compile
+	use doc && kde5_src_compile apidox
+}
+
+src_install() {
+	kde5_src_install
+	use doc && dodoc "${BUILD_DIR}"/KTp/docs/html/*
+}

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-16.04.49.9999.ebuild
similarity index 56%
copy from kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
copy to kde-apps/ktp-contact-list/ktp-contact-list-16.04.49.9999.ebuild
index 97884a5..c5bdd34 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-16.04.49.9999.ebuild
@@ -2,41 +2,43 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_BLOCK_SLOT4="false"
-KDE_DOXYGEN="true"
-KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Wallet management tool"
+DESCRIPTION="KDE Telepathy contact list"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpeople)
 	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}
-	!kde-apps/kwalletmanager:4[-minimal(-)]
+RDEPEND="${COMMON_DEPEND}
+	!net-im/ktp-contact-list
 "

diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.49.9999.ebuild
similarity index 61%
copy from kde-apps/ktp-approver/ktp-approver-9999.ebuild
copy to kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.49.9999.ebuild
index 289bdda..fb8e4df 100644
--- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.49.9999.ebuild
@@ -6,26 +6,26 @@ EAPI=6
 
 inherit kde5
 
-DESCRIPTION="KDE Telepathy notification handler"
+DESCRIPTION="KDE Telepathy krunner plugin"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep kconfig)
+COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep ktp-common-internals)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5]"
-
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-	!net-im/ktp-approver
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-im/ktp-contact-runner
 "

diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.49.9999.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.49.9999.ebuild
new file mode 100644
index 0000000..0d5f20a
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.49.9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-im/ktp-desktop-applets
+"

diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.49.9999.ebuild
similarity index 62%
copy from kde-apps/ktp-approver/ktp-approver-9999.ebuild
copy to kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.49.9999.ebuild
index 289bdda..2ee12e5 100644
--- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.49.9999.ebuild
@@ -6,26 +6,24 @@ EAPI=6
 
 inherit kde5
 
-DESCRIPTION="KDE Telepathy notification handler"
+DESCRIPTION="KDE Telepathy file transfer handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep ktp-common-internals)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5]"
-
+	net-libs/telepathy-qt[qt5]
+"
 RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-	!net-im/ktp-approver
+	!net-im/ktp-filetransfer-handler
 "

diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-16.04.49.9999.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-16.04.49.9999.ebuild
new file mode 100644
index 0000000..4f29ca4
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-16.04.49.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kwidgetsaddons)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep signon-kwallet-extension)
+	!net-im/ktp-kded-module
+"

diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-send-file/ktp-send-file-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/ktp-approver/ktp-approver-9999.ebuild
copy to kde-apps/ktp-send-file/ktp-send-file-16.04.49.9999.ebuild
index 289bdda..d9d7a78 100644
--- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-16.04.49.9999.ebuild
@@ -6,26 +6,30 @@ EAPI=6
 
 inherit kde5
 
-DESCRIPTION="KDE Telepathy notification handler"
+DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep kconfig)
+COMMON_DEPEND="
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep ktp-common-internals)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5]"
-
-RDEPEND="${DEPEND}
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+"
+RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep ktp-contact-list)
-	!net-im/ktp-approver
+	$(add_kdeapps_dep ktp-filetransfer-handler)
+	!net-im/ktp-send-file
 "

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild
similarity index 57%
copy from kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
copy to kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild
index 97884a5..56ed923 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-16.04.49.9999.ebuild
@@ -2,41 +2,47 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_BLOCK_SLOT4="false"
-KDE_DOXYGEN="true"
-KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KDE Wallet management tool"
+DESCRIPTION="KDE Telepathy text chat window"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kemoticons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpeople)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep ktp-common-internals otr)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
+	net-libs/telepathy-qt[qt5]
 "
 RDEPEND="${DEPEND}
-	!kde-apps/kwalletmanager:4[-minimal(-)]
+	$(add_kdeapps_dep ktp-contact-list)
+	!net-im/ktp-text-ui
 "

diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/ktuberling/ktuberling-9999.ebuild
copy to kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild
index ba85051..b9ced51 100644
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"
@@ -36,5 +36,4 @@ DEPEND="
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild
index ba85051..b9ced51 100644
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"
@@ -36,5 +36,4 @@ DEPEND="
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5]
 "
-
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kturtle/kturtle-16.04.49.9999.ebuild
similarity index 64%
copy from kde-apps/kblackbox/kblackbox-9999.ebuild
copy to kde-apps/kturtle/kturtle-16.04.49.9999.ebuild
index 7bf051c..4cb8687 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/kturtle/kturtle-16.04.49.9999.ebuild
@@ -2,31 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="KDE Blackbox Game"
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kubrick/kubrick-16.04.49.9999.ebuild b/kde-apps/kubrick/kubrick-16.04.49.9999.ebuild
new file mode 100644
index 0000000..7bd347e
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-16.04.49.9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle"
+HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="$(add_kdeapps_dep libkdegames)
+	virtual/glu
+"
+DEPEND="${RDEPEND}
+	virtual/opengl
+"

diff --git a/kde-apps/kuser/kuser-16.04.49.9999.ebuild b/kde-apps/kuser/kuser-16.04.49.9999.ebuild
new file mode 100644
index 0000000..ed301c0
--- /dev/null
+++ b/kde-apps/kuser/kuser-16.04.49.9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE application that helps you manage system users"
+HOMEPAGE="https://www.kde.org/applications/system/kuser/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs)
+"
+# notify is needed for dialogs
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep knotify)
+"

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
copy to kde-apps/kwalletmanager/kwalletmanager-16.04.49.9999.ebuild
index 97884a5..c9aca35 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_BLOCK_SLOT4="false"
 KDE_DOXYGEN="true"

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
index 97884a5..c9aca35 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_BLOCK_SLOT4="false"
 KDE_DOXYGEN="true"

diff --git a/kde-apps/kwordquiz/kwordquiz-9999.ebuild b/kde-apps/kwordquiz/kwordquiz-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/kwordquiz/kwordquiz-9999.ebuild
copy to kde-apps/kwordquiz/kwordquiz-16.04.49.9999.ebuild
index 9c1f32d..026154f 100644
--- a/kde-apps/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kwordquiz/kwordquiz-9999.ebuild b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
index 9c1f32d..026154f 100644
--- a/kde-apps/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5

diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kwrite/kwrite-16.04.49.9999.ebuild
similarity index 57%
copy from kde-apps/kompare/kompare-9999.ebuild
copy to kde-apps/kwrite/kwrite-16.04.49.9999.ebuild
index 5434469..588252d 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kwrite/kwrite-16.04.49.9999.ebuild
@@ -4,34 +4,40 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KMNAME="kate"
+KDE_HANDBOOK="true"
 inherit kde5
 
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://www.kde.org/applications/development/kompare
-http://www.caffeinated.me.uk/kompare"
+DESCRIPTION="KDE simple text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
 KEYWORDS=""
-IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtwidgets)
 "
-
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+		-DBUILD_katepart=FALSE
+		$(cmake-utils_use_find_package handbook DocTools)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/libgravatar/libgravatar-16.04.49.9999.ebuild
similarity index 56%
copy from kde-apps/kamera/kamera-9999.ebuild
copy to kde-apps/libgravatar/libgravatar-16.04.49.9999.ebuild
index 7cd9c98..a3de101 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-16.04.49.9999.ebuild
@@ -4,26 +4,29 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Plasma integration for gphoto2 cameras"
+DESCRIPTION="Library for gravatar integration"
+LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep pimcommon)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
new file mode 100644
index 0000000..4c5df1d
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE library for CDDB"
+KEYWORDS=""
+IUSE="debug musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT=test
+
+DEPEND="
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}"
+
+KMSAVELIBS="true"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null || die
+		comment_add_subdirectory doc
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with musicbrainz MusicBrainz5)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild
similarity index 69%
copy from kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
copy to kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild
index 105ff61..a56d284 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild
@@ -10,9 +10,15 @@ DESCRIPTION="KDE library for playing & ripping CDs"
 KEYWORDS=""
 IUSE="alsa debug"
 
+DEPEND="
+	media-libs/phonon[qt4]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_find_package alsa Alsa)
 	)
 	kde4-base_src_configure
 }

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index 105ff61..a56d284 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -10,9 +10,15 @@ DESCRIPTION="KDE library for playing & ripping CDs"
 KEYWORDS=""
 IUSE="alsa debug"
 
+DEPEND="
+	media-libs/phonon[qt4]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_find_package alsa Alsa)
 	)
 	kde4-base_src_configure
 }

diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/libkdcraw/libkdcraw-16.04.49.9999.ebuild
similarity index 53%
copy from kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
copy to kde-apps/libkdcraw/libkdcraw-16.04.49.9999.ebuild
index e3a7892..a0d2a7a 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-16.04.49.9999.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_BLOCK_SLOT4="false"
 inherit kde5
 
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
+DESCRIPTION="Digital camera raw image library wrapper"
 KEYWORDS=""
-LICENSE="LGPL-2.1"
+IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
+	$(add_qt_dep qtgui)
+	>=media-libs/libraw-0.16:=
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/libkdegames/libkdegames-16.04.49.9999.ebuild
similarity index 54%
copy from kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
copy to kde-apps/libkdegames/libkdegames-16.04.49.9999.ebuild
index 97884a5..ef6e2ea 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-16.04.49.9999.ebuild
@@ -2,41 +2,49 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_BLOCK_SLOT4="false"
 KDE_DOXYGEN="true"
-KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="KDE Wallet management tool"
+DESCRIPTION="Base library common to many KDE games"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtxml)
+	media-libs/libsndfile
+	media-libs/openal
 "
-RDEPEND="${DEPEND}
-	!kde-apps/kwalletmanager:4[-minimal(-)]
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/libkdepim/libkdepim-16.04.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-16.04.49.9999.ebuild
new file mode 100644
index 0000000..91fdc96
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-16.04.49.9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="LGPL-2+"
+KEYWORDS=""
+IUSE="designer"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwallet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kdepim-common-libs:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.49.9999.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d41e4d4
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.49.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for reading/writing KVTML"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
+			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i keduvocdocument/CMakeLists.txt
+	fi
+}

diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/libkexiv2/libkexiv2-16.04.49.9999.ebuild
similarity index 51%
copy from kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
copy to kde-apps/libkexiv2/libkexiv2-16.04.49.9999.ebuild
index e3a7892..9496786 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-16.04.49.9999.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_BLOCK_SLOT4="false"
 inherit kde5
 
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
 KEYWORDS=""
-LICENSE="LGPL-2.1"
+IUSE="+xmp"
 
 DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
+	$(add_qt_dep qtgui)
+	>=media-gfx/exiv2-0.25:=[xmp=]
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/libkface/libkface-16.04.49.9999.ebuild b/kde-apps/libkface/libkface-16.04.49.9999.ebuild
new file mode 100644
index 0000000..5ad984c
--- /dev/null
+++ b/kde-apps/libkface/libkface-16.04.49.9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
+HOMEPAGE="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=media-libs/opencv-3:=[contrib]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV3=ON
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/libkgeomap/libkgeomap-16.04.49.9999.ebuild
similarity index 51%
copy from kde-apps/kblackbox/kblackbox-9999.ebuild
copy to kde-apps/libkgeomap/libkgeomap-16.04.49.9999.ebuild
index 7bf051c..e2fb64e 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-16.04.49.9999.ebuild
@@ -2,30 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="KDE Blackbox Game"
+DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkexiv2 '' '' '5=')
+	$(add_kdeapps_dep marble 'kde' '' '5=')
+	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "

diff --git a/kde-apps/libkipi/libkipi-9999.ebuild b/kde-apps/libkipi/libkipi-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/libkipi/libkipi-9999.ebuild
copy to kde-apps/libkipi/libkipi-16.04.49.9999.ebuild
index f64b8ba..4737bca 100644
--- a/kde-apps/libkipi/libkipi-9999.ebuild
+++ b/kde-apps/libkipi/libkipi-16.04.49.9999.ebuild
@@ -20,7 +20,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-
 RDEPEND="${DEPEND}
 	!kde-apps/libkipi:4[-minimal(-)]
 "

diff --git a/kde-apps/libkipi/libkipi-9999.ebuild b/kde-apps/libkipi/libkipi-9999.ebuild
index f64b8ba..4737bca 100644
--- a/kde-apps/libkipi/libkipi-9999.ebuild
+++ b/kde-apps/libkipi/libkipi-9999.ebuild
@@ -20,7 +20,6 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-
 RDEPEND="${DEPEND}
 	!kde-apps/libkipi:4[-minimal(-)]
 "

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/libkleo/libkleo-16.04.49.9999.ebuild
similarity index 53%
copy from kde-apps/kcalutils/kcalutils-9999.ebuild
copy to kde-apps/libkleo/libkleo-16.04.49.9999.ebuild
index 36d0c69..74e8eaf 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/libkleo/libkleo-16.04.49.9999.ebuild
@@ -4,31 +4,35 @@
 
 EAPI=6
 
-KDE_DOXYGEN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
+KDE_TEST="false"
 inherit kde5
 
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
+DESCRIPTION="Library for encryption handling"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	dev-libs/grantlee:5
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/libkmahjongg/libkmahjongg-16.04.49.9999.ebuild
similarity index 63%
copy from kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
copy to kde-apps/libkmahjongg/libkmahjongg-16.04.49.9999.ebuild
index 4231873..5529c0b 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-16.04.49.9999.ebuild
@@ -4,24 +4,23 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional"
+KDE_BLOCK_SLOT4="false"
+KDE_PUNT_BOGUS_DEPS="true"
 inherit kde5
 
-DESCRIPTION="Widget library for baloo"
+DESCRIPTION="LibKMahjongg for KDE"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!kde-base/baloo-widgets
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-16.04.49.9999.ebuild
similarity index 62%
copy from kde-apps/kamera/kamera-9999.ebuild
copy to kde-apps/libkomparediff2/libkomparediff2-16.04.49.9999.ebuild
index 7cd9c98..8dd7264 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-16.04.49.9999.ebuild
@@ -4,26 +4,22 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Plasma integration for gphoto2 cameras"
+DESCRIPTION="KDE library to compare files and strings"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
+	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/libksane/libksane-16.04.49.9999.ebuild
similarity index 56%
copy from kde-apps/kldap/kldap-9999.ebuild
copy to kde-apps/libksane/libksane-16.04.49.9999.ebuild
index dac319f..04a516d 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/libksane/libksane-16.04.49.9999.ebuild
@@ -4,22 +4,21 @@
 
 EAPI=6
 
-KDE_DOXYGEN="true"
-KDE_TEST="true"
+KDE_BLOCK_SLOT4="false"
 inherit kde5
 
-DESCRIPTION="Library for interacting with LDAP servers"
-LICENSE="LGPL-2+"
+DESCRIPTION="SANE Library interface for KDE"
 KEYWORDS=""
 IUSE=""
+LICENSE="LGPL-2"
 
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
+DEPEND="
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-	net-nds/openldap
+	media-gfx/sane-backends
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/libksieve/libksieve-16.04.49.9999.ebuild b/kde-apps/libksieve/libksieve-16.04.49.9999.ebuild
new file mode 100644
index 0000000..4971a25
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-16.04.49.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="LGPL-2+"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kmail:4
+"

diff --git a/kde-apps/libktnef/libktnef-16.04.49.9999.ebuild b/kde-apps/libktnef/libktnef-16.04.49.9999.ebuild
new file mode 100644
index 0000000..ef7400b
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-16.04.49.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+KMNAME="ktnef"
+inherit kde5
+
+DESCRIPTION="Library for handling TNEF data"
+LICENSE="LGPL-2+"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/ktnef:4
+	!<kde-apps/ktnef-15.12.2:5
+"

diff --git a/kde-apps/lokalize/lokalize-16.04.49.9999.ebuild b/kde-apps/lokalize/lokalize-16.04.49.9999.ebuild
new file mode 100644
index 0000000..6a24e20
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-16.04.49.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://www.kde.org/applications/development/lokalize
+http://l10n.kde.org/tools"
+KEYWORDS=""
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-text/hunspell-1.2.8
+"
+RDEPEND="${DEPEND}
+	dev-python/translate-toolkit[${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_install() {
+	kde5_src_install
+	python_fix_shebang "${ED}usr/share/${PN}"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version dev-vcs/subversion ; then
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+	fi
+}

diff --git a/kde-apps/lskat/lskat-16.04.49.9999.ebuild b/kde-apps/lskat/lskat-16.04.49.9999.ebuild
new file mode 100644
index 0000000..749231c
--- /dev/null
+++ b/kde-apps/lskat/lskat-16.04.49.9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Skat game for KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/lskat/
+	https://games.kde.org/game.php?game=lskat
+"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/eventviews/eventviews-9999.ebuild
copy to kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild
index 5e32c89..999704f 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-16.04.49.9999.ebuild
@@ -4,46 +4,51 @@
 
 EAPI=6
 
-KDE_TEST="true"
+KDE_TEST="false"
 inherit kde5
 
-DESCRIPTION="Calendar viewer for KDE PIM"
+DESCRIPTION="Common mail library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE=""
+IUSE="designer"
 
 COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdgantt2)
-	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libkdepim)
-	dev-libs/libical
-	$(add_qt_dep designer)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	dev-libs/libxslt
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	designer? ( $(add_qt_dep designer) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.08.50:5
 	!kde-apps/kdepim-common-libs:4
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/mailimporter/mailimporter-16.04.49.9999.ebuild
similarity index 50%
copy from kde-apps/kcalutils/kcalutils-9999.ebuild
copy to kde-apps/mailimporter/mailimporter-16.04.49.9999.ebuild
index 36d0c69..3d2ef48 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-16.04.49.9999.ebuild
@@ -4,31 +4,33 @@
 
 EAPI=6
 
-KDE_DOXYGEN="true"
 KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
+DESCRIPTION="Library to import mail from various sources"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	dev-libs/grantlee:5
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep designer)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/marble/marble-16.04.49.9999.ebuild b/kde-apps/marble/marble-16.04.49.9999.ebuild
new file mode 100644
index 0000000..fc16a5d
--- /dev/null
+++ b/kde-apps/marble/marble-16.04.49.9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="https://marble.kde.org/"
+KEYWORDS=""
+
+IUSE="aprs designer-plugin gps +kde phonon shapefile"
+
+# FIXME (new packages):
+# libwlocate, WLAN-based geolocation
+# qextserialport, interface to old fashioned serial ports
+RDEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	gps? ( >=sci-geosciences/gpsd-2.95 )
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kcrash)
+		$(add_frameworks_dep ki18n)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep kwallet)
+	)
+	phonon? ( media-libs/phonon[qt5] )
+	shapefile? ( sci-libs/shapelib )
+"
+DEPEND="${RDEPEND}
+	aprs? ( dev-lang/perl )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aprs Perl)
+		-DBUILD_MARBLE_TESTS=$(usex test)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer-plugin)
+		-DWITH_libgps=$(usex gps)
+		-DWITH_KF5=$(usex kde)
+		-DWITH_Phonon=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		-DWITH_QextSerialPort=OFF
+		-DWITH_liblocation=0
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/messagelib/messagelib-16.04.49.9999.ebuild b/kde-apps/messagelib/messagelib-16.04.49.9999.ebuild
new file mode 100644
index 0000000..8aa6c8f
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-16.04.49.9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="LGPL-2+"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/messagecomposer:5
+	!kde-apps/messagecore:5
+	!kde-apps/messagelist:5
+	!kde-apps/messageviewer:5
+	!kde-apps/templateparser:5
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kmail:4
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test ; then
+		sed -i \
+			-e '/add_subdirectory(autotests)/ s/^/#DONT/' \
+			-e '/add_subdirectory(tests)/ s/^/#DONT/' \
+			messagecomposer/CMakeLists.txt \
+			messagecore/CMakeLists.txt \
+			messagelist/CMakeLists.txt \
+			messageviewer/CMakeLists.txt \
+			templateparser/CMakeLists.txt || die
+	fi
+}

diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/okteta/okteta-16.04.49.9999.ebuild
similarity index 54%
copy from kde-apps/kompare/kompare-9999.ebuild
copy to kde-apps/okteta/okteta-16.04.49.9999.ebuild
index 5434469..9559d19 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/okteta/okteta-16.04.49.9999.ebuild
@@ -5,33 +5,49 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
 inherit kde5
 
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://www.kde.org/applications/development/kompare
-http://www.caffeinated.me.uk/kompare"
+DESCRIPTION="KDE hexeditor"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
 KEYWORDS=""
-IUSE=""
+IUSE="crypt examples"
 
 DEPEND="
-	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep designer)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
 	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5] )
 "
-
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OKTETA_BUILD_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package crypt QCA2)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-apps/okular/okular-16.04.49.9999.ebuild b/kde-apps/okular/okular-16.04.49.9999.ebuild
new file mode 100644
index 0000000..953a1b9
--- /dev/null
+++ b/kde-apps/okular/okular-16.04.49.9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+
+#VIRTUALX_REQUIRED=test
+RESTRICT=test
+# test 2: parttest hangs
+
+inherit kde4-base
+
+DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS=""
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/qimageblitz
+	sys-libs/zlib
+	chm? ( dev-libs/chmlib )
+	crypt? ( app-crypt/qca:2[qt4] )
+	djvu? ( app-text/djvu )
+	dpi? ( x11-libs/libkscreen:4 )
+	ebook? ( app-text/ebook-tools )
+	jpeg? (
+		$(add_kdeapps_dep libkexiv2)
+		virtual/jpeg:0
+	)
+	kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
+	postscript? ( app-text/libspectre )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with chm)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with djvu DjVuLibre)
+		$(cmake-utils_use_with dpi LibKScreen)
+		$(cmake-utils_use_with ebook EPub)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with jpeg Kexiv2)
+		$(cmake-utils_use_with kde KActivities)
+		$(cmake-utils_use_with mobi QMobipocket)
+		$(cmake-utils_use_with postscript 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-apps/palapeli/palapeli-16.04.49.9999.ebuild b/kde-apps/palapeli/palapeli-16.04.49.9999.ebuild
new file mode 100644
index 0000000..6cc7a85
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-16.04.49.9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE jigsaw puzzle game"
+HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/khangman/khangman-9999.ebuild b/kde-apps/parley/parley-16.04.49.9999.ebuild
similarity index 56%
copy from kde-apps/khangman/khangman-9999.ebuild
copy to kde-apps/parley/parley-16.04.49.9999.ebuild
index 05fcef4..4c2460f 100644
--- a/kde-apps/khangman/khangman-9999.ebuild
+++ b/kde-apps/parley/parley-16.04.49.9999.ebuild
@@ -2,34 +2,45 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="true"
+KDE_DOC_DIR="docs"
 inherit kde5
 
-DESCRIPTION="Classical hangman game for KDE"
-HOMEPAGE="https://www.kde.org/applications/education/khangman
-https://edu.kde.org/khangman"
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+HOMEPAGE="https://www.kde.org/applications/education/parley
+https://edu.kde.org/applications/school/parley"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdeedu-data)

diff --git a/kde-apps/picmi/picmi-9999.ebuild b/kde-apps/picmi/picmi-16.04.49.9999.ebuild
similarity index 99%
copy from kde-apps/picmi/picmi-9999.ebuild
copy to kde-apps/picmi/picmi-16.04.49.9999.ebuild
index 70dc9d9..bbb35a0 100644
--- a/kde-apps/picmi/picmi-9999.ebuild
+++ b/kde-apps/picmi/picmi-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"

diff --git a/kde-apps/picmi/picmi-9999.ebuild b/kde-apps/picmi/picmi-9999.ebuild
index 70dc9d9..bbb35a0 100644
--- a/kde-apps/picmi/picmi-9999.ebuild
+++ b/kde-apps/picmi/picmi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"

diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/pimcommon/pimcommon-16.04.49.9999.ebuild
similarity index 65%
copy from kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
copy to kde-apps/pimcommon/pimcommon-16.04.49.9999.ebuild
index d6f21bd..927ddd7 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.04.49.9999.ebuild
@@ -2,67 +2,67 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_TEST="false"
 inherit kde5
 
-DESCRIPTION="Libraries for KDE PIM applications"
+DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="prison"
+IUSE="designer"
 
 COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-contact)
 	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kimap)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	dev-libs/grantlee:5
-	$(add_qt_dep designer)
+	$(add_kdeapps_dep libkdepim)
+	dev-libs/libxslt
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
-	prison? ( media-libs/prison:5 )
+	$(add_qt_dep qtxml)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	designer? ( $(add_qt_dep designer) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.08.50:5
-	!kde-apps/composereditor:5
-	!kde-apps/kaddressbookgrantlee:5
-	!kde-apps/libfollowupreminder:5
-	!kde-apps/libkdepimdbusinterfaces:5
-	!kde-apps/libsendlater:5
 	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kmail:4
 "
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package designer Qt5Designer)
 	)
-
 	kde5_src_configure
 }

diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.49.9999.ebuild
similarity index 94%
copy from kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
copy to kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.49.9999.ebuild
index 3327180..f25577f 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.49.9999.ebuild
@@ -29,9 +29,7 @@ RDEPEND="
 	$(add_kdeapps_dep ktp-send-file)
 	$(add_kdeapps_dep ktp-text-ui)
 	!net-im/kde-telepathy-meta
-	nls? (
-		$(add_kdeapps_dep ktp-l10n '' ${L10N_MINIMAL})
-	)
+	nls? ( $(add_kdeapps_dep ktp-l10n '' ${L10N_MINIMAL}) )
 "
 
 pkg_postinst() {

diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
index 3327180..f25577f 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
@@ -29,9 +29,7 @@ RDEPEND="
 	$(add_kdeapps_dep ktp-send-file)
 	$(add_kdeapps_dep ktp-text-ui)
 	!net-im/kde-telepathy-meta
-	nls? (
-		$(add_kdeapps_dep ktp-l10n '' ${L10N_MINIMAL})
-	)
+	nls? ( $(add_kdeapps_dep ktp-l10n '' ${L10N_MINIMAL}) )
 "
 
 pkg_postinst() {

diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/poxml/poxml-16.04.49.9999.ebuild
similarity index 51%
copy from kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
copy to kde-apps/poxml/poxml-16.04.49.9999.ebuild
index e3a7892..8e925ef 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/poxml/poxml-16.04.49.9999.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
+KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
+DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 KEYWORDS=""
-LICENSE="LGPL-2.1"
+IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
+	$(add_qt_dep qtxml)
+	sys-devel/gettext
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/print-manager/print-manager-16.04.49.9999.ebuild b/kde-apps/print-manager/print-manager-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d81eec6
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-16.04.49.9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Manage print jobs and printers in Plasma"
+KEYWORDS=""
+IUSE="+gtk"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-print/cups
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	gtk? ( app-admin/system-config-printer )
+"
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}

diff --git a/kde-apps/rocs/rocs-16.04.49.9999.ebuild b/kde-apps/rocs/rocs-16.04.49.9999.ebuild
new file mode 100644
index 0000000..e334976
--- /dev/null
+++ b/kde-apps/rocs/rocs-16.04.49.9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.0.0"
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Interface to work with Graph Theory"
+HOMEPAGE="https://www.kde.org/applications/education/rocs
+https://edu.kde.org/applications/mathematics/rocs"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.49
+"
+
+RESTRICT=test	# 1/10 tests currently fails

diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.49.9999.ebuild
similarity index 97%
copy from kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
copy to kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.49.9999.ebuild
index e3a7892..b0c134c 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
index e3a7892..b0c134c 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde5
 

diff --git a/kde-apps/spectacle/spectacle-16.04.49.9999.ebuild b/kde-apps/spectacle/spectacle-16.04.49.9999.ebuild
new file mode 100644
index 0000000..d9d6907
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-16.04.49.9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screenshot capture utility"
+KEYWORDS=""
+IUSE="kipi share"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkscreen '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	kipi? ( $(add_kdeapps_dep libkipi) )
+	share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+	!kde-apps/ksnapshot
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/step/step-16.04.49.9999.ebuild b/kde-apps/step/step-16.04.49.9999.ebuild
new file mode 100644
index 0000000..3c54851
--- /dev/null
+++ b/kde-apps/step/step-16.04.49.9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://edu.kde.org/step"
+KEYWORDS=""
+IUSE="+gsl +qalculate"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	=dev-cpp/eigen-3.2*:3
+	sci-libs/cln
+	gsl? ( >=sci-libs/gsl-1.9-r1 )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Drop duplicate upstream
+	sed -e '/find_package.*Xml Test/ s/^/#/' \
+		-i stepcore/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/svgpart/svgpart-16.04.49.9999.ebuild b/kde-apps/svgpart/svgpart-16.04.49.9999.ebuild
new file mode 100644
index 0000000..bf13359
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-16.04.49.9999.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Svgpart is a kpart for viewing SVGs"
+KEYWORDS=""
+IUSE="debug"

diff --git a/kde-apps/sweeper/sweeper-16.04.49.9999.ebuild b/kde-apps/sweeper/sweeper-16.04.49.9999.ebuild
new file mode 100644
index 0000000..44e0dea
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-16.04.49.9999.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Privacy Settings Widget"
+HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
+https://utils.kde.org/projects/sweeper"
+KEYWORDS=""
+IUSE="debug"

diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/syndication/syndication-16.04.49.9999.ebuild
similarity index 92%
copy from kde-apps/syndication/syndication-9999.ebuild
copy to kde-apps/syndication/syndication-16.04.49.9999.ebuild
index a0a9e9f..cc61db2 100644
--- a/kde-apps/syndication/syndication-9999.ebuild
+++ b/kde-apps/syndication/syndication-16.04.49.9999.ebuild
@@ -13,10 +13,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kio)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/syndication/syndication-9999.ebuild
index a0a9e9f..cc61db2 100644
--- a/kde-apps/syndication/syndication-9999.ebuild
+++ b/kde-apps/syndication/syndication-9999.ebuild
@@ -13,10 +13,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kio)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/thumbnailers/thumbnailers-16.04.49.9999.ebuild b/kde-apps/thumbnailers/thumbnailers-16.04.49.9999.ebuild
new file mode 100644
index 0000000..b1a624c
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-16.04.49.9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="kdegraphics-thumbnailers"
+inherit kde5
+
+DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"

diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-16.04.49.9999.ebuild
similarity index 97%
copy from kde-apps/umbrello/umbrello-9999.ebuild
copy to kde-apps/umbrello/umbrello-16.04.49.9999.ebuild
index a6f3233..7c2505c 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-16.04.49.9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index a6f3233..7c2505c 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -39,7 +39,7 @@ RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.49.9999.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.49.9999.ebuild
new file mode 100644
index 0000000..8541846
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.49.9999.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS=""
+IUSE="debug"


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-03-25 14:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-25 14:00 [gentoo-commits] proj/kde:master commit in: kde-apps/kleopatra/, kde-apps/kig/, kde-apps/akonadi-calendar/, Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox