Version bump KDE PIM 4.14.10

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xFDF4F788)

4 files changed, 191 insertions, 2 deletions

diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index 9b589f21845c..7f5a8ecad2dd 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.187 2015/06/13 08:34:13 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.188 2015/07/11 11:49:26 johu Exp $
+
+*kdepim-common-libs-4.14.10 (11 Jul 2015)
+
+  11 Jul 2015; Johannes Huber <johu@gentoo.org>
+  +kdepim-common-libs-4.14.10.ebuild,
+  +files/kdepim-common-libs-install-headers.patch:
+  Version bump KDE PIM 4.14.10
 
   13 Jun 2015; Mikle Kolyada <zlogene@gentoo.org>
   kdepim-common-libs-4.14.8.ebuild:
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch
new file mode 100644
index 000000000000..f0037beac4cd
--- /dev/null
+++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch
@@ -0,0 +1,86 @@
+Install headers needed by Kopete's cryptography plugin.
+
+Patch borrowed from Fedora.
+
+diff --git a/libkleo/CMakeLists.txt b/libkleo/CMakeLists.txt
+index 84e660f..bfb92f8 100644
+--- a/libkleo/CMakeLists.txt
++++ b/libkleo/CMakeLists.txt
+@@ -124,3 +124,61 @@ install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} R
+ else ()
+ install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
+ endif ()
++
++install( FILES
++    kleo/kleo_export.h
++    kleo/enum.h
++    kleo/oidmap.h
++    kleo/cryptobackend.h
++    kleo/cryptobackendfactory.h
++    kleo/cryptoconfig.h
++    kleo/dn.h
++    kleo/job.h
++    kleo/keylistjob.h
++    kleo/keygenerationjob.h
++    kleo/abstractimportjob.h
++    kleo/importjob.h
++    kleo/importfromkeyserverjob.h
++    kleo/exportjob.h
++    kleo/changeexpiryjob.h
++    kleo/changeownertrustjob.h
++    kleo/downloadjob.h
++    kleo/deletejob.h
++    kleo/encryptjob.h
++    kleo/decryptjob.h
++    kleo/signjob.h
++    kleo/specialjob.h
++    kleo/verifydetachedjob.h
++    kleo/verifyopaquejob.h
++    kleo/decryptverifyjob.h
++    kleo/signencryptjob.h
++    kleo/signkeyjob.h
++    kleo/adduseridjob.h
++    kleo/refreshkeysjob.h
++    kleo/multideletejob.h
++    kleo/hierarchicalkeylistjob.h
++    kleo/keyfilter.h
++    kleo/keyfiltermanager.h
++    kleo/changepasswdjob.h
++    kleo/checksumdefinition.h
++    kleo/exception.h
++    kleo/kconfigbasedkeyfilter.h
++    kleo/listallkeysjob.h
++    kleo/stl_util.h
++    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
++
++install ( FILES
++    ui/kdhorizontalline.h
++    ui/messagebox.h
++    ui/progressbar.h
++    ui/progressdialog.h
++    ui/keylistview.h
++    ui/keyselectiondialog.h
++    ui/keyrequester.h
++    ui/keyapprovaldialog.h
++    ui/dnattributeorderconfigwidget.h
++    ui/cryptoconfigmodule.h
++    ui/cryptoconfigdialog.h
++    ui/directoryserviceswidget.h
++    ui/filenamerequester.h
++    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
+diff --git a/libkpgp/CMakeLists.txt b/libkpgp/CMakeLists.txt
+index 4be58ba..de868ad 100644
+--- a/libkpgp/CMakeLists.txt
++++ b/libkpgp/CMakeLists.txt
+@@ -35,3 +35,11 @@ add_subdirectory( tests )
+ install(FILES kconf_update/kpgp.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+ install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+ 
++install(FILES
++        kpgp.h
++        kpgpbase.h
++        kpgpblock.h
++        kpgpkey.h
++        kpgpui.h
++        libkpgp_export.h
++        DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
new file mode 100644
index 000000000000..79816cd4bdc3
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild,v 1.1 2015/07/11 11:49:26 johu Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google"
+
+DEPEND="
+	app-crypt/gpgme
+	>=app-office/akonadi-server-1.12.90
+	dev-libs/grantlee:0
+	$(add_kdebase_dep baloo '' 4.14.3)
+	$(add_kdebase_dep kdepimlibs 'akonadi(+)')
+	google? ( net-libs/libkgapi:4 )
+"
+RDEPEND="${DEPEND}
+	!kde-base/akonadi:4
+	!kde-base/libkdepim:4
+	!kde-base/libkleo:4
+	!kde-base/libkpgp:4
+	!<kde-base/kaddressbook-4.11.50:4
+	!kde-base/kdepim-wizards:4
+	!<kde-base/kmail-4.14.5
+	!<kde-base/korganizer-4.5.67:4
+	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+RESTRICT="test"
+# bug 393131
+
+KMEXTRA="
+	agents/sendlateragent/
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	composereditor-ng/
+	grantleeeditor/grantleethemeeditor/
+	grantleetheme/
+	incidenceeditor-ng/
+	libkdepim/
+	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
+	kaddressbookgrantlee/
+	kdgantt2/
+	mailcommon/
+	mailimporter/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	noteshared/
+	pimcommon/
+	templateparser/
+"
+KMEXTRACTONLY="
+	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+	kleopatra/
+	kmail/
+	knode/org.kde.knode.xml
+	korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/data/org.kde.korganizer.Korganizer.xml
+	korganizer/data/org.kde.Korganizer.Calendar.xml
+"
+KMSAVELIBS="true"
+
+PATCHES=(
+	"${FILESDIR}/install-composereditorng.patch"
+	"${FILESDIR}/${PN}-install-headers.patch"
+)
+
+src_prepare() {
+	kde4-meta_src_prepare
+	sed -e '/folderarchiveagent.desktop/d' \
+		-i agents/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package google LibKGAPI2)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdepim-common-libs/metadata.xml b/kde-base/kdepim-common-libs/metadata.xml
index 8d1e86a9cefb..5d980cdd6db6 100644
--- a/kde-base/kdepim-common-libs/metadata.xml
+++ b/kde-base/kdepim-common-libs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
+	<use>
+		<flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag>
+	</use>
 </pkgmetadata>