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

Conflicts:
	community/haskell-dataenc/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	core/openssl/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/kdebindings-python/PKGBUILD

1 files changed, 21 insertions, 22 deletions

diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 71916a267..7de28e2b6 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,65 +1,64 @@
-# $Id: PKGBUILD 173132 2012-12-11 14:42:23Z jgc $
+# $Id: PKGBUILD 177788 2013-02-08 18:59:53Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.9.0
-pkgrel=3
+pkgver=3.0.0
+pkgrel=2
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('df4b879a95f4ccac4480c5161d66fb05d6fbefcd')
+             'cmake' 'automoc4' 'doxygen' 'mesa' 'lensfun')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('45a9490b2b10b7b42fa9f90b7389eeb248326718')
 
 build() {
-  cd "${srcdir}"
-
   mkdir build
   cd build
-  # Use internal lensfun (FS#21816)
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DLENSFUN_LIBRARY="" \
-    -DLENSFUN_INCLUDE_DIR=""
+    -DBUILD_tests=OFF
   make
 }
 
 package_digikam() {
   pkgdesc="Digital photo management application for KDE"
   depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
-           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
+           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun')
   optdepends=('kipi-plugins: for more extras and plugins')
   install=digikam.install
 
-  cd "${srcdir}"/build/core
+  cd build/core
   make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc
+  cd ../../build/doc
   make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/po
+  cd ../../build/po
   make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts with kde-l10n-*
+  rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo
 }
 
 package_libkface() {
   pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
   depends=('kdelibs' 'opencv')
 
-  cd "${srcdir}"/build/extra/libkface
+  cd build/extra/libkface
   make DESTDIR="${pkgdir}" install
 }
 
 package_libkgeomap() {
   pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
+  depends=('kdelibs' 'kdeedu-marble')
 
-  cd "${srcdir}"/build/extra/libkgeomap
+  cd build/extra/libkgeomap
   make DESTDIR="${pkgdir}" install
 }
 
@@ -67,7 +66,7 @@ package_libkvkontakte() {
   pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
   depends=('kdelibs' 'qjson')
 
-  cd "${srcdir}"/build/extra/libkvkontakte
+  cd build/extra/libkvkontakte
   make DESTDIR="${pkgdir}" install
 }
 
@@ -75,20 +74,20 @@ package_libmediawiki() {
   pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
   depends=('kdelibs')
 
-  cd "${srcdir}"/build/extra/libmediawiki
+  cd build/extra/libmediawiki
   make DESTDIR="${pkgdir}" install
 }
 
 package_kipi-plugins() {
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
   depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
+           'opencv' 'libkvkontakte' 'libkexiv2')
   optdepends=('libkgeomap'
               'libmediawiki'
               'libgpod'
               'hugin')
   install=kipi-plugins.install
 
-  cd "${srcdir}"/build/extra/kipi-plugins
+  cd build/extra/kipi-plugins
   make DESTDIR="${pkgdir}" install
 }