commit: 96d8f03c3ff1bb8c859a90b415ddf5bb76c5a8f9
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 7 18:17:33 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 13:07:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=96d8f03c
kde-apps: DEPEND on split kdepimlibs, fix DEPENDs
Package-Manager: portage-2.2.22
.../akonadi-calendar/akonadi-calendar-9999.ebuild | 4 +++-
kde-apps/akonadi-search/akonadi-search-9999.ebuild | 4 +++-
kde-apps/kalarmcal/kalarmcal-9999.ebuild | 2 +-
kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 7 +++++-
kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 28 ++++++++++++----------
kde-apps/kdepim/kdepim-9999.ebuild | 7 +++++-
kde-apps/kmailtransport/kmailtransport-9999.ebuild | 9 ++++++-
7 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index eb59b25..10427cf 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
@@ -27,13 +27,15 @@ RDEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep akonadi-contact)
+ $(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kdepimlibs)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep libakonadi)
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index 4d7c717..bcc8c8c 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
@@ -20,11 +20,13 @@ RDEPEND="
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kdepimlibs)
+ $(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep libakonadi)
=dev-libs/xapian-1.2*[chert]
dev-qt/qtdbus:5
dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
"
DEPEND="${RDEPEND}
dev-libs/boost
diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index c673136..5c97698 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
@@ -14,9 +14,9 @@ RDEPEND="
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kdepimlibs)
$(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep libakonadi)
dev-qt/qtgui:5
"
DEPEND="${RDEPEND}
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index fec7002..089da75 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -16,7 +16,11 @@ IUSE="cvs nls"
RDEPEND="
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep akonadi-contact)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep akonadi-socialutils)
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep kalarmcal)
$(add_kdeapps_dep kblog)
@@ -24,8 +28,8 @@ RDEPEND="
$(add_kdeapps_dep kcalutils)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim)
+ $(add_kdeapps_dep kdepim-kioslaves)
$(add_kdeapps_dep kdepim-runtime)
- $(add_kdeapps_dep kdepimlibs)
$(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kimap)
@@ -36,6 +40,7 @@ RDEPEND="
$(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep kpimtextedit)
$(add_kdeapps_dep ktnef)
+ $(add_kdeapps_dep libakonadi)
$(add_kdeapps_dep syndication)
nls? (
$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 7bf0f34..b01275a 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -13,18 +13,6 @@ IUSE="google"
# TODO kolab, Qt5TextToSpeech
CDEPEND="
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep akonadi-calendar)
- $(add_kdeapps_dep kalarmcal)
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcalutils)
- $(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kdepimlibs)
- $(add_kdeapps_dep kidentitymanagement)
- $(add_kdeapps_dep kimap)
- $(add_kdeapps_dep kmailtransport)
- $(add_kdeapps_dep kmbox)
- $(add_kdeapps_dep kmime)
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kcodecs)
$(add_frameworks_dep kcompletion)
@@ -46,6 +34,22 @@ CDEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep akonadi-contact)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep akonadi-notes)
+ $(add_kdeapps_dep akonadi-socialutils)
+ $(add_kdeapps_dep kalarmcal)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kimap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep libakonadi)
dev-libs/libical:=
dev-qt/qtdbus:5
dev-qt/qtgui:5
diff --git a/kde-apps/kdepim/kdepim-9999.ebuild
b/kde-apps/kdepim/kdepim-9999.ebuild
index d5f20c1..29e1098 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -50,13 +50,17 @@ DEPEND="
$(add_frameworks_dep sonnet)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep akonadi-contact)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep akonadi-socialutils)
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep kalarmcal)
$(add_kdeapps_dep kblog)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kdepimlibs)
+ $(add_kdeapps_dep kdepim-kioslaves)
$(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
$(add_kdeapps_dep kimap)
@@ -67,6 +71,7 @@ DEPEND="
$(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep kpimtextedit)
$(add_kdeapps_dep ktnef)
+ $(add_kdeapps_dep libakonadi)
$(add_kdeapps_dep syndication)
>=app-crypt/gpgme-1.3.2
dev-libs/boost:=
diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
index 616c094..07ae2cc 100644
--- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
@@ -17,10 +17,17 @@ DEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
$(add_frameworks_dep kwallet)
- $(add_kdeapps_dep kdepimlibs)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep libakonadi)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
"
RDEPEND="${DEPEND}"
