[gentoo-commits] proj/kde:master commit in: kde-apps/picmi/, kde-apps/kgoldrunner/, kde-apps/dolphin/, kde-apps/kblocks/, ...

[Michael Palimaka]

commit:     b39f91ecc554a86c812caecaab32183a5bd35697
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 29 15:14:29 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 29 15:14:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b39f91ec

[kde-apps] add_kdebase_dep -> add_kdeapps_dep

---
 kde-apps/ark/ark-14.11.97.ebuild                   |  2 +-
 kde-apps/ark/ark-9999.ebuild                       |  2 +-
 kde-apps/artikulate/artikulate-14.11.97.ebuild     |  2 +-
 kde-apps/artikulate/artikulate-9999.ebuild         |  2 +-
 kde-apps/audiocd-kio/audiocd-kio-14.11.97.ebuild   |  4 +-
 kde-apps/audiocd-kio/audiocd-kio-9999.ebuild       |  4 +-
 kde-apps/bomber/bomber-14.11.97.ebuild             |  2 +-
 kde-apps/bomber/bomber-9999.ebuild                 |  2 +-
 kde-apps/bovo/bovo-14.11.97.ebuild                 |  2 +-
 kde-apps/bovo/bovo-9999.ebuild                     |  2 +-
 kde-apps/cantor/cantor-14.11.97.ebuild             |  2 +-
 kde-apps/cantor/cantor-9999.ebuild                 |  2 +-
 .../dolphin-plugins-14.11.97.ebuild                |  4 +-
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |  4 +-
 kde-apps/dolphin/dolphin-14.11.97.ebuild           | 18 ++---
 kde-apps/dolphin/dolphin-5.9999.ebuild             |  6 +-
 kde-apps/dolphin/dolphin-9999.ebuild               | 18 ++---
 kde-apps/drkonqi/drkonqi-14.11.97.ebuild           |  2 +-
 kde-apps/drkonqi/drkonqi-9999.ebuild               |  2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-14.11.97.ebuild |  2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild     |  2 +-
 kde-apps/granatier/granatier-14.11.97.ebuild       |  2 +-
 kde-apps/granatier/granatier-9999.ebuild           |  2 +-
 kde-apps/gwenview/gwenview-14.11.97.ebuild         |  2 +-
 kde-apps/gwenview/gwenview-9999.ebuild             |  2 +-
 kde-apps/kajongg/kajongg-14.11.97.ebuild           |  6 +-
 kde-apps/kajongg/kajongg-9999.ebuild               |  6 +-
 kde-apps/kalgebra/kalgebra-14.11.97.ebuild         |  4 +-
 kde-apps/kalgebra/kalgebra-9999.ebuild             |  4 +-
 kde-apps/kalzium/kalzium-14.11.97.ebuild           |  2 +-
 kde-apps/kalzium/kalzium-9999.ebuild               |  2 +-
 kde-apps/kapman/kapman-14.11.97.ebuild             |  2 +-
 kde-apps/kapman/kapman-9999.ebuild                 |  2 +-
 kde-apps/katomic/katomic-14.11.97.ebuild           |  2 +-
 kde-apps/katomic/katomic-9999.ebuild               |  2 +-
 kde-apps/kblackbox/kblackbox-14.11.97.ebuild       |  2 +-
 kde-apps/kblackbox/kblackbox-9999.ebuild           |  2 +-
 kde-apps/kblocks/kblocks-14.11.97.ebuild           |  2 +-
 kde-apps/kblocks/kblocks-9999.ebuild               |  2 +-
 kde-apps/kbounce/kbounce-14.11.97.ebuild           |  2 +-
 kde-apps/kbounce/kbounce-9999.ebuild               |  2 +-
 kde-apps/kbreakout/kbreakout-14.11.97.ebuild       |  2 +-
 kde-apps/kbreakout/kbreakout-9999.ebuild           |  2 +-
 kde-apps/kcontrol/kcontrol-14.11.97.ebuild         |  4 +-
 kde-apps/kcontrol/kcontrol-9999.ebuild             |  4 +-
 kde-apps/kde-meta/kde-meta-14.11.97.ebuild         | 36 ++++-----
 kde-apps/kde-meta/kde-meta-9999.ebuild             | 36 ++++-----
 .../kdeartwork-kscreensaver-14.11.97.ebuild        |  4 +-
 .../kdeartwork-kscreensaver-9999.ebuild            |  4 +-
 .../kdeartwork-meta-14.11.97.ebuild                | 16 ++--
 .../kdeartwork-meta/kdeartwork-meta-9999.ebuild    | 16 ++--
 .../kdeartwork-styles-14.11.97.ebuild              |  2 +-
 .../kdeartwork-styles-9999.ebuild                  |  2 +-
 .../kdeartwork-weatherwallpapers-14.11.97.ebuild   |  2 +-
 .../kdeartwork-weatherwallpapers-9999.ebuild       |  2 +-
 kde-apps/kdebase-data/kdebase-data-14.11.97.ebuild |  4 +-
 kde-apps/kdebase-data/kdebase-data-9999.ebuild     |  4 +-
 .../kdebase-kioslaves-14.11.97.ebuild              |  4 +-
 .../kdebase-kioslaves-9999.ebuild                  |  4 +-
 kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild | 94 +++++++++++-----------
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild     | 94 +++++++++++-----------
 .../kdebase-runtime-meta-14.11.97.ebuild           | 70 ++++++++--------
 .../kdebase-runtime-meta-9999.ebuild               | 70 ++++++++--------
 .../kdegames-meta/kdegames-meta-14.11.97.ebuild    | 82 +++++++++----------
 kde-apps/kdegames-meta/kdegames-meta-9999.ebuild   | 82 +++++++++----------
 .../kdegraphics-meta-14.11.97.ebuild               | 32 ++++----
 .../kdegraphics-meta/kdegraphics-meta-9999.ebuild  | 32 ++++----
 .../kdemultimedia-meta-14.11.97.ebuild             | 18 ++---
 .../kdemultimedia-meta-9999.ebuild                 | 18 ++---
 .../kdenetwork-meta-14.11.97.ebuild                | 14 ++--
 .../kdenetwork-meta/kdenetwork-meta-9999.ebuild    | 14 ++--
 kde-apps/kdepasswd/kdepasswd-14.11.97.ebuild       |  4 +-
 kde-apps/kdepasswd/kdepasswd-9999.ebuild           |  4 +-
 kde-apps/kdesdk-meta/kdesdk-meta-14.11.97.ebuild   | 28 +++----
 kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild       | 28 +++----
 .../kdewebdev-meta/kdewebdev-meta-14.11.97.ebuild  |  8 +-
 kde-apps/kdewebdev-meta/kdewebdev-meta-9999.ebuild |  8 +-
 kde-apps/kdiamond/kdiamond-14.11.97.ebuild         |  2 +-
 kde-apps/kdiamond/kdiamond-9999.ebuild             |  2 +-
 .../keditbookmarks/keditbookmarks-14.11.97.ebuild  |  2 +-
 kde-apps/keditbookmarks/keditbookmarks-9999.ebuild |  2 +-
 kde-apps/kfind/kfind-14.11.97.ebuild               |  2 +-
 kde-apps/kfind/kfind-9999.ebuild                   |  2 +-
 kde-apps/kfourinline/kfourinline-14.11.97.ebuild   |  2 +-
 kde-apps/kfourinline/kfourinline-9999.ebuild       |  2 +-
 kde-apps/kget/kget-14.11.97.ebuild                 | 10 +--
 kde-apps/kget/kget-9999.ebuild                     | 10 +--
 kde-apps/kgoldrunner/kgoldrunner-14.11.97.ebuild   |  2 +-
 kde-apps/kgoldrunner/kgoldrunner-9999.ebuild       |  2 +-
 kde-apps/kgpg/kgpg-14.11.97.ebuild                 |  2 +-
 kde-apps/kgpg/kgpg-9999.ebuild                     |  2 +-
 kde-apps/kigo/kigo-14.11.97.ebuild                 |  2 +-
 kde-apps/kigo/kigo-9999.ebuild                     |  2 +-
 kde-apps/killbots/killbots-14.11.97.ebuild         |  2 +-
 kde-apps/killbots/killbots-9999.ebuild             |  2 +-
 kde-apps/kiriki/kiriki-14.11.97.ebuild             |  2 +-
 kde-apps/kiriki/kiriki-9999.ebuild                 |  2 +-
 kde-apps/kjumpingcube/kjumpingcube-14.11.97.ebuild |  2 +-
 kde-apps/kjumpingcube/kjumpingcube-9999.ebuild     |  2 +-
 kde-apps/klettres/klettres-14.11.97.ebuild         |  2 +-
 kde-apps/klettres/klettres-9999.ebuild             |  2 +-
 kde-apps/klickety/klickety-14.11.97.ebuild         |  2 +-
 kde-apps/klickety/klickety-9999.ebuild             |  2 +-
 kde-apps/klines/klines-14.11.97.ebuild             |  2 +-
 kde-apps/klines/klines-9999.ebuild                 |  2 +-
 kde-apps/klinkstatus/klinkstatus-14.11.97.ebuild   |  2 +-
 kde-apps/klinkstatus/klinkstatus-9999.ebuild       |  2 +-
 kde-apps/kmag/kmag-14.11.97.ebuild                 |  2 +-
 kde-apps/kmag/kmag-9999.ebuild                     |  2 +-
 kde-apps/kmahjongg/kmahjongg-14.11.97.ebuild       |  4 +-
 kde-apps/kmahjongg/kmahjongg-9999.ebuild           |  4 +-
 kde-apps/kmines/kmines-14.11.97.ebuild             |  2 +-
 kde-apps/kmines/kmines-9999.ebuild                 |  2 +-
 kde-apps/kmousetool/kmousetool-14.11.97.ebuild     |  2 +-
 kde-apps/kmousetool/kmousetool-9999.ebuild         |  2 +-
 kde-apps/kmplot/kmplot-14.11.97.ebuild             |  2 +-
 kde-apps/kmplot/kmplot-9999.ebuild                 |  2 +-
 kde-apps/knavalbattle/knavalbattle-14.11.97.ebuild |  2 +-
 kde-apps/knavalbattle/knavalbattle-9999.ebuild     |  2 +-
 kde-apps/knetwalk/knetwalk-14.11.97.ebuild         |  2 +-
 kde-apps/knetwalk/knetwalk-9999.ebuild             |  2 +-
 kde-apps/kolf/kolf-14.11.97.ebuild                 |  2 +-
 kde-apps/kolf/kolf-9999.ebuild                     |  2 +-
 kde-apps/kollision/kollision-14.11.97.ebuild       |  2 +-
 kde-apps/kollision/kollision-9999.ebuild           |  2 +-
 kde-apps/kompare/kompare-14.11.97.ebuild           |  2 +-
 kde-apps/kompare/kompare-9999.ebuild               |  2 +-
 kde-apps/konq-plugins/konq-plugins-14.11.97.ebuild |  6 +-
 kde-apps/konq-plugins/konq-plugins-9999.ebuild     |  6 +-
 kde-apps/konqueror/konqueror-14.11.97.ebuild       | 12 +--
 kde-apps/konqueror/konqueror-9999.ebuild           | 12 +--
 kde-apps/konquest/konquest-14.11.97.ebuild         |  2 +-
 kde-apps/konquest/konquest-9999.ebuild             |  2 +-
 kde-apps/kopete/kopete-14.11.97.ebuild             |  4 +-
 kde-apps/kopete/kopete-9999.ebuild                 |  4 +-
 kde-apps/kpat/kpat-14.11.97.ebuild                 |  2 +-
 kde-apps/kpat/kpat-9999.ebuild                     |  2 +-
 .../kqtquickcharts/kqtquickcharts-14.11.97.ebuild  |  2 +-
 kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild |  2 +-
 kde-apps/kreversi/kreversi-14.11.97.ebuild         |  2 +-
 kde-apps/kreversi/kreversi-9999.ebuild             |  2 +-
 kde-apps/ksaneplugin/ksaneplugin-14.11.97.ebuild   |  2 +-
 kde-apps/ksaneplugin/ksaneplugin-9999.ebuild       |  2 +-
 kde-apps/kscd/kscd-14.11.97.ebuild                 |  4 +-
 kde-apps/kscd/kscd-9999.ebuild                     |  4 +-
 kde-apps/kshisen/kshisen-14.11.97.ebuild           |  4 +-
 kde-apps/kshisen/kshisen-9999.ebuild               |  4 +-
 kde-apps/ksirk/ksirk-14.11.97.ebuild               |  2 +-
 kde-apps/ksirk/ksirk-9999.ebuild                   |  2 +-
 kde-apps/ksnakeduel/ksnakeduel-14.11.97.ebuild     |  2 +-
 kde-apps/ksnakeduel/ksnakeduel-9999.ebuild         |  2 +-
 kde-apps/ksnapshot/ksnapshot-14.11.97.ebuild       |  2 +-
 kde-apps/ksnapshot/ksnapshot-9999.ebuild           |  2 +-
 kde-apps/kspaceduel/kspaceduel-14.11.97.ebuild     |  2 +-
 kde-apps/kspaceduel/kspaceduel-9999.ebuild         |  2 +-
 kde-apps/ksquares/ksquares-14.11.97.ebuild         |  2 +-
 kde-apps/ksquares/ksquares-9999.ebuild             |  2 +-
 kde-apps/kstars/kstars-14.11.97.ebuild             |  2 +-
 kde-apps/kstars/kstars-9999.ebuild                 |  2 +-
 kde-apps/ksudoku/ksudoku-14.11.97.ebuild           |  2 +-
 kde-apps/ksudoku/ksudoku-9999.ebuild               |  2 +-
 kde-apps/ktouch/ktouch-14.11.97.ebuild             |  6 +-
 kde-apps/ktouch/ktouch-9999.ebuild                 |  6 +-
 kde-apps/ktuberling/ktuberling-14.11.97.ebuild     |  2 +-
 kde-apps/ktuberling/ktuberling-9999.ebuild         |  2 +-
 kde-apps/kturtle/kturtle-14.11.97.ebuild           |  2 +-
 kde-apps/kturtle/kturtle-9999.ebuild               |  2 +-
 kde-apps/kubrick/kubrick-14.11.97.ebuild           |  2 +-
 kde-apps/kubrick/kubrick-9999.ebuild               |  2 +-
 kde-apps/kuser/kuser-14.11.97.ebuild               |  4 +-
 kde-apps/kuser/kuser-9999.ebuild                   |  4 +-
 kde-apps/kwalletd/kwalletd-14.11.97.ebuild         |  2 +-
 kde-apps/kwalletd/kwalletd-9999.ebuild             |  2 +-
 kde-apps/kwordquiz/kwordquiz-14.11.97.ebuild       |  2 +-
 kde-apps/kwordquiz/kwordquiz-9999.ebuild           |  2 +-
 kde-apps/lokalize/lokalize-14.11.97.ebuild         |  6 +-
 kde-apps/lokalize/lokalize-9999.ebuild             |  6 +-
 kde-apps/lskat/lskat-14.11.97.ebuild               |  2 +-
 kde-apps/lskat/lskat-9999.ebuild                   |  2 +-
 kde-apps/marble/marble-14.11.97.ebuild             |  2 +-
 kde-apps/marble/marble-9999.ebuild                 |  2 +-
 .../mplayerthumbs/mplayerthumbs-14.11.97.ebuild    |  2 +-
 kde-apps/mplayerthumbs/mplayerthumbs-9999.ebuild   |  2 +-
 kde-apps/nepomuk/nepomuk-14.11.97.ebuild           |  4 +-
 kde-apps/nepomuk/nepomuk-9999.ebuild               |  4 +-
 kde-apps/nsplugins/nsplugins-14.11.97.ebuild       |  2 +-
 kde-apps/nsplugins/nsplugins-9999.ebuild           |  2 +-
 kde-apps/okular/okular-14.11.97.ebuild             |  4 +-
 kde-apps/okular/okular-5.9999.ebuild               |  2 +-
 kde-apps/okular/okular-9999.ebuild                 |  4 +-
 kde-apps/palapeli/palapeli-14.11.97.ebuild         |  2 +-
 kde-apps/palapeli/palapeli-9999.ebuild             |  2 +-
 kde-apps/parley/parley-14.11.97.ebuild             |  2 +-
 kde-apps/parley/parley-9999.ebuild                 |  2 +-
 kde-apps/picmi/picmi-14.11.97.ebuild               |  2 +-
 kde-apps/picmi/picmi-9999.ebuild                   |  2 +-
 kde-apps/plasma-apps/plasma-apps-14.11.97.ebuild   |  2 +-
 kde-apps/plasma-apps/plasma-apps-9999.ebuild       |  2 +-
 .../plasma-runtime/plasma-runtime-14.11.97.ebuild  |  2 +-
 kde-apps/plasma-runtime/plasma-runtime-9999.ebuild |  2 +-
 kde-apps/superkaramba/superkaramba-14.11.97.ebuild |  4 +-
 kde-apps/superkaramba/superkaramba-9999.ebuild     |  4 +-
 kde-apps/thumbnailers/thumbnailers-14.11.97.ebuild |  6 +-
 kde-apps/thumbnailers/thumbnailers-9999.ebuild     |  6 +-
 204 files changed, 670 insertions(+), 670 deletions(-)

