rename KDE4 kdepim nonprism package

7 files changed, 19 insertions, 14 deletions

diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim4/PKGBUILD
index 178518a44..a0520dd16 100644
--- a/nonprism/kdepim/PKGBUILD
+++ b/nonprism/kdepim4/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $
-# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 243749 2015-08-15 10:54:22Z 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
+pkgbase=kdepim4
 pkgname=('kdepim-akonadiconsole'
          'kdepim-kaddressbook'
          'kdepim-kjots'
@@ -14,20 +15,20 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-libkdepim')
 pkgver=4.14.10
 _kdeappver=15.04.3
-pkgrel=1.nonprism1
+pkgrel=3.nonprism1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim4-runtime' 'libxss' 'pilot-link'
              'libbaloo4' 'grantlee-qt4')
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgbase}-${pkgver}.tar.xz")
+groups=('kdepim4')
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepim-${pkgver}.tar.xz")
 sha1sums=('6f74763dda68dbb44394e807eab9204777bddf0a')
 
 build() {
 	mkdir build
 	cd build
-	cmake ../${pkgbase}-${pkgver} \
+	cmake ../kdepim-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE4_BUILD_TESTS=OFF \
 		-DCMAKE_SKIP_RPATH=ON \
@@ -42,8 +43,9 @@ package_kdepim-akonadiconsole() {
 	depends=('kdepim-libkdepim')
 	conflicts=('kdepim-akonadiconsole-nonprism')
 	replaces=('kdepim-akonadiconsole-nonprism')
+	provides=('akonadiconsole')
 	url='http://pim.kde.org'
-	install='kdepim.install'
+	install='kdepim4.install'
 	cd "${srcdir}"/build/akonadiconsole
 	make DESTDIR="${pkgdir}" install
 }
@@ -51,6 +53,7 @@ package_kdepim-akonadiconsole() {
 package_kdepim-kaddressbook() {
 	pkgdesc='Contact Manager, without Google Drive support'
 	depends=('kdepim-libkdepim')
+	provides=('kaddressbook')
 	url="http://kde.org/applications/office/kaddressbook/"
 	conflicts=('kdepim-kaddressbook-nonprism')
 	replaces=('kdepim-kaddressbook-nonprism')
@@ -66,9 +69,9 @@ package_kdepim-kjots() {
 	pkgdesc='Note Taker, without Google Drive support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/kjots/"
+	install='kdepim4.install'
 	conflicts=('kdepim-kjots-nonprism')
 	replaces=('kdepim-kjots-nonprism')
-	install='kdepim.install'
 	cd "${srcdir}"/build/kjots
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/kontact/plugins/kjots
@@ -80,7 +83,7 @@ package_kdepim-kjots() {
 package_kdepim-kmail() {
 	pkgdesc='Mail Client, without Google Drive support'
     depends=('kdepim-libkdepim')
-    optdepends=('kde-agent: For starting and shutting down gpg-agent with KDE session manager')
+	provides=('kmail')
 	url="http://kde.org/applications/internet/kmail/"
 	install='kdepim-kmail.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
@@ -119,10 +122,11 @@ package_kdepim-knode() {
 package_kdepim-knotes() {
 	pkgdesc='Popup Notes, without Google Drive support'
 	depends=('kdepim-libkdepim')
+	provides=('knotes')
 	url="http://kde.org/applications/utilities/knotes/"
+	install='kdepim4.install'
 	conflicts=('kdepim-knotes-nonprism')
 	replaces=('kdepim-knotes-nonprism')
-	install='kdepim.install'
 	cd "${srcdir}"/build/knotes
 	make DESTDIR="${pkgdir}" install
     cd "${srcdir}"/build/agents/notesagent
@@ -136,6 +140,7 @@ package_kdepim-knotes() {
 package_kdepim-korganizer() {
 	pkgdesc='Calendar and Scheduling Program, without Google Drive support'
 	depends=('kdepim-libkdepim')
+	provides=('korganizer')
 	url="http://kde.org/applications/office/korganizer"
 	conflicts=('kdepim-korganizer-nonprism')
 	replaces=('kdepim-korganizer-nonprism')
@@ -151,13 +156,13 @@ package_kdepim-korganizer() {
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM, without Google Drive support'
 	groups=()
-	depends=('kdepim-runtime' 'baloo4-akonadi' 'grantlee-qt4')
+	depends=('kdepim4-runtime' 'baloo4-akonadi' 'grantlee-qt4')
 	url='http://pim.kde.org'
 	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	           'kdepim-akonadi' 'kdepim-libkdepim-nonprism')
 	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	          'kdepim-akonadi' 'kdepim-libkdepim-nonprism')
-	install='kdepim.install'
+	install='kdepim4.install'
 	for i in agents/sendlateragent akonadi_next calendarsupport \
   incidenceeditor-ng kaddressbookgrantlee grantleetheme kdgantt2 libkdepim \
   libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
diff --git a/nonprism/kdepim/kdepim-akregator.install b/nonprism/kdepim4/kdepim-akregator.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim/kdepim-akregator.install
+++ b/nonprism/kdepim4/kdepim-akregator.install
diff --git a/nonprism/kdepim/kdepim-kaddressbook.install b/nonprism/kdepim4/kdepim-kaddressbook.install
index 5c501dc49..5c501dc49 100644
--- a/nonprism/kdepim/kdepim-kaddressbook.install
+++ b/nonprism/kdepim4/kdepim-kaddressbook.install
diff --git a/nonprism/kdepim/kdepim-kmail.install b/nonprism/kdepim4/kdepim-kmail.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim/kdepim-kmail.install
+++ b/nonprism/kdepim4/kdepim-kmail.install
diff --git a/nonprism/kdepim/kdepim-knode.install b/nonprism/kdepim4/kdepim-knode.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim/kdepim-knode.install
+++ b/nonprism/kdepim4/kdepim-knode.install
diff --git a/nonprism/kdepim/kdepim-korganizer.install b/nonprism/kdepim4/kdepim-korganizer.install
index 5787df72f..5787df72f 100644
--- a/nonprism/kdepim/kdepim-korganizer.install
+++ b/nonprism/kdepim4/kdepim-korganizer.install
diff --git a/nonprism/kdepim/kdepim.install b/nonprism/kdepim4/kdepim4.install
index e70c054ec..e70c054ec 100644
--- a/nonprism/kdepim/kdepim.install
+++ b/nonprism/kdepim4/kdepim4.install