commit: 4291d03f3d98ae1cf79788095d1932b541fa278d Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Dec 27 13:52:30 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Dec 29 16:23:13 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4291d03f
kde-apps: Follow-up KDE PIM pkgmove in tree Package-Manager: portage-2.2.24 eclass/kde4-meta.eclass | 2 +- .../akonadi-contact/akonadi-contact-15.12.0.ebuild | 1 - .../akonadi-contact-15.12.49.9999.ebuild | 1 - .../akonadi-contact/akonadi-contact-9999.ebuild | 1 - kde-apps/akonadi-mime/akonadi-mime-15.12.0.ebuild | 1 - .../akonadi-mime/akonadi-mime-15.12.49.9999.ebuild | 1 - kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 1 - .../akonadi-notes/akonadi-notes-15.12.0.ebuild | 1 - .../akonadi-notes-15.12.49.9999.ebuild | 1 - kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 1 - .../akonadi-socialutils-15.12.0.ebuild | 1 - .../akonadi-socialutils-15.12.49.9999.ebuild | 1 - .../akonadi-socialutils-9999.ebuild | 1 - kde-apps/akonadi/akonadi-15.08.3.ebuild | 2 +- kde-apps/akonadi/akonadi-15.12.0.ebuild | 2 +- kde-apps/akonadi/akonadi-15.12.49.9999.ebuild | 2 +- kde-apps/akonadi/akonadi-9999.ebuild | 2 +- .../calendarsupport/calendarsupport-15.12.0.ebuild | 2 +- .../calendarsupport-15.12.49.9999.ebuild | 2 +- .../calendarsupport/calendarsupport-9999.ebuild | 2 +- .../composereditor/composereditor-15.12.0.ebuild | 2 +- .../composereditor-15.12.49.9999.ebuild | 2 +- kde-apps/drkonqi/drkonqi-15.12.0.ebuild | 2 +- kde-apps/drkonqi/drkonqi-15.12.49.9999.ebuild | 2 +- kde-apps/drkonqi/drkonqi-9999.ebuild | 2 +- kde-apps/eventviews/eventviews-15.12.0.ebuild | 2 +- .../eventviews/eventviews-15.12.49.9999.ebuild | 2 +- kde-apps/eventviews/eventviews-9999.ebuild | 2 +- .../grantleetheme/grantleetheme-15.12.0.ebuild | 2 +- .../grantleetheme-15.12.49.9999.ebuild | 2 +- kde-apps/grantleetheme/grantleetheme-9999.ebuild | 2 +- .../incidenceeditor/incidenceeditor-15.12.0.ebuild | 2 +- .../incidenceeditor-15.12.49.9999.ebuild | 2 +- .../incidenceeditor/incidenceeditor-9999.ebuild | 2 +- .../kaddressbookgrantlee-15.12.0.ebuild | 2 +- .../kaddressbookgrantlee-15.12.49.9999.ebuild | 2 +- kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 6 +-- .../kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 4 +- .../kdepim-kioslaves-15.12.0.ebuild | 1 - .../kdepim-kioslaves-15.12.49.9999.ebuild | 1 - .../kdepim-kioslaves/kdepim-kioslaves-9999.ebuild | 1 - .../kdepim-runtime/kdepim-runtime-15.08.3.ebuild | 2 +- .../kdepim-runtime/kdepim-runtime-15.12.0.ebuild | 2 +- .../kdepim-runtime-15.12.49.9999.ebuild | 2 +- kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 2 +- kde-apps/kdepim/kdepim-15.08.3.ebuild | 46 +++++++++++----------- kde-apps/kdepim/kdepim-15.12.0.ebuild | 38 +++++++++--------- kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 38 +++++++++--------- kde-apps/kdepim/kdepim-9999.ebuild | 38 +++++++++--------- kde-apps/kdepimlibs/kdepimlibs-15.08.3.ebuild | 4 +- kde-apps/kdgantt2/kdgantt2-15.12.0.ebuild | 2 +- kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild | 2 +- kde-apps/kdgantt2/kdgantt2-9999.ebuild | 2 +- kde-apps/kget/kget-15.12.0.ebuild | 2 +- kde-apps/kget/kget-15.12.49.9999.ebuild | 2 +- kde-apps/kget/kget-9999.ebuild | 2 +- kde-apps/kget/metadata.xml | 2 +- kde-apps/kgpg/kgpg-15.12.0.ebuild | 2 +- kde-apps/kgpg/kgpg-15.12.49.9999.ebuild | 2 +- kde-apps/kgpg/kgpg-9999.ebuild | 2 +- kde-apps/kjots/kjots-9999.ebuild | 1 - kde-apps/klinkstatus/klinkstatus-15.08.3.ebuild | 2 +- kde-apps/klinkstatus/klinkstatus-15.12.0.ebuild | 2 +- .../klinkstatus/klinkstatus-15.12.49.9999.ebuild | 2 +- kde-apps/klinkstatus/klinkstatus-9999.ebuild | 2 +- kde-apps/kopete/kopete-15.12.0.ebuild | 2 +- kde-apps/kopete/kopete-15.12.49.9999.ebuild | 2 +- kde-apps/kopete/kopete-9999.ebuild | 2 +- kde-apps/kuser/kuser-15.12.0.ebuild | 2 +- kde-apps/kuser/kuser-15.12.49.9999.ebuild | 2 +- kde-apps/kuser/kuser-9999.ebuild | 2 +- kde-apps/kwalletd/kwalletd-15.12.0.ebuild | 2 +- kde-apps/kwalletd/kwalletd-15.12.49.9999.ebuild | 2 +- kde-apps/kwalletd/kwalletd-9999.ebuild | 2 +- kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild | 1 - .../libakonadi/libakonadi-15.12.49.9999.ebuild | 1 - kde-apps/libakonadi/libakonadi-9999.ebuild | 1 - .../libfollowupreminder-15.12.0.ebuild | 2 +- .../libfollowupreminder-15.12.49.9999.ebuild | 2 +- kde-apps/libgravatar/libgravatar-15.12.0.ebuild | 2 +- .../libgravatar/libgravatar-15.12.49.9999.ebuild | 2 +- kde-apps/libgravatar/libgravatar-9999.ebuild | 2 +- kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild | 3 +- kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild | 3 +- kde-apps/libkdepim/libkdepim-9999.ebuild | 3 +- .../libkdepimdbusinterfaces-15.12.0.ebuild | 2 +- .../libkdepimdbusinterfaces-15.12.49.9999.ebuild | 2 +- kde-apps/libkleo/libkleo-15.12.0.ebuild | 3 +- kde-apps/libkleo/libkleo-15.12.49.9999.ebuild | 3 +- kde-apps/libkleo/libkleo-9999.ebuild | 3 +- kde-apps/libksieve/libksieve-15.12.0.ebuild | 2 +- kde-apps/libksieve/libksieve-15.12.49.9999.ebuild | 2 +- kde-apps/libksieve/libksieve-9999.ebuild | 2 +- kde-apps/libsendlater/libsendlater-15.12.0.ebuild | 2 +- .../libsendlater/libsendlater-15.12.49.9999.ebuild | 2 +- kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild | 2 +- .../mailcommon/mailcommon-15.12.49.9999.ebuild | 2 +- kde-apps/mailcommon/mailcommon-9999.ebuild | 2 +- kde-apps/mailimporter/mailimporter-15.12.0.ebuild | 2 +- .../mailimporter/mailimporter-15.12.49.9999.ebuild | 2 +- kde-apps/mailimporter/mailimporter-9999.ebuild | 2 +- .../messagecomposer/messagecomposer-15.12.0.ebuild | 2 +- .../messagecomposer-15.12.49.9999.ebuild | 2 +- kde-apps/messagecore/messagecore-15.12.0.ebuild | 2 +- .../messagecore/messagecore-15.12.49.9999.ebuild | 2 +- kde-apps/messagelib/messagelib-9999.ebuild | 4 +- kde-apps/messagelist/messagelist-15.12.0.ebuild | 4 +- .../messagelist/messagelist-15.12.49.9999.ebuild | 4 +- .../messageviewer/messageviewer-15.12.0.ebuild | 2 +- .../messageviewer-15.12.49.9999.ebuild | 2 +- kde-apps/noteshared/noteshared-15.12.0.ebuild | 2 +- .../noteshared/noteshared-15.12.49.9999.ebuild | 2 +- kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild | 2 +- kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild | 2 +- kde-apps/pimcommon/pimcommon-9999.ebuild | 2 +- .../templateparser/templateparser-15.12.0.ebuild | 2 +- .../templateparser-15.12.49.9999.ebuild | 2 +- .../akonadi-git-resource-9999.ebuild | 2 +- kde-misc/basket/basket-9999.ebuild | 2 +- .../plasma-lionmail/plasma-lionmail-9999.ebuild | 4 +- net-p2p/ktorrent/ktorrent-9999.ebuild | 2 +- sets/kdelibs | 4 +- sets/kdelibs-4.14 | 2 +- sets/kdepim | 46 +++++++++++----------- sets/kdepim-4.14 | 46 +++++++++++----------- sets/kdepim-4.4 | 44 ++++++++++----------- 126 files changed, 256 insertions(+), 283 deletions(-) diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 2e243b0..a28c8a1 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -28,7 +28,7 @@ case ${KMNAME} in case ${PN} in akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) IUSE+=" +kontact" - RDEPEND+=" kontact? ( $(add_kdebase_dep kontact) )" + RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact) )" ;; esac ;; diff --git a/kde-apps/akonadi-contact/akonadi-contact-15.12.0.ebuild b/kde-apps/akonadi-contact/akonadi-contact-15.12.0.ebuild index 2be6846..df0c4d7 100644 --- a/kde-apps/akonadi-contact/akonadi-contact-15.12.0.ebuild +++ b/kde-apps/akonadi-contact/akonadi-contact-15.12.0.ebuild @@ -47,7 +47,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild index f32bc76..7cdbde1 100644 --- a/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild +++ b/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild @@ -47,7 +47,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild index c6f678c..4f83436 100644 --- a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild +++ b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild @@ -48,7 +48,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.12.50 !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-15.12.0.ebuild index 1913ea5..ca7f5ee 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-15.12.0.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-15.12.0.ebuild @@ -38,7 +38,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild index 71d47fc..b70a1bd 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild @@ -38,7 +38,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild index 49971b5..e259dd7 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild @@ -38,7 +38,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-notes/akonadi-notes-15.12.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-15.12.0.ebuild index b84247c..fdd881d 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-15.12.0.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-15.12.0.ebuild @@ -28,7 +28,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild index e1f7d15..57cc722 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild @@ -28,7 +28,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild index b06f8a7..82e6b56 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild @@ -28,7 +28,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.0.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.0.ebuild index 338e7c3..da04bc0 100644 --- a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.0.ebuild +++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.0.ebuild @@ -30,7 +30,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild index a949399..a39850d 100644 --- a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild +++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild @@ -30,7 +30,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild index 1a10a5f..8fb8f87 100644 --- a/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild +++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild @@ -30,7 +30,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/akonadi/akonadi-15.08.3.ebuild b/kde-apps/akonadi/akonadi-15.08.3.ebuild index 84b85e6..50a929d 100644 --- a/kde-apps/akonadi/akonadi-15.08.3.ebuild +++ b/kde-apps/akonadi/akonadi-15.08.3.ebuild @@ -62,7 +62,7 @@ pkg_setup() { ewarn ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite" + ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" ewarn "backend anymore." ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." ewarn "Available drivers are:${AVAILABLE}" diff --git a/kde-apps/akonadi/akonadi-15.12.0.ebuild b/kde-apps/akonadi/akonadi-15.12.0.ebuild index 7b6d126..e8fac9d 100644 --- a/kde-apps/akonadi/akonadi-15.12.0.ebuild +++ b/kde-apps/akonadi/akonadi-15.12.0.ebuild @@ -62,7 +62,7 @@ pkg_setup() { ewarn ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite" + ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" ewarn "backend anymore." ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." ewarn "Available drivers are:${AVAILABLE}" diff --git a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild index f310a4c..0f38bf6 100644 --- a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild +++ b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild @@ -62,7 +62,7 @@ pkg_setup() { ewarn ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite" + ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" ewarn "backend anymore." ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." ewarn "Available drivers are:${AVAILABLE}" diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild index f310a4c..0f38bf6 100644 --- a/kde-apps/akonadi/akonadi-9999.ebuild +++ b/kde-apps/akonadi/akonadi-9999.ebuild @@ -62,7 +62,7 @@ pkg_setup() { ewarn ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite" + ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" ewarn "backend anymore." ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." ewarn "Available drivers are:${AVAILABLE}" diff --git a/kde-apps/calendarsupport/calendarsupport-15.12.0.ebuild b/kde-apps/calendarsupport/calendarsupport-15.12.0.ebuild index 946cd15..2a3627f 100644 --- a/kde-apps/calendarsupport/calendarsupport-15.12.0.ebuild +++ b/kde-apps/calendarsupport/calendarsupport-15.12.0.ebuild @@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild index bb487a8..f0817d0 100644 --- a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild +++ b/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild @@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild index ba42d51..2b383b1 100644 --- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild +++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild @@ -48,5 +48,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/composereditor/composereditor-15.12.0.ebuild b/kde-apps/composereditor/composereditor-15.12.0.ebuild index c617894..41a9d30 100644 --- a/kde-apps/composereditor/composereditor-15.12.0.ebuild +++ b/kde-apps/composereditor/composereditor-15.12.0.ebuild @@ -40,7 +40,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild b/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild index 7d081f3..015387a 100644 --- a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild +++ b/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild @@ -40,7 +40,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/drkonqi/drkonqi-15.12.0.ebuild b/kde-apps/drkonqi/drkonqi-15.12.0.ebuild index bae6c2e..a7c5716 100644 --- a/kde-apps/drkonqi/drkonqi-15.12.0.ebuild +++ b/kde-apps/drkonqi/drkonqi-15.12.0.ebuild @@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) " RDEPEND="${DEPEND}" diff --git a/kde-apps/drkonqi/drkonqi-15.12.49.9999.ebuild b/kde-apps/drkonqi/drkonqi-15.12.49.9999.ebuild index bd854ad..2bbff99 100644 --- a/kde-apps/drkonqi/drkonqi-15.12.49.9999.ebuild +++ b/kde-apps/drkonqi/drkonqi-15.12.49.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/drkonqi/drkonqi-9999.ebuild b/kde-apps/drkonqi/drkonqi-9999.ebuild index bd854ad..2bbff99 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/eventviews/eventviews-15.12.0.ebuild b/kde-apps/eventviews/eventviews-15.12.0.ebuild index c4054e6..a03e339 100644 --- a/kde-apps/eventviews/eventviews-15.12.0.ebuild +++ b/kde-apps/eventviews/eventviews-15.12.0.ebuild @@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild b/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild index 4aece9e..1653cec 100644 --- a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild +++ b/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild @@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild index fa0500b..92d779d 100644 --- a/kde-apps/eventviews/eventviews-9999.ebuild +++ b/kde-apps/eventviews/eventviews-9999.ebuild @@ -45,5 +45,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/grantleetheme/grantleetheme-15.12.0.ebuild b/kde-apps/grantleetheme/grantleetheme-15.12.0.ebuild index 325dcf5..3f71cc4 100644 --- a/kde-apps/grantleetheme/grantleetheme-15.12.0.ebuild +++ b/kde-apps/grantleetheme/grantleetheme-15.12.0.ebuild @@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild b/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild index 09ee0bf..cecc7c7 100644 --- a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild +++ b/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild @@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild index f4cabd4..93af3b1 100644 --- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild +++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild @@ -29,5 +29,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/incidenceeditor/incidenceeditor-15.12.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-15.12.0.ebuild index 51e7f7e..6ede652 100644 --- a/kde-apps/incidenceeditor/incidenceeditor-15.12.0.ebuild +++ b/kde-apps/incidenceeditor/incidenceeditor-15.12.0.ebuild @@ -57,7 +57,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild index 0a88bfd..7e5c3c3 100644 --- a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild +++ b/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild @@ -57,7 +57,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild index f2b7ad0..40a42bf 100644 --- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild +++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild @@ -55,5 +55,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.0.ebuild b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.0.ebuild index 1376a76..531acde 100644 --- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.0.ebuild +++ b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.0.ebuild @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild index ae41e75..9966b58 100644 --- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild +++ b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild @@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild index f8fe6e2..9960c7a 100644 --- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild +++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild @@ -54,9 +54,9 @@ RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.12.50:5 !kde-apps/messageviewer:5 !<kde-apps/pimcommon-15.12.50:5 - !kde-base/kaddressbook:4 - !kde-base/kmail:4 - !kde-base/korganizer:4 + !kde-apps/kaddressbook:4 + !kde-apps/kmail:4 + !kde-apps/korganizer:4 $(add_kdeapps_dep kdepim) " diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild index 58149ed..4005352 100644 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild @@ -55,8 +55,8 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/libfollowupreminder:5 !kde-apps/libkdepimdbusinterfaces:5 !kde-apps/libsendlater:5 - !kde-base/kdepim-common-libs:4 - !kde-base/kmail:4 + !kde-apps/kdepim-common-libs:4 + !kde-apps/kmail:4 " src_configure() { diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.0.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.0.ebuild index d9d0972..b8fb7b7 100644 --- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.0.ebuild +++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.0.ebuild @@ -32,7 +32,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild index 2a385ef..74434e6 100644 --- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild +++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild @@ -32,7 +32,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild index 2a385ef..74434e6 100644 --- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild +++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild @@ -32,7 +32,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.3.ebuild index 8803beb..f28328d 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.3.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.3.ebuild @@ -65,7 +65,7 @@ DEPEND="${CDEPEND} google? ( net-libs/libkgapi:5 ) " RDEPEND="${CDEPEND} - !kde-base/kdepim-runtime:4 + !kde-apps/kdepim-runtime:4 " src_configure() { diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.0.ebuild index 9ce8adf..1e533f3 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.0.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.0.ebuild @@ -68,7 +68,7 @@ DEPEND="${CDEPEND} google? ( >=net-libs/libkgapi-5.1.0:5 ) " RDEPEND="${CDEPEND} - !kde-base/kdepim-runtime:4 + !kde-apps/kdepim-runtime:4 " src_configure() { diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild index 11b6452..13533c4 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild @@ -68,7 +68,7 @@ DEPEND="${CDEPEND} google? ( >=net-libs/libkgapi-5.1.0:5 ) " RDEPEND="${CDEPEND} - !kde-base/kdepim-runtime:4 + !kde-apps/kdepim-runtime:4 " src_configure() { diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild index 11b6452..13533c4 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild @@ -68,7 +68,7 @@ DEPEND="${CDEPEND} google? ( >=net-libs/libkgapi-5.1.0:5 ) " RDEPEND="${CDEPEND} - !kde-base/kdepim-runtime:4 + !kde-apps/kdepim-runtime:4 " src_configure() { diff --git a/kde-apps/kdepim/kdepim-15.08.3.ebuild b/kde-apps/kdepim/kdepim-15.08.3.ebuild index 7a36ed2..b838f69 100644 --- a/kde-apps/kdepim/kdepim-15.08.3.ebuild +++ b/kde-apps/kdepim/kdepim-15.08.3.ebuild @@ -96,29 +96,29 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kde-base/akonadiconsole:4 - !kde-base/akregator:4 - !kde-base/blogilo:4 - !kde-base/calendarjanitor:4 - !kde-base/kabcclient:4 - !kde-base/kaddressbook:4 - !kde-base/kalarm:4 - !kde-base/kdepim-common-libs:4 - !kde-base/kdepim-icons:4 - !kde-base/kdepim-kresources:4 - !kde-base/kdepim-l10n:4 - !kde-base/kdepim-meta:4 - !kde-base/kdepim-runtime:4 - !kde-base/kjots:4 - !kde-base/kleopatra:4 - !kde-base/kmail:4 - !kde-base/knode:4 - !kde-base/knotes:4 - !kde-base/konsolekalendar:4 - !kde-base/kontact:4 - !kde-base/korganizer:4 - !kde-base/ktimetracker:4 - !kde-base/ktnef:4 + !kde-apps/akonadiconsole:4 + !kde-apps/akregator:4 + !kde-apps/blogilo:4 + !kde-apps/calendarjanitor:4 + !kde-apps/kabcclient:4 + !kde-apps/kaddressbook:4 + !kde-apps/kalarm:4 + !kde-apps/kdepim-common-libs:4 + !kde-apps/kdepim-icons:4 + !kde-apps/kdepim-kresources:4 + !kde-apps/kdepim-l10n:4 + !kde-apps/kdepim-meta:4 + !kde-apps/kdepim-runtime:4 + !kde-apps/kjots:4 + !kde-apps/kleopatra:4 + !kde-apps/kmail:4 + !kde-apps/knode:4 + !kde-apps/knotes:4 + !kde-apps/konsolekalendar:4 + !kde-apps/kontact:4 + !kde-apps/korganizer:4 + !kde-apps/ktimetracker:4 + !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) kdepim_features_kleopatra? ( app-crypt/gnupg ) " diff --git a/kde-apps/kdepim/kdepim-15.12.0.ebuild b/kde-apps/kdepim/kdepim-15.12.0.ebuild index 8c03e27..2dd7f95 100644 --- a/kde-apps/kdepim/kdepim-15.12.0.ebuild +++ b/kde-apps/kdepim/kdepim-15.12.0.ebuild @@ -132,25 +132,25 @@ DEPEND="${COMMON_DEPEND} ) " RDEPEND="${COMMON_DEPEND} - !kde-base/akonadiconsole:4 - !kde-base/akregator:4 - !kde-base/blogilo:4 - !kde-base/calendarjanitor:4 - !kde-base/kabcclient:4 - !kde-base/kaddressbook:4 - !kde-base/kalarm:4 - !kde-base/kdepim-icons:4 - !kde-base/kdepim-runtime:4 - !kde-base/kjots:4 - !kde-base/kleopatra:4 - !kde-base/kmail:4 - !kde-base/knode:4 - !kde-base/knotes:4 - !kde-base/konsolekalendar:4 - !kde-base/kontact:4 - !kde-base/korganizer:4 - !kde-base/ktimetracker:4 - !kde-base/ktnef:4 + !kde-apps/akonadiconsole:4 + !kde-apps/akregator:4 + !kde-apps/blogilo:4 + !kde-apps/calendarjanitor:4 + !kde-apps/kabcclient:4 + !kde-apps/kaddressbook:4 + !kde-apps/kalarm:4 + !kde-apps/kdepim-icons:4 + !kde-apps/kdepim-runtime:4 + !kde-apps/kjots:4 + !kde-apps/kleopatra:4 + !kde-apps/kmail:4 + !kde-apps/knode:4 + !kde-apps/knotes:4 + !kde-apps/konsolekalendar:4 + !kde-apps/kontact:4 + !kde-apps/korganizer:4 + !kde-apps/ktimetracker:4 + !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) kdepim_features_kleopatra? ( app-crypt/gnupg ) " diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild index baa5510..b81b336 100644 --- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild +++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild @@ -132,25 +132,25 @@ DEPEND="${COMMON_DEPEND} ) " RDEPEND="${COMMON_DEPEND} - !kde-base/akonadiconsole:4 - !kde-base/akregator:4 - !kde-base/blogilo:4 - !kde-base/calendarjanitor:4 - !kde-base/kabcclient:4 - !kde-base/kaddressbook:4 - !kde-base/kalarm:4 - !kde-base/kdepim-icons:4 - !kde-base/kdepim-runtime:4 - !kde-base/kjots:4 - !kde-base/kleopatra:4 - !kde-base/kmail:4 - !kde-base/knode:4 - !kde-base/knotes:4 - !kde-base/konsolekalendar:4 - !kde-base/kontact:4 - !kde-base/korganizer:4 - !kde-base/ktimetracker:4 - !kde-base/ktnef:4 + !kde-apps/akonadiconsole:4 + !kde-apps/akregator:4 + !kde-apps/blogilo:4 + !kde-apps/calendarjanitor:4 + !kde-apps/kabcclient:4 + !kde-apps/kaddressbook:4 + !kde-apps/kalarm:4 + !kde-apps/kdepim-icons:4 + !kde-apps/kdepim-runtime:4 + !kde-apps/kjots:4 + !kde-apps/kleopatra:4 + !kde-apps/kmail:4 + !kde-apps/knode:4 + !kde-apps/knotes:4 + !kde-apps/konsolekalendar:4 + !kde-apps/kontact:4 + !kde-apps/korganizer:4 + !kde-apps/ktimetracker:4 + !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) kdepim_features_kleopatra? ( app-crypt/gnupg ) " diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild index 52d6a83..410682b 100644 --- a/kde-apps/kdepim/kdepim-9999.ebuild +++ b/kde-apps/kdepim/kdepim-9999.ebuild @@ -122,25 +122,25 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/noteshared - !kde-base/akonadiconsole:4 - !kde-base/akregator:4 - !kde-base/blogilo:4 - !kde-base/calendarjanitor:4 - !kde-base/kabcclient:4 - !kde-base/kaddressbook:4 - !kde-base/kalarm:4 - !kde-base/kdepim-icons:4 - !kde-base/kdepim-runtime:4 - !kde-base/kjots:4 - !kde-base/kleopatra:4 - !kde-base/kmail:4 - !kde-base/knode:4 - !kde-base/knotes:4 - !kde-base/konsolekalendar:4 - !kde-base/kontact:4 - !kde-base/korganizer:4 - !kde-base/ktimetracker:4 - !kde-base/ktnef:4 + !kde-apps/akonadiconsole:4 + !kde-apps/akregator:4 + !kde-apps/blogilo:4 + !kde-apps/calendarjanitor:4 + !kde-apps/kabcclient:4 + !kde-apps/kaddressbook:4 + !kde-apps/kalarm:4 + !kde-apps/kdepim-icons:4 + !kde-apps/kdepim-runtime:4 + !kde-apps/kjots:4 + !kde-apps/kleopatra:4 + !kde-apps/kmail:4 + !kde-apps/knode:4 + !kde-apps/knotes:4 + !kde-apps/konsolekalendar:4 + !kde-apps/kontact:4 + !kde-apps/korganizer:4 + !kde-apps/ktimetracker:4 + !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) kdepim_features_kleopatra? ( app-crypt/gnupg ) " diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.3.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.3.ebuild index f6811d9..469c81b 100644 --- a/kde-apps/kdepimlibs/kdepimlibs-15.08.3.ebuild +++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.3.ebuild @@ -63,9 +63,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} dev-libs/boost " -RDEPEND="${COMMON_DEPEND} - !kde-base/kdepimlibs:4 -" +RDEPEND="${COMMON_DEPEND}" src_prepare() { use handbook || \ diff --git a/kde-apps/kdgantt2/kdgantt2-15.12.0.ebuild b/kde-apps/kdgantt2/kdgantt2-15.12.0.ebuild index ab08adf..976bfcf 100644 --- a/kde-apps/kdgantt2/kdgantt2-15.12.0.ebuild +++ b/kde-apps/kdgantt2/kdgantt2-15.12.0.ebuild @@ -24,7 +24,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild b/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild index 135a8f6..0d3a928 100644 --- a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild +++ b/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild @@ -24,7 +24,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/kdgantt2/kdgantt2-9999.ebuild b/kde-apps/kdgantt2/kdgantt2-9999.ebuild index dc6ef35..1c746c1 100644 --- a/kde-apps/kdgantt2/kdgantt2-9999.ebuild +++ b/kde-apps/kdgantt2/kdgantt2-9999.ebuild @@ -23,5 +23,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/kget/kget-15.12.0.ebuild b/kde-apps/kget/kget-15.12.0.ebuild index e397b4e..00ab979 100644 --- a/kde-apps/kget/kget-15.12.0.ebuild +++ b/kde-apps/kget/kget-15.12.0.ebuild @@ -17,7 +17,7 @@ RDEPEND=" $(add_kdeapps_dep libkonq) $(add_kdebase_dep libkworkspace '' 4.11) bittorrent? ( >=net-libs/libktorrent-1.0.3 ) - gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdebase_dep kdepimlibs) ) ) + gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6:4 ) diff --git a/kde-apps/kget/kget-15.12.49.9999.ebuild b/kde-apps/kget/kget-15.12.49.9999.ebuild index af093eb..894b64a 100644 --- a/kde-apps/kget/kget-15.12.49.9999.ebuild +++ b/kde-apps/kget/kget-15.12.49.9999.ebuild @@ -17,7 +17,7 @@ RDEPEND=" $(add_kdeapps_dep libkonq) $(add_kdebase_dep libkworkspace '' 4.11) bittorrent? ( >=net-libs/libktorrent-1.0.3 ) - gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdebase_dep kdepimlibs) ) ) + gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6:4 ) diff --git a/kde-apps/kget/kget-9999.ebuild b/kde-apps/kget/kget-9999.ebuild index af093eb..894b64a 100644 --- a/kde-apps/kget/kget-9999.ebuild +++ b/kde-apps/kget/kget-9999.ebuild @@ -17,7 +17,7 @@ RDEPEND=" $(add_kdeapps_dep libkonq) $(add_kdebase_dep libkworkspace '' 4.11) bittorrent? ( >=net-libs/libktorrent-1.0.3 ) - gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdebase_dep kdepimlibs) ) ) + gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) webkit? ( >=kde-misc/kwebkitpart-0.9.6:4 ) diff --git a/kde-apps/kget/metadata.xml b/kde-apps/kget/metadata.xml index 458e02d..b0562c2 100644 --- a/kde-apps/kget/metadata.xml +++ b/kde-apps/kget/metadata.xml @@ -4,7 +4,7 @@ <herd>kde</herd> <use> <flag name="bittorrent">Enable bittorrent transfer plugin through <pkg>net-libs/libktorrent</pkg></flag> - <flag name="gpg">Enable signature verification by QGpgME via <pkg>kde-apps/gpgmepp</pkg> or <pkg>kde-base/kdepimlibs</pkg></flag> + <flag name="gpg">Enable signature verification by QGpgME via <pkg>kde-apps/gpgmepp</pkg> or <pkg>kde-apps/kdepimlibs</pkg></flag> <flag name="mms">Enable MMS (Microsoft Media Server) plugin through <pkg>media-libs/libmms</pkg></flag> <flag name="webkit">Enable KdeWebkit browser plugin using <pkg>kde-misc/kwebkitpart</pkg></flag> </use> diff --git a/kde-apps/kgpg/kgpg-15.12.0.ebuild b/kde-apps/kgpg/kgpg-15.12.0.ebuild index 0fe2aa2..22d02b5 100644 --- a/kde-apps/kgpg/kgpg-15.12.0.ebuild +++ b/kde-apps/kgpg/kgpg-15.12.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) " RDEPEND="${DEPEND} app-crypt/gnupg diff --git a/kde-apps/kgpg/kgpg-15.12.49.9999.ebuild b/kde-apps/kgpg/kgpg-15.12.49.9999.ebuild index 2b076d7..4758dbd 100644 --- a/kde-apps/kgpg/kgpg-15.12.49.9999.ebuild +++ b/kde-apps/kgpg/kgpg-15.12.49.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/kgpg/kgpg-9999.ebuild b/kde-apps/kgpg/kgpg-9999.ebuild index 2b076d7..4758dbd 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/kjots/kjots-9999.ebuild b/kde-apps/kjots/kjots-9999.ebuild index 938fbeb..c751424 100644 --- a/kde-apps/kjots/kjots-9999.ebuild +++ b/kde-apps/kjots/kjots-9999.ebuild @@ -37,6 +37,5 @@ RDEPEND=" dev-qt/qtwidgets:5 " DEPEND="${RDEPEND} - !kde-base/kjots:4 sys-devel/gettext " diff --git a/kde-apps/klinkstatus/klinkstatus-15.08.3.ebuild b/kde-apps/klinkstatus/klinkstatus-15.08.3.ebuild index ab450c2..6a68959 100644 --- a/kde-apps/klinkstatus/klinkstatus-15.08.3.ebuild +++ b/kde-apps/klinkstatus/klinkstatus-15.08.3.ebuild @@ -15,7 +15,7 @@ KEYWORDS=" ~amd64 ~x86" 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-15.12.0.ebuild b/kde-apps/klinkstatus/klinkstatus-15.12.0.ebuild index 8779f32..e2fc941 100644 --- a/kde-apps/klinkstatus/klinkstatus-15.12.0.ebuild +++ b/kde-apps/klinkstatus/klinkstatus-15.12.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" 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-15.12.49.9999.ebuild b/kde-apps/klinkstatus/klinkstatus-15.12.49.9999.ebuild index a8cce9c..0b33d5d 100644 --- a/kde-apps/klinkstatus/klinkstatus-15.12.49.9999.ebuild +++ b/kde-apps/klinkstatus/klinkstatus-15.12.49.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/klinkstatus/klinkstatus-9999.ebuild b/kde-apps/klinkstatus/klinkstatus-9999.ebuild index a8cce9c..0b33d5d 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/kopete/kopete-15.12.0.ebuild b/kde-apps/kopete/kopete-15.12.0.ebuild index c59f394..1247671 100644 --- a/kde-apps/kopete/kopete-15.12.0.ebuild +++ b/kde-apps/kopete/kopete-15.12.0.ebuild @@ -65,7 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" COMMONDEPEND=" $(add_kdebase_dep kdelibs 'zeroconf?') - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) dev-libs/libpcre >=dev-qt/qtgui-4.4.0:4[mng] media-libs/phonon[qt4] diff --git a/kde-apps/kopete/kopete-15.12.49.9999.ebuild b/kde-apps/kopete/kopete-15.12.49.9999.ebuild index 97f34e3..ab31918 100644 --- a/kde-apps/kopete/kopete-15.12.49.9999.ebuild +++ b/kde-apps/kopete/kopete-15.12.49.9999.ebuild @@ -65,7 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" COMMONDEPEND=" $(add_kdebase_dep kdelibs 'zeroconf?') - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) dev-libs/libpcre >=dev-qt/qtgui-4.4.0:4[mng] media-libs/phonon[qt4] diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index 97f34e3..ab31918 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -65,7 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" COMMONDEPEND=" $(add_kdebase_dep kdelibs 'zeroconf?') - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) dev-libs/libpcre >=dev-qt/qtgui-4.4.0:4[mng] media-libs/phonon[qt4] diff --git a/kde-apps/kuser/kuser-15.12.0.ebuild b/kde-apps/kuser/kuser-15.12.0.ebuild index 13bd116..582da31 100644 --- a/kde-apps/kuser/kuser-15.12.0.ebuild +++ b/kde-apps/kuser/kuser-15.12.0.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) " # notify is needed for dialogs RDEPEND="${DEPEND} diff --git a/kde-apps/kuser/kuser-15.12.49.9999.ebuild b/kde-apps/kuser/kuser-15.12.49.9999.ebuild index a4bc578..1eda1e8 100644 --- a/kde-apps/kuser/kuser-15.12.49.9999.ebuild +++ b/kde-apps/kuser/kuser-15.12.49.9999.ebuild @@ -13,7 +13,7 @@ KEYWORDS="" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) " # notify is needed for dialogs RDEPEND="${DEPEND} diff --git a/kde-apps/kuser/kuser-9999.ebuild b/kde-apps/kuser/kuser-9999.ebuild index a4bc578..1eda1e8 100644 --- a/kde-apps/kuser/kuser-9999.ebuild +++ b/kde-apps/kuser/kuser-9999.ebuild @@ -13,7 +13,7 @@ KEYWORDS="" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) " # notify is needed for dialogs RDEPEND="${DEPEND} diff --git a/kde-apps/kwalletd/kwalletd-15.12.0.ebuild b/kde-apps/kwalletd/kwalletd-15.12.0.ebuild index 1e6eabc..1dcdef1 100644 --- a/kde-apps/kwalletd/kwalletd-15.12.0.ebuild +++ b/kde-apps/kwalletd/kwalletd-15.12.0.ebuild @@ -15,7 +15,7 @@ DEPEND=" dev-libs/libgcrypt:0= gpg? ( app-crypt/gpgme - || ( $(add_kdeapps_dep gpgmepp) $(add_kdebase_dep kdepimlibs) ) + || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/kwalletd/kwalletd-15.12.49.9999.ebuild b/kde-apps/kwalletd/kwalletd-15.12.49.9999.ebuild index b39161b..bc90d69 100644 --- a/kde-apps/kwalletd/kwalletd-15.12.49.9999.ebuild +++ b/kde-apps/kwalletd/kwalletd-15.12.49.9999.ebuild @@ -15,7 +15,7 @@ DEPEND=" dev-libs/libgcrypt:0= gpg? ( app-crypt/gpgme - || ( $(add_kdeapps_dep gpgmepp) $(add_kdebase_dep kdepimlibs) ) + || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/kwalletd/kwalletd-9999.ebuild b/kde-apps/kwalletd/kwalletd-9999.ebuild index b39161b..bc90d69 100644 --- a/kde-apps/kwalletd/kwalletd-9999.ebuild +++ b/kde-apps/kwalletd/kwalletd-9999.ebuild @@ -15,7 +15,7 @@ DEPEND=" dev-libs/libgcrypt:0= gpg? ( app-crypt/gpgme - || ( $(add_kdeapps_dep gpgmepp) $(add_kdebase_dep kdepimlibs) ) + || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild b/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild index 391ec29..c84d4f1 100644 --- a/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild +++ b/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild @@ -50,7 +50,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " REQUIRED_USE="test? ( tools )" diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild index 2b384cb..ee26a4b 100644 --- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild +++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild @@ -50,7 +50,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " REQUIRED_USE="test? ( tools )" diff --git a/kde-apps/libakonadi/libakonadi-9999.ebuild b/kde-apps/libakonadi/libakonadi-9999.ebuild index 2b384cb..ee26a4b 100644 --- a/kde-apps/libakonadi/libakonadi-9999.ebuild +++ b/kde-apps/libakonadi/libakonadi-9999.ebuild @@ -50,7 +50,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs - !kde-base/kdepimlibs:4 " REQUIRED_USE="test? ( tools )" diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.0.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.0.ebuild index 9c8431a..d84441c 100644 --- a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.0.ebuild +++ b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.0.ebuild @@ -27,7 +27,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kmail:4 + !kde-apps/kmail:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild index b2fee35..1ce9a91 100644 --- a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild +++ b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild @@ -27,7 +27,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kmail:4 + !kde-apps/kmail:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libgravatar/libgravatar-15.12.0.ebuild b/kde-apps/libgravatar/libgravatar-15.12.0.ebuild index 4773793..7e2af33 100644 --- a/kde-apps/libgravatar/libgravatar-15.12.0.ebuild +++ b/kde-apps/libgravatar/libgravatar-15.12.0.ebuild @@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild b/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild index 3ddc23c..428ae3d 100644 --- a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild +++ b/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild @@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild b/kde-apps/libgravatar/libgravatar-9999.ebuild index 3f9e43b..9bca69c 100644 --- a/kde-apps/libgravatar/libgravatar-9999.ebuild +++ b/kde-apps/libgravatar/libgravatar-9999.ebuild @@ -28,5 +28,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild b/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild index 1266628..4b01876 100644 --- a/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild +++ b/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild @@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/libkdepim:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild index a32f3b2..45472ed 100644 --- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild +++ b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild @@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/libkdepim:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild index e301a20..d5f11ca 100644 --- a/kde-apps/libkdepim/libkdepim-9999.ebuild +++ b/kde-apps/libkdepim/libkdepim-9999.ebuild @@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/libkdepim:4 + !kde-apps/kdepim-common-libs:4 " src_configure() { diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.0.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.0.ebuild index c8a3890..7f31891 100644 --- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.0.ebuild +++ b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.0.ebuild @@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild index e8d4acb..3a5965d 100644 --- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild +++ b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild @@ -29,7 +29,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libkleo/libkleo-15.12.0.ebuild b/kde-apps/libkleo/libkleo-15.12.0.ebuild index ce46596..ed7f4c6 100644 --- a/kde-apps/libkleo/libkleo-15.12.0.ebuild +++ b/kde-apps/libkleo/libkleo-15.12.0.ebuild @@ -35,8 +35,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/libkleo:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild index 616f7ad..9d2e07e 100644 --- a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild +++ b/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild @@ -35,8 +35,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/libkleo:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild index d0cab1f..2ed385e 100644 --- a/kde-apps/libkleo/libkleo-9999.ebuild +++ b/kde-apps/libkleo/libkleo-9999.ebuild @@ -34,6 +34,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/libkleo:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/libksieve/libksieve-15.12.0.ebuild b/kde-apps/libksieve/libksieve-15.12.0.ebuild index 9c8ca44..e4ac132 100644 --- a/kde-apps/libksieve/libksieve-15.12.0.ebuild +++ b/kde-apps/libksieve/libksieve-15.12.0.ebuild @@ -36,7 +36,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kmail:4 + !kde-apps/kmail:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild b/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild index 2494ca3..11abaad 100644 --- a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild +++ b/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild @@ -36,7 +36,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kmail:4 + !kde-apps/kmail:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild index 690e2a9..940c07e 100644 --- a/kde-apps/libksieve/libksieve-9999.ebuild +++ b/kde-apps/libksieve/libksieve-9999.ebuild @@ -35,5 +35,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kmail:4 + !kde-apps/kmail:4 " diff --git a/kde-apps/libsendlater/libsendlater-15.12.0.ebuild b/kde-apps/libsendlater/libsendlater-15.12.0.ebuild index 29a4c14..11d0709 100644 --- a/kde-apps/libsendlater/libsendlater-15.12.0.ebuild +++ b/kde-apps/libsendlater/libsendlater-15.12.0.ebuild @@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild b/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild index 11716ca..6fd9ef6 100644 --- a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild +++ b/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild @@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild b/kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild index 06413c9..48c8c99 100644 --- a/kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild +++ b/kde-apps/mailcommon/mailcommon-15.12.0-r1.ebuild @@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild index 27ae909..66bf6ed 100644 --- a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild +++ b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild @@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild index 2c16313..7456da7 100644 --- a/kde-apps/mailcommon/mailcommon-9999.ebuild +++ b/kde-apps/mailcommon/mailcommon-9999.ebuild @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " src_configure() { diff --git a/kde-apps/mailimporter/mailimporter-15.12.0.ebuild b/kde-apps/mailimporter/mailimporter-15.12.0.ebuild index d84e869..046f0d5 100644 --- a/kde-apps/mailimporter/mailimporter-15.12.0.ebuild +++ b/kde-apps/mailimporter/mailimporter-15.12.0.ebuild @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild b/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild index abbb74d..ad07417 100644 --- a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild +++ b/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild b/kde-apps/mailimporter/mailimporter-9999.ebuild index d1c7e53..a24975d 100644 --- a/kde-apps/mailimporter/mailimporter-9999.ebuild +++ b/kde-apps/mailimporter/mailimporter-9999.ebuild @@ -32,5 +32,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/messagecomposer/messagecomposer-15.12.0.ebuild b/kde-apps/messagecomposer/messagecomposer-15.12.0.ebuild index 7ba5399..3a667b5 100644 --- a/kde-apps/messagecomposer/messagecomposer-15.12.0.ebuild +++ b/kde-apps/messagecomposer/messagecomposer-15.12.0.ebuild @@ -42,7 +42,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild b/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild index a675301..d000072 100644 --- a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild +++ b/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild @@ -42,7 +42,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messagecore/messagecore-15.12.0.ebuild b/kde-apps/messagecore/messagecore-15.12.0.ebuild index b387bb6..d65d0e8 100644 --- a/kde-apps/messagecore/messagecore-15.12.0.ebuild +++ b/kde-apps/messagecore/messagecore-15.12.0.ebuild @@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild b/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild index f7c90a1..e477afc 100644 --- a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild +++ b/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild @@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild index 2040995..e49aa78 100644 --- a/kde-apps/messagelib/messagelib-9999.ebuild +++ b/kde-apps/messagelib/messagelib-9999.ebuild @@ -73,8 +73,8 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/messagelist:5 !kde-apps/messageviewer:5 !kde-apps/templateparser:5 - !kde-base/kdepim-common-libs:4 - !kde-base/kmail:4 + !kde-apps/kdepim-common-libs:4 + !kde-apps/kmail:4 " src_prepare() { diff --git a/kde-apps/messagelist/messagelist-15.12.0.ebuild b/kde-apps/messagelist/messagelist-15.12.0.ebuild index 09d94a8..c0615bc 100644 --- a/kde-apps/messagelist/messagelist-15.12.0.ebuild +++ b/kde-apps/messagelist/messagelist-15.12.0.ebuild @@ -39,8 +39,8 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/kmail:4 + !kde-apps/kdepim-common-libs:4 + !kde-apps/kmail:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild b/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild index a645252..fc8729d 100644 --- a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild +++ b/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild @@ -39,8 +39,8 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 - !kde-base/kmail:4 + !kde-apps/kdepim-common-libs:4 + !kde-apps/kmail:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messageviewer/messageviewer-15.12.0.ebuild b/kde-apps/messageviewer/messageviewer-15.12.0.ebuild index 9618f2f..96bb017 100644 --- a/kde-apps/messageviewer/messageviewer-15.12.0.ebuild +++ b/kde-apps/messageviewer/messageviewer-15.12.0.ebuild @@ -64,7 +64,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild b/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild index 7d7bddb..3c2761d 100644 --- a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild +++ b/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild @@ -64,7 +64,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/noteshared/noteshared-15.12.0.ebuild b/kde-apps/noteshared/noteshared-15.12.0.ebuild index 4fa66bc..1ef8fec 100644 --- a/kde-apps/noteshared/noteshared-15.12.0.ebuild +++ b/kde-apps/noteshared/noteshared-15.12.0.ebuild @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild b/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild index 54df6e2..3465056 100644 --- a/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild +++ b/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild b/kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild index ec5cc0b..972982b 100644 --- a/kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild +++ b/kde-apps/pimcommon/pimcommon-15.12.0-r1.ebuild @@ -58,7 +58,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild index b3dba99..ac68b10 100644 --- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild @@ -58,7 +58,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild index 0e18ea9..44ebd5d 100644 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild @@ -57,7 +57,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " src_configure() { diff --git a/kde-apps/templateparser/templateparser-15.12.0.ebuild b/kde-apps/templateparser/templateparser-15.12.0.ebuild index f2a6c29..ba13365 100644 --- a/kde-apps/templateparser/templateparser-15.12.0.ebuild +++ b/kde-apps/templateparser/templateparser-15.12.0.ebuild @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild b/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild index 67338e4..cd6adb0 100644 --- a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild +++ b/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 - !kde-base/kdepim-common-libs:4 + !kde-apps/kdepim-common-libs:4 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then diff --git a/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild b/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild index 885cf8b..18fe599 100644 --- a/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild +++ b/kde-misc/akonadi-git-resource/akonadi-git-resource-9999.ebuild @@ -15,6 +15,6 @@ KEYWORDS="" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) >=dev-libs/libgit2-0.17:= " diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild index a35dae8..4662748 100644 --- a/kde-misc/basket/basket-9999.ebuild +++ b/kde-misc/basket/basket-9999.ebuild @@ -17,7 +17,7 @@ SLOT="4" IUSE="debug crypt" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) media-libs/qimageblitz x11-libs/libX11 crypt? ( >=app-crypt/gpgme-1.0 ) diff --git a/kde-misc/plasma-lionmail/plasma-lionmail-9999.ebuild b/kde-misc/plasma-lionmail/plasma-lionmail-9999.ebuild index f0663d0..cd2335f 100644 --- a/kde-misc/plasma-lionmail/plasma-lionmail-9999.ebuild +++ b/kde-misc/plasma-lionmail/plasma-lionmail-9999.ebuild @@ -15,12 +15,12 @@ KEYWORDS="" IUSE="debug" DEPEND=" - $(add_kdebase_dep kdepimlibs) + $(add_kdeapps_dep kdepimlibs) app-office/akonadi-server dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 " RDEPEND="${DEPEND} - $(add_kdebase_dep kdepim-runtime) + $(add_kdeapps_dep kdepim-runtime) " diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild index 4efb889..aca0e20 100644 --- a/net-p2p/ktorrent/ktorrent-9999.ebuild +++ b/net-p2p/ktorrent/ktorrent-9999.ebuild @@ -47,7 +47,7 @@ COMMONDEPEND=" infowidget? ( dev-libs/geoip ) mediaplayer? ( >=media-libs/taglib-1.5 ) plasma? ( $(add_kdebase_dep libtaskmanager) ) - rss? ( $(add_kdebase_dep kdepimlibs) ) + rss? ( $(add_kdeapps_dep kdepimlibs) ) shutdown? ( $(add_kdebase_dep libkworkspace) ) " DEPEND="${COMMONDEPEND} diff --git a/sets/kdelibs b/sets/kdelibs index 706e95f..cd0e8d6 100644 --- a/sets/kdelibs +++ b/sets/kdelibs @@ -1,10 +1,10 @@ # Autogenerated by regenerate-files, DO NOT EDIT. +kde-apps/kdepimlibs:4 kde-base/baloo:4 kde-base/baloo-widgets:4 kde-base/kactivities:4 kde-base/kde-env:4 kde-base/kdelibs:4 kde-base/kfilemetadata:4 -kde-base/kdepimlibs:4 -kde-apps/oxygen-icons-4.14.50 kde-base/katepart:4 +kde-frameworks/oxygen-icons-4.14.50 diff --git a/sets/kdelibs-4.14 b/sets/kdelibs-4.14 index 154662b..351be5b 100644 --- a/sets/kdelibs-4.14 +++ b/sets/kdelibs-4.14 @@ -1,3 +1,4 @@ +<kde-apps/kdepimlibs-4.14.50 <kde-base/baloo-4.14.50 <kde-base/baloo-widgets-4.14.50 <kde-base/kactivities-4.13.50 @@ -5,6 +6,5 @@ <kde-base/kde-env-4.14.50 <kde-base/kdelibs-4.14.50 <kde-base/kfilemetadata-4.14.50 -<kde-base/kdepimlibs-4.14.50 <kde-base/katepart-4.14.50 <kde-frameworks/oxygen-icons-4.14.50 diff --git a/sets/kdepim b/sets/kdepim index 4205d77..a25a761 100644 --- a/sets/kdepim +++ b/sets/kdepim @@ -1,24 +1,24 @@ # Autogenerated by regenerate-files, DO NOT EDIT. -kde-base/akonadiconsole:4 -kde-base/akregator:4 -kde-base/blogilo:4 -kde-base/calendarjanitor:4 -kde-base/kabcclient:4 -kde-base/kaddressbook:4 -kde-base/kalarm:4 -kde-base/kdepim-common-libs:4 -kde-base/kdepim-icons:4 -kde-base/kdepim-kresources:4 -kde-base/kdepim-l10n:4 -kde-base/kdepim-meta:4 -kde-base/kdepim-runtime:4 -kde-base/kjots:4 -kde-base/kleopatra:4 -kde-base/kmail:4 -kde-base/knode:4 -kde-base/knotes:4 -kde-base/konsolekalendar:4 -kde-base/kontact:4 -kde-base/korganizer:4 -kde-base/ktimetracker:4 -kde-base/ktnef:4 +kde-apps/akonadiconsole:4 +kde-apps/akregator:4 +kde-apps/blogilo:4 +kde-apps/calendarjanitor:4 +kde-apps/kabcclient:4 +kde-apps/kaddressbook:4 +kde-apps/kalarm:4 +kde-apps/kdepim-common-libs:4 +kde-apps/kdepim-icons:4 +kde-apps/kdepim-kresources:4 +kde-apps/kdepim-l10n:4 +kde-apps/kdepim-meta:4 +kde-apps/kdepim-runtime:4 +kde-apps/kjots:4 +kde-apps/kleopatra:4 +kde-apps/kmail:4 +kde-apps/knode:4 +kde-apps/knotes:4 +kde-apps/konsolekalendar:4 +kde-apps/kontact:4 +kde-apps/korganizer:4 +kde-apps/ktimetracker:4 +kde-apps/ktnef:4 diff --git a/sets/kdepim-4.14 b/sets/kdepim-4.14 index 02d95f3..e45cd49 100644 --- a/sets/kdepim-4.14 +++ b/sets/kdepim-4.14 @@ -1,23 +1,23 @@ -<kde-base/akonadiconsole-4.14.50 -<kde-base/akregator-4.14.50 -<kde-base/blogilo-4.14.50 -<kde-base/calendarjanitor-4.14.50 -<kde-base/kabcclient-4.14.50 -<kde-base/kaddressbook-4.14.50 -<kde-base/kalarm-4.14.50 -<kde-base/kdepim-common-libs-4.14.50 -<kde-base/kdepim-icons-4.14.50 -<kde-base/kdepim-kresources-4.14.50 -<kde-base/kdepim-l10n-4.14.50 -<kde-base/kdepim-meta-4.14.50 -<kde-base/kdepim-runtime-4.14.50 -<kde-base/kjots-4.14.50 -<kde-base/kleopatra-4.14.50 -<kde-base/kmail-4.14.50 -<kde-base/knode-4.14.50 -<kde-base/knotes-4.14.50 -<kde-base/konsolekalendar-4.14.50 -<kde-base/kontact-4.14.50 -<kde-base/korganizer-4.14.50 -<kde-base/ktimetracker-4.14.50 -<kde-base/ktnef-4.14.50 +<kde-apps/akonadiconsole-4.14.50 +<kde-apps/akregator-4.14.50 +<kde-apps/blogilo-4.14.50 +<kde-apps/calendarjanitor-4.14.50 +<kde-apps/kabcclient-4.14.50 +<kde-apps/kaddressbook-4.14.50 +<kde-apps/kalarm-4.14.50 +<kde-apps/kdepim-common-libs-4.14.50 +<kde-apps/kdepim-icons-4.14.50 +<kde-apps/kdepim-kresources-4.14.50 +<kde-apps/kdepim-l10n-4.14.50 +<kde-apps/kdepim-meta-4.14.50 +<kde-apps/kdepim-runtime-4.14.50 +<kde-apps/kjots-4.14.50 +<kde-apps/kleopatra-4.14.50 +<kde-apps/kmail-4.14.50 +<kde-apps/knode-4.14.50 +<kde-apps/knotes-4.14.50 +<kde-apps/konsolekalendar-4.14.50 +<kde-apps/kontact-4.14.50 +<kde-apps/korganizer-4.14.50 +<kde-apps/ktimetracker-4.14.50 +<kde-apps/ktnef-4.14.50 diff --git a/sets/kdepim-4.4 b/sets/kdepim-4.4 index 9c08226..8f343d0 100644 --- a/sets/kdepim-4.4 +++ b/sets/kdepim-4.4 @@ -1,23 +1,23 @@ <kde-base/akonadi-4.4.50 -<kde-base/akregator-4.4.50 -<kde-base/blogilo-4.4.50 -<kde-base/kabcclient-4.4.50 -<kde-base/kaddressbook-4.4.50 -<kde-base/kalarm-4.4.50 -<kde-base/kdepim-icons-4.4.50 -<kde-base/kdepim-kresources-4.4.50 -<kde-base/kdepim-meta-4.4.50 -<kde-base/kdepim-runtime-4.4.50 -<kde-base/kdepim-wizards-4.4.50 -<kde-base/kjots-4.4.50 -<kde-base/kleopatra-4.4.50 -<kde-base/kmail-4.4.50 -<kde-base/knode-4.4.50 -<kde-base/knotes-4.4.50 -<kde-base/konsolekalendar-4.4.50 -<kde-base/kontact-4.4.50 -<kde-base/korganizer-4.4.50 -<kde-base/ktimetracker-4.4.50 -<kde-base/libkdepim-4.4.50 -<kde-base/libkleo-4.4.50 -<kde-base/libkpgp-4.4.50 +<kde-apps/akregator-4.4.50 +<kde-apps/blogilo-4.4.50 +<kde-apps/kabcclient-4.4.50 +<kde-apps/kaddressbook-4.4.50 +<kde-apps/kalarm-4.4.50 +<kde-apps/kdepim-icons-4.4.50 +<kde-apps/kdepim-kresources-4.4.50 +<kde-apps/kdepim-meta-4.4.50 +<kde-apps/kdepim-runtime-4.4.50 +<kde-apps/kdepim-wizards-4.4.50 +<kde-apps/kjots-4.4.50 +<kde-apps/kleopatra-4.4.50 +<kde-apps/kmail-4.4.50 +<kde-apps/knode-4.4.50 +<kde-apps/knotes-4.4.50 +<kde-apps/konsolekalendar-4.4.50 +<kde-apps/kontact-4.4.50 +<kde-apps/korganizer-4.4.50 +<kde-apps/ktimetracker-4.4.50 +<kde-apps/libkdepim-4.4.50 +<kde-apps/libkleo-4.4.50 +<kde-apps/libkpgp-4.4.50