From 35c07d08888ad1811a46598a1c0cbe0af07ffe16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
Date: Sat, 21 Jan 2012 18:16:12 +0100
Subject: Update kdeutils-ark-libre.

---
 libre/kdeutils-libre/PKGBUILD   | 33 ++++++++++++++++++++-------------
 libre/kdeutils-libre/rePKGBUILD | 21 +++++++++++----------
 2 files changed, 31 insertions(+), 23 deletions(-)

(limited to 'libre')

diff --git a/libre/kdeutils-libre/PKGBUILD b/libre/kdeutils-libre/PKGBUILD
index 4337580e3..16fff37d3 100644
--- a/libre/kdeutils-libre/PKGBUILD
+++ b/libre/kdeutils-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139746 2011-10-04 21:03:39Z andrea $
+# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -16,8 +16,8 @@ pkgname=('kdeutils-ark-libre'
          'kdeutils-printer-applet'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
-pkgver=4.7.2
-pkgrel=1
+pkgver=4.7.4
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -26,27 +26,37 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'qjson')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4')
+sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e')
 
 build() {
-	cd ${srcdir}
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    
+    # Use Python2
+    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
+      kcharselect/kcharselect-generate-datafile.py \
+      superkaramba/examples/richtext/rtext.py
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
+
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2
 	make
 }
 
 package_kdeutils-ark-libre() {
 	pkgdesc='Archiving Tool'
 	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip')
+	optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+	provides=("kdeutils-ark=$pkgver")
+	replaces=('kdeutils-ark')
+	conflicts=('kdeutils-ark')
 	url="http://kde.org/applications/utilities/ark/"
-    provides=("kdeutils-ark=$pkgver")
-    replaces=('kdeutils-ark')
-    conflicts=('kdeutils-ark')
 	cd $srcdir/build/ark
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/ark/doc
@@ -162,9 +172,6 @@ package_kdeutils-printer-applet() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/printer-applet/doc
 	make DESTDIR=$pkgdir install
-
-        # Use the python2 executable
-        find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
 }
 
 package_kdeutils-superkaramba() {
diff --git a/libre/kdeutils-libre/rePKGBUILD b/libre/kdeutils-libre/rePKGBUILD
index a8d78bede..9dad18cf0 100644
--- a/libre/kdeutils-libre/rePKGBUILD
+++ b/libre/kdeutils-libre/rePKGBUILD
@@ -2,8 +2,9 @@
 source PKGBUILD
 #CARCH=x86_64
 unset build package md5sums source
+pkgname=("kdeutils-ark-libre")
 _repo=extra       # Put the repo here
-_mirror=ftp://ftp.archlinux.org # Put mirror here
+_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here
 source=(PKGBUILD
         "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
         # files for pkg modifications below this line
@@ -18,15 +19,15 @@ build() {
 }
 
 package_kdeutils-ark-libre() {
-  pkgdesc='Archiving Tool'
-  depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-  optdepends=('p7zip' 'zip')
-  url="http://kde.org/applications/utilities/ark/"
-  provides=("kdeutils-ark=$pkgver")
-  replaces=('kdeutils-ark')
-  conflicts=('kdeutils-ark')
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
+	pkgdesc='Archiving Tool'
+	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
+	optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+	provides=("kdeutils-ark=$pkgver")
+	replaces=('kdeutils-ark')
+	conflicts=('kdeutils-ark')
+	url="http://kde.org/applications/utilities/ark/"
+	find ${srcdir} -maxdepth 1 -type l -delete
+	cp -a ${srcdir}/* ${pkgdir}
 }
 
 
-- 
cgit v1.2.3-2-g168b