commit:     b01661369c334a327d2bef18a95bb521a1b4b6cf
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Jun  5 16:14:32 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 16:15:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0166136

Move various kde-base packages to kde-apps.

 app-cdr/k3b/k3b-9999.ebuild                                |  2 +-
 app-editors/kile/kile-9999.ebuild                          |  6 +++---
 app-office/skrooge/skrooge-9999.ebuild                     |  2 +-
 app-portage/kportagetray/kportagetray-9999.ebuild          |  6 +++---
 dev-util/kdevelop/kdevelop-4.9999.ebuild                   |  6 +++---
 dev-util/kdevelop/kdevelop-9999.ebuild                     |  2 +-
 dev-util/kdevplatform/kdevplatform-4.9999.ebuild           |  2 +-
 kde-apps/cantor/cantor-14.12.3.ebuild                      |  2 +-
 .../kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild  | 14 +++++++-------
 kde-base/kdelibs/kdelibs-4.9999.ebuild                     |  2 +-
 kde-base/kdm/kdm-4.11.49.9999.ebuild                       |  2 +-
 kde-base/korganizer/korganizer-4.9999.ebuild               |  2 +-
 .../plasma-workspace/plasma-workspace-4.11.49.9999.ebuild  |  2 +-
 kde-base/smokekde/smokekde-9999.ebuild                     |  4 ++--
 .../solid-actions-kcm-4.11.49.9999.ebuild                  |  2 +-
 kde-misc/homerun/homerun-9999.ebuild                       |  2 +-
 .../kde-overlay-servicemenus-0.1.ebuild                    |  8 ++++----
 kde-misc/publictransport/publictransport-0.11_beta.ebuild  |  2 +-
 kde-misc/yakuake/yakuake-9999.ebuild                       |  2 +-
 media-sound/amarok/amarok-9999.ebuild                      | 10 +++++-----
 media-sound/kaudiocreator/kaudiocreator-9999.ebuild        |  6 +++---
 media-video/kamoso/kamoso-9999.ebuild                      |  2 +-
 media-video/kmplayer/kmplayer-9999.ebuild                  |  2 +-
 net-p2p/ktorrent/ktorrent-9999.ebuild                      |  2 +-
 .../share-like-connect/share-like-connect-0.4.ebuild       |  2 +-
 www-client/rekonq/rekonq-4.9999.ebuild                     |  4 ++--
 26 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index b2cd543..36fefb0 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -32,7 +32,7 @@ SLOT="4"
 IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox 
taglib vcd vorbis"
 
 DEPEND="
