commit: b0a1e144cc77d30dbb2bbae82fe8a90d46736b69
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 6 20:43:25 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 12:13:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0a1e144
kde-apps/kdepim-apps-lib: Several kdepim libs merged into new package
Package-Manager: portage-2.2.20.1
.../calendarsupport/calendarsupport-9999.ebuild | 2 +-
kde-apps/composereditor/composereditor-9999.ebuild | 46 ----------------------
.../incidenceeditor/incidenceeditor-9999.ebuild | 2 +-
.../kdepim-apps-lib-9999.ebuild} | 22 ++++++++++-
kde-apps/kdepim-apps-lib/metadata.xml | 8 ++++
kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 6 +--
kde-apps/kdepim/kdepim-9999.ebuild | 12 +-----
.../libfollowupreminder-9999.ebuild | 33 ----------------
.../libkdepimdbusinterfaces-9999.ebuild | 35 ----------------
kde-apps/libsendlater/libsendlater-9999.ebuild | 34 ----------------
.../messagecomposer/messagecomposer-9999.ebuild | 3 +-
kde-apps/messageviewer/messageviewer-9999.ebuild | 2 +-
12 files changed, 36 insertions(+), 169 deletions(-)
diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index 0601ff1..c7fff46 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 24cc5c0..0000000
--- 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 4989c63..4286840 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
similarity index 61%
rename from kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-9999.ebuild
rename to kde-apps/kdepim-apps-lib/kdepim-apps-lib-9999.ebuild
index 132b4e1..e229f14 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 0000000..d19719a
--- /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 c5a3250..548d6ac 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 b0adc90..7210cb8 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 4f73d22..0000000
--- 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 a4dff67..0000000
--- 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 46ef8c4..0000000
--- 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 b91995d..6a2dc0a 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 123d6f2..9ffb663 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)