diff --git a/kde-apps/ark/ark-14.11.97.ebuild b/kde-apps/ark/ark-14.11.97.ebuild
index f672065..4f0f42e 100644
--- a/kde-apps/ark/ark-14.11.97.ebuild
+++ b/kde-apps/ark/ark-14.11.97.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="+archive +bzip2 debug lzma"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 	sys-libs/zlib
 	archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] )
 "

diff --git a/kde-apps/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild
index f672065..4f0f42e 100644
--- a/kde-apps/ark/ark-9999.ebuild
+++ b/kde-apps/ark/ark-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="+archive +bzip2 debug lzma"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 	sys-libs/zlib
 	archive? ( >=app-arch/libarchive-2.6.1:=[bzip2?,lzma?,zlib] )
 "

diff --git a/kde-apps/artikulate/artikulate-14.11.97.ebuild b/kde-apps/artikulate/artikulate-14.11.97.ebuild
index f06e7cd..13c8266 100644
--- a/kde-apps/artikulate/artikulate-14.11.97.ebuild
+++ b/kde-apps/artikulate/artikulate-14.11.97.ebuild
@@ -18,5 +18,5 @@ DEPEND="
 	>=media-libs/qt-gstreamer-1.2.0
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kqtquickcharts)
+	$(add_kdeapps_dep kqtquickcharts)
 "

diff --git a/kde-apps/artikulate/artikulate-9999.ebuild b/kde-apps/artikulate/artikulate-9999.ebuild
index f06e7cd..13c8266 100644
--- a/kde-apps/artikulate/artikulate-9999.ebuild
+++ b/kde-apps/artikulate/artikulate-9999.ebuild
@@ -18,5 +18,5 @@ DEPEND="
 	>=media-libs/qt-gstreamer-1.2.0
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kqtquickcharts)
+	$(add_kdeapps_dep kqtquickcharts)
 "

diff --git a/kde-apps/audiocd-kio/audiocd-kio-14.11.97.ebuild b/kde-apps/audiocd-kio/audiocd-kio-14.11.97.ebuild
index 201ca35..7190181 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-14.11.97.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-14.11.97.ebuild
@@ -12,8 +12,8 @@ KEYWORDS=""
 IUSE="debug flac vorbis"
 
 DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
 	media-sound/cdparanoia
 	flac? ( >=media-libs/flac-1.1.2 )
 	vorbis? (

diff --git a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
index 201ca35..7190181 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
@@ -12,8 +12,8 @@ KEYWORDS=""
 IUSE="debug flac vorbis"
 
 DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
 	media-sound/cdparanoia
 	flac? ( >=media-libs/flac-1.1.2 )
 	vorbis? (

diff --git a/kde-apps/bomber/bomber-14.11.97.ebuild b/kde-apps/bomber/bomber-14.11.97.ebuild
index 5ca249a..8e27fe8 100644
--- a/kde-apps/bomber/bomber-14.11.97.ebuild
+++ b/kde-apps/bomber/bomber-14.11.97.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/bomber/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-9999.ebuild
index 5ca249a..8e27fe8 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-9999.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/bomber/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/bovo/bovo-14.11.97.ebuild b/kde-apps/bovo/bovo-14.11.97.ebuild
index afef811..5519efd 100644
--- a/kde-apps/bovo/bovo-14.11.97.ebuild
+++ b/kde-apps/bovo/bovo-14.11.97.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/bovo/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/bovo/bovo-9999.ebuild b/kde-apps/bovo/bovo-9999.ebuild
index afef811..5519efd 100644
--- a/kde-apps/bovo/bovo-9999.ebuild
+++ b/kde-apps/bovo/bovo-9999.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/bovo/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/cantor/cantor-14.11.97.ebuild b/kde-apps/cantor/cantor-14.11.97.ebuild
index 33897eb..54dc97d 100644
--- a/kde-apps/cantor/cantor-14.11.97.ebuild
+++ b/kde-apps/cantor/cantor-14.11.97.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
-	analitza? ( $(add_kdebase_dep analitza) )
+	analitza? ( $(add_kdeapps_dep analitza) )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate

diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index 33897eb..54dc97d 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 RDEPEND="
-	analitza? ( $(add_kdebase_dep analitza) )
+	analitza? ( $(add_kdeapps_dep analitza) )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate

diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-14.11.97.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-14.11.97.ebuild
index 896ca24..21f3c46 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-14.11.97.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-14.11.97.ebuild
@@ -11,10 +11,10 @@ KEYWORDS=""
 IUSE="debug bazaar git mercurial subversion"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kompare)
+	$(add_kdeapps_dep kompare)
 	bazaar? ( dev-vcs/bzr )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )

diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
index 896ca24..21f3c46 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -11,10 +11,10 @@ KEYWORDS=""
 IUSE="debug bazaar git mercurial subversion"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kompare)
+	$(add_kdeapps_dep kompare)
 	bazaar? ( dev-vcs/bzr )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )

diff --git a/kde-apps/dolphin/dolphin-14.11.97.ebuild b/kde-apps/dolphin/dolphin-14.11.97.ebuild
index d35e42d..f7fdaa7 100644
--- a/kde-apps/dolphin/dolphin-14.11.97.ebuild
+++ b/kde-apps/dolphin/dolphin-14.11.97.ebuild
@@ -14,23 +14,23 @@ KEYWORDS=""
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
-	$(add_kdebase_dep kactivities '' 4.13)
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep kactivities '' 4.13)
+	$(add_kdeapps_dep libkonq)
 	media-libs/phonon[qt4]
 	x11-libs/libXrender
 	semantic-desktop? (
-		$(add_kdebase_dep baloo)
-		$(add_kdebase_dep baloo-widgets)
-		$(add_kdebase_dep kfilemetadata)
+		$(add_kdeapps_dep baloo)
+		$(add_kdeapps_dep baloo-widgets)
+		$(add_kdeapps_dep kfilemetadata)
 	)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
+	$(add_kdeapps_dep kfind)
 	thumbnail? (
-		$(add_kdebase_dep thumbnailers)
+		$(add_kdeapps_dep thumbnailers)
 		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdeapps_dep ffmpegthumbs)
+			$(add_kdeapps_dep mplayerthumbs)
 		)
 	)
 "

diff --git a/kde-apps/dolphin/dolphin-5.9999.ebuild b/kde-apps/dolphin/dolphin-5.9999.ebuild
index 0e98a85..1ff0344 100644
--- a/kde-apps/dolphin/dolphin-5.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-5.9999.ebuild
@@ -44,9 +44,9 @@ DEPEND="
 	dev-qt/qtxml:5
 	media-libs/phonon[qt5]
 	semantic-desktop? (
-		$(add_kdebase_dep baloo)
-		$(add_kdebase_dep baloo-widgets)
-		$(add_kdebase_dep kfilemetadata)
+		$(add_kdeapps_dep baloo)
+		$(add_kdeapps_dep baloo-widgets)
+		$(add_kdeapps_dep kfilemetadata)
 	)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild
index d35e42d..f7fdaa7 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -14,23 +14,23 @@ KEYWORDS=""
 IUSE="debug semantic-desktop thumbnail"
 
 DEPEND="
-	$(add_kdebase_dep kactivities '' 4.13)
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep kactivities '' 4.13)
+	$(add_kdeapps_dep libkonq)
 	media-libs/phonon[qt4]
 	x11-libs/libXrender
 	semantic-desktop? (
-		$(add_kdebase_dep baloo)
-		$(add_kdebase_dep baloo-widgets)
-		$(add_kdebase_dep kfilemetadata)
+		$(add_kdeapps_dep baloo)
+		$(add_kdeapps_dep baloo-widgets)
+		$(add_kdeapps_dep kfilemetadata)
 	)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
+	$(add_kdeapps_dep kfind)
 	thumbnail? (
-		$(add_kdebase_dep thumbnailers)
+		$(add_kdeapps_dep thumbnailers)
 		|| (
-			$(add_kdebase_dep ffmpegthumbs)
-			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdeapps_dep ffmpegthumbs)
+			$(add_kdeapps_dep mplayerthumbs)
 		)
 	)
 "

diff --git a/kde-apps/drkonqi/drkonqi-14.11.97.ebuild b/kde-apps/drkonqi/drkonqi-14.11.97.ebuild
index 73b1ed5..27d6831 100644
--- a/kde-apps/drkonqi/drkonqi-14.11.97.ebuild
+++ b/kde-apps/drkonqi/drkonqi-14.11.97.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/drkonqi/drkonqi-9999.ebuild b/kde-apps/drkonqi/drkonqi-9999.ebuild
index 73b1ed5..27d6831 100644
--- a/kde-apps/drkonqi/drkonqi-9999.ebuild
+++ b/kde-apps/drkonqi/drkonqi-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-14.11.97.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-14.11.97.ebuild
index 98f7640..ff398e6 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-14.11.97.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-14.11.97.ebuild
@@ -14,5 +14,5 @@ DEPEND="
 	virtual/ffmpeg
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kdebase-kioslaves)
 "

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
index 98f7640..ff398e6 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
@@ -14,5 +14,5 @@ DEPEND="
 	virtual/ffmpeg
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kdebase-kioslaves)
 "

diff --git a/kde-apps/granatier/granatier-14.11.97.ebuild b/kde-apps/granatier/granatier-14.11.97.ebuild
index 97fb826..4a8a728 100644
--- a/kde-apps/granatier/granatier-14.11.97.ebuild
+++ b/kde-apps/granatier/granatier-14.11.97.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/granatier/granatier-9999.ebuild
index 97fb826..4a8a728 100644
--- a/kde-apps/granatier/granatier-9999.ebuild
+++ b/kde-apps/granatier/granatier-9999.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/gwenview/gwenview-14.11.97.ebuild b/kde-apps/gwenview/gwenview-14.11.97.ebuild
index 521989e..5f77645 100644
--- a/kde-apps/gwenview/gwenview-14.11.97.ebuild
+++ b/kde-apps/gwenview/gwenview-14.11.97.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
 	x11-libs/libX11
-	semantic-desktop? ( $(add_kdebase_dep baloo) )
+	semantic-desktop? ( $(add_kdeapps_dep baloo) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/gwenview:4

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 521989e..5f77645 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
 	x11-libs/libX11
-	semantic-desktop? ( $(add_kdebase_dep baloo) )
+	semantic-desktop? ( $(add_kdeapps_dep baloo) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/gwenview:4

diff --git a/kde-apps/kajongg/kajongg-14.11.97.ebuild b/kde-apps/kajongg/kajongg-14.11.97.ebuild
index a5fbb4e..c5d5a10 100644
--- a/kde-apps/kajongg/kajongg-14.11.97.ebuild
+++ b/kde-apps/kajongg/kajongg-14.11.97.ebuild
@@ -18,11 +18,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	dev-db/sqlite:3
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep libkmahjongg)
+	$(add_kdeapps_dep libkmahjongg)
 	>=dev-python/twisted-core-8.2.0
 "
 

diff --git a/kde-apps/kajongg/kajongg-9999.ebuild b/kde-apps/kajongg/kajongg-9999.ebuild
index a5fbb4e..c5d5a10 100644
--- a/kde-apps/kajongg/kajongg-9999.ebuild
+++ b/kde-apps/kajongg/kajongg-9999.ebuild
@@ -18,11 +18,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	dev-db/sqlite:3
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep libkmahjongg)
+	$(add_kdeapps_dep libkmahjongg)
 	>=dev-python/twisted-core-8.2.0
 "
 

diff --git a/kde-apps/kalgebra/kalgebra-14.11.97.ebuild b/kde-apps/kalgebra/kalgebra-14.11.97.ebuild
index 5a34081..e3b271b 100644
--- a/kde-apps/kalgebra/kalgebra-14.11.97.ebuild
+++ b/kde-apps/kalgebra/kalgebra-14.11.97.ebuild
@@ -16,8 +16,8 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep analitza opengl?)
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep analitza opengl?)
+	$(add_kdeapps_dep libkdeedu)
 	opengl? ( virtual/glu )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kalgebra/kalgebra-9999.ebuild b/kde-apps/kalgebra/kalgebra-9999.ebuild
index 5a34081..e3b271b 100644
--- a/kde-apps/kalgebra/kalgebra-9999.ebuild
+++ b/kde-apps/kalgebra/kalgebra-9999.ebuild
@@ -16,8 +16,8 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep analitza opengl?)
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep analitza opengl?)
+	$(add_kdeapps_dep libkdeedu)
 	opengl? ( virtual/glu )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kalzium/kalzium-14.11.97.ebuild b/kde-apps/kalzium/kalzium-14.11.97.ebuild
