Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arpack/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	staging/digikam/PKGBUILD
	testing/curl/PKGBUILD

4 files changed, 46 insertions, 18 deletions

diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 16140a51b..5148230c6 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144735 2011-12-08 09:21:28Z andrea $
+# $Id: PKGBUILD 147897 2012-01-28 10:36:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,18 +18,17 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-korganizer'
          'kdepim-kresources'
          'kdepim-ktimetracker'
-         'kdepim-libkdepim'
-         'kdepim-wizards')
-pkgver=4.7.4
+         'kdepim-libkdepim')
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
-             'pilot-link' 'kde-agent')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+             'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('233f6c413eeedd4af7cf15106a2af7b8f29977bf')
+sha1sums=('61509f42a96193ae2a9b9f8560dccb73d739f356')
 
 build() {
     cd "${srcdir}"
@@ -127,6 +126,7 @@ package_kdepim-kjots() {
 package_kdepim-kleopatra() {
 	pkgdesc='Certificate Manager and Unified Crypto GUI'
 	depends=('kdepim-libkdepim')
+    install=kdepim-kleopatra.install
 	url="http://kde.org/applications/utilities/kleopatra/"
 	cd "${srcdir}"/build/kleopatra
 	make DESTDIR="${pkgdir}" install
@@ -138,13 +138,13 @@ package_kdepim-kmail() {
 	pkgdesc='Mail Client'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim.install'
+	install='kdepim-kmail.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
 	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		nepomuk_email_feeder ontologies kontact/plugins/kmail; do
+		mailfilteragent ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -194,7 +194,7 @@ package_kdepim-korganizer() {
 	pkgdesc='Calendar and Scheduling Program'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
-	install='kdepim.install'
+	install='kdepim-korganizer.install'
 	cd "${srcdir}"/build/korganizer
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/korganizer
@@ -242,11 +242,3 @@ package_kdepim-libkdepim() {
 		make DESTDIR="${pkgdir}" install
 	done
 }
-
-package_kdepim-wizards() {
-	pkgdesc='KDE Groupware Wizard'
-	depends=('kdepim-kresources')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/wizards
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-kleopatra.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-kmail.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-korganizer.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}