Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

6 files changed, 35 insertions, 34 deletions

diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index e7578c381..0d54fe269 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205134 2014-02-04 13:52:45Z svenstaro $
+# $Id: PKGBUILD 206697 2014-03-05 07:38:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,24 +6,24 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.12.2
+pkgver=4.12.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
+conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
+replaces=('kdebase-nsplugins' 'kdebase-konqueror')
+provides=("kdebase-konqueror=$pkgver")
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
         'konq-about-fsdg.diff')
-sha1sums=('7002c8d1a8f4fb1735ad70b8cb1a106876323f94'
+sha1sums=('8ac3fb05357e74e1ab394333095f404c68edd8ec'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
 optdepends=('kwebkitpart: to enable webkit engine')
 install='kdebase-konqueror.install'
-conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
-replaces=('kdebase-nsplugins' 'kdebase-konqueror')
-provides=("kdebase-konqueror=$pkgver")
 
 prepare() {
   mkdir build
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 369ec746f..315d4b370 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 205106 2014-02-04 13:51:12Z svenstaro $
+# $Id: PKGBUILD 206697 2014-03-05 07:38:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.12.2
+pkgver=4.12.3
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('935dd93d1a705de6b11dc489a56dfb40827b2046'
+sha1sums=('c2453e7a6a6b5493af7698ed2e871d03a707ad59'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index c1936476d..4110187f0 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 205088 2014-02-04 13:47:15Z svenstaro $
+# $Id: PKGBUILD 206697 2014-03-05 07:38:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.12.2
+pkgver=4.12.3
 pkgrel=1
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
+provides=("kdelibs=$pkgver")
+replaces=('kdelibs')
+conflicts=('kdelibs')
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
         'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
         'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-provides=("kdelibs=$pkgver")
-replaces=('kdelibs')
-conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 
         'khtml-fsdg.diff')
-sha1sums=('05e324af3752953ca637c2a51d989155f9f6bb8a'
+sha1sums=('57a9685d9c05f9304b0037f578bc13ca3371e74d'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 2f33f98e9..a33841bb2 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 205344 2014-02-04 14:04:24Z svenstaro $
+# $Id: PKGBUILD 206697 2014-03-05 07:38:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre
-pkgver=4.12.2
+pkgver=4.12.3
 pkgrel=1
 pkgdesc='Instant Messenger, without Skype support'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' 'libidn'
          'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${_pkgname}.install
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
-sha1sums=('6b5ebab916f4527157cf7f979724538f38052bad')
+sha1sums=('bf707283338c8387619a9f4387af9b72e6275e95')
 
 prepare() {
   cd kopete-${pkgver}
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index be15c03fb..da2eab27a 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205354 2014-02-04 14:04:58Z svenstaro $
+# $Id: PKGBUILD 206697 2014-03-05 07:38:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.12.2
+pkgver=4.12.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'nepomuk-widgets' 'link-grammar')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('c1e5f3284ab23233632ae27edb85f80588bb7e86')
+sha1sums=('56a084c653f3b9b42710509ff9013e32b81a30d8')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index b7a3d7047..0423c8afd 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 205392 2014-02-04 14:07:41Z svenstaro $
+# $Id: PKGBUILD 206697 2014-03-05 07:38:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.12.2
+pkgver=4.12.3
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeutils')
+provides=("kdeutils-ark=$pkgver")
+replaces=('kdeutils-ark')
+conflicts=('kdeutils-ark')
 depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
 makedepends=('cmake' 'automoc4')
 optdepends=('p7zip' 'zip' 'unzip' 'unar')
 install=${_pkgname}.install
-provides=("kdeutils-ark=$pkgver")
-replaces=('kdeutils-ark')
-conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('ab99d0b78536f187566e1f0a602f41551bbf0f29'
+sha1sums=('b24b3ca5326979797946e262583ce23b11337106'
           'a0a836950f185d9b2245204579f969203036fdec')
 
-build() {
+prepare() {
   cd "${srcdir}/ark-${pkgver}"
-  
   # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3.
   patch -Np1 -i "${srcdir}/ark-unar-06.patch"
-  
-  cd ..
+}
+
+build() {
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../ark-${pkgver} \