index d4ba6db..4688465 100644
--- a/kde-apps/kalzium/kalzium-14.11.97.ebuild
+++ b/kde-apps/kalzium/kalzium-14.11.97.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE="editor debug +plasma solver"
 
 DEPEND="
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 	editor? (
 		>=dev-cpp/eigen-2.0.3:2
 		sci-chemistry/avogadro

diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index d4ba6db..4688465 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE="editor debug +plasma solver"
 
 DEPEND="
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 	editor? (
 		>=dev-cpp/eigen-2.0.3:2
 		sci-chemistry/avogadro

diff --git a/kde-apps/kapman/kapman-14.11.97.ebuild b/kde-apps/kapman/kapman-14.11.97.ebuild
index 4ea6d7d..c804a24 100644
--- a/kde-apps/kapman/kapman-14.11.97.ebuild
+++ b/kde-apps/kapman/kapman-14.11.97.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/kapman/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kapman/kapman-9999.ebuild b/kde-apps/kapman/kapman-9999.ebuild
index 4ea6d7d..c804a24 100644
--- a/kde-apps/kapman/kapman-9999.ebuild
+++ b/kde-apps/kapman/kapman-9999.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/kapman/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/katomic/katomic-14.11.97.ebuild b/kde-apps/katomic/katomic-14.11.97.ebuild
index 7e0619f..9517f71 100644
--- a/kde-apps/katomic/katomic-14.11.97.ebuild
+++ b/kde-apps/katomic/katomic-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/katomic/katomic-9999.ebuild b/kde-apps/katomic/katomic-9999.ebuild
index 7e0619f..9517f71 100644
--- a/kde-apps/katomic/katomic-9999.ebuild
+++ b/kde-apps/katomic/katomic-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kblackbox/kblackbox-14.11.97.ebuild b/kde-apps/kblackbox/kblackbox-14.11.97.ebuild
index dfd9479..e9a1556 100644
--- a/kde-apps/kblackbox/kblackbox-14.11.97.ebuild
+++ b/kde-apps/kblackbox/kblackbox-14.11.97.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="KDE Blackbox Game"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kblackbox/kblackbox-9999.ebuild
index dfd9479..e9a1556 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/kblackbox/kblackbox-9999.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="KDE Blackbox Game"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kblocks/kblocks-14.11.97.ebuild b/kde-apps/kblocks/kblocks-14.11.97.ebuild
index d0fd1aa..0617038 100644
--- a/kde-apps/kblocks/kblocks-14.11.97.ebuild
+++ b/kde-apps/kblocks/kblocks-14.11.97.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/kblocks/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kblocks/kblocks-9999.ebuild b/kde-apps/kblocks/kblocks-9999.ebuild
index d0fd1aa..0617038 100644
--- a/kde-apps/kblocks/kblocks-9999.ebuild
+++ b/kde-apps/kblocks/kblocks-9999.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/kblocks/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kbounce/kbounce-14.11.97.ebuild b/kde-apps/kbounce/kbounce-14.11.97.ebuild
index 8ec2131..fcd1252 100644
--- a/kde-apps/kbounce/kbounce-14.11.97.ebuild
+++ b/kde-apps/kbounce/kbounce-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kbounce/kbounce-9999.ebuild b/kde-apps/kbounce/kbounce-9999.ebuild
index 8ec2131..fcd1252 100644
--- a/kde-apps/kbounce/kbounce-9999.ebuild
+++ b/kde-apps/kbounce/kbounce-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kbreakout/kbreakout-14.11.97.ebuild b/kde-apps/kbreakout/kbreakout-14.11.97.ebuild
index 42d249b..4d7e4f6 100644
--- a/kde-apps/kbreakout/kbreakout-14.11.97.ebuild
+++ b/kde-apps/kbreakout/kbreakout-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kbreakout/kbreakout-9999.ebuild b/kde-apps/kbreakout/kbreakout-9999.ebuild
index 42d249b..4d7e4f6 100644
--- a/kde-apps/kbreakout/kbreakout-9999.ebuild
+++ b/kde-apps/kbreakout/kbreakout-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kcontrol/kcontrol-14.11.97.ebuild b/kde-apps/kcontrol/kcontrol-14.11.97.ebuild
index e46515f..dfb9596 100644
--- a/kde-apps/kcontrol/kcontrol-14.11.97.ebuild
+++ b/kde-apps/kcontrol/kcontrol-14.11.97.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep khotkeys '' 4.11)
-	$(add_kdebase_dep zeroconf-ioslave)
+	$(add_kdeapps_dep khotkeys '' 4.11)
+	$(add_kdeapps_dep zeroconf-ioslave)
 "

diff --git a/kde-apps/kcontrol/kcontrol-9999.ebuild b/kde-apps/kcontrol/kcontrol-9999.ebuild
index e46515f..dfb9596 100644
--- a/kde-apps/kcontrol/kcontrol-9999.ebuild
+++ b/kde-apps/kcontrol/kcontrol-9999.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep khotkeys '' 4.11)
-	$(add_kdebase_dep zeroconf-ioslave)
+	$(add_kdeapps_dep khotkeys '' 4.11)
+	$(add_kdeapps_dep zeroconf-ioslave)
 "

diff --git a/kde-apps/kde-meta/kde-meta-14.11.97.ebuild b/kde-apps/kde-meta/kde-meta-14.11.97.ebuild
index 0772e00..ea36afd 100644
--- a/kde-apps/kde-meta/kde-meta-14.11.97.ebuild
+++ b/kde-apps/kde-meta/kde-meta-14.11.97.ebuild
@@ -10,24 +10,24 @@ KEYWORDS=""
 IUSE="accessibility kdepim minimal nls sdk"
 
 RDEPEND="
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kdeadmin-meta)
-	$(add_kdebase_dep kdeartwork-meta)
-	$(add_kdebase_dep kdebase-meta)
-	$(add_kdebase_dep kdeedu-meta)
-	$(add_kdebase_dep kdegames-meta)
-	$(add_kdebase_dep kdegraphics-meta)
-	$(add_kdebase_dep kdemultimedia-meta)
-	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdetoys-meta)
-	$(add_kdebase_dep kdeutils-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	kdepim? ( $(add_kdebase_dep kdepim-meta "" 4.4.11.1) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
+	$(add_kdeapps_dep kate)
+	$(add_kdeapps_dep kdeadmin-meta)
+	$(add_kdeapps_dep kdeartwork-meta)
+	$(add_kdeapps_dep kdebase-meta)
+	$(add_kdeapps_dep kdeedu-meta)
+	$(add_kdeapps_dep kdegames-meta)
+	$(add_kdeapps_dep kdegraphics-meta)
+	$(add_kdeapps_dep kdemultimedia-meta)
+	$(add_kdeapps_dep kdenetwork-meta)
+	$(add_kdeapps_dep kdetoys-meta)
+	$(add_kdeapps_dep kdeutils-meta)
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	kdepim? ( $(add_kdeapps_dep kdepim-meta "" 4.4.11.1) )
+	nls? ( $(add_kdeapps_dep kde-l10n) )
 	sdk? (
-		$(add_kdebase_dep kdebindings-meta)
-		$(add_kdebase_dep kdesdk-meta)
-		$(add_kdebase_dep kdewebdev-meta)
+		$(add_kdeapps_dep kdebindings-meta)
+		$(add_kdeapps_dep kdesdk-meta)
+		$(add_kdeapps_dep kdewebdev-meta)
 	)
-	!minimal? ( $(add_kdebase_dep kdeplasma-addons) )
+	!minimal? ( $(add_kdeapps_dep kdeplasma-addons) )
 "

diff --git a/kde-apps/kde-meta/kde-meta-9999.ebuild b/kde-apps/kde-meta/kde-meta-9999.ebuild
index 0772e00..ea36afd 100644
--- a/kde-apps/kde-meta/kde-meta-9999.ebuild
+++ b/kde-apps/kde-meta/kde-meta-9999.ebuild
@@ -10,24 +10,24 @@ KEYWORDS=""
 IUSE="accessibility kdepim minimal nls sdk"
 
 RDEPEND="
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kdeadmin-meta)
-	$(add_kdebase_dep kdeartwork-meta)
-	$(add_kdebase_dep kdebase-meta)
-	$(add_kdebase_dep kdeedu-meta)
-	$(add_kdebase_dep kdegames-meta)
-	$(add_kdebase_dep kdegraphics-meta)
-	$(add_kdebase_dep kdemultimedia-meta)
-	$(add_kdebase_dep kdenetwork-meta)
-	$(add_kdebase_dep kdetoys-meta)
-	$(add_kdebase_dep kdeutils-meta)
-	accessibility? ( $(add_kdebase_dep kdeaccessibility-meta) )
-	kdepim? ( $(add_kdebase_dep kdepim-meta "" 4.4.11.1) )
-	nls? ( $(add_kdebase_dep kde-l10n) )
+	$(add_kdeapps_dep kate)
+	$(add_kdeapps_dep kdeadmin-meta)
+	$(add_kdeapps_dep kdeartwork-meta)
+	$(add_kdeapps_dep kdebase-meta)
+	$(add_kdeapps_dep kdeedu-meta)
+	$(add_kdeapps_dep kdegames-meta)
+	$(add_kdeapps_dep kdegraphics-meta)
+	$(add_kdeapps_dep kdemultimedia-meta)
+	$(add_kdeapps_dep kdenetwork-meta)
+	$(add_kdeapps_dep kdetoys-meta)
+	$(add_kdeapps_dep kdeutils-meta)
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	kdepim? ( $(add_kdeapps_dep kdepim-meta "" 4.4.11.1) )
+	nls? ( $(add_kdeapps_dep kde-l10n) )
 	sdk? (
-		$(add_kdebase_dep kdebindings-meta)
-		$(add_kdebase_dep kdesdk-meta)
-		$(add_kdebase_dep kdewebdev-meta)
+		$(add_kdeapps_dep kdebindings-meta)
+		$(add_kdeapps_dep kdesdk-meta)
+		$(add_kdeapps_dep kdewebdev-meta)
 	)
-	!minimal? ( $(add_kdebase_dep kdeplasma-addons) )
+	!minimal? ( $(add_kdeapps_dep kdeplasma-addons) )
 "

diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-14.11.97.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-14.11.97.ebuild
index 3e730fd..12c0d82 100644
--- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-14.11.97.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-14.11.97.ebuild
@@ -16,12 +16,12 @@ IUSE="debug +eigen +kexiv2 xscreensaver"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
 RDEPEND="
-	$(add_kdebase_dep kscreensaver '' 4.11)
+	$(add_kdeapps_dep kscreensaver '' 4.11)
 	$(add_kdebase_dep libkworkspace '' 4.11)
 	media-libs/libart_lgpl
 	x11-libs/libX11
 	x11-libs/libXt
-	kexiv2? ( $(add_kdebase_dep libkexiv2) )
+	kexiv2? ( $(add_kdeapps_dep libkexiv2) )
 	virtual/glu
 	virtual/opengl
 	xscreensaver? ( x11-misc/xscreensaver )

diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
index 3e730fd..12c0d82 100644
--- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
@@ -16,12 +16,12 @@ IUSE="debug +eigen +kexiv2 xscreensaver"
 
 # libkworkspace - only as a stub to provide KDE4Workspace config
 RDEPEND="
-	$(add_kdebase_dep kscreensaver '' 4.11)
+	$(add_kdeapps_dep kscreensaver '' 4.11)
 	$(add_kdebase_dep libkworkspace '' 4.11)
 	media-libs/libart_lgpl
 	x11-libs/libX11
 	x11-libs/libXt
-	kexiv2? ( $(add_kdebase_dep libkexiv2) )
+	kexiv2? ( $(add_kdeapps_dep libkexiv2) )
 	virtual/glu
 	virtual/opengl
 	xscreensaver? ( x11-misc/xscreensaver )

diff --git a/kde-apps/kdeartwork-meta/kdeartwork-meta-14.11.97.ebuild b/kde-apps/kdeartwork-meta/kdeartwork-meta-14.11.97.ebuild
index 4d96ed0..e2ed266 100644
--- a/kde-apps/kdeartwork-meta/kdeartwork-meta-14.11.97.ebuild
+++ b/kde-apps/kdeartwork-meta/kdeartwork-meta-14.11.97.ebuild
@@ -10,12 +10,12 @@ KEYWORDS=""
 IUSE="minimal"
 
 RDEPEND="
-	$(add_kdebase_dep kdeartwork-colorschemes)
-	$(add_kdebase_dep kdeartwork-desktopthemes)
-	$(add_kdebase_dep kdeartwork-emoticons)
-	$(add_kdebase_dep kdeartwork-iconthemes)
-	$(add_kdebase_dep kdeartwork-kscreensaver)
-	$(add_kdebase_dep kdeartwork-wallpapers)
-	$(add_kdebase_dep kdeartwork-weatherwallpapers)
-	!minimal? ( $(add_kdebase_dep kdeartwork-styles) )
+	$(add_kdeapps_dep kdeartwork-colorschemes)
+	$(add_kdeapps_dep kdeartwork-desktopthemes)
+	$(add_kdeapps_dep kdeartwork-emoticons)
+	$(add_kdeapps_dep kdeartwork-iconthemes)
+	$(add_kdeapps_dep kdeartwork-kscreensaver)
+	$(add_kdeapps_dep kdeartwork-wallpapers)
+	$(add_kdeapps_dep kdeartwork-weatherwallpapers)
+	!minimal? ( $(add_kdeapps_dep kdeartwork-styles) )
 "

diff --git a/kde-apps/kdeartwork-meta/kdeartwork-meta-9999.ebuild b/kde-apps/kdeartwork-meta/kdeartwork-meta-9999.ebuild
index 4d96ed0..e2ed266 100644
--- a/kde-apps/kdeartwork-meta/kdeartwork-meta-9999.ebuild
+++ b/kde-apps/kdeartwork-meta/kdeartwork-meta-9999.ebuild
@@ -10,12 +10,12 @@ KEYWORDS=""
 IUSE="minimal"
 
 RDEPEND="
-	$(add_kdebase_dep kdeartwork-colorschemes)
-	$(add_kdebase_dep kdeartwork-desktopthemes)
-	$(add_kdebase_dep kdeartwork-emoticons)
-	$(add_kdebase_dep kdeartwork-iconthemes)
-	$(add_kdebase_dep kdeartwork-kscreensaver)
-	$(add_kdebase_dep kdeartwork-wallpapers)
-	$(add_kdebase_dep kdeartwork-weatherwallpapers)
-	!minimal? ( $(add_kdebase_dep kdeartwork-styles) )
+	$(add_kdeapps_dep kdeartwork-colorschemes)
+	$(add_kdeapps_dep kdeartwork-desktopthemes)
+	$(add_kdeapps_dep kdeartwork-emoticons)
+	$(add_kdeapps_dep kdeartwork-iconthemes)
+	$(add_kdeapps_dep kdeartwork-kscreensaver)
+	$(add_kdeapps_dep kdeartwork-wallpapers)
+	$(add_kdeapps_dep kdeartwork-weatherwallpapers)
+	!minimal? ( $(add_kdeapps_dep kdeartwork-styles) )
 "

diff --git a/kde-apps/kdeartwork-styles/kdeartwork-styles-14.11.97.ebuild b/kde-apps/kdeartwork-styles/kdeartwork-styles-14.11.97.ebuild
index 15fd7e6..841a080 100644
--- a/kde-apps/kdeartwork-styles/kdeartwork-styles-14.11.97.ebuild
+++ b/kde-apps/kdeartwork-styles/kdeartwork-styles-14.11.97.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kwin '' 4.11)
+	$(add_kdeapps_dep kwin '' 4.11)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kdeartwork-styles/kdeartwork-styles-9999.ebuild b/kde-apps/kdeartwork-styles/kdeartwork-styles-9999.ebuild
index 15fd7e6..841a080 100644
--- a/kde-apps/kdeartwork-styles/kdeartwork-styles-9999.ebuild
+++ b/kde-apps/kdeartwork-styles/kdeartwork-styles-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kwin '' 4.11)
+	$(add_kdeapps_dep kwin '' 4.11)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-14.11.97.ebuild b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-14.11.97.ebuild
index f526abc..0f65037 100644
--- a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-14.11.97.ebuild
+++ b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-14.11.97.ebuild
@@ -14,5 +14,5 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdebase_dep kdeartwork-wallpapers)
+	$(add_kdeapps_dep kdeartwork-wallpapers)
 "

diff --git a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
index f526abc..0f65037 100644
--- a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
+++ b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-9999.ebuild
@@ -14,5 +14,5 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdebase_dep kdeartwork-wallpapers)
+	$(add_kdeapps_dep kdeartwork-wallpapers)
 "

diff --git a/kde-apps/kdebase-data/kdebase-data-14.11.97.ebuild b/kde-apps/kdebase-data/kdebase-data-14.11.97.ebuild
index 0e41ad1..43e1119 100644
--- a/kde-apps/kdebase-data/kdebase-data-14.11.97.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-14.11.97.ebuild
@@ -13,8 +13,8 @@ IUSE="+wallpapers"
 KEYWORDS=""
 
 RDEPEND="
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep oxygen-icons)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+	$(add_kdeapps_dep oxygen-icons)
 	x11-themes/hicolor-icon-theme
 "
 

diff --git a/kde-apps/kdebase-data/kdebase-data-9999.ebuild b/kde-apps/kdebase-data/kdebase-data-9999.ebuild
index 0e41ad1..43e1119 100644
--- a/kde-apps/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-9999.ebuild
@@ -13,8 +13,8 @@ IUSE="+wallpapers"
 KEYWORDS=""
 
 RDEPEND="
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-	$(add_kdebase_dep oxygen-icons)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+	$(add_kdeapps_dep oxygen-icons)
 	x11-themes/hicolor-icon-theme
 "
 

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-14.11.97.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-14.11.97.ebuild
index e1deae5..a1b0478 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-14.11.97.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-14.11.97.ebuild
@@ -26,8 +26,8 @@ DEPEND="
 	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
-	$(add_kdebase_dep kdialog)
+	$(add_kdeapps_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdeapps_dep kdialog)
 	virtual/ssh
 	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
 "

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
index a211ec8..c0928fc 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
@@ -26,8 +26,8 @@ DEPEND="
 	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
