commit: e78d686176e0dd1b8e95e5bf1b436defbbeae53b
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 6 23:27:21 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=e78d6861
kde-apps/messagelib: Several kdepim libs merged into new package
Package-Manager: portage-2.2.20.1
kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 6 +--
kde-apps/kdepim/kdepim-9999.ebuild | 12 +-----
kde-apps/mailcommon/mailcommon-9999.ebuild | 5 +--
.../messagecomposer/messagecomposer-9999.ebuild | 47 ---------------------
kde-apps/messagecore/messagecore-9999.ebuild | 41 ------------------
.../messagelib-9999.ebuild} | 30 ++++++++++++-
kde-apps/messagelib/metadata.xml | 5 +++
kde-apps/messagelist/messagelist-9999.ebuild | 46 --------------------
kde-apps/templateparser/templateparser-9999.ebuild | 49 ----------------------
9 files changed, 37 insertions(+), 204 deletions(-)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 548d6ac..19d95f7 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -53,13 +53,9 @@ RDEPEND="
$(add_kdeapps_dep libksieve)
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
- $(add_kdeapps_dep messagecomposer)
- $(add_kdeapps_dep messagecore)
- $(add_kdeapps_dep messagelist)
- $(add_kdeapps_dep messageviewer)
+ $(add_kdeapps_dep messagelib)
$(add_kdeapps_dep pimcommon)
$(add_kdeapps_dep syndication)
- $(add_kdeapps_dep templateparser)
nls? (
$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})
)
diff --git a/kde-apps/kdepim/kdepim-9999.ebuild
b/kde-apps/kdepim/kdepim-9999.ebuild
index 7210cb8..440f5f0 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -85,13 +85,9 @@ COMMON_DEPEND="
$(add_kdeapps_dep libksieve)
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
- $(add_kdeapps_dep messagecomposer)
- $(add_kdeapps_dep messagecore)
- $(add_kdeapps_dep messagelist)
- $(add_kdeapps_dep messageviewer)
+ $(add_kdeapps_dep messagelib)
$(add_kdeapps_dep pimcommon)
$(add_kdeapps_dep syndication)
- $(add_kdeapps_dep templateparser)
>=app-crypt/gpgme-1.3.2
dev-libs/boost:=
dev-libs/grantlee:5
@@ -169,12 +165,8 @@ src_prepare() {
libksieve \
mailcommon \
mailimporter \
- messagecomposer \
- messagecore \
- messagelist \
- messageviewer \
+ messagelib \
pimcommon \
- templateparser \
|| die "Failed to remove split libraries"
use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild
b/kde-apps/mailcommon/mailcommon-9999.ebuild
index 2bc0662..d90a83a 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
@@ -31,11 +31,8 @@ COMMON_DEPEND="
$(add_kdeapps_dep libakonadi)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep mailimporter)
- $(add_kdeapps_dep messagecomposer)
- $(add_kdeapps_dep messagecore)
- $(add_kdeapps_dep messageviewer)
+ $(add_kdeapps_dep messagelib)
$(add_kdeapps_dep pimcommon)
- $(add_kdeapps_dep templateparser)
dev-libs/libxslt
dev-qt/designer:5
dev-qt/qtgui:5
diff --git a/kde-apps/messagecomposer/messagecomposer-9999.ebuild
b/kde-apps/messagecomposer/messagecomposer-9999.ebuild
deleted file mode 100644
index 6a2dc0a..0000000
--- a/kde-apps/messagecomposer/messagecomposer-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Message composer for KMail"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-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 libkdepim)
- $(add_kdeapps_dep libkleo)
- $(add_kdeapps_dep messagecore)
- $(add_kdeapps_dep messageviewer)
- $(add_kdeapps_dep pimcommon)
- $(add_kdeapps_dep templateparser)
- dev-libs/grantlee:5
- dev-qt/designer:5
- dev-qt/qtgui: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}/${PN}"
diff --git a/kde-apps/messagecore/messagecore-9999.ebuild
b/kde-apps/messagecore/messagecore-9999.ebuild
deleted file mode 100644
index 0324581..0000000
--- a/kde-apps/messagecore/messagecore-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Library for core messaging functions"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep ki18n)
- $(add_kdeapps_dep akonadi-mime)
- $(add_kdeapps_dep kmime)
- $(add_kdeapps_dep kpimtextedit)
- $(add_kdeapps_dep libakonadi)
- $(add_kdeapps_dep libkleo)
- dev-qt/designer:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork: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/messageviewer/messageviewer-9999.ebuild
b/kde-apps/messagelib/messagelib-9999.ebuild
similarity index 69%
rename from kde-apps/messageviewer/messageviewer-9999.ebuild
rename to kde-apps/messagelib/messagelib-9999.ebuild
index 9ffb663..6bd802c 100644
--- a/kde-apps/messageviewer/messageviewer-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-9999.ebuild
@@ -8,22 +8,25 @@ KDE_TEST="true"
KMNAME="kdepim"
inherit kde5
-DESCRIPTION="Libary and plugins for viewing various message types and styles"
+DESCRIPTION="Libraries for messaging functions"
LICENSE="LGPL-2+"
KEYWORDS=""
IUSE=""
COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
$(add_frameworks_dep kcodecs)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdewebkit)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
@@ -32,6 +35,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
$(add_kdeapps_dep akonadi-contact)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
@@ -41,6 +45,8 @@ COMMON_DEPEND="
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim-apps-lib)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kldap)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmbox)
$(add_kdeapps_dep kmime)
@@ -49,7 +55,6 @@ COMMON_DEPEND="
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep libkleo)
- $(add_kdeapps_dep messagecore)
$(add_kdeapps_dep pimcommon)
dev-libs/grantlee:5
dev-qt/designer:5
@@ -64,7 +69,28 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!<kde-apps/kdepim-15.08.50:5
+ !kde-apps/messagecomposer:5
+ !kde-apps/messagecore:5
+ !kde-apps/messagelist:5
+ !kde-apps/messageviewer:5
+ !kde-apps/templateparser:5
!kde-base/kdepim-common-libs:4
+ !kde-base/kmail:4
"
S="${WORKDIR}/${P}/${PN}"
+
+src_prepare() {
+ kde5_src_prepare
+
+ if ! use test ; then
+ sed -i \
+ -e '/add_subdirectory(autotests)/ s/^/#DONT/' \
+ -e '/add_subdirectory(tests)/ s/^/#DONT/' \
+ messagecomposer/CMakeLists.txt \
+ messagecore/CMakeLists.txt \
+ messagelist/CMakeLists.txt \
+ messageviewer/CMakeLists.txt \
+ templateparser/CMakeLists.txt || die
+ fi
+}
diff --git a/kde-apps/messagelib/metadata.xml b/kde-apps/messagelib/metadata.xml
new file mode 100644
index 0000000..a23f444
--- /dev/null
+++ b/kde-apps/messagelib/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-apps/messagelist/messagelist-9999.ebuild
b/kde-apps/messagelist/messagelist-9999.ebuild
deleted file mode 100644
index d3dbdf9..0000000
--- a/kde-apps/messagelist/messagelist-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
-
-KDE_TEST="true"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="Message list view for KMail"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep akonadi-mime)
- $(add_kdeapps_dep akonadi-search)
- $(add_kdeapps_dep kmime)
- $(add_kdeapps_dep libakonadi)
- $(add_kdeapps_dep messagecore)
- $(add_kdeapps_dep pimcommon)
- dev-qt/designer: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
- !kde-base/kmail:4
-"
-
-S="${WORKDIR}/${P}/${PN}"
diff --git a/kde-apps/templateparser/templateparser-9999.ebuild
b/kde-apps/templateparser/templateparser-9999.ebuild
deleted file mode 100644
index 4d2516d..0000000
--- a/kde-apps/templateparser/templateparser-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-KMNAME="kdepim"
-inherit kde5
-
-DESCRIPTION="KDE PIM template parser"
-LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_kdeapps_dep akonadi-mime)
- $(add_kdeapps_dep kidentitymanagement)
- $(add_kdeapps_dep kmime)
- $(add_kdeapps_dep kpimtextedit)
- $(add_kdeapps_dep libakonadi)
- $(add_kdeapps_dep libkleo)
- $(add_kdeapps_dep messagecore)
- $(add_kdeapps_dep messageviewer)
- $(add_kdeapps_dep pimcommon)
- dev-qt/designer:5
- dev-qt/qtgui: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}/${PN}"
