kde-apps/kdepim-apps-lib: Several kdepim libs merged into new package

Package-Manager: portage-2.2.20.1

12 files changed, 36 insertions, 169 deletions

diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index 0601ff15f9f..c7fff460162 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
@@ -31,12 +31,12 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kdepim-apps-lib)
 	$(add_kdeapps_dep kholidays)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkdepimdbusinterfaces)
 	$(add_kdeapps_dep pimcommon)
 	dev-libs/libical
 	dev-qt/designer:5
diff --git a/kde-apps/composereditor/composereditor-9999.ebuild b/kde-apps/composereditor/composereditor-9999.ebuild
deleted file mode 100644
index 24cc5c071c0..00000000000
--- a/kde-apps/composereditor/composereditor-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN}-ng"
-KDE_TEST="false"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Composer editor for KDE PIM"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep pimcommon)
-	dev-qt/designer:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-base/kdepim-common-libs:4
-"
-
-S="${WORKDIR}/${P}/${MY_PN}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index 4989c635199..42868402fbc 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-lib)
 	$(add_kdeapps_dep kdgantt2)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
@@ -45,7 +46,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkdepimdbusinterfaces)
 	dev-qt/designer:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-9999.ebuild b/kde-apps/kdepim-apps-lib/kdepim-apps-lib-9999.ebuild
index 132b4e1084c..e229f14535e 100644
--- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-9999.ebuild
+++ b/kde-apps/kdepim-apps-lib/kdepim-apps-lib-9999.ebuild
@@ -8,27 +8,41 @@ KDE_TEST="false"
 KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="Grantlee templating for kaddressbook"
+DESCRIPTION="Libraries for KDE PIM applications"
 LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="prison"
 
 COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdewebkit)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
 	$(add_kdeapps_dep akonadi-contact)
+	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
 	dev-libs/grantlee:5
 	dev-qt/designer:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	prison? ( media-libs/prison:5 )
 "
@@ -37,7 +51,13 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.08.50:5
+	!kde-apps/composereditor:5
+	!kde-apps/kaddressbookgrantlee:5
+	!kde-apps/libfollowupreminder:5
+	!kde-apps/libkdepimdbusinterfaces:5
+	!kde-apps/libsendlater:5
 	!kde-base/kdepim-common-libs:4
+	!kde-base/kmail:4
 "
 
 S="${WORKDIR}/${P}/${PN}"
diff --git a/kde-apps/kdepim-apps-lib/metadata.xml b/kde-apps/kdepim-apps-lib/metadata.xml
new file mode 100644
index 00000000000..d19719a52ce
--- /dev/null
+++ b/kde-apps/kdepim-apps-lib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="prison">Enable support for QRcodes in contacts</flag>
+	</use>
+</pkgmetadata>
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index c5a3250dca0..548d6ac2717 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -22,18 +22,17 @@ RDEPEND="
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep akonadi-socialutils)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep composereditor)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbookgrantlee)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim)
+	$(add_kdeapps_dep kdepim-apps-lib)
 	$(add_kdeapps_dep kdepim-kioslaves)
 	$(add_kdeapps_dep kdepim-runtime)
 	$(add_kdeapps_dep kdgantt2)
@@ -48,13 +47,10 @@ RDEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep ktnef)
 	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep libfollowupreminder)
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkdepimdbusinterfaces)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libsendlater)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
 	$(add_kdeapps_dep messagecomposer)
diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index b0adc909315..7210cb80747 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -57,16 +57,15 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep akonadi-socialutils)
 	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep composereditor)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbookgrantlee)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-lib)
 	$(add_kdeapps_dep kdepim-kioslaves)
 	$(add_kdeapps_dep kdgantt2)
 	$(add_kdeapps_dep kholidays)
@@ -80,13 +79,10 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep ktnef)
 	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep libfollowupreminder)
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkdepimdbusinterfaces)
 	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libsendlater)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
 	$(add_kdeapps_dep messagecomposer)
@@ -162,19 +158,15 @@ src_prepare() {
 	kde5_src_prepare
 
 	rm -r calendarsupport		\
-		composereditor-ng	\
 		eventviews		\
 		grantleetheme		\
 		incidenceeditor-ng	\
-		kaddressbookgrantlee	\
+		kdepim-apps-lib		\
 		kdgantt2		\
-		libfollowupreminder	\
 		libgravatar		\
 		libkdepim		\
-		libkdepimdbusinterfaces	\
 		libkleo			\
 		libksieve		\
-		libsendlater		\
 		mailcommon		\
 		mailimporter		\
 		messagecomposer		\
diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-9999.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-9999.ebuild
deleted file mode 100644
index 4f73d22b796..00000000000
--- a/kde-apps/libfollowupreminder/libfollowupreminder-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Library for followup reminders"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_kdeapps_dep libakonadi)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-base/kmail:4
-"
-
-S="${WORKDIR}/${P}/${PN}"
diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-9999.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-9999.ebuild
deleted file mode 100644
index a4dff6706b5..00000000000
--- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="KDE PIM DBus library"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_kdeapps_dep akonadi-contact)
-	$(add_kdeapps_dep libakonadi)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-base/kdepim-common-libs:4
-"
-
-S="${WORKDIR}/${P}/${PN}"
diff --git a/kde-apps/libsendlater/libsendlater-9999.ebuild b/kde-apps/libsendlater/libsendlater-9999.ebuild
deleted file mode 100644
index 46ef8c45866..00000000000
--- a/kde-apps/libsendlater/libsendlater-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="false"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Library for sending mails later"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep libakonadi)
-	dev-qt/designer:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-15.08.50:5
-	!kde-base/kdepim-common-libs:4
-"
-
-S="${WORKDIR}/${P}/${PN}"
diff --git a/kde-apps/messagecomposer/messagecomposer-9999.ebuild b/kde-apps/messagecomposer/messagecomposer-9999.ebuild
index b91995d2ece..6a2dc0a4fb8 100644
--- a/kde-apps/messagecomposer/messagecomposer-9999.ebuild
+++ b/kde-apps/messagecomposer/messagecomposer-9999.ebuild
@@ -17,16 +17,15 @@ COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep ki18n)
 	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kdepim-apps-lib)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libakonadi)
-	$(add_kdeapps_dep libfollowupreminder)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libsendlater)
 	$(add_kdeapps_dep messagecore)
 	$(add_kdeapps_dep messageviewer)
 	$(add_kdeapps_dep pimcommon)
diff --git a/kde-apps/messageviewer/messageviewer-9999.ebuild b/kde-apps/messageviewer/messageviewer-9999.ebuild
index 123d6f22a25..9ffb6639354 100644
--- a/kde-apps/messageviewer/messageviewer-9999.ebuild
+++ b/kde-apps/messageviewer/messageviewer-9999.ebuild
@@ -38,9 +38,9 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbookgrantlee)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-lib)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)