-	$(add_kdebase_dep kdialog)
+	$(add_kdeapps_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdeapps_dep kdialog)
 	virtual/ssh
 	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
 "

diff --git a/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild b/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
index af706da..55fa00f 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-14.11.97.ebuild
@@ -10,54 +10,54 @@ KEYWORDS=""
 IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
-	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers '' 4.11) )
-	$(add_kdebase_dep kde-base-artwork)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdialog)
-	$(add_kdebase_dep keditbookmarks)
-	$(add_kdebase_dep kephal '' 4.11)
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep konq-plugins)
-	$(add_kdebase_dep konqueror)
-	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep kstartupconfig '' 4.11)
-	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksystraycmd '' 4.11)
-	$(add_kdebase_dep kwrite)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep liboxygenstyle '' 4.11)
-	$(add_kdebase_dep libplasmaclock '' 4.11)
-	$(add_kdebase_dep nsplugins)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
+	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep kcheckpass '' 4.11)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
+	$(add_kdeapps_dep kde-base-artwork)
+	$(add_kdeapps_dep kdebase-runtime-meta)
+	$(add_kdeapps_dep kdialog)
+	$(add_kdeapps_dep keditbookmarks)
+	$(add_kdeapps_dep kephal '' 4.11)
+	$(add_kdeapps_dep kfind)
+	$(add_kdeapps_dep kfmclient)
+	$(add_kdeapps_dep konq-plugins)
+	$(add_kdeapps_dep konqueror)
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kscreensaver '' 4.11)
+	$(add_kdeapps_dep kstartupconfig '' 4.11)
+	$(add_kdeapps_dep kstyles '' 4.11)
+	$(add_kdeapps_dep ksystraycmd '' 4.11)
+	$(add_kdeapps_dep kwrite)
+	$(add_kdeapps_dep libkonq)
+	$(add_kdeapps_dep liboxygenstyle '' 4.11)
+	$(add_kdeapps_dep libplasmaclock '' 4.11)
+	$(add_kdeapps_dep nsplugins)
+	$(add_kdeapps_dep phonon-kde)
+	$(add_kdeapps_dep plasma-apps)
+	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
-		$(add_kdebase_dep freespacenotifier '' 4.11)
-		$(add_kdebase_dep kcminit '' 4.11)
-		$(add_kdebase_dep kdebase-cursors '' 4.11)
-		$(add_kdebase_dep kdebase-startkde '' 4.11)
-		$(add_kdebase_dep kdepasswd)
-		$(add_kdebase_dep khotkeys '' 4.11)
-		$(add_kdebase_dep kinfocenter '' 4.11)
-		$(add_kdebase_dep klipper '' 4.11)
-		$(add_kdebase_dep kmenuedit '' 4.11)
-		$(add_kdebase_dep krunner '' 4.11)
-		$(add_kdebase_dep ksmserver '' 4.11)
-		$(add_kdebase_dep ksplash '' 4.11)
-		$(add_kdebase_dep ksysguard '' 4.11)
-		$(add_kdebase_dep kwin '' 4.11)
-		$(add_kdebase_dep kwrited '' 4.11)
+		$(add_kdeapps_dep freespacenotifier '' 4.11)
+		$(add_kdeapps_dep kcminit '' 4.11)
+		$(add_kdeapps_dep kdebase-cursors '' 4.11)
+		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(add_kdeapps_dep kdepasswd)
+		$(add_kdeapps_dep khotkeys '' 4.11)
+		$(add_kdeapps_dep kinfocenter '' 4.11)
+		$(add_kdeapps_dep klipper '' 4.11)
+		$(add_kdeapps_dep kmenuedit '' 4.11)
+		$(add_kdeapps_dep krunner '' 4.11)
+		$(add_kdeapps_dep ksmserver '' 4.11)
+		$(add_kdeapps_dep ksplash '' 4.11)
+		$(add_kdeapps_dep ksysguard '' 4.11)
+		$(add_kdeapps_dep kwin '' 4.11)
+		$(add_kdeapps_dep kwrited '' 4.11)
 		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdebase_dep libplasmagenericshell '' 4.11)
-		$(add_kdebase_dep libtaskmanager '' 4.11)
-		$(add_kdebase_dep plasma-workspace '' 4.11)
-		$(add_kdebase_dep powerdevil '' 4.11)
-		$(add_kdebase_dep solid-actions-kcm '' 4.11)
-		$(add_kdebase_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+		$(add_kdeapps_dep libplasmagenericshell '' 4.11)
+		$(add_kdeapps_dep libtaskmanager '' 4.11)
+		$(add_kdeapps_dep plasma-workspace '' 4.11)
+		$(add_kdeapps_dep powerdevil '' 4.11)
+		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
+		$(add_kdeapps_dep systemsettings '' 4.11)
+		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
 	)
 "

diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index af706da..55fa00f 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -10,54 +10,54 @@ KEYWORDS=""
 IUSE="+display-manager minimal +wallpapers"
 
 RDEPEND="
-	$(add_kdebase_dep dolphin)
-	$(add_kdebase_dep kcheckpass '' 4.11)
-	wallpapers? ( $(add_kdebase_dep kde-wallpapers '' 4.11) )
-	$(add_kdebase_dep kde-base-artwork)
-	$(add_kdebase_dep kdebase-runtime-meta)
-	$(add_kdebase_dep kdialog)
-	$(add_kdebase_dep keditbookmarks)
-	$(add_kdebase_dep kephal '' 4.11)
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep konq-plugins)
-	$(add_kdebase_dep konqueror)
-	$(add_kdebase_dep konsole)
-	$(add_kdebase_dep kscreensaver '' 4.11)
-	$(add_kdebase_dep kstartupconfig '' 4.11)
-	$(add_kdebase_dep kstyles '' 4.11)
-	$(add_kdebase_dep ksystraycmd '' 4.11)
-	$(add_kdebase_dep kwrite)
-	$(add_kdebase_dep libkonq)
-	$(add_kdebase_dep liboxygenstyle '' 4.11)
-	$(add_kdebase_dep libplasmaclock '' 4.11)
-	$(add_kdebase_dep nsplugins)
-	$(add_kdebase_dep phonon-kde)
-	$(add_kdebase_dep plasma-apps)
-	$(add_kdebase_dep qguiplatformplugin_kde '' 4.11)
+	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep kcheckpass '' 4.11)
+	wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 4.11) )
+	$(add_kdeapps_dep kde-base-artwork)
+	$(add_kdeapps_dep kdebase-runtime-meta)
+	$(add_kdeapps_dep kdialog)
+	$(add_kdeapps_dep keditbookmarks)
+	$(add_kdeapps_dep kephal '' 4.11)
+	$(add_kdeapps_dep kfind)
+	$(add_kdeapps_dep kfmclient)
+	$(add_kdeapps_dep konq-plugins)
+	$(add_kdeapps_dep konqueror)
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kscreensaver '' 4.11)
+	$(add_kdeapps_dep kstartupconfig '' 4.11)
+	$(add_kdeapps_dep kstyles '' 4.11)
+	$(add_kdeapps_dep ksystraycmd '' 4.11)
+	$(add_kdeapps_dep kwrite)
+	$(add_kdeapps_dep libkonq)
+	$(add_kdeapps_dep liboxygenstyle '' 4.11)
+	$(add_kdeapps_dep libplasmaclock '' 4.11)
+	$(add_kdeapps_dep nsplugins)
+	$(add_kdeapps_dep phonon-kde)
+	$(add_kdeapps_dep plasma-apps)
+	$(add_kdeapps_dep qguiplatformplugin_kde '' 4.11)
 	!minimal? (
-		$(add_kdebase_dep freespacenotifier '' 4.11)
-		$(add_kdebase_dep kcminit '' 4.11)
-		$(add_kdebase_dep kdebase-cursors '' 4.11)
-		$(add_kdebase_dep kdebase-startkde '' 4.11)
-		$(add_kdebase_dep kdepasswd)
-		$(add_kdebase_dep khotkeys '' 4.11)
-		$(add_kdebase_dep kinfocenter '' 4.11)
-		$(add_kdebase_dep klipper '' 4.11)
-		$(add_kdebase_dep kmenuedit '' 4.11)
-		$(add_kdebase_dep krunner '' 4.11)
-		$(add_kdebase_dep ksmserver '' 4.11)
-		$(add_kdebase_dep ksplash '' 4.11)
-		$(add_kdebase_dep ksysguard '' 4.11)
-		$(add_kdebase_dep kwin '' 4.11)
-		$(add_kdebase_dep kwrited '' 4.11)
+		$(add_kdeapps_dep freespacenotifier '' 4.11)
+		$(add_kdeapps_dep kcminit '' 4.11)
+		$(add_kdeapps_dep kdebase-cursors '' 4.11)
+		$(add_kdeapps_dep kdebase-startkde '' 4.11)
+		$(add_kdeapps_dep kdepasswd)
+		$(add_kdeapps_dep khotkeys '' 4.11)
+		$(add_kdeapps_dep kinfocenter '' 4.11)
+		$(add_kdeapps_dep klipper '' 4.11)
+		$(add_kdeapps_dep kmenuedit '' 4.11)
+		$(add_kdeapps_dep krunner '' 4.11)
+		$(add_kdeapps_dep ksmserver '' 4.11)
+		$(add_kdeapps_dep ksplash '' 4.11)
+		$(add_kdeapps_dep ksysguard '' 4.11)
+		$(add_kdeapps_dep kwin '' 4.11)
+		$(add_kdeapps_dep kwrited '' 4.11)
 		$(add_kdebase_dep libkworkspace '' 4.11)
-		$(add_kdebase_dep libplasmagenericshell '' 4.11)
-		$(add_kdebase_dep libtaskmanager '' 4.11)
-		$(add_kdebase_dep plasma-workspace '' 4.11)
-		$(add_kdebase_dep powerdevil '' 4.11)
-		$(add_kdebase_dep solid-actions-kcm '' 4.11)
-		$(add_kdebase_dep systemsettings '' 4.11)
-		!prefix? ( display-manager? ( || ( $(add_kdebase_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
+		$(add_kdeapps_dep libplasmagenericshell '' 4.11)
+		$(add_kdeapps_dep libtaskmanager '' 4.11)
+		$(add_kdeapps_dep plasma-workspace '' 4.11)
+		$(add_kdeapps_dep powerdevil '' 4.11)
+		$(add_kdeapps_dep solid-actions-kcm '' 4.11)
+		$(add_kdeapps_dep systemsettings '' 4.11)
+		!prefix? ( display-manager? ( || ( $(add_kdeapps_dep kdm '' 4.11) x11-misc/lightdm x11-misc/sddm ) ) )
 	)
 "

diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild
index 865aa3d..978580c 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild
@@ -10,44 +10,44 @@ KEYWORDS=""
 IUSE="+crash-reporter +handbook minimal nepomuk"
 
 RDEPEND="
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kdebase-data)
-	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-menu)
-	$(add_kdebase_dep kdebase-menu-icons)
-	$(add_kdebase_dep kdebugdialog)
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep kdontchangethehostname)
-	$(add_kdebase_dep keditfiletype)
-	$(add_kdebase_dep kfile)
-	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep kiconfinder)
-	$(add_kdebase_dep kimgio)
-	$(add_kdebase_dep kioclient)
-	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knewstuff)
-	$(add_kdebase_dep kpasswdserver)
-	$(add_kdebase_dep kquitapp)
-	$(add_kdebase_dep kstart)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(add_kdebase_dep kwalletd)
-	$(add_kdebase_dep kwalletmanager)
-	$(add_kdebase_dep plasma-runtime)
-	$(add_kdebase_dep renamedlg-plugins)
-	$(add_kdebase_dep solid-runtime)
-	crash-reporter? ( $(add_kdebase_dep drkonqi ) )
+	$(add_kdeapps_dep kcmshell)
+	$(add_kdeapps_dep kdebase-data)
+	$(add_kdeapps_dep kdebase-desktoptheme)
+	$(add_kdeapps_dep kdebase-menu)
+	$(add_kdeapps_dep kdebase-menu-icons)
+	$(add_kdeapps_dep kdebugdialog)
+	$(add_kdeapps_dep kdesu)
+	$(add_kdeapps_dep kdontchangethehostname)
+	$(add_kdeapps_dep keditfiletype)
+	$(add_kdeapps_dep kfile)
+	$(add_kdeapps_dep kglobalaccel)
+	$(add_kdeapps_dep kiconfinder)
+	$(add_kdeapps_dep kimgio)
+	$(add_kdeapps_dep kioclient)
+	$(add_kdeapps_dep kmimetypefinder)
+	$(add_kdeapps_dep knewstuff)
+	$(add_kdeapps_dep kpasswdserver)
+	$(add_kdeapps_dep kquitapp)
+	$(add_kdeapps_dep kstart)
+	$(add_kdeapps_dep ktimezoned)
+	$(add_kdeapps_dep ktraderclient)
+	$(add_kdeapps_dep kuiserver)
+	$(add_kdeapps_dep kurifilter-plugins)
+	$(add_kdeapps_dep kwalletd)
+	$(add_kdeapps_dep kwalletmanager)
+	$(add_kdeapps_dep plasma-runtime)
+	$(add_kdeapps_dep renamedlg-plugins)
+	$(add_kdeapps_dep solid-runtime)
+	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
 	handbook? ( || (
-		$(add_kdebase_dep khelpcenter)
+		$(add_kdeapps_dep khelpcenter)
 		kde-base/khelpcenter:5[compat(+)]
 	) )
-	nepomuk? ( $(add_kdebase_dep nepomuk) )
+	nepomuk? ( $(add_kdeapps_dep nepomuk) )
 	!minimal? (
-		$(add_kdebase_dep attica)
-		$(add_kdebase_dep kcontrol)
-		$(add_kdebase_dep kdebase-kioslaves)
-		$(add_kdebase_dep knetattach)
+		$(add_kdeapps_dep attica)
+		$(add_kdeapps_dep kcontrol)
+		$(add_kdeapps_dep kdebase-kioslaves)
+		$(add_kdeapps_dep knetattach)
 	)
 "

diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
index 865aa3d..978580c 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
@@ -10,44 +10,44 @@ KEYWORDS=""
 IUSE="+crash-reporter +handbook minimal nepomuk"
 
 RDEPEND="
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep kdebase-data)
-	$(add_kdebase_dep kdebase-desktoptheme)
-	$(add_kdebase_dep kdebase-menu)
-	$(add_kdebase_dep kdebase-menu-icons)
-	$(add_kdebase_dep kdebugdialog)
-	$(add_kdebase_dep kdesu)
-	$(add_kdebase_dep kdontchangethehostname)
-	$(add_kdebase_dep keditfiletype)
-	$(add_kdebase_dep kfile)
-	$(add_kdebase_dep kglobalaccel)
-	$(add_kdebase_dep kiconfinder)
-	$(add_kdebase_dep kimgio)
-	$(add_kdebase_dep kioclient)
-	$(add_kdebase_dep kmimetypefinder)
-	$(add_kdebase_dep knewstuff)
-	$(add_kdebase_dep kpasswdserver)
-	$(add_kdebase_dep kquitapp)
-	$(add_kdebase_dep kstart)
-	$(add_kdebase_dep ktimezoned)
-	$(add_kdebase_dep ktraderclient)
-	$(add_kdebase_dep kuiserver)
-	$(add_kdebase_dep kurifilter-plugins)
-	$(add_kdebase_dep kwalletd)
-	$(add_kdebase_dep kwalletmanager)
-	$(add_kdebase_dep plasma-runtime)
-	$(add_kdebase_dep renamedlg-plugins)
-	$(add_kdebase_dep solid-runtime)
-	crash-reporter? ( $(add_kdebase_dep drkonqi ) )
+	$(add_kdeapps_dep kcmshell)
+	$(add_kdeapps_dep kdebase-data)
+	$(add_kdeapps_dep kdebase-desktoptheme)
+	$(add_kdeapps_dep kdebase-menu)
+	$(add_kdeapps_dep kdebase-menu-icons)
+	$(add_kdeapps_dep kdebugdialog)
+	$(add_kdeapps_dep kdesu)
+	$(add_kdeapps_dep kdontchangethehostname)
+	$(add_kdeapps_dep keditfiletype)
+	$(add_kdeapps_dep kfile)
+	$(add_kdeapps_dep kglobalaccel)
+	$(add_kdeapps_dep kiconfinder)
+	$(add_kdeapps_dep kimgio)
+	$(add_kdeapps_dep kioclient)
+	$(add_kdeapps_dep kmimetypefinder)
+	$(add_kdeapps_dep knewstuff)
+	$(add_kdeapps_dep kpasswdserver)
+	$(add_kdeapps_dep kquitapp)
+	$(add_kdeapps_dep kstart)
+	$(add_kdeapps_dep ktimezoned)
+	$(add_kdeapps_dep ktraderclient)
+	$(add_kdeapps_dep kuiserver)
+	$(add_kdeapps_dep kurifilter-plugins)
+	$(add_kdeapps_dep kwalletd)
+	$(add_kdeapps_dep kwalletmanager)
+	$(add_kdeapps_dep plasma-runtime)
+	$(add_kdeapps_dep renamedlg-plugins)
+	$(add_kdeapps_dep solid-runtime)
+	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
 	handbook? ( || (
-		$(add_kdebase_dep khelpcenter)
+		$(add_kdeapps_dep khelpcenter)
 		kde-base/khelpcenter:5[compat(+)]
 	) )
