commit: ed50bcdb4dc236da63aa3d50997bd8c8fad76d9e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 23:18:31 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 23:24:41 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed50bcdb
kde-apps: Drop obsolete blockers
Do some sorting along the way.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../akonadi-calendar-19.12.49.9999.ebuild | 1 -
.../akonadi-calendar/akonadi-calendar-9999.ebuild | 1 -
.../akonadi-contacts-19.12.49.9999.ebuild | 1 -
.../akonadi-contacts/akonadi-contacts-9999.ebuild | 1 -
.../akonadi-import-wizard-19.12.49.9999.ebuild | 27 +++++-----
.../akonadi-import-wizard-9999.ebuild | 27 +++++-----
.../akonadi-mime/akonadi-mime-19.12.49.9999.ebuild | 2 -
kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 14 +++---
.../akonadi-notes-19.12.49.9999.ebuild | 8 ++-
kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 8 ++-
.../akonadi-search-19.12.49.9999.ebuild | 21 ++++----
kde-apps/akonadi-search/akonadi-search-9999.ebuild | 21 ++++----
kde-apps/akonadi/akonadi-19.12.49.9999.ebuild | 2 -
kde-apps/akonadi/akonadi-9999.ebuild | 4 +-
kde-apps/akregator/akregator-19.12.49.9999.ebuild | 7 +--
kde-apps/akregator/akregator-9999.ebuild | 31 ++++++------
.../calendarjanitor-19.12.49.9999.ebuild | 12 ++---
.../calendarjanitor/calendarjanitor-9999.ebuild | 12 ++---
.../calendarsupport-19.12.49.9999.ebuild | 4 +-
.../calendarsupport/calendarsupport-9999.ebuild | 32 ++++++------
.../eventviews/eventviews-19.12.49.9999.ebuild | 4 +-
kde-apps/eventviews/eventviews-9999.ebuild | 26 +++++-----
.../grantlee-editor-19.12.49.9999.ebuild | 7 +--
.../grantlee-editor/grantlee-editor-9999.ebuild | 23 ++++-----
.../grantleetheme-19.12.49.9999.ebuild | 13 ++---
kde-apps/grantleetheme/grantleetheme-9999.ebuild | 13 ++---
.../incidenceeditor-19.12.49.9999.ebuild | 5 +-
.../incidenceeditor/incidenceeditor-9999.ebuild | 39 +++++++--------
.../kaddressbook/kaddressbook-19.12.49.9999.ebuild | 1 -
kde-apps/kaddressbook/kaddressbook-9999.ebuild | 33 ++++++------
kde-apps/kalarm/kalarm-19.12.49.9999.ebuild | 1 -
kde-apps/kalarm/kalarm-9999.ebuild | 37 +++++++-------
kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild | 1 -
kde-apps/kalarmcal/kalarmcal-9999.ebuild | 9 ++--
kde-apps/kblog/kblog-19.12.49.9999.ebuild | 4 +-
kde-apps/kblog/kblog-9999.ebuild | 4 +-
kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild | 4 +-
kde-apps/kcalutils/kcalutils-9999.ebuild | 12 ++---
kde-apps/kdav/kdav-19.12.49.9999.ebuild | 4 +-
kde-apps/kdav/kdav-9999.ebuild | 8 ++-
.../kdepim-addons-19.12.49.9999.ebuild | 9 +---
kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 9 +---
.../kdepim-apps-libs-19.12.49.9999.ebuild | 4 +-
.../kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 22 ++++----
.../kdepim-meta/kdepim-meta-19.12.49.9999.ebuild | 1 -
kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 1 -
.../kdepim-runtime-19.12.49.9999.ebuild | 1 -
kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 58 ++++++++++------------
.../kidentitymanagement-19.12.49.9999.ebuild | 14 +++---
.../kidentitymanagement-9999.ebuild | 4 +-
kde-apps/kimap/kimap-19.12.49.9999.ebuild | 13 ++---
kde-apps/kimap/kimap-9999.ebuild | 13 ++---
kde-apps/kldap/kldap-19.12.49.9999.ebuild | 10 ++--
kde-apps/kldap/kldap-9999.ebuild | 4 +-
kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild | 1 -
kde-apps/kleopatra/kleopatra-9999.ebuild | 23 ++++-----
.../kmail-account-wizard-19.12.49.9999.ebuild | 28 +++++------
.../kmail-account-wizard-9999.ebuild | 28 +++++------
kde-apps/kmail/kmail-19.12.49.9999.ebuild | 2 -
kde-apps/kmail/kmail-9999.ebuild | 52 ++++++++++---------
.../kmailtransport-19.12.49.9999.ebuild | 8 +--
kde-apps/kmailtransport/kmailtransport-9999.ebuild | 26 ++++------
kde-apps/kmime/kmime-19.12.49.9999.ebuild | 4 +-
kde-apps/kmime/kmime-9999.ebuild | 4 +-
kde-apps/knotes/knotes-19.12.49.9999.ebuild | 1 -
kde-apps/knotes/knotes-9999.ebuild | 35 +++++++------
.../konsolekalendar-19.12.49.9999.ebuild | 4 +-
.../konsolekalendar/konsolekalendar-9999.ebuild | 12 ++---
kde-apps/kontact/kontact-19.12.49.9999.ebuild | 4 +-
kde-apps/kontact/kontact-9999.ebuild | 26 +++++-----
.../kontactinterface-19.12.49.9999.ebuild | 4 +-
.../kontactinterface/kontactinterface-9999.ebuild | 12 ++---
.../korganizer/korganizer-19.12.49.9999.ebuild | 2 -
kde-apps/korganizer/korganizer-9999.ebuild | 48 +++++++++---------
.../kpimtextedit/kpimtextedit-19.12.49.9999.ebuild | 7 +--
kde-apps/kpimtextedit/kpimtextedit-9999.ebuild | 15 +++---
.../libgravatar/libgravatar-19.12.49.9999.ebuild | 4 +-
kde-apps/libgravatar/libgravatar-9999.ebuild | 12 ++---
kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild | 21 ++++----
kde-apps/libkdepim/libkdepim-9999.ebuild | 21 ++++----
kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild | 1 -
kde-apps/libkgapi/libkgapi-9999.ebuild | 11 ++--
kde-apps/libkleo/libkleo-19.12.49.9999.ebuild | 7 +--
kde-apps/libkleo/libkleo-9999.ebuild | 13 ++---
kde-apps/libksieve/libksieve-19.12.49.9999.ebuild | 31 ++++++------
kde-apps/libksieve/libksieve-9999.ebuild | 31 ++++++------
kde-apps/libktnef/libktnef-19.12.49.9999.ebuild | 4 +-
kde-apps/libktnef/libktnef-9999.ebuild | 8 ++-
.../mailcommon/mailcommon-19.12.49.9999.ebuild | 4 +-
kde-apps/mailcommon/mailcommon-9999.ebuild | 34 ++++++-------
.../mailimporter/mailimporter-19.12.49.9999.ebuild | 4 +-
kde-apps/mailimporter/mailimporter-9999.ebuild | 18 +++----
.../mbox-importer-19.12.49.9999.ebuild | 5 +-
kde-apps/mbox-importer/mbox-importer-9999.ebuild | 17 +++----
.../messagelib/messagelib-19.12.49.9999.ebuild | 5 +-
kde-apps/messagelib/messagelib-9999.ebuild | 51 +++++++++----------
.../pim-data-exporter-19.12.49.9999.ebuild | 5 +-
.../pim-data-exporter-9999.ebuild | 25 ++++------
.../pim-sieve-editor-19.12.49.9999.ebuild | 5 +-
.../pim-sieve-editor/pim-sieve-editor-9999.ebuild | 25 ++++------
kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild | 8 +--
kde-apps/pimcommon/pimcommon-9999.ebuild | 30 +++++------
102 files changed, 577 insertions(+), 816 deletions(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
index 4c75bc61f1..8e5d5b7a72 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
@@ -42,7 +42,6 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index fc4a1d73cc..560993e4b1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -42,7 +42,6 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
index 7b0f716a71..5c45ea6e37 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
@@ -42,6 +42,5 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
index 3ba6e152f0..a22efd7647 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
@@ -42,6 +42,5 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
"
diff --git
a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
index 5d0c09505d..a6a79d3712 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
@@ -18,6 +18,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/mailimporter-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -28,19 +39,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/mailimporter-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
index 622693cba5..f160f6bfeb 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
@@ -18,6 +18,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/mailimporter-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -28,19 +39,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/mailimporter-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
index 1f983dd0f9..e8398e64c2 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
@@ -36,7 +36,5 @@ DEPEND="
dev-libs/libxslt
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
- !kde-apps/kdepimlibs:4
"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
index d1fb4ed38c..23a243df5a 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
@@ -20,6 +20,12 @@ IUSE=""
RESTRICT+=" test"
DEPEND="
+ dev-libs/libxslt
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
@@ -28,15 +34,7 @@ DEPEND="
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/libxslt
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
- !kde-apps/kdepimlibs:4
"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
b/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
index 32d1e81d34..ce400f8919 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
@@ -17,11 +17,9 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
index ff38a53c86..f8ca14e4ec 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
@@ -17,11 +17,9 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
b/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
index c716da3175..6c36e95f99 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
@@ -21,7 +21,14 @@ IUSE=""
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
-COMMON_DEPEND="
+RDEPEND="
+ >=dev-libs/xapian-1.3:=[chert(+)]
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -33,18 +40,8 @@ COMMON_DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/krunner-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-libs/xapian-1.3:=[chert(+)]
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index 07a8429dae..b711688281 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
@@ -21,7 +21,14 @@ IUSE=""
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
-COMMON_DEPEND="
+RDEPEND="
+ >=dev-libs/xapian-1.3:=[chert(+)]
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -33,18 +40,8 @@ COMMON_DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/krunner-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-libs/xapian-1.3:=[chert(+)]
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
index 670615cd65..4c7e21add6 100644
--- a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
@@ -60,8 +60,6 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!<kde-apps/kapptemplate-17.11.80
- !kde-apps/kdepim-l10n
- !kde-apps/kdepimlibs
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql )
"
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild
b/kde-apps/akonadi/akonadi-9999.ebuild
index b97d105597..6f8339e324 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -47,8 +47,8 @@ COMMON_DEPEND="
net-libs/accounts-qt
)
sqlite? (
- >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
dev-db/sqlite:3
+ >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
)
xml? ( dev-libs/libxml2 )
"
@@ -59,8 +59,6 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!<kde-apps/kapptemplate-17.11.80
- !kde-apps/kdepim-l10n
- !kde-apps/kdepimlibs
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql )
"
diff --git a/kde-apps/akregator/akregator-19.12.49.9999.ebuild
b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
index 3992177061..4f4dcaf552 100644
--- a/kde-apps/akregator/akregator-19.12.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
@@ -18,7 +18,7 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -51,9 +51,6 @@ COMMON_DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/grantlee:5
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akregator/akregator-9999.ebuild
b/kde-apps/akregator/akregator-9999.ebuild
index a0ca3d64fd..ea3fe3c329 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -18,7 +18,19 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -37,22 +49,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/syndication-${KFMIN}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/grantlee:5
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
b/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
index 82ffdf8348..533670c011 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
@@ -19,17 +19,15 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/akonadi-calendar-${PVCUT}:5
>=kde-apps/calendarsupport-${PVCUT}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
"
+RDEPEND="${DEPEND}"
src_prepare() {
ecm_src_prepare
diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
index 3387588a55..8faada72b3 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
@@ -19,17 +19,15 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/akonadi-calendar-${PVCUT}:5
>=kde-apps/calendarsupport-${PVCUT}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
"
+RDEPEND="${DEPEND}"
src_prepare() {
ecm_src_prepare
diff --git a/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
index 7b744c6dd9..8bea7ebeeb 100644
--- a/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
@@ -43,6 +43,4 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
dev-libs/libical
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index d136247a43..321ec53069 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
@@ -17,6 +17,20 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ dev-libs/libical
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-calendar-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -28,21 +42,5 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/libical
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
b/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
index abdc343614..6405623014 100644
--- a/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
+++ b/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
@@ -43,6 +43,4 @@ DEPEND="
dev-libs/kdiagram:5
dev-libs/libical
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-9999.ebuild
b/kde-apps/eventviews/eventviews-9999.ebuild
index 59fb65438b..b131169e96 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-9999.ebuild
@@ -18,6 +18,17 @@ IUSE=""
# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
DEPEND="
+ dev-libs/kdiagram:5
+ dev-libs/libical
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-calendar-${PVCUT}:5
+ >=kde-apps/calendarsupport-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -31,18 +42,5 @@ DEPEND="
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/kdiagram:5
- dev-libs/libical
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
b/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
index fceabdf735..567dab0015 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
@@ -41,9 +41,4 @@ DEPEND="
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kaddressbook:4
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
index e9ed4276eb..35925d7426 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
@@ -17,6 +17,14 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -32,18 +40,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kaddressbook:4
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
b/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
index 40e00b7259..fdfad2e205 100644
--- a/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
@@ -15,7 +15,10 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/grantlee:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
@@ -24,16 +27,10 @@ COMMON_DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=dev-qt/qtnetwork-${QTMIN}:5
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
# 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 138f73269a..a4b94f5449 100644
--- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
@@ -15,7 +15,10 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/grantlee:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
@@ -24,16 +27,10 @@ COMMON_DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=dev-qt/qtnetwork-${QTMIN}:5
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
# fails if package not already installed
RESTRICT+=" test"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
b/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
index db042ad552..45a5b8182c 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
@@ -52,7 +52,4 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
dev-libs/kdiagram:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index bee1f891d0..56d6f56d48 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -18,6 +18,23 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ dev-libs/kdiagram:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-calendar-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/calendarsupport-${PVCUT}:5
+ >=kde-apps/eventviews-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -34,25 +51,5 @@ DEPEND="
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/eventviews-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
index 0912d339cb..0abd13bef6 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
@@ -55,7 +55,6 @@ DEPEND="
dev-libs/grantlee:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index 6ea1ee358c..b96485b1a1 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -20,6 +20,22 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=app-crypt/gpgme-1.11.1[cxx,qt5]
+ dev-libs/grantlee:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/libgravatar-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -37,25 +53,8 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/prison-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/libgravatar-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
- dev-libs/grantlee:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
b/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
index 0af7f6fc45..30feac8462 100644
--- a/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
@@ -72,7 +72,6 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/kalarm/kalarm-9999.ebuild
b/kde-apps/kalarm/kalarm-9999.ebuild
index 08dac83ec6..d90c30d27e 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -22,6 +22,24 @@ BDEPEND="
dev-libs/libxslt
"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kalarmcal-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kauth-${KFMIN}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -47,24 +65,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kalarmcal-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
media-libs/phonon[qt5(+)]
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -72,7 +72,6 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
b/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
index 5671a38f52..a391a8aa70 100644
--- a/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
@@ -30,7 +30,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
"
diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index fb44a9a4e5..ebfcf82f8d 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
@@ -17,20 +17,19 @@ KEYWORDS=""
IUSE=""
COMMON_DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kholidays-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
"
DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.03.80
"
diff --git a/kde-apps/kblog/kblog-19.12.49.9999.ebuild
b/kde-apps/kblog/kblog-19.12.49.9999.ebuild
index 786ef92a71..a0f35b86b0 100644
--- a/kde-apps/kblog/kblog-19.12.49.9999.ebuild
+++ b/kde-apps/kblog/kblog-19.12.49.9999.ebuild
@@ -23,6 +23,4 @@ DEPEND="
>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
>=kde-frameworks/syndication-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
index 7e4d58f1ce..cb91e7109a 100644
--- a/kde-apps/kblog/kblog-9999.ebuild
+++ b/kde-apps/kblog/kblog-9999.ebuild
@@ -23,6 +23,4 @@ DEPEND="
>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
>=kde-frameworks/syndication-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
b/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
index 17cc18da60..636e2f5b5b 100644
--- a/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
@@ -32,9 +32,7 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
dev-libs/grantlee:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_test() {
# bug 653616
diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild
b/kde-apps/kcalutils/kcalutils-9999.ebuild
index 3089562c02..3d3d86286b 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
@@ -19,6 +19,10 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ dev-libs/grantlee:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -27,14 +31,8 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
src_test() {
# bug 653616
diff --git a/kde-apps/kdav/kdav-19.12.49.9999.ebuild
b/kde-apps/kdav/kdav-19.12.49.9999.ebuild
index 8e4e799702..f518ab2dfb 100644
--- a/kde-apps/kdav/kdav-19.12.49.9999.ebuild
+++ b/kde-apps/kdav/kdav-19.12.49.9999.ebuild
@@ -24,9 +24,7 @@ DEPEND="
>=dev-qt/qtxml-${QTMIN}:5
>=dev-qt/qtxmlpatterns-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_test() {
# bug 616808 - DavItemFetchJobTest requires D-Bus
diff --git a/kde-apps/kdav/kdav-9999.ebuild b/kde-apps/kdav/kdav-9999.ebuild
index c56fcce6b6..91e351529e 100644
--- a/kde-apps/kdav/kdav-9999.ebuild
+++ b/kde-apps/kdav/kdav-9999.ebuild
@@ -18,15 +18,13 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_test() {
# bug 616808 - DavItemFetchJobTest requires D-Bus
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
b/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
index 2f3fc6572e..932d07dae9 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
IUSE="importwizard markdown"
# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
+RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5=
@@ -64,14 +64,9 @@ COMMON_DEPEND="
importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
markdown? ( app-text/discount )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=app-crypt/gpgme-1.11.1[cxx,qt5]
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kaddressbook:4
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
RESTRICT+=" test"
diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index a295d1cd2d..a1875de86a 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
@@ -19,7 +19,7 @@ KEYWORDS=""
IUSE="importwizard markdown"
# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
+RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5=
@@ -63,14 +63,9 @@ COMMON_DEPEND="
importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
markdown? ( app-text/discount )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=app-crypt/gpgme-1.11.1[cxx,qt5]
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kaddressbook:4
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
RESTRICT+=" test"
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
index 771a312343..1ba2e4a4ef 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
@@ -38,6 +38,4 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-libs/grantlee-5.1.0:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
index 68978c95ba..5589ffcb25 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
@@ -19,6 +19,15 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-libs/grantlee-5.1.0:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -28,16 +37,5 @@ DEPEND="
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/prison-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
index bc70703454..34e4ac2739 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
@@ -65,7 +65,6 @@ RDEPEND="
>=kde-apps/pim-data-exporter-${PV}:${SLOT}
>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
>=kde-apps/pimcommon-${PV}:${SLOT}
- !kde-apps/kdepim-meta:4
"
# Optional runtime dependencies: kde-apps/kmail
RDEPEND="${RDEPEND}
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index bc70703454..34e4ac2739 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -65,7 +65,6 @@ RDEPEND="
>=kde-apps/pim-data-exporter-${PV}:${SLOT}
>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
>=kde-apps/pimcommon-${PV}:${SLOT}
- !kde-apps/kdepim-meta:4
"
# Optional runtime dependencies: kde-apps/kmail
RDEPEND="${RDEPEND}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
index c74cfbcc72..c62b95a17e 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
@@ -76,7 +76,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
!kde-misc/akonadi-ews
"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 96ffabd8c8..767142619e 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -23,7 +23,32 @@ IUSE=""
BDEPEND="
dev-libs/libxslt
"
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/cyrus-sasl:2
+ dev-libs/libical:=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${QTMIN}:5
+ >=dev-qt/qtspeech-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-calendar-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/akonadi-notes-${PVCUT}:5
+ >=kde-apps/kalarmcal-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kdav-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kimap-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmbox-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkgapi-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -45,40 +70,11 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/akonadi-notes-${PVCUT}:5
- >=kde-apps/kalarmcal-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdav-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kimap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmbox-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkgapi-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtnetworkauth-${QTMIN}:5
- >=dev-qt/qtspeech-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- dev-libs/cyrus-sasl:2
- dev-libs/libical:=
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=dev-qt/qtxmlpatterns-${QTMIN}:5
test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
- !kde-misc/akonadi-ews
-"
RESTRICT+=" test"
diff --git
a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
index c19bec2cfd..b656a168c3 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
@@ -18,6 +18,11 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -27,14 +32,7 @@ DEPEND="
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
index d350cf6e53..e0965a87b3 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
@@ -32,8 +32,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
RESTRICT+=" test"
diff --git a/kde-apps/kimap/kimap-19.12.49.9999.ebuild
b/kde-apps/kimap/kimap-19.12.49.9999.ebuild
index 9a49570792..27f4eb37be 100644
--- a/kde-apps/kimap/kimap-19.12.49.9999.ebuild
+++ b/kde-apps/kimap/kimap-19.12.49.9999.ebuild
@@ -17,22 +17,19 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/cyrus-sasl
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- dev-libs/cyrus-sasl
"
# TODO: Convince upstream not to install stuff with tests
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
src_test() {
# tests cannot be run in parallel #605586
diff --git a/kde-apps/kimap/kimap-9999.ebuild b/kde-apps/kimap/kimap-9999.ebuild
index 9ebdc1c92c..d8e1467b2e 100644
--- a/kde-apps/kimap/kimap-9999.ebuild
+++ b/kde-apps/kimap/kimap-9999.ebuild
@@ -17,22 +17,19 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/cyrus-sasl
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=kde-apps/kmime-${PVCUT}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- dev-libs/cyrus-sasl
"
# TODO: Convince upstream not to install stuff with tests
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
src_test() {
# tests cannot be run in parallel #605586
diff --git a/kde-apps/kldap/kldap-19.12.49.9999.ebuild
b/kde-apps/kldap/kldap-19.12.49.9999.ebuild
index 8a331caab0..8583ab4364 100644
--- a/kde-apps/kldap/kldap-19.12.49.9999.ebuild
+++ b/kde-apps/kldap/kldap-19.12.49.9999.ebuild
@@ -18,18 +18,16 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ dev-libs/cyrus-sasl
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/cyrus-sasl
net-nds/openldap
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_prepare() {
ecm_src_prepare
diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
index 9bf122c442..af12ecfb0d 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kldap/kldap-9999.ebuild
@@ -26,9 +26,7 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
net-nds/openldap
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_prepare() {
ecm_src_prepare
diff --git a/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
b/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
index 752f07acba..76ec940ef5 100644
--- a/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
+++ b/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
@@ -47,7 +47,6 @@ DEPEND="
dev-libs/libgpg-error
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=app-crypt/gnupg-2.1
app-crypt/paperkey
"
diff --git a/kde-apps/kleopatra/kleopatra-9999.ebuild
b/kde-apps/kleopatra/kleopatra-9999.ebuild
index 8f4b5e7da0..daebca5e5b 100644
--- a/kde-apps/kleopatra/kleopatra-9999.ebuild
+++ b/kde-apps/kleopatra/kleopatra-9999.ebuild
@@ -20,6 +20,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=app-crypt/gpgme-1.11.1[cxx,qt5]
+ dev-libs/boost:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -34,20 +45,8 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
- dev-libs/boost:=
- dev-libs/libassuan
- dev-libs/libgpg-error
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=app-crypt/gnupg-2.1
app-crypt/paperkey
"
diff --git
a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
index 3b9a804548..35d8537d42 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
@@ -20,6 +20,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -38,20 +49,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
- !kde-apps/kdepim-runtime:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
index b5535cef11..2d86732827 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
@@ -20,6 +20,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -38,20 +49,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
- !kde-apps/kdepim-runtime:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail/kmail-19.12.49.9999.ebuild
b/kde-apps/kmail/kmail-19.12.49.9999.ebuild
index cee9d7fd2f..3e44c17936 100644
--- a/kde-apps/kmail/kmail-19.12.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-19.12.49.9999.ebuild
@@ -84,8 +84,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
>=kde-apps/kmail-account-wizard-${PVCUT}:5
"
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 09cdec7c5f..c6047c25f1 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -26,6 +26,31 @@ BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
COMMON_DEPEND="
+ >=app-crypt/gpgme-1.11.1[cxx,qt5]
+ >=dev-qt/qtcore-${QTMIN}:5=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libgravatar-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/libksieve-${PVCUT}:5
+ >=kde-apps/libktnef-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -52,31 +77,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libgravatar-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/libksieve-${PVCUT}:5
- >=kde-apps/libktnef-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtcore-${QTMIN}:5=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
"
DEPEND="${COMMON_DEPEND}
>=kde-apps/kcalutils-${PVCUT}:5
@@ -84,8 +84,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
>=kde-apps/kmail-account-wizard-${PVCUT}:5
"
diff --git a/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
b/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
index 645dc04221..a566162361 100644
--- a/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
@@ -16,7 +16,7 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -36,12 +36,8 @@ COMMON_DEPEND="
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kdepimlibs:4
-"
RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
index 016335b657..cd06982eaf 100644
--- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
@@ -16,7 +16,16 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/ksmtp-${PVCUT}:5
+ >=kde-apps/libkgapi-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -26,22 +35,9 @@ COMMON_DEPEND="
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/ksmtp-${PVCUT}:5
- >=kde-apps/libkgapi-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kdepimlibs:4
-"
RESTRICT+=" test"
diff --git a/kde-apps/kmime/kmime-19.12.49.9999.ebuild
b/kde-apps/kmime/kmime-19.12.49.9999.ebuild
index 52b0dbad10..51adc6bc32 100644
--- a/kde-apps/kmime/kmime-19.12.49.9999.ebuild
+++ b/kde-apps/kmime/kmime-19.12.49.9999.ebuild
@@ -18,6 +18,4 @@ DEPEND="
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/kmime-9999.ebuild b/kde-apps/kmime/kmime-9999.ebuild
index a8fd0f0408..b10e83502f 100644
--- a/kde-apps/kmime/kmime-9999.ebuild
+++ b/kde-apps/kmime/kmime-9999.ebuild
@@ -18,6 +18,4 @@ DEPEND="
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knotes/knotes-19.12.49.9999.ebuild
b/kde-apps/knotes/knotes-19.12.49.9999.ebuild
index c610890356..f5838fc84a 100644
--- a/kde-apps/knotes/knotes-19.12.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-19.12.49.9999.ebuild
@@ -62,7 +62,6 @@ DEPEND="
x11-libs/libX11
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/knotes/knotes-9999.ebuild
b/kde-apps/knotes/knotes-9999.ebuild
index fd9f47e4c6..980e6fc8ff 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -21,6 +21,23 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ dev-libs/grantlee:5
+ dev-libs/libxslt
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-notes-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -42,27 +59,9 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-notes-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- dev-libs/grantlee:5
- dev-libs/libxslt
x11-libs/libX11
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
b/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
index 018247f262..c6ddbd4db1 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
@@ -27,9 +27,7 @@ DEPEND="
>=kde-apps/calendarsupport-${PVCUT}:5
>=kde-apps/kcalutils-${PVCUT}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_prepare() {
ecm_src_prepare
diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
index ba8fcd2c72..bc5d80c110 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
@@ -18,18 +18,16 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/akonadi-calendar-${PVCUT}:5
>=kde-apps/calendarsupport-${PVCUT}:5
>=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_prepare() {
ecm_src_prepare
diff --git a/kde-apps/kontact/kontact-19.12.49.9999.ebuild
b/kde-apps/kontact/kontact-19.12.49.9999.ebuild
index 3385204f14..d3bfd726c2 100644
--- a/kde-apps/kontact/kontact-19.12.49.9999.ebuild
+++ b/kde-apps/kontact/kontact-19.12.49.9999.ebuild
@@ -45,6 +45,4 @@ DEPEND="
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontact/kontact-9999.ebuild
b/kde-apps/kontact/kontact-9999.ebuild
index 692d30149a..51fcda7608 100644
--- a/kde-apps/kontact/kontact-9999.ebuild
+++ b/kde-apps/kontact/kontact-9999.ebuild
@@ -18,6 +18,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -33,18 +44,5 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
b/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
index 58fa1f3e7d..4fbf55402d 100644
--- a/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
@@ -26,6 +26,4 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
index 087557ba08..27247eccf1 100644
--- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
@@ -16,16 +16,14 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kparts-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
b/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
index 11ab95e231..767022bcb0 100644
--- a/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
@@ -80,8 +80,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild
b/kde-apps/korganizer/korganizer-9999.ebuild
index 41215c26bc..83553ab6b4 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -23,6 +23,28 @@ BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtmultimedia-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-calendar-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/akonadi-notes-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/calendarsupport-${PVCUT}:5
+ >=kde-apps/eventviews-${PVCUT}:5
+ >=kde-apps/incidenceeditor-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -47,41 +69,17 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/akonadi-notes-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/eventviews-${PVCUT}:5
- >=kde-apps/incidenceeditor-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtmultimedia-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
)
"
DEPEND="${COMMON_DEPEND}
- >=kde-apps/kldap-${PVCUT}:5
>=dev-qt/designer-${QTMIN}:5
+ >=kde-apps/kldap-${PVCUT}:5
test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
b/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
index 79f3245dbb..5126b52cc6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -35,11 +35,8 @@ COMMON_DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index 731c487478..c269f6688d 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -17,7 +17,11 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/grantlee:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtspeech-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -30,16 +34,9 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtspeech-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/grantlee:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
RESTRICT+=" test"
diff --git a/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
b/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
index d4a505bc3a..7eb06a745c 100644
--- a/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
@@ -28,9 +28,7 @@ DEPEND="
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
src_test() {
# bug 624584 - needs internet connection
diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild
b/kde-apps/libgravatar/libgravatar-9999.ebuild
index 01b060f51c..e96355dc0f 100644
--- a/kde-apps/libgravatar/libgravatar-9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-9999.ebuild
@@ -18,19 +18,17 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
src_test() {
# bug 624584 - needs internet connection
diff --git a/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
b/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
index 12b07ba1a7..331e5a83dc 100644
--- a/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
@@ -19,6 +19,14 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -32,16 +40,5 @@ DEPEND="
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild
b/kde-apps/libkdepim/libkdepim-9999.ebuild
index 6bd8a843b8..4b3ec7b83b 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
@@ -19,6 +19,14 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -32,16 +40,5 @@ DEPEND="
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
b/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
index e1a44d34bb..6bc43aaa27 100644
--- a/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
+++ b/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
@@ -33,6 +33,5 @@ DEPEND="
dev-libs/cyrus-sasl:2
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.07.80:5
"
diff --git a/kde-apps/libkgapi/libkgapi-9999.ebuild
b/kde-apps/libkgapi/libkgapi-9999.ebuild
index 80f5204e12..6d5eabc1b9 100644
--- a/kde-apps/libkgapi/libkgapi-9999.ebuild
+++ b/kde-apps/libkgapi/libkgapi-9999.ebuild
@@ -21,18 +21,17 @@ BDEPEND="
nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
"
DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ dev-libs/cyrus-sasl:2
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
- dev-libs/cyrus-sasl:2
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
"
RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
!<kde-apps/kdepim-runtime-18.07.80:5
"
diff --git a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
index b1fbe18095..7f66a9d53d 100644
--- a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
+++ b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
@@ -16,7 +16,7 @@ SLOT="5"
KEYWORDS=""
IUSE="+fancyviewer"
-COMMON_DEPEND="
+RDEPEND="
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -30,12 +30,9 @@ COMMON_DEPEND="
>=app-crypt/gpgme-1.11.1[cxx,qt5]
fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/libkleo/libkleo-9999.ebuild
b/kde-apps/libkleo/libkleo-9999.ebuild
index fe16bbbf4a..cba3badae9 100644
--- a/kde-apps/libkleo/libkleo-9999.ebuild
+++ b/kde-apps/libkleo/libkleo-9999.ebuild
@@ -16,7 +16,10 @@ SLOT="5"
KEYWORDS=""
IUSE="+fancyviewer"
-COMMON_DEPEND="
+RDEPEND="
+ >=app-crypt/gpgme-1.11.1[cxx,qt5]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -25,17 +28,11 @@ COMMON_DEPEND="
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
b/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
index 0223241c1a..27bb469b5b 100644
--- a/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
+++ b/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
@@ -19,7 +19,19 @@ KEYWORDS=""
IUSE=""
# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/cyrus-sasl
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5=
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -31,26 +43,11 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5=
- dev-libs/cyrus-sasl
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=kde-apps/kimap-${PVCUT}:5
>=kde-apps/kmailtransport-${PVCUT}:5
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
RESTRICT+=" test"
diff --git a/kde-apps/libksieve/libksieve-9999.ebuild
b/kde-apps/libksieve/libksieve-9999.ebuild
index 0fe3e1cc82..cdd6291abf 100644
--- a/kde-apps/libksieve/libksieve-9999.ebuild
+++ b/kde-apps/libksieve/libksieve-9999.ebuild
@@ -19,7 +19,19 @@ KEYWORDS=""
IUSE=""
# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
+RDEPEND="
+ dev-libs/cyrus-sasl
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5=
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -31,26 +43,11 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5=
- dev-libs/cyrus-sasl
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
>=kde-apps/kimap-${PVCUT}:5
>=kde-apps/kmailtransport-${PVCUT}:5
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
RESTRICT+=" test"
diff --git a/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
b/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
index 2f9be069e6..dcbbf8510d 100644
--- a/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
+++ b/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
@@ -24,6 +24,4 @@ DEPEND="
>=kde-apps/kcalutils-${PVCUT}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-9999.ebuild
b/kde-apps/libktnef/libktnef-9999.ebuild
index 705f9da605..f7eb9b03a3 100644
--- a/kde-apps/libktnef/libktnef-9999.ebuild
+++ b/kde-apps/libktnef/libktnef-9999.ebuild
@@ -18,12 +18,10 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcontacts-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
b/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
index 0c5b2c549d..d9b0bdc9bf 100644
--- a/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
@@ -57,8 +57,6 @@ DEPEND="
>=dev-qt/qtxml-${QTMIN}:5
>=media-libs/phonon-4.10.90
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild
b/kde-apps/mailcommon/mailcommon-9999.ebuild
index f88e9bd990..a787a12e60 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -23,6 +23,21 @@ BDEPEND="
dev-libs/libxslt
"
DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtmultimedia-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5=
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/mailimporter-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -40,25 +55,8 @@ DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailimporter-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtmultimedia-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5=
- >=dev-qt/qtxml-${QTMIN}:5
>=media-libs/phonon-4.10.90
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
b/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
index 63b79a31b4..0c29d5f1b3 100644
--- a/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
@@ -30,6 +30,4 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild
b/kde-apps/mailimporter/mailimporter-9999.ebuild
index 78fdcff01a..547d204963 100644
--- a/kde-apps/mailimporter/mailimporter-9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-9999.ebuild
@@ -18,18 +18,16 @@ KEYWORDS=""
IUSE=""
DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-apps/akonadi-${PVCUT}:5
>=kde-apps/akonadi-mime-${PVCUT}:5
>=kde-apps/kmime-${PVCUT}:5
>=kde-apps/libkdepim-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
b/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
index 54b9fa07b9..e42e0b192d 100644
--- a/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
@@ -31,7 +31,4 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-9999.ebuild
b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
index 4ab2c82320..17a6d9d5ad 100644
--- a/kde-apps/mbox-importer/mbox-importer-9999.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
@@ -17,6 +17,12 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/mailimporter-${PVCUT}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
@@ -24,14 +30,5 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/mailimporter-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
b/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
index 145786227b..87ae05a156 100644
--- a/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
+++ b/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
@@ -65,10 +65,7 @@ DEPEND="
app-crypt/qca:2
>=dev-libs/grantlee-5.1.0:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
# bug 579630
RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-9999.ebuild
b/kde-apps/messagelib/messagelib-9999.ebuild
index 141ef9924d..24425d5dc8 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -18,6 +18,29 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+ app-crypt/qca:2
+ >=dev-libs/grantlee-5.1.0:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/grantleetheme-${PVCUT}:5
+ >=kde-apps/incidenceeditor-${PVCUT}:5
+ >=kde-apps/kdepim-apps-libs-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmbox-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libgravatar-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -41,34 +64,8 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
>=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/incidenceeditor-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmbox-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libgravatar-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
- app-crypt/qca:2
- >=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
# bug 579630
RESTRICT+=" test"
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
index e53e8250aa..758f285494 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
@@ -44,7 +44,4 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
index 8588729761..38b288fd08 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
@@ -20,6 +20,16 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -33,18 +43,5 @@ DEPEND="
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
index 487d912b90..fa78aa407b 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
@@ -43,7 +43,4 @@ DEPEND="
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
index 71083b934d..61477d9daa 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
@@ -19,6 +19,16 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/calendarsupport-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/libksieve-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcalendarcore-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -32,18 +42,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libksieve-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
b/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
index 0a6d5e2375..4ea604eecc 100644
--- a/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
@@ -21,7 +21,7 @@ IUSE=""
BDEPEND="
dev-libs/libxslt
"
-COMMON_DEPEND="
+RDEPEND="
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -51,13 +51,9 @@ COMMON_DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=kde-apps/kmime-${PVCUT}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
-"
src_test() {
# bugs 641730, 661330
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild
b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 8cc3847bad..4778255c6a 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -21,7 +21,18 @@ IUSE=""
BDEPEND="
dev-libs/libxslt
"
-COMMON_DEPEND="
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/kimap-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -39,25 +50,10 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/purpose-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/kimap-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
test? ( >=kde-apps/kmime-${PVCUT}:5 )
"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
-"
src_test() {
# bugs 641730, 661330
