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

8 files changed, 103 insertions, 52 deletions

diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 0a9da92ae..c742bc59d 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144767 2011-12-08 10:28:41Z andrea $
+# $Id: PKGBUILD 147901 2012-01-28 10:36:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -14,44 +14,38 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-kompare'
          'kdesdk-kpartloader'
          'kdesdk-kprofilemethod'
-#         'kdesdk-kspy'
          'kdesdk-kstartperf'
          'kdesdk-kuiviewer'
          'kdesdk-lokalize'
          'kdesdk-okteta'
          'kdesdk-poxml'
-#         'kdesdk-scheck'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
-             'kdepimlibs' 'kdebase-lib')
+makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
+             'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'fix-python2-path.patch')
-sha1sums=('3a0f61204653dc3f9f975732b6f67659c60ecaf3'
-          'd05ca0231869c484fd3861955d960a60aff7dcfb')
+sha1sums=('2c55ed17350cb5eba4213007614e4c587feb94b9'
+          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	# Fix python2 path
+	# Fix hardcoded python2 cmd
 	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-		-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-		$(find . -name '*.py')
 
 	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
@@ -60,7 +54,7 @@ package_kdesdk-cervisia() {
 	pkgdesc='CVS Frontend'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk.install'
+	install='kdesdk-cervisia.install'
 	cd $srcdir/build/cervisia
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/cervisia
@@ -93,11 +87,15 @@ package_kdesdk-kcachegrind() {
 	depends=('kdebase-runtime' 'python2')
 	optdepends=('php: PHP support')
 	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk.install'
+	install='kdesdk-kcachegrind.install'
 	cd $srcdir/build/kcachegrind
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kcachegrind
 	make DESTDIR=$pkgdir install
+
+        # Fix python 2 path
+        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+                "${pkgdir}"/usr/bin/hotshot2calltree
 }
 
 package_kdesdk-kdeaccounts-plugin() {
@@ -117,6 +115,7 @@ package_kdesdk-kdepalettes() {
 package_kdesdk-kioslave() {
 	pkgdesc='KDED Subversion Module'
 	depends=('kdebase-runtime' 'subversion')
+        install='kdesdk.install'
 	cd $srcdir/build/kioslave
 	make DESTDIR=$pkgdir install
 }
@@ -173,7 +172,7 @@ package_kdesdk-kuiviewer() {
 	pkgdesc='Qt Designer UI File Viewer'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk.install'
+	install='kdesdk-kuiviewer.install'
 	cd $srcdir/build/kuiviewer
 	make DESTDIR=$pkgdir install
 }
@@ -183,11 +182,15 @@ package_kdesdk-lokalize() {
 	depends=('kdebase-runtime' 'kdebindings-python')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk.install'
+	install='kdesdk-lokalize.install'
 	cd $srcdir/build/lokalize
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/lokalize
 	make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
 }
 
 package_kdesdk-okteta() {
@@ -195,7 +198,7 @@ package_kdesdk-okteta() {
 	depends=('kdebase-runtime')
 	replaces=('kdeutils-okteta')
 	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta"
+	url="http://kde.org/applications/utilities/okteta/"
 	install='kdesdk-okteta.install'
 	cd $srcdir/build/okteta
 	make DESTDIR=$pkgdir install
@@ -226,6 +229,10 @@ package_kdesdk-scripts() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/scripts
 	make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
 }
 
 package_kdesdk-strigi-analyzer() {
@@ -239,9 +246,13 @@ package_kdesdk-umbrello() {
 	pkgdesc='UML Modeller'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk.install'
+	install='kdesdk-umbrello.install'
 	cd $srcdir/build/umbrello
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/umbrello
 	make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
 }
diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch
index c2c0745d1..720487031 100644
--- a/extra/kdesdk/fix-python2-path.patch
+++ b/extra/kdesdk/fix-python2-path.patch
@@ -1,11 +1,3 @@
---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~	2010-11-24 11:53:38.586666671 +0100
-+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree	2010-11-24 11:53:38.623333337 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # _*_ coding: latin1 _*_
- 
- #
 --- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
 +++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
 @@ -114,7 +114,7 @@
@@ -28,14 +20,6 @@
  
  try: convert()
  except: print 'error occured'
---- kdesdk-4.5.80/scripts/rename_source_files~	2010-11-24 11:45:41.040000004 +0100
-+++ kdesdk-4.5.80/scripts/rename_source_files	2010-11-24 11:45:41.093333336 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- #
- # Copyright David Faure <faure@kde.org>, License LGPL v2
- #
 --- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
 +++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
 @@ -17,6 +17,6 @@
@@ -45,20 +29,4 @@
 -svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
 +svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
  
- rm /tmp/accounts.$PPID
---- kdesdk-4.5.80/scripts/kde_generate_export_header~	2010-11-24 11:48:49.696666669 +0100
-+++ kdesdk-4.5.80/scripts/kde_generate_export_header	2010-11-24 11:48:49.753333338 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- 
- import os, sys, string
- 
---- kdesdk-4.5.80/scripts/reviewboarddiff~	2010-11-24 11:49:37.686666670 +0100
-+++ kdesdk-4.5.80/scripts/reviewboarddiff	2010-11-24 11:49:37.740000003 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # encoding: utf-8
- #
- # Generates reviewboard compatible diffs from git-svn repositories.
+ rm /tmp/accounts.$PPID
\ No newline at end of file
diff --git a/extra/kdesdk/kdesdk-cervisia.install b/extra/kdesdk/kdesdk-cervisia.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-cervisia.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/kdesdk/kdesdk-kcachegrind.install b/extra/kdesdk/kdesdk-kcachegrind.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-kcachegrind.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/kdesdk/kdesdk-kompare.install b/extra/kdesdk/kdesdk-kompare.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-kompare.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/kdesdk/kdesdk-kuiviewer.install b/extra/kdesdk/kdesdk-kuiviewer.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-kuiviewer.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/kdesdk/kdesdk-lokalize.install b/extra/kdesdk/kdesdk-lokalize.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-lokalize.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/kdesdk/kdesdk-umbrello.install b/extra/kdesdk/kdesdk-umbrello.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-umbrello.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
+}