-	nepomuk? ( $(add_kdebase_dep nepomuk) )
+	nepomuk? ( $(add_kdeapps_dep nepomuk) )
 	!minimal? (
-		$(add_kdebase_dep attica)
-		$(add_kdebase_dep kcontrol)
-		$(add_kdebase_dep kdebase-kioslaves)
-		$(add_kdebase_dep knetattach)
+		$(add_kdeapps_dep attica)
+		$(add_kdeapps_dep kcontrol)
+		$(add_kdeapps_dep kdebase-kioslaves)
+		$(add_kdeapps_dep knetattach)
 	)
 "

diff --git a/kde-apps/kdegames-meta/kdegames-meta-14.11.97.ebuild b/kde-apps/kdegames-meta/kdegames-meta-14.11.97.ebuild
index e96f699..e315743 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-14.11.97.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-14.11.97.ebuild
@@ -11,45 +11,45 @@ KEYWORDS=""
 IUSE="opengl python"
 
 RDEPEND="
-	$(add_kdebase_dep bomber)
-	$(add_kdebase_dep bovo)
-	$(add_kdebase_dep granatier)
-	$(add_kdebase_dep kapman)
-	$(add_kdebase_dep katomic)
-	$(add_kdebase_dep kblackbox)
-	$(add_kdebase_dep kblocks)
-	$(add_kdebase_dep kbounce)
-	$(add_kdebase_dep kbreakout)
-	$(add_kdebase_dep kdiamond)
-	$(add_kdebase_dep kfourinline)
-	$(add_kdebase_dep kgoldrunner)
-	$(add_kdebase_dep killbots)
-	$(add_kdebase_dep kigo)
-	$(add_kdebase_dep kiriki)
-	$(add_kdebase_dep kjumpingcube)
-	$(add_kdebase_dep klickety)
-	$(add_kdebase_dep klines)
-	$(add_kdebase_dep kmahjongg)
-	$(add_kdebase_dep kmines)
-	$(add_kdebase_dep knavalbattle)
-	$(add_kdebase_dep knetwalk)
-	$(add_kdebase_dep kolf)
-	$(add_kdebase_dep kollision)
-	$(add_kdebase_dep konquest)
-	$(add_kdebase_dep kpat)
-	$(add_kdebase_dep kreversi)
-	$(add_kdebase_dep kshisen)
-	$(add_kdebase_dep ksirk)
-	$(add_kdebase_dep ksnakeduel)
-	$(add_kdebase_dep kspaceduel)
-	$(add_kdebase_dep ksquares)
-	$(add_kdebase_dep ktuberling)
-	$(add_kdebase_dep kubrick)
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
-	$(add_kdebase_dep lskat)
-	$(add_kdebase_dep palapeli)
-	$(add_kdebase_dep picmi)
-	opengl? ( $(add_kdebase_dep ksudoku) )
-	python? ( $(add_kdebase_dep kajongg) )
+	$(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 killbots)
+	$(add_kdeapps_dep kigo)
+	$(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 kubrick)
+	$(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) )
+	python? ( $(add_kdeapps_dep kajongg) )
 "

diff --git a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
index e96f699..e315743 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
@@ -11,45 +11,45 @@ KEYWORDS=""
 IUSE="opengl python"
 
 RDEPEND="
-	$(add_kdebase_dep bomber)
-	$(add_kdebase_dep bovo)
-	$(add_kdebase_dep granatier)
-	$(add_kdebase_dep kapman)
-	$(add_kdebase_dep katomic)
-	$(add_kdebase_dep kblackbox)
-	$(add_kdebase_dep kblocks)
-	$(add_kdebase_dep kbounce)
-	$(add_kdebase_dep kbreakout)
-	$(add_kdebase_dep kdiamond)
-	$(add_kdebase_dep kfourinline)
-	$(add_kdebase_dep kgoldrunner)
-	$(add_kdebase_dep killbots)
-	$(add_kdebase_dep kigo)
-	$(add_kdebase_dep kiriki)
-	$(add_kdebase_dep kjumpingcube)
-	$(add_kdebase_dep klickety)
-	$(add_kdebase_dep klines)
-	$(add_kdebase_dep kmahjongg)
-	$(add_kdebase_dep kmines)
-	$(add_kdebase_dep knavalbattle)
-	$(add_kdebase_dep knetwalk)
-	$(add_kdebase_dep kolf)
-	$(add_kdebase_dep kollision)
-	$(add_kdebase_dep konquest)
-	$(add_kdebase_dep kpat)
-	$(add_kdebase_dep kreversi)
-	$(add_kdebase_dep kshisen)
-	$(add_kdebase_dep ksirk)
-	$(add_kdebase_dep ksnakeduel)
-	$(add_kdebase_dep kspaceduel)
-	$(add_kdebase_dep ksquares)
-	$(add_kdebase_dep ktuberling)
-	$(add_kdebase_dep kubrick)
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
-	$(add_kdebase_dep lskat)
-	$(add_kdebase_dep palapeli)
-	$(add_kdebase_dep picmi)
-	opengl? ( $(add_kdebase_dep ksudoku) )
-	python? ( $(add_kdebase_dep kajongg) )
+	$(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 killbots)
+	$(add_kdeapps_dep kigo)
+	$(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 kubrick)
+	$(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) )
+	python? ( $(add_kdeapps_dep kajongg) )
 "

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-14.11.97.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-14.11.97.ebuild
index dc49708..072b735 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-14.11.97.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-14.11.97.ebuild
@@ -11,22 +11,22 @@ KEYWORDS=""
 IUSE="scanner"
 
 RDEPEND="
-	$(add_kdebase_dep gwenview)
-	$(add_kdebase_dep kamera)
-	$(add_kdebase_dep kcolorchooser)
-	$(add_kdebase_dep kdegraphics-mobipocket)
-	$(add_kdebase_dep kgamma)
-	$(add_kdebase_dep kolourpaint)
-	$(add_kdebase_dep kruler)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
+	$(add_kdeapps_dep gwenview)
+	$(add_kdeapps_dep kamera)
+	$(add_kdeapps_dep kcolorchooser)
+	$(add_kdeapps_dep kdegraphics-mobipocket)
+	$(add_kdeapps_dep kgamma)
+	$(add_kdeapps_dep kolourpaint)
+	$(add_kdeapps_dep kruler)
+	$(add_kdeapps_dep ksnapshot)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+	$(add_kdeapps_dep libkipi)
+	$(add_kdeapps_dep okular)
+	$(add_kdeapps_dep svgpart)
+	$(add_kdeapps_dep thumbnailers)
 	scanner? (
-		$(add_kdebase_dep ksaneplugin)
-		$(add_kdebase_dep libksane)
+		$(add_kdeapps_dep ksaneplugin)
+		$(add_kdeapps_dep libksane)
 	)
 "

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
index dc49708..072b735 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
@@ -11,22 +11,22 @@ KEYWORDS=""
 IUSE="scanner"
 
 RDEPEND="
-	$(add_kdebase_dep gwenview)
-	$(add_kdebase_dep kamera)
-	$(add_kdebase_dep kcolorchooser)
-	$(add_kdebase_dep kdegraphics-mobipocket)
-	$(add_kdebase_dep kgamma)
-	$(add_kdebase_dep kolourpaint)
-	$(add_kdebase_dep kruler)
-	$(add_kdebase_dep ksnapshot)
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep okular)
-	$(add_kdebase_dep svgpart)
-	$(add_kdebase_dep thumbnailers)
+	$(add_kdeapps_dep gwenview)
+	$(add_kdeapps_dep kamera)
+	$(add_kdeapps_dep kcolorchooser)
+	$(add_kdeapps_dep kdegraphics-mobipocket)
+	$(add_kdeapps_dep kgamma)
+	$(add_kdeapps_dep kolourpaint)
+	$(add_kdeapps_dep kruler)
+	$(add_kdeapps_dep ksnapshot)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+	$(add_kdeapps_dep libkipi)
+	$(add_kdeapps_dep okular)
+	$(add_kdeapps_dep svgpart)
+	$(add_kdeapps_dep thumbnailers)
 	scanner? (
-		$(add_kdebase_dep ksaneplugin)
-		$(add_kdebase_dep libksane)
+		$(add_kdeapps_dep ksaneplugin)
+		$(add_kdeapps_dep libksane)
 	)
 "

diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-14.11.97.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-14.11.97.ebuild
index 3380379..4512701 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-14.11.97.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-14.11.97.ebuild
@@ -14,13 +14,13 @@ KEYWORDS=""
 IUSE="+ffmpeg mplayer"
 
 RDEPEND="
-	$(add_kdebase_dep dragon)
-	$(add_kdebase_dep juk)
-	$(add_kdebase_dep audiocd-kio)
-	$(add_kdebase_dep kmix)
-	$(add_kdebase_dep kscd)
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	mplayer? ( $(add_kdebase_dep mplayerthumbs) )
-	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep audiocd-kio)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kscd)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
 "

diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
index 3380379..4512701 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
@@ -14,13 +14,13 @@ KEYWORDS=""
 IUSE="+ffmpeg mplayer"
 
 RDEPEND="
-	$(add_kdebase_dep dragon)
-	$(add_kdebase_dep juk)
-	$(add_kdebase_dep audiocd-kio)
-	$(add_kdebase_dep kmix)
-	$(add_kdebase_dep kscd)
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
-	mplayer? ( $(add_kdebase_dep mplayerthumbs) )
-	ffmpeg? ( $(add_kdebase_dep ffmpegthumbs) )
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep audiocd-kio)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kscd)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	mplayer? ( $(add_kdeapps_dep mplayerthumbs) )
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-14.11.97.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-14.11.97.ebuild
index 0fa8e11..8bafbe6 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-14.11.97.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-14.11.97.ebuild
@@ -11,11 +11,11 @@ KEYWORDS=""
 IUSE="ppp"
 
 RDEPEND="
-	$(add_kdebase_dep kdenetwork-filesharing)
-	$(add_kdebase_dep kget)
-	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep krdc)
-	$(add_kdebase_dep krfb)
-	$(add_kdebase_dep zeroconf-ioslave)
-	ppp? ( $(add_kdebase_dep kppp) )
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep kopete)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep zeroconf-ioslave)
+	ppp? ( $(add_kdeapps_dep kppp) )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
index 0fa8e11..8bafbe6 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
@@ -11,11 +11,11 @@ KEYWORDS=""
 IUSE="ppp"
 
 RDEPEND="
-	$(add_kdebase_dep kdenetwork-filesharing)
-	$(add_kdebase_dep kget)
-	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep krdc)
-	$(add_kdebase_dep krfb)
-	$(add_kdebase_dep zeroconf-ioslave)
-	ppp? ( $(add_kdebase_dep kppp) )
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep kopete)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep zeroconf-ioslave)
+	ppp? ( $(add_kdeapps_dep kppp) )
 "

diff --git a/kde-apps/kdepasswd/kdepasswd-14.11.97.ebuild b/kde-apps/kdepasswd/kdepasswd-14.11.97.ebuild
index 24a1a6a..da42af2 100644
--- a/kde-apps/kdepasswd/kdepasswd-14.11.97.ebuild
+++ b/kde-apps/kdepasswd/kdepasswd-14.11.97.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesu)
+	$(add_kdeapps_dep kdesu)
 	sys-apps/accountsservice
 "

diff --git a/kde-apps/kdepasswd/kdepasswd-9999.ebuild b/kde-apps/kdepasswd/kdepasswd-9999.ebuild
index 24a1a6a..da42af2 100644
--- a/kde-apps/kdepasswd/kdepasswd-9999.ebuild
+++ b/kde-apps/kdepasswd/kdepasswd-9999.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesu)
+	$(add_kdeapps_dep kdesu)
 	sys-apps/accountsservice
 "

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-14.11.97.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-14.11.97.ebuild
index 30a1b31..a2389ed 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-14.11.97.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-14.11.97.ebuild
@@ -11,18 +11,18 @@ KEYWORDS=""
 IUSE="cvs"
 
 RDEPEND="
-	cvs? ( $(add_kdebase_dep cervisia) )
-	$(add_kdebase_dep dolphin-plugins)
-	$(add_kdebase_dep kapptemplate)
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kcachegrind)
-	$(add_kdebase_dep kde-dev-scripts)
-	$(add_kdebase_dep kde-dev-utils)
-	$(add_kdebase_dep kdesdk-kioslaves)
-	$(add_kdebase_dep kompare)
-	$(add_kdebase_dep libkomparediff2)
-	$(add_kdebase_dep lokalize)
-	$(add_kdebase_dep okteta)
-	$(add_kdebase_dep poxml)
-	$(add_kdebase_dep umbrello)
+	cvs? ( $(add_kdeapps_dep cervisia) )
+	$(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)
 "

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild
index 30a1b31..a2389ed 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild
@@ -11,18 +11,18 @@ KEYWORDS=""
 IUSE="cvs"
 
 RDEPEND="
-	cvs? ( $(add_kdebase_dep cervisia) )
-	$(add_kdebase_dep dolphin-plugins)
-	$(add_kdebase_dep kapptemplate)
-	$(add_kdebase_dep kate)
-	$(add_kdebase_dep kcachegrind)
-	$(add_kdebase_dep kde-dev-scripts)
-	$(add_kdebase_dep kde-dev-utils)
-	$(add_kdebase_dep kdesdk-kioslaves)
-	$(add_kdebase_dep kompare)
-	$(add_kdebase_dep libkomparediff2)
-	$(add_kdebase_dep lokalize)
-	$(add_kdebase_dep okteta)
-	$(add_kdebase_dep poxml)
-	$(add_kdebase_dep umbrello)
+	cvs? ( $(add_kdeapps_dep cervisia) )
+	$(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)
 "

diff --git a/kde-apps/kdewebdev-meta/kdewebdev-meta-14.11.97.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-14.11.97.ebuild
index 37561af..cba5ffe 100644
--- a/kde-apps/kdewebdev-meta/kdewebdev-meta-14.11.97.ebuild
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-14.11.97.ebuild
@@ -10,8 +10,8 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdebase_dep kfilereplace)
-	$(add_kdebase_dep kimagemapeditor)
-	$(add_kdebase_dep klinkstatus)
-	$(add_kdebase_dep kommander)
+	$(add_kdeapps_dep kfilereplace)
+	$(add_kdeapps_dep kimagemapeditor)
+	$(add_kdeapps_dep klinkstatus)
+	$(add_kdeapps_dep kommander)
 "

