commit: 4df748fcad88f687edd136af09d27610fd611db6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 18:57:17 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 10:29:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4df748fc
kde-apps: KDE PIM cleanup
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild | 6 +-----
kde-apps/akonadi-contact/akonadi-contact-9999.ebuild | 6 +-----
kde-apps/akonadi-mime/akonadi-mime-16.08.49.9999.ebuild | 1 -
kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 1 -
kde-apps/akonadi-notes/akonadi-notes-16.08.49.9999.ebuild | 8 ++------
kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 8 ++------
kde-apps/akonadi/akonadi-16.08.49.9999.ebuild | 1 -
kde-apps/akonadi/akonadi-9999.ebuild | 1 -
kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild | 4 +---
kde-apps/akonadiconsole/akonadiconsole-9999.ebuild | 4 +---
kde-apps/akregator/akregator-16.08.49.9999.ebuild | 4 +---
kde-apps/akregator/akregator-9999.ebuild | 4 +---
kde-apps/blogilo/blogilo-16.08.49.9999.ebuild | 1 -
kde-apps/blogilo/blogilo-9999.ebuild | 1 -
kde-apps/calendarsupport/calendarsupport-16.08.49.9999.ebuild | 5 +----
kde-apps/calendarsupport/calendarsupport-9999.ebuild | 5 +----
kde-apps/eventviews/eventviews-16.08.49.9999.ebuild | 5 +----
kde-apps/eventviews/eventviews-9999.ebuild | 5 +----
kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild | 2 ++
kde-apps/grantleeeditor/grantleeeditor-9999.ebuild | 2 ++
kde-apps/grantleetheme/grantleetheme-16.08.49.9999.ebuild | 8 ++------
kde-apps/grantleetheme/grantleetheme-9999.ebuild | 8 ++------
kde-apps/importwizard/importwizard-16.08.49.9999.ebuild | 4 ++--
kde-apps/importwizard/importwizard-9999.ebuild | 4 ++--
kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild | 5 +----
kde-apps/incidenceeditor/incidenceeditor-9999.ebuild | 5 +----
kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild | 1 -
kde-apps/kaddressbook/kaddressbook-9999.ebuild | 1 -
kde-apps/kalarm/kalarm-16.08.49.9999.ebuild | 3 +--
kde-apps/kalarm/kalarm-9999.ebuild | 3 +--
kde-apps/kdepim-addons/kdepim-addons-16.08.49.9999.ebuild | 11 +----------
kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 11 +----------
.../kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild | 10 +---------
kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 10 +---------
kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild | 1 -
kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 1 -
kde-apps/kdgantt2/kdgantt2-16.08.49.9999.ebuild | 5 +----
kde-apps/kdgantt2/kdgantt2-9999.ebuild | 5 +----
kde-apps/kmail/kmail-16.08.49.9999.ebuild | 2 +-
kde-apps/kmail/kmail-9999.ebuild | 2 +-
kde-apps/knotes/knotes-16.08.49.9999.ebuild | 5 +----
kde-apps/knotes/knotes-9999.ebuild | 5 +----
kde-apps/konsolekalendar/konsolekalendar-16.08.49.9999.ebuild | 4 +---
kde-apps/konsolekalendar/konsolekalendar-9999.ebuild | 4 +---
kde-apps/kontact/kontact-16.08.49.9999.ebuild | 1 -
kde-apps/kontact/kontact-9999.ebuild | 1 -
kde-apps/ktnef/ktnef-16.08.49.9999.ebuild | 4 +---
kde-apps/ktnef/ktnef-9999.ebuild | 4 +---
kde-apps/libgravatar/libgravatar-16.08.49.9999.ebuild | 5 +----
kde-apps/libgravatar/libgravatar-9999.ebuild | 5 +----
kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild | 1 -
kde-apps/libkdepim/libkdepim-9999.ebuild | 1 -
kde-apps/libksieve/libksieve-16.08.49.9999.ebuild | 2 --
kde-apps/libksieve/libksieve-9999.ebuild | 2 --
kde-apps/libktnef/libktnef-16.08.49.9999.ebuild | 9 +++------
kde-apps/libktnef/libktnef-9999.ebuild | 9 +++------
kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild | 5 +----
kde-apps/mailcommon/mailcommon-9999.ebuild | 5 +----
kde-apps/mailimporter/mailimporter-16.08.49.9999.ebuild | 5 +----
kde-apps/mailimporter/mailimporter-9999.ebuild | 5 +----
kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild | 2 +-
kde-apps/mboximporter/mboximporter-9999.ebuild | 2 +-
kde-apps/messagelib/messagelib-16.08.49.9999.ebuild | 7 -------
kde-apps/messagelib/messagelib-9999.ebuild | 7 -------
kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild | 8 ++------
kde-apps/pimcommon/pimcommon-9999.ebuild | 8 ++------
.../pimsettingexporter-16.08.49.9999.ebuild | 2 +-
kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild | 2 +-
68 files changed, 64 insertions(+), 230 deletions(-)
diff --git a/kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild
b/kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild
index bde274d..75f3d52 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi-contact/akonadi-contact-16.08.49.9999.ebuild
@@ -45,11 +45,7 @@ DEPEND="
>=dev-libs/grantlee-5.1.0:5
prison? ( media-libs/prison:5 )
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim
- !kde-apps/kdepimlibs:4
- !kde-apps/kdepimlibs:5
-"
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
index bde274d..75f3d52 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
+++ b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
@@ -45,11 +45,7 @@ DEPEND="
>=dev-libs/grantlee-5.1.0:5
prison? ( media-libs/prison:5 )
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim
- !kde-apps/kdepimlibs:4
- !kde-apps/kdepimlibs:5
-"
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/akonadi-mime/akonadi-mime-16.08.49.9999.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-16.08.49.9999.ebuild
index 542a6f6..01ab78d 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-16.08.49.9999.ebuild
@@ -35,5 +35,4 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepimlibs:4
- !kde-apps/kdepimlibs:5
"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
index 542a6f6..01ab78d 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
@@ -35,5 +35,4 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepimlibs:4
- !kde-apps/kdepimlibs:5
"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-16.08.49.9999.ebuild
b/kde-apps/akonadi-notes/akonadi-notes-16.08.49.9999.ebuild
index 7f46d50..64a8cf9 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-16.08.49.9999.ebuild
@@ -16,16 +16,12 @@ IUSE=""
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep kmime)
$(add_qt_dep qtgui)
$(add_qt_dep qtxml)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_kdeapps_dep akonadi)
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs:4
- !kde-apps/kdepimlibs:5
-"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
index 7f46d50..64a8cf9 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
@@ -16,16 +16,12 @@ IUSE=""
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep kmime)
$(add_qt_dep qtgui)
$(add_qt_dep qtxml)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_kdeapps_dep akonadi)
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs:4
- !kde-apps/kdepimlibs:5
-"
diff --git a/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
b/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
index 3ad61cf..5551cfd 100644
--- a/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.08.49.9999.ebuild
@@ -54,7 +54,6 @@ RDEPEND="${COMMON_DEPEND}
postgres? ( dev-db/postgresql )
!app-office/akonadi-server
!kde-apps/kdepimlibs
- !kde-apps/libakonadi
"
# some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild
b/kde-apps/akonadi/akonadi-9999.ebuild
index 3ad61cf..5551cfd 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -54,7 +54,6 @@ RDEPEND="${COMMON_DEPEND}
postgres? ( dev-db/postgresql )
!app-office/akonadi-server
!kde-apps/kdepimlibs
- !kde-apps/libakonadi
"
# some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
b/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
index 70bc185..9955998 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.08.49.9999.ebuild
@@ -44,6 +44,4 @@ DEPEND="
$(add_qt_dep qtsql)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
index 70bc185..9955998 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
@@ -44,6 +44,4 @@ DEPEND="
$(add_qt_dep qtsql)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/akregator-16.08.49.9999.ebuild
b/kde-apps/akregator/akregator-16.08.49.9999.ebuild
index 21bf595..c15dd1c 100644
--- a/kde-apps/akregator/akregator-16.08.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-16.08.49.9999.ebuild
@@ -55,9 +55,7 @@ DEPEND="
dev-libs/grantlee:5
dev-libs/libxslt
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
src_prepare() {
# akregator subproject does not contain doc
diff --git a/kde-apps/akregator/akregator-9999.ebuild
b/kde-apps/akregator/akregator-9999.ebuild
index 21bf595..c15dd1c 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -55,9 +55,7 @@ DEPEND="
dev-libs/grantlee:5
dev-libs/libxslt
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
src_prepare() {
# akregator subproject does not contain doc
diff --git a/kde-apps/blogilo/blogilo-16.08.49.9999.ebuild
b/kde-apps/blogilo/blogilo-16.08.49.9999.ebuild
index 03af352..49b331d 100644
--- a/kde-apps/blogilo/blogilo-16.08.49.9999.ebuild
+++ b/kde-apps/blogilo/blogilo-16.08.49.9999.ebuild
@@ -42,7 +42,6 @@ DEPEND="
google? ( net-libs/libkgapi:5 )
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
!<kde-apps/kdepim-apps-libs-16.04.50
"
diff --git a/kde-apps/blogilo/blogilo-9999.ebuild
b/kde-apps/blogilo/blogilo-9999.ebuild
index 03af352..49b331d 100644
--- a/kde-apps/blogilo/blogilo-9999.ebuild
+++ b/kde-apps/blogilo/blogilo-9999.ebuild
@@ -42,7 +42,6 @@ DEPEND="
google? ( net-libs/libkgapi:5 )
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
!<kde-apps/kdepim-apps-libs-16.04.50
"
diff --git a/kde-apps/calendarsupport/calendarsupport-16.08.49.9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-16.08.49.9999.ebuild
index 39471cb..441ccdd 100644
--- a/kde-apps/calendarsupport/calendarsupport-16.08.49.9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-16.08.49.9999.ebuild
@@ -42,7 +42,4 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/libical
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index 39471cb..441ccdd 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
@@ -42,7 +42,4 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/libical
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-16.08.49.9999.ebuild
b/kde-apps/eventviews/eventviews-16.08.49.9999.ebuild
index 3640489..f7c09c0 100644
--- a/kde-apps/eventviews/eventviews-16.08.49.9999.ebuild
+++ b/kde-apps/eventviews/eventviews-16.08.49.9999.ebuild
@@ -41,7 +41,4 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/libical
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-9999.ebuild
b/kde-apps/eventviews/eventviews-9999.ebuild
index 3640489..f7c09c0 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-9999.ebuild
@@ -41,7 +41,4 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/libical
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
b/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
index da9c5cf..ded41b2 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
+++ b/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
@@ -42,8 +42,10 @@ DEPEND="
$(add_qt_dep qtwidgets)
"
RDEPEND="${DEPEND}
+ !kde-apps/kaddressbook:4
!kde-apps/kdepim:5
!kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
index da9c5cf..ded41b2 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
+++ b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
@@ -42,8 +42,10 @@ DEPEND="
$(add_qt_dep qtwidgets)
"
RDEPEND="${DEPEND}
+ !kde-apps/kaddressbook:4
!kde-apps/kdepim:5
!kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/grantleetheme/grantleetheme-16.08.49.9999.ebuild
b/kde-apps/grantleetheme/grantleetheme-16.08.49.9999.ebuild
index 9c6b020..a178b65 100644
--- a/kde-apps/grantleetheme/grantleetheme-16.08.49.9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-16.08.49.9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
@@ -24,13 +24,9 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_qt_dep qtnetwork)
"
-RDEPEND="${COMMON_DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
# fails if package not already installed
RESTRICT="test"
diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
index 9c6b020..a178b65 100644
--- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
@@ -24,13 +24,9 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_qt_dep qtnetwork)
"
-RDEPEND="${COMMON_DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
# fails if package not already installed
RESTRICT="test"
diff --git a/kde-apps/importwizard/importwizard-16.08.49.9999.ebuild
b/kde-apps/importwizard/importwizard-16.08.49.9999.ebuild
index c7c0ae6..a5ec7d6 100644
--- a/kde-apps/importwizard/importwizard-16.08.49.9999.ebuild
+++ b/kde-apps/importwizard/importwizard-16.08.49.9999.ebuild
@@ -33,15 +33,15 @@ DEPEND="
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
$(add_kdeapps_dep messagelib)
- $(add_kdeapps_dep pimcommon)
$(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep pimcommon)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/importwizard/importwizard-9999.ebuild
b/kde-apps/importwizard/importwizard-9999.ebuild
index c7c0ae6..a5ec7d6 100644
--- a/kde-apps/importwizard/importwizard-9999.ebuild
+++ b/kde-apps/importwizard/importwizard-9999.ebuild
@@ -33,15 +33,15 @@ DEPEND="
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
$(add_kdeapps_dep messagelib)
- $(add_kdeapps_dep pimcommon)
$(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep pimcommon)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
b/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
index 363e2a3..9f6f70b 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.08.49.9999.ebuild
@@ -50,7 +50,4 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index 363e2a3..9f6f70b 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -50,7 +50,4 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
index 7fe350e..227b19e 100644
--- a/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.08.49.9999.ebuild
@@ -58,7 +58,6 @@ DEPEND="${COMMON_DEPEND}
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index 7fe350e..227b19e 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -58,7 +58,6 @@ DEPEND="${COMMON_DEPEND}
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
b/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
index f533383..d809cc3 100644
--- a/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-16.08.49.9999.ebuild
@@ -9,7 +9,7 @@ KMNAME="kdepim"
QT_MINIMAL="5.6.0"
inherit kde5
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+DESCRIPTION="Personal alarm message, command and email scheduler by KDE"
HOMEPAGE+=" https://userbase.kde.org/KAlarm";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
@@ -67,7 +67,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
"
src_prepare() {
diff --git a/kde-apps/kalarm/kalarm-9999.ebuild
b/kde-apps/kalarm/kalarm-9999.ebuild
index f533383..d809cc3 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -9,7 +9,7 @@ KMNAME="kdepim"
QT_MINIMAL="5.6.0"
inherit kde5
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+DESCRIPTION="Personal alarm message, command and email scheduler by KDE"
HOMEPAGE+=" https://userbase.kde.org/KAlarm";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
@@ -67,7 +67,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
"
src_prepare() {
diff --git a/kde-apps/kdepim-addons/kdepim-addons-16.08.49.9999.ebuild
b/kde-apps/kdepim-addons/kdepim-addons-16.08.49.9999.ebuild
index e7d4449..e781553 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-16.08.49.9999.ebuild
@@ -15,8 +15,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kontact/";
LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
-PIM_FTS="akregator kaddressbook kmail korganizer plugins"
-IUSE="google $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="google"
COMMON_DEPEND="
$(add_frameworks_dep kcompletion)
@@ -56,12 +55,8 @@ DEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep gpgmepp)
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/messageviewer:5
- !<kde-apps/pimcommon-15.12.50:5
!kde-apps/kaddressbook:4
!kde-apps/kmail:4
- !kde-apps/korganizer:4
"
src_prepare() {
@@ -73,10 +68,6 @@ src_prepare() {
plugins/messageviewer/bodypartformatter/CMakeLists.txt \
|| die "Failed to disable tests"
fi
-
- for pim_ft in ${PIM_FTS}; do
- use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory
${pim_ft}
- done
}
src_configure() {
diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index e7d4449..e781553 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
@@ -15,8 +15,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kontact/";
LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
-PIM_FTS="akregator kaddressbook kmail korganizer plugins"
-IUSE="google $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="google"
COMMON_DEPEND="
$(add_frameworks_dep kcompletion)
@@ -56,12 +55,8 @@ DEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep gpgmepp)
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/messageviewer:5
- !<kde-apps/pimcommon-15.12.50:5
!kde-apps/kaddressbook:4
!kde-apps/kmail:4
- !kde-apps/korganizer:4
"
src_prepare() {
@@ -73,10 +68,6 @@ src_prepare() {
plugins/messageviewer/bodypartformatter/CMakeLists.txt \
|| die "Failed to disable tests"
fi
-
- for pim_ft in ${PIM_FTS}; do
- use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory
${pim_ft}
- done
}
src_configure() {
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
index 86e91ca..2dfcc5e 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49.9999.ebuild
@@ -34,15 +34,7 @@ DEPEND="
>=dev-libs/grantlee-5.1.0:5
prison? ( media-libs/prison:5 )
"
-RDEPEND="${DEPEND}
- !kde-apps/kaddressbookgrantlee:5
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim:5
- !kde-apps/kmail:4
- !kde-apps/libfollowupreminder:5
- !kde-apps/libkdepimdbusinterfaces:5
- !kde-apps/libsendlater:5
-"
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
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 86e91ca..2dfcc5e 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
@@ -34,15 +34,7 @@ DEPEND="
>=dev-libs/grantlee-5.1.0:5
prison? ( media-libs/prison:5 )
"
-RDEPEND="${DEPEND}
- !kde-apps/kaddressbookgrantlee:5
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim:5
- !kde-apps/kmail:4
- !kde-apps/libfollowupreminder:5
- !kde-apps/libkdepimdbusinterfaces:5
- !kde-apps/libsendlater:5
-"
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
index f946406..aeff71f 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.08.49.9999.ebuild
@@ -71,7 +71,6 @@ DEPEND="${CDEPEND}
"
RDEPEND="${CDEPEND}
!kde-apps/kdepim-kioslaves
- !kde-apps/kdepim-runtime:4
$(add_frameworks_dep oxygen-icons)
"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index f946406..aeff71f 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -71,7 +71,6 @@ DEPEND="${CDEPEND}
"
RDEPEND="${CDEPEND}
!kde-apps/kdepim-kioslaves
- !kde-apps/kdepim-runtime:4
$(add_frameworks_dep oxygen-icons)
"
diff --git a/kde-apps/kdgantt2/kdgantt2-16.08.49.9999.ebuild
b/kde-apps/kdgantt2/kdgantt2-16.08.49.9999.ebuild
index 44d90b5..880ff21 100644
--- a/kde-apps/kdgantt2/kdgantt2-16.08.49.9999.ebuild
+++ b/kde-apps/kdgantt2/kdgantt2-16.08.49.9999.ebuild
@@ -18,7 +18,4 @@ DEPEND="
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdgantt2/kdgantt2-9999.ebuild
b/kde-apps/kdgantt2/kdgantt2-9999.ebuild
index 44d90b5..880ff21 100644
--- a/kde-apps/kdgantt2/kdgantt2-9999.ebuild
+++ b/kde-apps/kdgantt2/kdgantt2-9999.ebuild
@@ -18,7 +18,4 @@ DEPEND="
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail/kmail-16.08.49.9999.ebuild
b/kde-apps/kmail/kmail-16.08.49.9999.ebuild
index 445e42a..a7b8146 100644
--- a/kde-apps/kmail/kmail-16.08.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-16.08.49.9999.ebuild
@@ -11,7 +11,7 @@ QT_MINIMAL="5.6.1"
VIRTUALX_REQUIRED="test"
inherit kde5
-DESCRIPTION="Email component of Kontact, the integrated personal information
manager of KDE"
+DESCRIPTION="Email component of Kontact, the integrated personal information
manager by KDE"
HOMEPAGE="https://www.kde.org/applications/internet/kmail/";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 445e42a..a7b8146 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -11,7 +11,7 @@ QT_MINIMAL="5.6.1"
VIRTUALX_REQUIRED="test"
inherit kde5
-DESCRIPTION="Email component of Kontact, the integrated personal information
manager of KDE"
+DESCRIPTION="Email component of Kontact, the integrated personal information
manager by KDE"
HOMEPAGE="https://www.kde.org/applications/internet/kmail/";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
diff --git a/kde-apps/knotes/knotes-16.08.49.9999.ebuild
b/kde-apps/knotes/knotes-16.08.49.9999.ebuild
index e9c0a44..9e01133 100644
--- a/kde-apps/knotes/knotes-16.08.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-16.08.49.9999.ebuild
@@ -59,10 +59,7 @@ DEPEND="
dev-libs/libxslt
x11-libs/libX11
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/noteshared:5
-"
+RDEPEND="${DEPEND}"
src_prepare() {
# knotes subproject does not contain doc
diff --git a/kde-apps/knotes/knotes-9999.ebuild
b/kde-apps/knotes/knotes-9999.ebuild
index e9c0a44..9e01133 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -59,10 +59,7 @@ DEPEND="
dev-libs/libxslt
x11-libs/libX11
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/noteshared:5
-"
+RDEPEND="${DEPEND}"
src_prepare() {
# knotes subproject does not contain doc
diff --git a/kde-apps/konsolekalendar/konsolekalendar-16.08.49.9999.ebuild
b/kde-apps/konsolekalendar/konsolekalendar-16.08.49.9999.ebuild
index 1d97cbf..8d4bc3f 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-16.08.49.9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-16.08.49.9999.ebuild
@@ -27,9 +27,7 @@ DEPEND="
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
S="${WORKDIR}/${P}/console"
diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
index 1d97cbf..8d4bc3f 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
@@ -27,9 +27,7 @@ DEPEND="
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
S="${WORKDIR}/${P}/console"
diff --git a/kde-apps/kontact/kontact-16.08.49.9999.ebuild
b/kde-apps/kontact/kontact-16.08.49.9999.ebuild
index effd1e8..e06c755 100644
--- a/kde-apps/kontact/kontact-16.08.49.9999.ebuild
+++ b/kde-apps/kontact/kontact-16.08.49.9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
"
src_prepare() {
diff --git a/kde-apps/kontact/kontact-9999.ebuild
b/kde-apps/kontact/kontact-9999.ebuild
index effd1e8..e06c755 100644
--- a/kde-apps/kontact/kontact-9999.ebuild
+++ b/kde-apps/kontact/kontact-9999.ebuild
@@ -44,7 +44,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
"
src_prepare() {
diff --git a/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
b/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
index 4dd8267..5bb6fb1 100644
--- a/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
+++ b/kde-apps/ktnef/ktnef-16.08.49.9999.ebuild
@@ -31,9 +31,7 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
src_prepare() {
# ktnef subproject does not contain doc nor searches for DocTools
diff --git a/kde-apps/ktnef/ktnef-9999.ebuild b/kde-apps/ktnef/ktnef-9999.ebuild
index 4dd8267..5bb6fb1 100644
--- a/kde-apps/ktnef/ktnef-9999.ebuild
+++ b/kde-apps/ktnef/ktnef-9999.ebuild
@@ -31,9 +31,7 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
-"
+RDEPEND="${DEPEND}"
src_prepare() {
# ktnef subproject does not contain doc nor searches for DocTools
diff --git a/kde-apps/libgravatar/libgravatar-16.08.49.9999.ebuild
b/kde-apps/libgravatar/libgravatar-16.08.49.9999.ebuild
index 70075e9..4179107 100644
--- a/kde-apps/libgravatar/libgravatar-16.08.49.9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-16.08.49.9999.ebuild
@@ -24,7 +24,4 @@ DEPEND="
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild
b/kde-apps/libgravatar/libgravatar-9999.ebuild
index 70075e9..4179107 100644
--- a/kde-apps/libgravatar/libgravatar-9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-9999.ebuild
@@ -24,7 +24,4 @@ DEPEND="
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.08.50:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
b/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
index b12f489..1e5f9de 100644
--- a/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-16.08.49.9999.ebuild
@@ -41,6 +41,5 @@ DEPEND="
$(add_qt_dep qtwidgets)
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
!kde-apps/kdepim-common-libs:4
"
diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild
b/kde-apps/libkdepim/libkdepim-9999.ebuild
index b12f489..1e5f9de 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
@@ -41,6 +41,5 @@ DEPEND="
$(add_qt_dep qtwidgets)
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
!kde-apps/kdepim-common-libs:4
"
diff --git a/kde-apps/libksieve/libksieve-16.08.49.9999.ebuild
b/kde-apps/libksieve/libksieve-16.08.49.9999.ebuild
index c412533..8a138dd 100644
--- a/kde-apps/libksieve/libksieve-16.08.49.9999.ebuild
+++ b/kde-apps/libksieve/libksieve-16.08.49.9999.ebuild
@@ -35,9 +35,7 @@ DEPEND="
ssl? ( dev-libs/cyrus-sasl )
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
!kde-apps/kdepim-kioslaves
- !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/libksieve/libksieve-9999.ebuild
b/kde-apps/libksieve/libksieve-9999.ebuild
index c412533..8a138dd 100644
--- a/kde-apps/libksieve/libksieve-9999.ebuild
+++ b/kde-apps/libksieve/libksieve-9999.ebuild
@@ -35,9 +35,7 @@ DEPEND="
ssl? ( dev-libs/cyrus-sasl )
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
!kde-apps/kdepim-kioslaves
- !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/libktnef/libktnef-16.08.49.9999.ebuild
b/kde-apps/libktnef/libktnef-16.08.49.9999.ebuild
index 2bc1323..7bf319a 100644
--- a/kde-apps/libktnef/libktnef-16.08.49.9999.ebuild
+++ b/kde-apps/libktnef/libktnef-16.08.49.9999.ebuild
@@ -15,13 +15,10 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
-"
-RDEPEND="${DEPEND}
- !kde-apps/ktnef:4
- !<kde-apps/ktnef-15.12.2:5
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-9999.ebuild
b/kde-apps/libktnef/libktnef-9999.ebuild
index 2bc1323..7bf319a 100644
--- a/kde-apps/libktnef/libktnef-9999.ebuild
+++ b/kde-apps/libktnef/libktnef-9999.ebuild
@@ -15,13 +15,10 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
-"
-RDEPEND="${DEPEND}
- !kde-apps/ktnef:4
- !<kde-apps/ktnef-15.12.2:5
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
b/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
index cc42c9b..a7950b6 100644
--- a/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-16.08.49.9999.ebuild
@@ -51,7 +51,4 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild
b/kde-apps/mailcommon/mailcommon-9999.ebuild
index cc42c9b..a7950b6 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -51,7 +51,4 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-16.08.49.9999.ebuild
b/kde-apps/mailimporter/mailimporter-16.08.49.9999.ebuild
index 596f31e..40d834a 100644
--- a/kde-apps/mailimporter/mailimporter-16.08.49.9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-16.08.49.9999.ebuild
@@ -27,7 +27,4 @@ DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild
b/kde-apps/mailimporter/mailimporter-9999.ebuild
index 596f31e..40d834a 100644
--- a/kde-apps/mailimporter/mailimporter-9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-9999.ebuild
@@ -27,7 +27,4 @@ DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild
b/kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild
index b89202e..b7c63ab 100644
--- a/kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild
+++ b/kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild
@@ -31,5 +31,5 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
diff --git a/kde-apps/mboximporter/mboximporter-9999.ebuild
b/kde-apps/mboximporter/mboximporter-9999.ebuild
index b89202e..b7c63ab 100644
--- a/kde-apps/mboximporter/mboximporter-9999.ebuild
+++ b/kde-apps/mboximporter/mboximporter-9999.ebuild
@@ -31,5 +31,5 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
diff --git a/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
b/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
index 87b3989..3360716 100644
--- a/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
+++ b/kde-apps/messagelib/messagelib-16.08.49.9999.ebuild
@@ -67,15 +67,8 @@ DEPEND="${COMMON_DEPEND}
test? ( $(add_kdeapps_dep akonadi-contact) )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
!<kde-apps/kdepim-addons-16.04.50:5
!kde-apps/kdepim-common-libs:4
- !kde-apps/kmail:4
- !kde-apps/messagecomposer:5
- !kde-apps/messagecore:5
- !kde-apps/messagelist:5
- !kde-apps/messageviewer:5
- !kde-apps/templateparser:5
"
# bug 579630
diff --git a/kde-apps/messagelib/messagelib-9999.ebuild
b/kde-apps/messagelib/messagelib-9999.ebuild
index 87b3989..3360716 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -67,15 +67,8 @@ DEPEND="${COMMON_DEPEND}
test? ( $(add_kdeapps_dep akonadi-contact) )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
!<kde-apps/kdepim-addons-16.04.50:5
!kde-apps/kdepim-common-libs:4
- !kde-apps/kmail:4
- !kde-apps/messagecomposer:5
- !kde-apps/messagecore:5
- !kde-apps/messagelist:5
- !kde-apps/messageviewer:5
- !kde-apps/templateparser:5
"
# bug 579630
diff --git a/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
b/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
index 8018956..4d2e4ed 100644
--- a/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.08.49.9999.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcodecs)
$(add_frameworks_dep kcompletion)
@@ -51,10 +51,6 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/libxslt
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
-"
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild
b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 8018956..4d2e4ed 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcodecs)
$(add_frameworks_dep kcompletion)
@@ -51,10 +51,6 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/libxslt
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
-"
diff --git
a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
b/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
index 48f3646..dc63d12 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
+++ b/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
@@ -50,7 +50,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
src_prepare() {
diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
index 48f3646..dc63d12 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
+++ b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
@@ -50,7 +50,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim:5
- !kde-apps/kdepim-common-libs:4
+ !kde-apps/kmail:4
"
src_prepare() {