-       $(add_kdebase_dep libkcddb)
+       $(add_kdeapps_dep libkcddb)
        media-libs/libsamplerate
        dvd? ( media-libs/libdvdread )
        ffmpeg? (

diff --git a/app-editors/kile/kile-9999.ebuild 
b/app-editors/kile/kile-9999.ebuild
index 0f5333c..524524c 100644
--- a/app-editors/kile/kile-9999.ebuild
+++ b/app-editors/kile/kile-9999.ebuild
@@ -22,10 +22,10 @@ DEPEND="
        x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
-       $(add_kdebase_dep kdebase-data)
-       $(add_kdebase_dep konsole)
+       $(add_kdeapps_dep kdebase-data)
+       $(add_kdeapps_dep konsole)
        || (
-               $(add_kdebase_dep okular 'pdf?,postscript')
+               $(add_kdeapps_dep okular 'pdf?,postscript')
                app-text/acroread
        )
        virtual/latex-base

diff --git a/app-office/skrooge/skrooge-9999.ebuild 
b/app-office/skrooge/skrooge-9999.ebuild
index aca9c28..6057ea9 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
        dev-qt/qtsql:4[sqlite]
 "
 RDEPEND="${DEPEND}
-       $(add_kdebase_dep kde-dev-scripts)
+       $(add_kdeapps_dep kde-dev-scripts)
 "
 
 # upstream does not ship tests in releases

diff --git a/app-portage/kportagetray/kportagetray-9999.ebuild 
b/app-portage/kportagetray/kportagetray-9999.ebuild
index 83c768e..687fe0d 100644
--- a/app-portage/kportagetray/kportagetray-9999.ebuild
+++ b/app-portage/kportagetray/kportagetray-9999.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 RDEPEND="${DEPEND}
        app-portage/eix
        app-portage/genlop
-       $(add_kdebase_dep kdesu)
-       $(add_kdebase_dep knotify)
-       $(add_kdebase_dep konsole)
+       $(add_kdeapps_dep kdesu)
+       $(add_kdeapps_dep knotify)
+       $(add_kdeapps_dep konsole)
 "
 
 pkg_setup() {

diff --git a/dev-util/kdevelop/kdevelop-4.9999.ebuild 
b/dev-util/kdevelop/kdevelop-4.9999.ebuild
index 34589be..a238ab4 100644
--- a/dev-util/kdevelop/kdevelop-4.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.9999.ebuild
@@ -25,12 +25,12 @@ DEPEND="
                $(add_kdebase_dep ksysguard)
                $(add_kdebase_dep libkworkspace)
        )
-       okteta? ( $(add_kdebase_dep okteta) )
+       okteta? ( $(add_kdeapps_dep okteta) )
        qthelp? ( dev-qt/qthelp:4 )
 "
 RDEPEND="${DEPEND}
-       $(add_kdebase_dep kapptemplate)
-       || ( $(add_kdeapps_dep kdebase-kioslaves) $(add_kdebase_dep 
kdebase-kioslaves) )
+       $(add_kdeapps_dep kapptemplate)
+       $(add_kdeapps_dep kdebase-kioslaves)
        cxx? ( >=sys-devel/gdb-7.0[python] )
 "
 RESTRICT="test"

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild 
b/dev-util/kdevelop/kdevelop-9999.ebuild
index 25ade4c..e655b38 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -13,7 +13,7 @@ IUSE="+cmake +cxx debug +plasma qthelp"
 KEYWORDS=""
 
 # TODO: disabled upstream
-# okteta? ( $(add_kdebase_dep okteta) )
+# okteta? ( $(add_kdeapps_dep okteta) )
 DEPEND="
        $(add_frameworks_dep kcompletion)
        $(add_frameworks_dep kconfig)

diff --git a/dev-util/kdevplatform/kdevplatform-4.9999.ebuild 
b/dev-util/kdevplatform/kdevplatform-4.9999.ebuild
index 0f08275..cfb04cf 100644
--- a/dev-util/kdevplatform/kdevplatform-4.9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-4.9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="${COMMON_DEPEND}
        classbrowser? ( dev-libs/boost )
 "
 RDEPEND="${COMMON_DEPEND}
-       konsole? ( $(add_kdebase_dep konsole) )
+       konsole? ( $(add_kdeapps_dep konsole) )
        cvs? ( dev-vcs/cvs )
        !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 "

diff --git a/kde-apps/cantor/cantor-14.12.3.ebuild 
b/kde-apps/cantor/cantor-14.12.3.ebuild
index e3e69f3..11c7084 100644
--- a/kde-apps/cantor/cantor-14.12.3.ebuild
+++ b/kde-apps/cantor/cantor-14.12.3.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-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild 
b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild
index b29af3a..c2feb84 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.49.9999.ebuild
@@ -16,18 +16,18 @@ IUSE="+wallpapers"
 # These provide the most minimal KDE desktop.
 RDEPEND="
        $(add_kdebase_dep kcminit)
-       $(add_kdebase_dep kdebase-runtime-meta)
-       wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
-       $(add_kdebase_dep kfmclient)
-       $(add_kdebase_dep knotify)
-       $(add_kdebase_dep kreadconfig)
+       $(add_kdeapps_dep kdebase-runtime-meta)
+       wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
+       $(add_kdeapps_dep kfmclient)
+       $(add_kdeapps_dep knotify)
+       $(add_kdeapps_dep kreadconfig)
        $(add_kdebase_dep krunner)
        $(add_kdebase_dep ksmserver)
        $(add_kdebase_dep ksplash)
        $(add_kdebase_dep kstartupconfig)
        $(add_kdebase_dep kwin)
-       $(add_kdebase_dep phonon-kde)
-       $(add_kdebase_dep plasma-apps)
+       $(add_kdeapps_dep phonon-kde)
+       $(add_kdeapps_dep plasma-apps)
        $(add_kdebase_dep plasma-workspace)
        $(add_kdebase_dep systemsettings)
        x11-apps/mkfontdir

diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild 
b/kde-base/kdelibs/kdelibs-4.9999.ebuild
index 5d57ea7..8044743 100644
--- a/kde-base/kdelibs/kdelibs-4.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild
@@ -111,7 +111,7 @@ RDEPEND="${COMMONDEPEND}
 PDEPEND="
        $(add_kdebase_dep katepart '' 4.14.3)
        || (
-               $(add_kdebase_dep kfmclient '' 4.14.3)
+               $(add_kdeapps_dep kfmclient '' 4.14.3)
                x11-misc/xdg-utils
        )
        handbook? (

diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild 
b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index 37977cc..8fd5668 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="
        systemd? ( sys-apps/systemd )
 "
 RDEPEND="${DEPEND}
-       $(add_kdebase_dep kdepasswd)
+       $(add_kdeapps_dep kdepasswd)
        $(add_kdebase_dep libkgreeter)
        >=x11-apps/xinit-1.0.5-r2
        x11-apps/xmessage

diff --git a/kde-base/korganizer/korganizer-4.9999.ebuild 
b/kde-base/korganizer/korganizer-4.9999.ebuild
index 0690d42..16789e2 100644
--- a/kde-base/korganizer/korganizer-4.9999.ebuild
+++ b/kde-base/korganizer/korganizer-4.9999.ebuild
@@ -20,7 +20,7 @@ DEPEND="
        sys-libs/zlib
 "
 RDEPEND="${DEPEND}
-       || ( $(add_kdebase_dep ktimezoned '' 4.14.3) $(add_kdeapps_dep 
ktimezoned) )
+       $(add_kdeapps_dep ktimezoned '' 4.14.3)
 "
 
 RESTRICT="test"

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
index ae03449..c60b89f 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
@@ -59,7 +59,7 @@ DEPEND="${COMMONDEPEND}
        x11-proto/renderproto
 "
 RDEPEND="${COMMONDEPEND}
-       $(add_kdebase_dep plasma-runtime)
+       $(add_kdeapps_dep plasma-runtime)
 "
 
 KMEXTRA="

diff --git a/kde-base/smokekde/smokekde-9999.ebuild 
b/kde-base/smokekde/smokekde-9999.ebuild
index cdff2da..d61ea68 100644
--- a/kde-base/smokekde/smokekde-9999.ebuild
+++ b/kde-base/smokekde/smokekde-9999.ebuild
@@ -16,8 +16,8 @@ DEPEND="
        $(add_kdebase_dep smokeqt)
        akonadi? ( $(add_kdebase_dep kdepimlibs) )
        attica? ( dev-libs/libattica )
-       kate? ( $(add_kdebase_dep kate) )
-       okular? ( $(add_kdebase_dep okular) )
+       kate? ( $(add_kdeapps_dep kate) )
+       okular? ( $(add_kdeapps_dep okular) )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.49.9999.ebuild 
b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.49.9999.ebuild
index 6172a32..d7812c8 100644
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.49.9999.ebuild
+++ b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.49.9999.ebuild
@@ -14,6 +14,6 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-       $(add_kdebase_dep solid-runtime)
+       $(add_kdeapps_dep solid-runtime)
        !kde-base/solid:4
 "

diff --git a/kde-misc/homerun/homerun-9999.ebuild 
b/kde-misc/homerun/homerun-9999.ebuild
index 025bdd4..c26d8ab 100644
--- a/kde-misc/homerun/homerun-9999.ebuild
+++ b/kde-misc/homerun/homerun-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-       $(add_kdebase_dep libkonq)
+       $(add_kdeapps_dep libkonq)
        $(add_kdebase_dep libkworkspace)
 "
 RDEPEND="

diff --git 
a/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild 
b/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild
index ad309c8..e1ce7e5 100644
--- a/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild
+++ b/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild
@@ -18,11 +18,11 @@ SLOT="4"
 IUSE="debug"
 
 RDEPEND="
-       $(add_kdebase_dep kdialog)
-       $(add_kdebase_dep kompare)
+       $(add_kdeapps_dep kdialog)
+       $(add_kdeapps_dep kompare)
        || (
-               ( $(add_kdebase_dep dolphin) )
-               ( $(add_kdebase_dep konqueror) )
+               ( $(add_kdeapps_dep dolphin) )
+               ( $(add_kdeapps_dep konqueror) )
        )
 "
 

diff --git a/kde-misc/publictransport/publictransport-0.11_beta.ebuild 
b/kde-misc/publictransport/publictransport-0.11_beta.ebuild
index fdf733b..2ba1c2d 100644
--- a/kde-misc/publictransport/publictransport-0.11_beta.ebuild
+++ b/kde-misc/publictransport/publictransport-0.11_beta.ebuild
@@ -17,7 +17,7 @@ IUSE="debug gps protobuf marble test"
 
 DEPEND="
        $(add_kdebase_dep plasma-workspace)
-       marble? ( $(add_kdebase_dep marble) )
+       marble? ( $(add_kdeapps_dep marble) )
        protobuf? ( dev-libs/protobuf )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-misc/yakuake/yakuake-9999.ebuild 
b/kde-misc/yakuake/yakuake-9999.ebuild
index 2c6deda..19e2b9b 100644
--- a/kde-misc/yakuake/yakuake-9999.ebuild
+++ b/kde-misc/yakuake/yakuake-9999.ebuild
@@ -17,6 +17,6 @@ KEYWORDS=""
 SLOT="4"
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep konsole)
+DEPEND="$(add_kdeapps_dep konsole)
        sys-devel/gettext"
 RDEPEND="${DEPEND}"

diff --git a/media-sound/amarok/amarok-9999.ebuild 
b/media-sound/amarok/amarok-9999.ebuild
index 25d9c55..9740197 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -38,7 +38,7 @@ fi
 COMMONDEPEND="
        app-crypt/qca:2[qt4(+)]
        $(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
-       $(add_kdebase_dep kdebase-kioslaves)
+       $(add_kdeapps_dep kdebase-kioslaves)
        >=media-libs/taglib-1.7[asf,mp4]
        >=media-libs/taglib-extras-1.0.1
        sys-libs/zlib
@@ -48,9 +48,9 @@ COMMONDEPEND="
        >=dev-qt/qtscript-4.8:4
        >=x11-libs/qtscriptgenerator-0.1.0
        cdda? (
-               $(add_kdebase_dep libkcddb)
-               $(add_kdebase_dep libkcompactdisc)
-               $(add_kdebase_dep audiocd-kio)
+               $(add_kdeapps_dep libkcddb)
+               $(add_kdeapps_dep libkcompactdisc)
+               $(add_kdeapps_dep audiocd-kio)
        )
        ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
        lastfm? ( >=media-libs/liblastfm-1.0.3 )
@@ -74,7 +74,7 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}
        !media-sound/amarok-utils
-       $(add_kdebase_dep phonon-kde)
+       $(add_kdeapps_dep phonon-kde)
 "
 
 src_configure() {

diff --git a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild 
b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
index 0be23ed..447f23f 100644
--- a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
@@ -16,15 +16,15 @@ SLOT="4"
 IUSE="debug"
 
 COMMON_DEPEND="
-       $(add_kdebase_dep libkcddb)
-       $(add_kdebase_dep libkcompactdisc)
+       $(add_kdeapps_dep libkcddb)
+       $(add_kdeapps_dep libkcompactdisc)
        media-libs/libdiscid
        >=media-libs/taglib-1.5
 "
 
 RDEPEND="${COMMON_DEPEND}
        $(add_kdebase_dep kdelibs 'udev,udisks(+)')
-       $(add_kdebase_dep audiocd-kio)
+       $(add_kdeapps_dep audiocd-kio)
 "
 
 DEPEND="${COMMON_DEPEND}"

diff --git a/media-video/kamoso/kamoso-9999.ebuild 
b/media-video/kamoso/kamoso-9999.ebuild
index a9eb5c8..dc24dd7 100644
--- a/media-video/kamoso/kamoso-9999.ebuild
+++ b/media-video/kamoso/kamoso-9999.ebuild
@@ -16,7 +16,7 @@ IUSE="debug nepomuk"
 
 DEPEND="
        $(add_kdebase_dep kdelibs 'nepomuk?')
-       $(add_kdebase_dep libkipi)
+       $(add_kdeapps_dep libkipi)
        media-libs/phonon[qt4]
        media-libs/qt-gstreamer[qt4(+)]
 "

diff --git a/media-video/kmplayer/kmplayer-9999.ebuild 
b/media-video/kmplayer/kmplayer-9999.ebuild
index 4736e51..d5e9f8b 100644
--- a/media-video/kmplayer/kmplayer-9999.ebuild
+++ b/media-video/kmplayer/kmplayer-9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
        )
        npp? (
                dev-libs/dbus-glib
-               $(add_kdebase_dep kreadconfig)
+               $(add_kdeapps_dep kreadconfig)
                >=x11-libs/gtk+-2.10.14:2
                www-plugins/adobe-flash
        )

diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild 
b/net-p2p/ktorrent/ktorrent-9999.ebuild
index ddf8b63..75836e7 100644
--- a/net-p2p/ktorrent/ktorrent-9999.ebuild
+++ b/net-p2p/ktorrent/ktorrent-9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="${COMMONDEPEND}
        ipfilter? (
                app-arch/bzip2
                app-arch/unzip
-               $(add_kdebase_dep kdebase-kioslaves)
+               $(add_kdeapps_dep kdebase-kioslaves)
        )
        kross? ( $(add_kdebase_dep krosspython) )
 "

diff --git a/plasma-active/share-like-connect/share-like-connect-0.4.ebuild 
b/plasma-active/share-like-connect/share-like-connect-0.4.ebuild
index 8ab5488..9442e4e 100644
--- a/plasma-active/share-like-connect/share-like-connect-0.4.ebuild
+++ b/plasma-active/share-like-connect/share-like-connect-0.4.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND="
        dev-libs/soprano
        $(add_kdebase_dep kactivities)
-       $(add_kdebase_dep nepomuk)
+       $(add_kdeapps_dep nepomuk)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/www-client/rekonq/rekonq-4.9999.ebuild 
b/www-client/rekonq/rekonq-4.9999.ebuild
index ed37371..e453066 100644
--- a/www-client/rekonq/rekonq-4.9999.ebuild
+++ b/www-client/rekonq/rekonq-4.9999.ebuild
@@ -34,8 +34,8 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
-       $(add_kdebase_dep kdebase-kioslaves)
-       $(add_kdebase_dep keditbookmarks)
+       $(add_kdeapps_dep kdebase-kioslaves)
+       $(add_kdeapps_dep keditbookmarks)
 "
 
 src_configure() {

Reply via email to