diff --git a/kde-apps/kdewebdev-meta/kdewebdev-meta-9999.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-9999.ebuild
index 37561af..cba5ffe 100644
--- a/kde-apps/kdewebdev-meta/kdewebdev-meta-9999.ebuild
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-9999.ebuild
@@ -10,8 +10,8 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdebase_dep kfilereplace)
-	$(add_kdebase_dep kimagemapeditor)
-	$(add_kdebase_dep klinkstatus)
-	$(add_kdebase_dep kommander)
+	$(add_kdeapps_dep kfilereplace)
+	$(add_kdeapps_dep kimagemapeditor)
+	$(add_kdeapps_dep klinkstatus)
+	$(add_kdeapps_dep kommander)
 "

diff --git a/kde-apps/kdiamond/kdiamond-14.11.97.ebuild b/kde-apps/kdiamond/kdiamond-14.11.97.ebuild
index 79fe4e5..36d5bf8 100644
--- a/kde-apps/kdiamond/kdiamond-14.11.97.ebuild
+++ b/kde-apps/kdiamond/kdiamond-14.11.97.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kdiamond/kdiamond-9999.ebuild b/kde-apps/kdiamond/kdiamond-9999.ebuild
index 79fe4e5..36d5bf8 100644
--- a/kde-apps/kdiamond/kdiamond-9999.ebuild
+++ b/kde-apps/kdiamond/kdiamond-9999.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/keditbookmarks/keditbookmarks-14.11.97.ebuild b/kde-apps/keditbookmarks/keditbookmarks-14.11.97.ebuild
index 9add288..37b5f6a 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-14.11.97.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-14.11.97.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild b/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
index 9add288..37b5f6a 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kfind/kfind-14.11.97.ebuild b/kde-apps/kfind/kfind-14.11.97.ebuild
index f1d29da..2127d1b 100644
--- a/kde-apps/kfind/kfind-14.11.97.ebuild
+++ b/kde-apps/kfind/kfind-14.11.97.ebuild
@@ -14,6 +14,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kfind/kfind-9999.ebuild b/kde-apps/kfind/kfind-9999.ebuild
index f1d29da..2127d1b 100644
--- a/kde-apps/kfind/kfind-9999.ebuild
+++ b/kde-apps/kfind/kfind-9999.ebuild
@@ -14,6 +14,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kfourinline/kfourinline-14.11.97.ebuild b/kde-apps/kfourinline/kfourinline-14.11.97.ebuild
index 4934103..aa0ddcf 100644
--- a/kde-apps/kfourinline/kfourinline-14.11.97.ebuild
+++ b/kde-apps/kfourinline/kfourinline-14.11.97.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kfourinline/kfourinline-9999.ebuild b/kde-apps/kfourinline/kfourinline-9999.ebuild
index 4934103..aa0ddcf 100644
--- a/kde-apps/kfourinline/kfourinline-9999.ebuild
+++ b/kde-apps/kfourinline/kfourinline-9999.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kget/kget-14.11.97.ebuild b/kde-apps/kget/kget-14.11.97.ebuild
index 6b594f6..77fb94f 100644
--- a/kde-apps/kget/kget-14.11.97.ebuild
+++ b/kde-apps/kget/kget-14.11.97.ebuild
@@ -14,17 +14,17 @@ IUSE="debug bittorrent gpg mms nepomuk sqlite webkit"
 
 RDEPEND="
 	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep kdelibs 'nepomuk?')
+	$(add_kdeapps_dep libkonq)
 	$(add_kdebase_dep libkworkspace '' 4.11)
 	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
-	gpg? ( $(add_kdebase_dep kdepimlibs) )
+	gpg? ( $(add_kdeapps_dep kdepimlibs) )
 	mms? ( media-libs/libmms )
 	nepomuk? (
 		dev-libs/shared-desktop-ontologies
 		dev-libs/soprano
-		$(add_kdebase_dep nepomuk-core)
-		$(add_kdebase_dep nepomuk-widgets)
+		$(add_kdeapps_dep nepomuk-core)
+		$(add_kdeapps_dep nepomuk-widgets)
 	)
 	sqlite? ( dev-db/sqlite:3 )
 	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )

diff --git a/kde-apps/kget/kget-9999.ebuild b/kde-apps/kget/kget-9999.ebuild
index 6b594f6..77fb94f 100644
--- a/kde-apps/kget/kget-9999.ebuild
+++ b/kde-apps/kget/kget-9999.ebuild
@@ -14,17 +14,17 @@ IUSE="debug bittorrent gpg mms nepomuk sqlite webkit"
 
 RDEPEND="
 	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep kdelibs 'nepomuk?')
+	$(add_kdeapps_dep libkonq)
 	$(add_kdebase_dep libkworkspace '' 4.11)
 	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
-	gpg? ( $(add_kdebase_dep kdepimlibs) )
+	gpg? ( $(add_kdeapps_dep kdepimlibs) )
 	mms? ( media-libs/libmms )
 	nepomuk? (
 		dev-libs/shared-desktop-ontologies
 		dev-libs/soprano
-		$(add_kdebase_dep nepomuk-core)
-		$(add_kdebase_dep nepomuk-widgets)
+		$(add_kdeapps_dep nepomuk-core)
+		$(add_kdeapps_dep nepomuk-widgets)
 	)
 	sqlite? ( dev-db/sqlite:3 )
 	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )

diff --git a/kde-apps/kgoldrunner/kgoldrunner-14.11.97.ebuild b/kde-apps/kgoldrunner/kgoldrunner-14.11.97.ebuild
index 880d4c6..6243156 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-14.11.97.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-14.11.97.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 	media-libs/libsndfile
 	media-libs/openal
 "

diff --git a/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild b/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
index 880d4c6..6243156 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 	media-libs/libsndfile
 	media-libs/openal
 "

diff --git a/kde-apps/kgpg/kgpg-14.11.97.ebuild b/kde-apps/kgpg/kgpg-14.11.97.ebuild
index 0d401f0..d4ee6c3 100644
--- a/kde-apps/kgpg/kgpg-14.11.97.ebuild
+++ b/kde-apps/kgpg/kgpg-14.11.97.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg

diff --git a/kde-apps/kgpg/kgpg-9999.ebuild b/kde-apps/kgpg/kgpg-9999.ebuild
index 0d401f0..d4ee6c3 100644
--- a/kde-apps/kgpg/kgpg-9999.ebuild
+++ b/kde-apps/kgpg/kgpg-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg

diff --git a/kde-apps/kigo/kigo-14.11.97.ebuild b/kde-apps/kigo/kigo-14.11.97.ebuild
index b451f4e..73de8fb 100644
--- a/kde-apps/kigo/kigo-14.11.97.ebuild
+++ b/kde-apps/kigo/kigo-14.11.97.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/applications/games/kigo/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="
 	${DEPEND}
 	games-board/gnugo

diff --git a/kde-apps/kigo/kigo-9999.ebuild b/kde-apps/kigo/kigo-9999.ebuild
index b451f4e..73de8fb 100644
--- a/kde-apps/kigo/kigo-9999.ebuild
+++ b/kde-apps/kigo/kigo-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/applications/games/kigo/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="
 	${DEPEND}
 	games-board/gnugo

diff --git a/kde-apps/killbots/killbots-14.11.97.ebuild b/kde-apps/killbots/killbots-14.11.97.ebuild
index d378687..62a3084 100644
--- a/kde-apps/killbots/killbots-14.11.97.ebuild
+++ b/kde-apps/killbots/killbots-14.11.97.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://www.kde.org/applications/games/killbots/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/killbots/killbots-9999.ebuild b/kde-apps/killbots/killbots-9999.ebuild
index d378687..62a3084 100644
--- a/kde-apps/killbots/killbots-9999.ebuild
+++ b/kde-apps/killbots/killbots-9999.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://www.kde.org/applications/games/killbots/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kiriki/kiriki-14.11.97.ebuild b/kde-apps/kiriki/kiriki-14.11.97.ebuild
index d9e1c92..2b02aff 100644
--- a/kde-apps/kiriki/kiriki-14.11.97.ebuild
+++ b/kde-apps/kiriki/kiriki-14.11.97.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kiriki/kiriki-9999.ebuild b/kde-apps/kiriki/kiriki-9999.ebuild
index d9e1c92..2b02aff 100644
--- a/kde-apps/kiriki/kiriki-9999.ebuild
+++ b/kde-apps/kiriki/kiriki-9999.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kjumpingcube/kjumpingcube-14.11.97.ebuild b/kde-apps/kjumpingcube/kjumpingcube-14.11.97.ebuild
index 28d4d3a..b515124 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-14.11.97.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
index 28d4d3a..b515124 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klettres/klettres-14.11.97.ebuild b/kde-apps/klettres/klettres-14.11.97.ebuild
index 2af7fee..5266d2b 100644
--- a/kde-apps/klettres/klettres-14.11.97.ebuild
+++ b/kde-apps/klettres/klettres-14.11.97.ebuild
@@ -14,5 +14,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/klettres/klettres-9999.ebuild b/kde-apps/klettres/klettres-9999.ebuild
index 2af7fee..5266d2b 100644
--- a/kde-apps/klettres/klettres-9999.ebuild
+++ b/kde-apps/klettres/klettres-9999.ebuild
@@ -14,5 +14,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/klickety/klickety-14.11.97.ebuild b/kde-apps/klickety/klickety-14.11.97.ebuild
index 8c37b82..cea1761 100644
--- a/kde-apps/klickety/klickety-14.11.97.ebuild
+++ b/kde-apps/klickety/klickety-14.11.97.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="A KDE game almost the same as ksame, but a bit different"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/klickety/klickety-9999.ebuild
index 8c37b82..cea1761 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/klickety/klickety-9999.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="A KDE game almost the same as ksame, but a bit different"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klines/klines-14.11.97.ebuild b/kde-apps/klines/klines-14.11.97.ebuild
index 1779570..6fcb462 100644
--- a/kde-apps/klines/klines-14.11.97.ebuild
+++ b/kde-apps/klines/klines-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klines/klines-9999.ebuild b/kde-apps/klines/klines-9999.ebuild
index 1779570..6fcb462 100644
--- a/kde-apps/klines/klines-9999.ebuild
+++ b/kde-apps/klines/klines-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klinkstatus/klinkstatus-14.11.97.ebuild b/kde-apps/klinkstatus/klinkstatus-14.11.97.ebuild
index a7a81c4..22a2bfa 100644
--- a/kde-apps/klinkstatus/klinkstatus-14.11.97.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-14.11.97.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="debug tidy"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 	tidy? ( app-text/htmltidy )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/klinkstatus/klinkstatus-9999.ebuild b/kde-apps/klinkstatus/klinkstatus-9999.ebuild
index a7a81c4..22a2bfa 100644
--- a/kde-apps/klinkstatus/klinkstatus-9999.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="debug tidy"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 	tidy? ( app-text/htmltidy )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmag/kmag-14.11.97.ebuild b/kde-apps/kmag/kmag-14.11.97.ebuild
index 5f19512..fa1a7aa 100644
--- a/kde-apps/kmag/kmag-14.11.97.ebuild
+++ b/kde-apps/kmag/kmag-14.11.97.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kaccessible)
+	$(add_kdeapps_dep kaccessible)
 "

diff --git a/kde-apps/kmag/kmag-9999.ebuild b/kde-apps/kmag/kmag-9999.ebuild
index 5f19512..fa1a7aa 100644
--- a/kde-apps/kmag/kmag-9999.ebuild
+++ b/kde-apps/kmag/kmag-9999.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kaccessible)
+	$(add_kdeapps_dep kaccessible)
 "

diff --git a/kde-apps/kmahjongg/kmahjongg-14.11.97.ebuild b/kde-apps/kmahjongg/kmahjongg-14.11.97.ebuild
index 6a43c26..1c339d0 100644
--- a/kde-apps/kmahjongg/kmahjongg-14.11.97.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-14.11.97.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmahjongg/kmahjongg-9999.ebuild b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
index 6a43c26..1c339d0 100644
--- a/kde-apps/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmines/kmines-14.11.97.ebuild b/kde-apps/kmines/kmines-14.11.97.ebuild
index 9b248f3..c844cb7 100644
--- a/kde-apps/kmines/kmines-14.11.97.ebuild
+++ b/kde-apps/kmines/kmines-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmines/kmines-9999.ebuild b/kde-apps/kmines/kmines-9999.ebuild
index 9b248f3..c844cb7 100644
--- a/kde-apps/kmines/kmines-9999.ebuild
+++ b/kde-apps/kmines/kmines-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmousetool/kmousetool-14.11.97.ebuild b/kde-apps/kmousetool/kmousetool-14.11.97.ebuild
index 07d3c3e..1e85af3 100644
--- a/kde-apps/kmousetool/kmousetool-14.11.97.ebuild
+++ b/kde-apps/kmousetool/kmousetool-14.11.97.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kmousetool/kmousetool-9999.ebuild b/kde-apps/kmousetool/kmousetool-9999.ebuild
index 07d3c3e..1e85af3 100644
--- a/kde-apps/kmousetool/kmousetool-9999.ebuild
+++ b/kde-apps/kmousetool/kmousetool-9999.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kmplot/kmplot-14.11.97.ebuild b/kde-apps/kmplot/kmplot-14.11.97.ebuild
index 013d7ff..d22581b 100644
--- a/kde-apps/kmplot/kmplot-14.11.97.ebuild
+++ b/kde-apps/kmplot/kmplot-14.11.97.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kmplot/kmplot-9999.ebuild b/kde-apps/kmplot/kmplot-9999.ebuild
index 013d7ff..d22581b 100644
--- a/kde-apps/kmplot/kmplot-9999.ebuild
+++ b/kde-apps/kmplot/kmplot-9999.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/knavalbattle/knavalbattle-14.11.97.ebuild b/kde-apps/knavalbattle/knavalbattle-14.11.97.ebuild
index 1b98ae5..087f36a 100644
--- a/kde-apps/knavalbattle/knavalbattle-14.11.97.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-14.11.97.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}
 	!kde-base/kbattleship:4
 "

diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
index 1b98ae5..087f36a 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}
 	!kde-base/kbattleship:4
 "

