kdepim-16.04.0-2.nonprism1: updating version

1 files changed, 30 insertions, 51 deletions

diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD
index 15dbce394..d89c15196 100644
--- a/nonprism/kdepim/PKGBUILD
+++ b/nonprism/kdepim/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 261475 2016-03-15 10:26:40Z arojas $
+# $Id: PKGBUILD 265855 2016-04-22 20:34:00Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 pkgbase=kdepim
-pkgname=(akonadiconsole kaddressbook kmail knotes
-         korganizer libkdepim)
-pkgver=15.12.3
-pkgrel=1.nonprism1
+pkgname=(akonadiconsole kaddressbook kmail knotes korganizer)
+pkgver=16.04.0
+pkgrel=2.nonprism1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde-applications' 'kdepim')
-makedepends=(extra-cmake-modules kdepim-runtime qt5-tools kdoctools knewstuff khtml
-             ktexteditor kdnssd kldap libktnef kontactinterface kxmlrpcclient kblog akonadi-search boost)
+makedepends=(extra-cmake-modules kdepim-runtime qt5-tools kdoctools knewstuff kpimtextedit
+             ktexteditor kdnssd kldap libktnef kontactinterface kxmlrpcclient kblog akonadi-search boost
+             libgravatar mailcommon incidenceeditor libksieve python)
 source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz")
-sha1sums=('baa4feff57dc33a8edcdcb64dc0d5409a5c564b4')
+sha1sums=('fa8bc8fa7c5d40ced34688f69a9910dd1ebcee9f')
 
 prepare() {
 	mkdir -p build
- 
-	cd $pkgbase-$pkgver
 }
 
 build() {
@@ -31,47 +29,51 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-		-DLIBEXEC_INSTALL_DIR=lib \
+		-DKDE_INSTALL_LIBEXECDIR=lib \
 		-DKDEPIM_STORAGESERVICE_GDRIVE=OFF
 	make
 }
 
 package_akonadiconsole() {
 	pkgdesc='Akonadi Management and Debugging Console, without Google Drive support'
-	depends=('libkdepim')
+	depends=(calendarsupport messagelib hicolor-icon-theme)
 	conflicts=("kdepim-$pkgname")
 	replaces=("kdepim-$pkgname")
 	url='http://pim.kde.org'
 	install='kdepim.install'
+
 	cd build/akonadiconsole
 	make DESTDIR="$pkgdir" install
 }
 
 package_kaddressbook() {
 	pkgdesc='Contact Manager, without Google Drive support'
-	depends=('libkdepim' 'kontactinterface')
+	depends=('kdepim-common' 'kontactinterface')
+	optdepends=('kdepim-addons: additional plugins')
 	conflicts=("kdepim-$pkgname")
 	replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/office/kaddressbook/"
 	install='kaddressbook.install'
-	for _i in kaddressbook plugins/kaddressbook; do
-	    cd "$srcdir"/build/$_i
-	    make DESTDIR="$pkgdir" install
-	done
+
+	cd "$srcdir"/build/kaddressbook
+	make DESTDIR="$pkgdir" install
 }
 
 package_kmail() {
 	pkgdesc='Mail Client, without Google Drive support'
-	depends=('libkdepim' 'kontactinterface' 'kio-pim')
+	depends=(kdepim-common kontactinterface kio-pim libksieve kdepim-addons)
+	optdepends=('kleopatra: mail encryption support' 'kdepim-addons: additional plugins')
 	conflicts=("kdepim-$pkgname")
 	replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/internet/kmail/"
 	install='kmail.install'
+
 	for _i in kmail agents/archivemailagent agents/mailfilteragent \
-	  storageservicemanager importwizard libksieve messagelist grantleeeditor mboximporter sieveeditor; do
+	  storageservicemanager importwizard grantleeeditor mboximporter sieveeditor; do
 	  cd "$srcdir"/build/$_i
 	  make DESTDIR="$pkgdir" install
 	done
+
 	for _i in akonadi_archivemail_agent kmail importwizard sieveeditor; do
 	  cd "$srcdir"/build/doc/$_i
 	  make DESTDIR="$pkgdir" install
@@ -80,15 +82,15 @@ package_kmail() {
 
 package_knotes() {
 	pkgdesc='Popup Notes, without Google Drive support'
-	depends=('libkdepim' 'kontactinterface')
+	depends=('kdepim-common' 'kontactinterface')
 	conflicts=("kdepim-$pkgname")
 	replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/utilities/knotes/"
 	install='kdepim.install'
-	for _i in knotes noteshared agents/notesagent; do
-	  cd "$srcdir"/build/$_i
-	  make DESTDIR="$pkgdir" install
-	done
+
+	cd "$srcdir"/build/knotes
+	make DESTDIR="$pkgdir" install
+
 	for _i in knotes akonadi_notes_agent; do
 	  cd "$srcdir"/build/doc/$_i
 	  make DESTDIR="$pkgdir" install
@@ -97,41 +99,18 @@ package_knotes() {
 
 package_korganizer() {
 	pkgdesc='Calendar and Scheduling Program, without Google Drive support'
-	depends=('libkdepim' 'kontactinterface')
+	depends=('kdepim-common' 'kontactinterface')
+	optdepends=('kdepim-addons: additional plugins')
 	conflicts=("kdepim-$pkgname")
 	replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/office/korganizer"
 	install='korganizer.install'
+
 	for _i in korganizer korgac; do
 	  cd "$srcdir"/build/$_i
 	  make DESTDIR="$pkgdir" install
 	done
+
 	cd "$srcdir"/build/doc/korganizer
 	make DESTDIR="$pkgdir" install
 }
-
-package_libkdepim() {
-	pkgdesc='Common libraries and resources for KDE PIM applications, without Google Drive support'
-	groups=()
-	depends=('kdepim-runtime' 'akonadi-search' 'knewstuff' 'kldap' 'kdnssd' 'libktnef')
-	conflicts=('kdepim-libkdepim' 'kdepim-knode' 'kdepim-kresources' 'kdepim-ktimetracker')
-	url='http://pim.kde.org'
-	install=kdepim.install
-	for _i in agents/sendlateragent calendarsupport grantleetheme incidenceeditor-ng kdgantt2 libkdepim \
-	  accountwizard icons libkdepimdbusinterfaces libkleo mailcommon mailimporter libgravatar eventviews \
-	  messagecomposer messagecore messageviewer templateparser agents/followupreminderagent \
-	  plugins/messageviewer pimcommon pimsettingexporter kaddressbookgrantlee libfollowupreminder libsendlater; do
-		cd "$srcdir"/build/$_i
-		make DESTDIR="$pkgdir" install
-	done
-	for _i in akonadi_sendlater_agent akonadi_followupreminder_agent contactthemeeditor headerthemeeditor pimsettingexporter; do
-	  cd "$srcdir"/build/doc/$_i
-	  make DESTDIR="$pkgdir" install
-	done
-
-	mkdir -p "$pkgdir"/etc/xdg
-	install -m644 "$srcdir"/$pkgbase-$pkgver/kdepim.categories "$pkgdir"/etc/xdg
-
-	# Included in oxygen-icons 5.19.0
-	rm -vr "$pkgdir/usr/share/icons"
-}