diff --git a/kde-apps/knetwalk/knetwalk-14.11.97.ebuild b/kde-apps/knetwalk/knetwalk-14.11.97.ebuild
index c38db48..9c5ac75 100644
--- a/kde-apps/knetwalk/knetwalk-14.11.97.ebuild
+++ b/kde-apps/knetwalk/knetwalk-14.11.97.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/knetwalk/knetwalk-9999.ebuild b/kde-apps/knetwalk/knetwalk-9999.ebuild
index c38db48..9c5ac75 100644
--- a/kde-apps/knetwalk/knetwalk-9999.ebuild
+++ b/kde-apps/knetwalk/knetwalk-9999.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kolf/kolf-14.11.97.ebuild b/kde-apps/kolf/kolf-14.11.97.ebuild
index b4dda15..beb8ce7 100644
--- a/kde-apps/kolf/kolf-14.11.97.ebuild
+++ b/kde-apps/kolf/kolf-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kolf/kolf-9999.ebuild b/kde-apps/kolf/kolf-9999.ebuild
index b4dda15..beb8ce7 100644
--- a/kde-apps/kolf/kolf-9999.ebuild
+++ b/kde-apps/kolf/kolf-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kollision/kollision-14.11.97.ebuild b/kde-apps/kollision/kollision-14.11.97.ebuild
index 79cd217..5c406c0 100644
--- a/kde-apps/kollision/kollision-14.11.97.ebuild
+++ b/kde-apps/kollision/kollision-14.11.97.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kollision/kollision-9999.ebuild b/kde-apps/kollision/kollision-9999.ebuild
index 79cd217..5c406c0 100644
--- a/kde-apps/kollision/kollision-9999.ebuild
+++ b/kde-apps/kollision/kollision-9999.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kompare/kompare-14.11.97.ebuild b/kde-apps/kompare/kompare-14.11.97.ebuild
index 46920cb..b992f1e 100644
--- a/kde-apps/kompare/kompare-14.11.97.ebuild
+++ b/kde-apps/kompare/kompare-14.11.97.ebuild
@@ -13,5 +13,5 @@ http://www.caffeinated.me.uk/kompare"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkomparediff2)"
+DEPEND="$(add_kdeapps_dep libkomparediff2)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-9999.ebuild
index 46920cb..b992f1e 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kompare/kompare-9999.ebuild
@@ -13,5 +13,5 @@ http://www.caffeinated.me.uk/kompare"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkomparediff2)"
+DEPEND="$(add_kdeapps_dep libkomparediff2)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/konq-plugins/konq-plugins-14.11.97.ebuild b/kde-apps/konq-plugins/konq-plugins-14.11.97.ebuild
index e9925c8..0b3973a 100644
--- a/kde-apps/konq-plugins/konq-plugins-14.11.97.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-14.11.97.ebuild
@@ -12,13 +12,13 @@ KEYWORDS=""
 IUSE="debug tidy"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 	tidy? ( app-text/htmltidy )
 "
 RDEPEND="${DEPEND}
 	!kde-misc/konq-plugins
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep konqueror)
+	$(add_kdeapps_dep kcmshell)
+	$(add_kdeapps_dep konqueror)
 "
 
 src_configure() {

diff --git a/kde-apps/konq-plugins/konq-plugins-9999.ebuild b/kde-apps/konq-plugins/konq-plugins-9999.ebuild
index e9925c8..0b3973a 100644
--- a/kde-apps/konq-plugins/konq-plugins-9999.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-9999.ebuild
@@ -12,13 +12,13 @@ KEYWORDS=""
 IUSE="debug tidy"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 	tidy? ( app-text/htmltidy )
 "
 RDEPEND="${DEPEND}
 	!kde-misc/konq-plugins
-	$(add_kdebase_dep kcmshell)
-	$(add_kdebase_dep konqueror)
+	$(add_kdeapps_dep kcmshell)
+	$(add_kdeapps_dep konqueror)
 "
 
 src_configure() {

diff --git a/kde-apps/konqueror/konqueror-14.11.97.ebuild b/kde-apps/konqueror/konqueror-14.11.97.ebuild
index 29c755d..328c662 100644
--- a/kde-apps/konqueror/konqueror-14.11.97.ebuild
+++ b/kde-apps/konqueror/konqueror-14.11.97.ebuild
@@ -19,14 +19,14 @@ IUSE="+bookmarks debug svg"
 RESTRICT="test"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep kurifilter-plugins)
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-	svg? ( $(add_kdebase_dep svgpart) )
+	$(add_kdeapps_dep kfind)
+	$(add_kdeapps_dep kfmclient)
+	$(add_kdeapps_dep kurifilter-plugins)
+	bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+	svg? ( $(add_kdeapps_dep svgpart) )
 "
 
 KMEXTRACTONLY="

diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index 29c755d..328c662 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -19,14 +19,14 @@ IUSE="+bookmarks debug svg"
 RESTRICT="test"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kfind)
-	$(add_kdebase_dep kfmclient)
-	$(add_kdebase_dep kurifilter-plugins)
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-	svg? ( $(add_kdebase_dep svgpart) )
+	$(add_kdeapps_dep kfind)
+	$(add_kdeapps_dep kfmclient)
+	$(add_kdeapps_dep kurifilter-plugins)
+	bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+	svg? ( $(add_kdeapps_dep svgpart) )
 "
 
 KMEXTRACTONLY="

diff --git a/kde-apps/konquest/konquest-14.11.97.ebuild b/kde-apps/konquest/konquest-14.11.97.ebuild
index 16926c7..9295a1e 100644
--- a/kde-apps/konquest/konquest-14.11.97.ebuild
+++ b/kde-apps/konquest/konquest-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/konquest/konquest-9999.ebuild b/kde-apps/konquest/konquest-9999.ebuild
index 16926c7..9295a1e 100644
--- a/kde-apps/konquest/konquest-9999.ebuild
+++ b/kde-apps/konquest/konquest-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kopete/kopete-14.11.97.ebuild b/kde-apps/kopete/kopete-14.11.97.ebuild
index e9b69f1..fec12e3 100644
--- a/kde-apps/kopete/kopete-14.11.97.ebuild
+++ b/kde-apps/kopete/kopete-14.11.97.ebuild
@@ -65,8 +65,8 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
-	$(add_kdebase_dep kdelibs 'zeroconf?')
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdelibs 'zeroconf?')
+	$(add_kdeapps_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index e9b69f1..fec12e3 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -65,8 +65,8 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
-	$(add_kdebase_dep kdelibs 'zeroconf?')
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdelibs 'zeroconf?')
+	$(add_kdeapps_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )

diff --git a/kde-apps/kpat/kpat-14.11.97.ebuild b/kde-apps/kpat/kpat-14.11.97.ebuild
index f3d96cb..e0f6f9b 100644
--- a/kde-apps/kpat/kpat-14.11.97.ebuild
+++ b/kde-apps/kpat/kpat-14.11.97.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://games.kde.org/game.php?game=kpat"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kpat/kpat-9999.ebuild b/kde-apps/kpat/kpat-9999.ebuild
index f3d96cb..e0f6f9b 100644
--- a/kde-apps/kpat/kpat-9999.ebuild
+++ b/kde-apps/kpat/kpat-9999.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://games.kde.org/game.php?game=kpat"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-14.11.97.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-14.11.97.ebuild
index a3268ee..1cfd3e5 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-14.11.97.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-14.11.97.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
 KEYWORDS=""
 IUSE="debug"
 
-RDEPEND="$(add_kdebase_dep plasma-runtime)"
+RDEPEND="$(add_kdeapps_dep plasma-runtime)"

diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild
index a3268ee..1cfd3e5 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
 KEYWORDS=""
 IUSE="debug"
 
-RDEPEND="$(add_kdebase_dep plasma-runtime)"
+RDEPEND="$(add_kdeapps_dep plasma-runtime)"

diff --git a/kde-apps/kreversi/kreversi-14.11.97.ebuild b/kde-apps/kreversi/kreversi-14.11.97.ebuild
index 97521fa..c7fd35b 100644
--- a/kde-apps/kreversi/kreversi-14.11.97.ebuild
+++ b/kde-apps/kreversi/kreversi-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kreversi/kreversi-9999.ebuild b/kde-apps/kreversi/kreversi-9999.ebuild
index 97521fa..c7fd35b 100644
--- a/kde-apps/kreversi/kreversi-9999.ebuild
+++ b/kde-apps/kreversi/kreversi-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksaneplugin/ksaneplugin-14.11.97.ebuild b/kde-apps/ksaneplugin/ksaneplugin-14.11.97.ebuild
index 2b0d52b..e5ab924 100644
--- a/kde-apps/ksaneplugin/ksaneplugin-14.11.97.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-14.11.97.ebuild
@@ -11,6 +11,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libksane)
+	$(add_kdeapps_dep libksane)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksaneplugin/ksaneplugin-9999.ebuild b/kde-apps/ksaneplugin/ksaneplugin-9999.ebuild
index 2b0d52b..e5ab924 100644
--- a/kde-apps/ksaneplugin/ksaneplugin-9999.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-9999.ebuild
@@ -11,6 +11,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libksane)
+	$(add_kdeapps_dep libksane)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kscd/kscd-14.11.97.ebuild b/kde-apps/kscd/kscd-14.11.97.ebuild
index d6274d2..93a0b37 100644
--- a/kde-apps/kscd/kscd-14.11.97.ebuild
+++ b/kde-apps/kscd/kscd-14.11.97.ebuild
@@ -12,8 +12,8 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
 	media-libs/musicbrainz:3
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kscd/kscd-9999.ebuild b/kde-apps/kscd/kscd-9999.ebuild
index d6274d2..93a0b37 100644
--- a/kde-apps/kscd/kscd-9999.ebuild
+++ b/kde-apps/kscd/kscd-9999.ebuild
@@ -12,8 +12,8 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
 	media-libs/musicbrainz:3
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kshisen/kshisen-14.11.97.ebuild b/kde-apps/kshisen/kshisen-14.11.97.ebuild
index 0f93e41..39d4aa5 100644
--- a/kde-apps/kshisen/kshisen-14.11.97.ebuild
+++ b/kde-apps/kshisen/kshisen-14.11.97.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kshisen/kshisen-9999.ebuild b/kde-apps/kshisen/kshisen-9999.ebuild
index 0f93e41..39d4aa5 100644
--- a/kde-apps/kshisen/kshisen-9999.ebuild
+++ b/kde-apps/kshisen/kshisen-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
-	$(add_kdebase_dep libkmahjongg)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksirk/ksirk-14.11.97.ebuild b/kde-apps/ksirk/ksirk-14.11.97.ebuild
index 6784708..acfe586 100644
--- a/kde-apps/ksirk/ksirk-14.11.97.ebuild
+++ b/kde-apps/ksirk/ksirk-14.11.97.ebuild
@@ -17,7 +17,7 @@ IUSE="debug"
 
 DEPEND="
 	app-crypt/qca:2
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksirk/ksirk-9999.ebuild b/kde-apps/ksirk/ksirk-9999.ebuild
index 6784708..acfe586 100644
--- a/kde-apps/ksirk/ksirk-9999.ebuild
+++ b/kde-apps/ksirk/ksirk-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="debug"
 
 DEPEND="
 	app-crypt/qca:2
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksnakeduel/ksnakeduel-14.11.97.ebuild b/kde-apps/ksnakeduel/ksnakeduel-14.11.97.ebuild
index ca0fd56..7acdee0 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-14.11.97.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-14.11.97.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/applications/games/ksnakeduel/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}
 	!kde-base/ktron:4
 "

diff --git a/kde-apps/ksnakeduel/ksnakeduel-9999.ebuild b/kde-apps/ksnakeduel/ksnakeduel-9999.ebuild
index ca0fd56..7acdee0 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-9999.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/applications/games/ksnakeduel/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}
 	!kde-base/ktron:4
 "

diff --git a/kde-apps/ksnapshot/ksnapshot-14.11.97.ebuild b/kde-apps/ksnapshot/ksnapshot-14.11.97.ebuild
index e02b8e0..e821f11 100644
--- a/kde-apps/ksnapshot/ksnapshot-14.11.97.ebuild
+++ b/kde-apps/ksnapshot/ksnapshot-14.11.97.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 	)
-	kipi? ( $(add_kdebase_dep libkipi) )
+	kipi? ( $(add_kdeapps_dep libkipi) )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/ksnapshot/ksnapshot-9999.ebuild b/kde-apps/ksnapshot/ksnapshot-9999.ebuild
index e02b8e0..e821f11 100644
--- a/kde-apps/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-apps/ksnapshot/ksnapshot-9999.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 	)
-	kipi? ( $(add_kdebase_dep libkipi) )
+	kipi? ( $(add_kdeapps_dep libkipi) )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kspaceduel/kspaceduel-14.11.97.ebuild b/kde-apps/kspaceduel/kspaceduel-14.11.97.ebuild
index 05e21a6..e1d2ea7 100644
--- a/kde-apps/kspaceduel/kspaceduel-14.11.97.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kspaceduel/kspaceduel-9999.ebuild b/kde-apps/kspaceduel/kspaceduel-9999.ebuild
index 05e21a6..e1d2ea7 100644
--- a/kde-apps/kspaceduel/kspaceduel-9999.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksquares/ksquares-14.11.97.ebuild b/kde-apps/ksquares/ksquares-14.11.97.ebuild
index 5bde371..76d6a4b 100644
--- a/kde-apps/ksquares/ksquares-14.11.97.ebuild
+++ b/kde-apps/ksquares/ksquares-14.11.97.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksquares/ksquares-9999.ebuild b/kde-apps/ksquares/ksquares-9999.ebuild
index 5bde371..76d6a4b 100644
--- a/kde-apps/ksquares/ksquares-9999.ebuild
+++ b/kde-apps/ksquares/ksquares-9999.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kstars/kstars-14.11.97.ebuild b/kde-apps/kstars/kstars-14.11.97.ebuild
index f575d8d..323a1ad 100644
--- a/kde-apps/kstars/kstars-14.11.97.ebuild
+++ b/kde-apps/kstars/kstars-14.11.97.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="indi? ( fits )"
 
 DEPEND="
 	dev-cpp/eigen:3
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 	fits? ( >=sci-libs/cfitsio-0.390 )
 	indi? ( >=sci-libs/indilib-0.9.8 )
 "

diff --git a/kde-apps/kstars/kstars-9999.ebuild b/kde-apps/kstars/kstars-9999.ebuild
index f575d8d..323a1ad 100644
--- a/kde-apps/kstars/kstars-9999.ebuild
+++ b/kde-apps/kstars/kstars-9999.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="indi? ( fits )"
 
 DEPEND="
 	dev-cpp/eigen:3
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 	fits? ( >=sci-libs/cfitsio-0.390 )
 	indi? ( >=sci-libs/indilib-0.9.8 )
 "

diff --git a/kde-apps/ksudoku/ksudoku-14.11.97.ebuild b/kde-apps/ksudoku/ksudoku-14.11.97.ebuild
index 93727cb..7c58f65 100644
--- a/kde-apps/ksudoku/ksudoku-14.11.97.ebuild
+++ b/kde-apps/ksudoku/ksudoku-14.11.97.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 	opengl? ( virtual/glu )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ksudoku/ksudoku-9999.ebuild b/kde-apps/ksudoku/ksudoku-9999.ebuild
index 93727cb..7c58f65 100644
--- a/kde-apps/ksudoku/ksudoku-9999.ebuild
+++ b/kde-apps/ksudoku/ksudoku-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdegames)
+	$(add_kdeapps_dep libkdegames)
 	opengl? ( virtual/glu )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ktouch/ktouch-14.11.97.ebuild b/kde-apps/ktouch/ktouch-14.11.97.ebuild
index 6d6ceb9..1618acd 100644
--- a/kde-apps/ktouch/ktouch-14.11.97.ebuild
+++ b/kde-apps/ktouch/ktouch-14.11.97.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
-	$(add_kdebase_dep kqtquickcharts)
-	$(add_kdebase_dep plasma-runtime)
+	$(add_kdeapps_dep knotify)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep plasma-runtime)
 "

diff --git a/kde-apps/ktouch/ktouch-9999.ebuild b/kde-apps/ktouch/ktouch-9999.ebuild
index 6d6ceb9..1618acd 100644
--- a/kde-apps/ktouch/ktouch-9999.ebuild
+++ b/kde-apps/ktouch/ktouch-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
-	$(add_kdebase_dep kqtquickcharts)
-	$(add_kdebase_dep plasma-runtime)
+	$(add_kdeapps_dep knotify)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep plasma-runtime)
 "

diff --git a/kde-apps/ktuberling/ktuberling-14.11.97.ebuild b/kde-apps/ktuberling/ktuberling-14.11.97.ebuild
index 071f0e4..746f859 100644
--- a/kde-apps/ktuberling/ktuberling-14.11.97.ebuild
+++ b/kde-apps/ktuberling/ktuberling-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild
index 071f0e4..746f859 100644
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kturtle/kturtle-14.11.97.ebuild b/kde-apps/kturtle/kturtle-14.11.97.ebuild
index bf145f1..48a69db 100644
--- a/kde-apps/kturtle/kturtle-14.11.97.ebuild
+++ b/kde-apps/kturtle/kturtle-14.11.97.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kturtle/kturtle-9999.ebuild b/kde-apps/kturtle/kturtle-9999.ebuild
index bf145f1..48a69db 100644
--- a/kde-apps/kturtle/kturtle-9999.ebuild
+++ b/kde-apps/kturtle/kturtle-9999.ebuild
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kubrick/kubrick-14.11.97.ebuild b/kde-apps/kubrick/kubrick-14.11.97.ebuild
index 04d883a..922ac1b 100644
--- a/kde-apps/kubrick/kubrick-14.11.97.ebuild
+++ b/kde-apps/kubrick/kubrick-14.11.97.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kde.org/applications/games/kubrick/"
 KEYWORDS=""
 IUSE="debug"
 
-RDEPEND="$(add_kdebase_dep libkdegames)
+RDEPEND="$(add_kdeapps_dep libkdegames)
 	virtual/glu
 "
 DEPEND="${RDEPEND}

diff --git a/kde-apps/kubrick/kubrick-9999.ebuild b/kde-apps/kubrick/kubrick-9999.ebuild
index 04d883a..922ac1b 100644
--- a/kde-apps/kubrick/kubrick-9999.ebuild
+++ b/kde-apps/kubrick/kubrick-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kde.org/applications/games/kubrick/"
 KEYWORDS=""
 IUSE="debug"
 
-RDEPEND="$(add_kdebase_dep libkdegames)
+RDEPEND="$(add_kdeapps_dep libkdegames)
 	virtual/glu
 "
 DEPEND="${RDEPEND}

diff --git a/kde-apps/kuser/kuser-14.11.97.ebuild b/kde-apps/kuser/kuser-14.11.97.ebuild
index 24ae89b..6d6f585 100644
--- a/kde-apps/kuser/kuser-14.11.97.ebuild
+++ b/kde-apps/kuser/kuser-14.11.97.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 # notify is needed for dialogs
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kuser/kuser-9999.ebuild b/kde-apps/kuser/kuser-9999.ebuild
index 24ae89b..6d6f585 100644
--- a/kde-apps/kuser/kuser-9999.ebuild
+++ b/kde-apps/kuser/kuser-9999.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 # notify is needed for dialogs
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep knotify)
+	$(add_kdeapps_dep knotify)
 "

diff --git a/kde-apps/kwalletd/kwalletd-14.11.97.ebuild b/kde-apps/kwalletd/kwalletd-14.11.97.ebuild
index 53d6eaf..045a977 100644
--- a/kde-apps/kwalletd/kwalletd-14.11.97.ebuild
+++ b/kde-apps/kwalletd/kwalletd-14.11.97.ebuild
@@ -14,7 +14,7 @@ IUSE="debug gpg"
 DEPEND="
 	gpg? (
 		app-crypt/gpgme
-		$(add_kdebase_dep kdepimlibs)
+		$(add_kdeapps_dep kdepimlibs)
 	)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kwalletd/kwalletd-9999.ebuild b/kde-apps/kwalletd/kwalletd-9999.ebuild
index 53d6eaf..045a977 100644
--- a/kde-apps/kwalletd/kwalletd-9999.ebuild
+++ b/kde-apps/kwalletd/kwalletd-9999.ebuild
@@ -14,7 +14,7 @@ IUSE="debug gpg"
 DEPEND="
 	gpg? (
 		app-crypt/gpgme
-		$(add_kdebase_dep kdepimlibs)
+		$(add_kdeapps_dep kdepimlibs)
 	)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/kwordquiz/kwordquiz-14.11.97.ebuild b/kde-apps/kwordquiz/kwordquiz-14.11.97.ebuild
index 01bb38f..bab2dd2 100644
--- a/kde-apps/kwordquiz/kwordquiz-14.11.97.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-14.11.97.ebuild
@@ -14,6 +14,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 "
 RDEPEND=${DEPEND}

diff --git a/kde-apps/kwordquiz/kwordquiz-9999.ebuild b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
index 01bb38f..bab2dd2 100644
--- a/kde-apps/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
@@ -14,6 +14,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 "
 RDEPEND=${DEPEND}

diff --git a/kde-apps/lokalize/lokalize-14.11.97.ebuild b/kde-apps/lokalize/lokalize-14.11.97.ebuild
index c7154db..71acb0c 100644
--- a/kde-apps/lokalize/lokalize-14.11.97.ebuild
+++ b/kde-apps/lokalize/lokalize-14.11.97.ebuild
@@ -23,9 +23,9 @@ DEPEND="
 	nepomuk? ( >=dev-libs/soprano-2.9.0 )
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep krosspython "${PYTHON_USEDEP}")
-	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	$(add_kdeapps_dep kdesdk-strigi-analyzer)
+	$(add_kdeapps_dep krosspython "${PYTHON_USEDEP}")
+	$(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
 "
 
 pkg_setup() {

diff --git a/kde-apps/lokalize/lokalize-9999.ebuild b/kde-apps/lokalize/lokalize-9999.ebuild
index c7154db..71acb0c 100644
--- a/kde-apps/lokalize/lokalize-9999.ebuild
+++ b/kde-apps/lokalize/lokalize-9999.ebuild
@@ -23,9 +23,9 @@ DEPEND="
 	nepomuk? ( >=dev-libs/soprano-2.9.0 )
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-strigi-analyzer)
-	$(add_kdebase_dep krosspython "${PYTHON_USEDEP}")
-	$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	$(add_kdeapps_dep kdesdk-strigi-analyzer)
+	$(add_kdeapps_dep krosspython "${PYTHON_USEDEP}")
+	$(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
 "
 
 pkg_setup() {

diff --git a/kde-apps/lskat/lskat-14.11.97.ebuild b/kde-apps/lskat/lskat-14.11.97.ebuild
index 9d5f353..662be35 100644
--- a/kde-apps/lskat/lskat-14.11.97.ebuild
+++ b/kde-apps/lskat/lskat-14.11.97.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/lskat/lskat-9999.ebuild b/kde-apps/lskat/lskat-9999.ebuild
index 9d5f353..662be35 100644
--- a/kde-apps/lskat/lskat-9999.ebuild
+++ b/kde-apps/lskat/lskat-9999.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/marble/marble-14.11.97.ebuild b/kde-apps/marble/marble-14.11.97.ebuild
index 6a1f8da..a3c593e 100644
--- a/kde-apps/marble/marble-14.11.97.ebuild
+++ b/kde-apps/marble/marble-14.11.97.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
-		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
+		kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) )
 	)
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )

diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index 6a1f8da..a3c593e 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
-		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
+		kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) )
 	)
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )

diff --git a/kde-apps/mplayerthumbs/mplayerthumbs-14.11.97.ebuild b/kde-apps/mplayerthumbs/mplayerthumbs-14.11.97.ebuild
index 3b38191..0f0e55d 100644
--- a/kde-apps/mplayerthumbs/mplayerthumbs-14.11.97.ebuild
+++ b/kde-apps/mplayerthumbs/mplayerthumbs-14.11.97.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kdebase-kioslaves)
 "
 
 src_configure() {

diff --git a/kde-apps/mplayerthumbs/mplayerthumbs-9999.ebuild b/kde-apps/mplayerthumbs/mplayerthumbs-9999.ebuild
index 3b38191..0f0e55d 100644
--- a/kde-apps/mplayerthumbs/mplayerthumbs-9999.ebuild
+++ b/kde-apps/mplayerthumbs/mplayerthumbs-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kdebase-kioslaves)
 "
 
 src_configure() {

diff --git a/kde-apps/nepomuk/nepomuk-14.11.97.ebuild b/kde-apps/nepomuk/nepomuk-14.11.97.ebuild
index e87b77d..d34b72b 100644
--- a/kde-apps/nepomuk/nepomuk-14.11.97.ebuild
+++ b/kde-apps/nepomuk/nepomuk-14.11.97.ebuild
@@ -15,8 +15,8 @@ IUSE="debug"
 
 DEPEND="
 	>=dev-libs/soprano-2.9.0[dbus,raptor,redland,virtuoso]
-	$(add_kdebase_dep kdelibs 'nepomuk')
-	$(add_kdebase_dep nepomuk-core)
+	$(add_kdeapps_dep kdelibs 'nepomuk')
+	$(add_kdeapps_dep nepomuk-core)
 	!kde-misc/nepomukcontroller
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/nepomuk/nepomuk-9999.ebuild b/kde-apps/nepomuk/nepomuk-9999.ebuild
index e87b77d..d34b72b 100644
--- a/kde-apps/nepomuk/nepomuk-9999.ebuild
+++ b/kde-apps/nepomuk/nepomuk-9999.ebuild
@@ -15,8 +15,8 @@ IUSE="debug"
 
 DEPEND="
 	>=dev-libs/soprano-2.9.0[dbus,raptor,redland,virtuoso]
-	$(add_kdebase_dep kdelibs 'nepomuk')
-	$(add_kdebase_dep nepomuk-core)
+	$(add_kdeapps_dep kdelibs 'nepomuk')
+	$(add_kdeapps_dep nepomuk-core)
 	!kde-misc/nepomukcontroller
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/nsplugins/nsplugins-14.11.97.ebuild b/kde-apps/nsplugins/nsplugins-14.11.97.ebuild
index a3ca407..72cb8e7 100644
--- a/kde-apps/nsplugins/nsplugins-14.11.97.ebuild
+++ b/kde-apps/nsplugins/nsplugins-14.11.97.ebuild
@@ -15,7 +15,7 @@ DEPEND="
 	x11-libs/libXt
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
+	$(add_kdeapps_dep konqueror)
 "
 
 KMEXTRACTONLY="

diff --git a/kde-apps/nsplugins/nsplugins-9999.ebuild b/kde-apps/nsplugins/nsplugins-9999.ebuild
index a3ca407..72cb8e7 100644
--- a/kde-apps/nsplugins/nsplugins-9999.ebuild
+++ b/kde-apps/nsplugins/nsplugins-9999.ebuild
@@ -15,7 +15,7 @@ DEPEND="
 	x11-libs/libXt
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep konqueror)
+	$(add_kdeapps_dep konqueror)
 "
 
 KMEXTRACTONLY="

diff --git a/kde-apps/okular/okular-14.11.97.ebuild b/kde-apps/okular/okular-14.11.97.ebuild
index 6d539b8..bffa3b0 100644
--- a/kde-apps/okular/okular-14.11.97.ebuild
+++ b/kde-apps/okular/okular-14.11.97.ebuild
@@ -27,10 +27,10 @@ DEPEND="
 	dpi? ( x11-libs/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
-		$(add_kdebase_dep libkexiv2)
+		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
-	mobi? ( $(add_kdebase_dep kdegraphics-mobipocket) )
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff )

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index 3d818c3..1bff7e6 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
-	dpi? ( $(add_kdebase_dep libkscreen) )
+	dpi? ( $(add_kdeapps_dep libkscreen) )
 	ebook? ( app-text/ebook-tools )
 	jpeg? ( virtual/jpeg:0 )
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 6d539b8..bffa3b0 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -27,10 +27,10 @@ DEPEND="
 	dpi? ( x11-libs/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
-		$(add_kdebase_dep libkexiv2)
+		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
-	mobi? ( $(add_kdebase_dep kdegraphics-mobipocket) )
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff )

diff --git a/kde-apps/palapeli/palapeli-14.11.97.ebuild b/kde-apps/palapeli/palapeli-14.11.97.ebuild
index 359f513..d8bb81e 100644
--- a/kde-apps/palapeli/palapeli-14.11.97.ebuild
+++ b/kde-apps/palapeli/palapeli-14.11.97.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/palapeli/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/palapeli/palapeli-9999.ebuild b/kde-apps/palapeli/palapeli-9999.ebuild
index 359f513..d8bb81e 100644
--- a/kde-apps/palapeli/palapeli-9999.ebuild
+++ b/kde-apps/palapeli/palapeli-9999.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.kde.org/applications/games/palapeli/"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/parley/parley-14.11.97.ebuild b/kde-apps/parley/parley-14.11.97.ebuild
index e8dfe66..edc1472 100644
--- a/kde-apps/parley/parley-14.11.97.ebuild
+++ b/kde-apps/parley/parley-14.11.97.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtsvg:5
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 "
 RDEPEND="${DEPEND}
 	!kde-base/parley:4

diff --git a/kde-apps/parley/parley-9999.ebuild b/kde-apps/parley/parley-9999.ebuild
index 9686dad..17242fd 100644
--- a/kde-apps/parley/parley-9999.ebuild
+++ b/kde-apps/parley/parley-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug +plasma"
 
 DEPEND="
-	$(add_kdebase_dep libkdeedu)
+	$(add_kdeapps_dep libkdeedu)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/picmi/picmi-14.11.97.ebuild b/kde-apps/picmi/picmi-14.11.97.ebuild
index 0906fe5..03b3f9b 100644
--- a/kde-apps/picmi/picmi-14.11.97.ebuild
+++ b/kde-apps/picmi/picmi-14.11.97.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://games.kde.org/game.php?game=picmi"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"
 
 RESTRICT=test

diff --git a/kde-apps/picmi/picmi-9999.ebuild b/kde-apps/picmi/picmi-9999.ebuild
index 0906fe5..03b3f9b 100644
--- a/kde-apps/picmi/picmi-9999.ebuild
+++ b/kde-apps/picmi/picmi-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://games.kde.org/game.php?game=picmi"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep libkdegames)"
+DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"
 
 RESTRICT=test

diff --git a/kde-apps/plasma-apps/plasma-apps-14.11.97.ebuild b/kde-apps/plasma-apps/plasma-apps-14.11.97.ebuild
index ef79703..9f28d93 100644
--- a/kde-apps/plasma-apps/plasma-apps-14.11.97.ebuild
+++ b/kde-apps/plasma-apps/plasma-apps-14.11.97.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/plasma-apps/plasma-apps-9999.ebuild b/kde-apps/plasma-apps/plasma-apps-9999.ebuild
index ef79703..9f28d93 100644
--- a/kde-apps/plasma-apps/plasma-apps-9999.ebuild
+++ b/kde-apps/plasma-apps/plasma-apps-9999.ebuild
@@ -13,6 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkonq)
+	$(add_kdeapps_dep libkonq)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/plasma-runtime/plasma-runtime-14.11.97.ebuild b/kde-apps/plasma-runtime/plasma-runtime-14.11.97.ebuild
index 76f7b11..67477ab 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-14.11.97.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-14.11.97.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kactivities '' 4.13)
+	$(add_kdeapps_dep kactivities '' 4.13)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/plasma-runtime/plasma-runtime-9999.ebuild b/kde-apps/plasma-runtime/plasma-runtime-9999.ebuild
index 76f7b11..67477ab 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-9999.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kactivities '' 4.13)
+	$(add_kdeapps_dep kactivities '' 4.13)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/superkaramba/superkaramba-14.11.97.ebuild b/kde-apps/superkaramba/superkaramba-14.11.97.ebuild
index b07dcf6..2f8e95f 100644
--- a/kde-apps/superkaramba/superkaramba-14.11.97.ebuild
+++ b/kde-apps/superkaramba/superkaramba-14.11.97.ebuild
@@ -21,11 +21,11 @@ DEPEND="
 	x11-libs/libXrender
 	python? (
 		${PYTHON_DEPS}
-		$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+		$(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
 	)
 "
 RDEPEND="${DEPEND}
-	python? ( $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") )
+	python? ( $(add_kdeapps_dep krosspython "${PYTHON_USEDEP}") )
 "
 
 pkg_setup() {

diff --git a/kde-apps/superkaramba/superkaramba-9999.ebuild b/kde-apps/superkaramba/superkaramba-9999.ebuild
index b07dcf6..2f8e95f 100644
--- a/kde-apps/superkaramba/superkaramba-9999.ebuild
+++ b/kde-apps/superkaramba/superkaramba-9999.ebuild
@@ -21,11 +21,11 @@ DEPEND="
 	x11-libs/libXrender
 	python? (
 		${PYTHON_DEPS}
-		$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+		$(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
 	)
 "
 RDEPEND="${DEPEND}
-	python? ( $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") )
+	python? ( $(add_kdeapps_dep krosspython "${PYTHON_USEDEP}") )
 "
 
 pkg_setup() {

diff --git a/kde-apps/thumbnailers/thumbnailers-14.11.97.ebuild b/kde-apps/thumbnailers/thumbnailers-14.11.97.ebuild
index f20aa0f..0a94658 100644
--- a/kde-apps/thumbnailers/thumbnailers-14.11.97.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-14.11.97.ebuild
@@ -12,11 +12,11 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kdebase-kioslaves)
 "
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then

diff --git a/kde-apps/thumbnailers/thumbnailers-9999.ebuild b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
index f20aa0f..0a94658 100644
--- a/kde-apps/thumbnailers/thumbnailers-9999.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
@@ -12,11 +12,11 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kdebase-kioslaves)
 "
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then