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

Conflicts:
	staging/kdebase-konsole/PKGBUILD
	staging/kdeedu-cantor/PKGBUILD
	staging/kdeedu-kstars/PKGBUILD
	staging/kdeedu-step/PKGBUILD
	staging/kdesdk/PKGBUILD

2 files changed, 24 insertions, 20 deletions

diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 834b0a8b8..4286d258a 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgbase=abiword
 pkgbase=abiword-libre
 pkgname=('abiword-libre' 'abiword-libre-plugins')
 pkgver=2.8.6
-pkgrel=7
+pkgrel=7.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.abisource.com"
@@ -24,9 +24,6 @@ md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
          '42e2614b6e0aad457d91f6ce20b6f225'
          '40e370e7e88c5437140ef18037abfbd3'
          '880b17db6f249d977d2a7cd012d9ce02')
-conflicts=('abiword')
-replaces=('abiword')
-provides=("abiword=$pkgver")
 
 build() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -59,8 +56,10 @@ package_abiword-libre() {
   pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
   depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
   install=$pkgname.install
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
+  optdepends=('abiword-libre-plugins')
+  conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
+  replaces=('abiword')
+  provides=("abiword=$pkgver")
 
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   sed -i plugins/Makefile \
@@ -80,8 +79,12 @@ package_abiword-libre-plugins() {
   pkgdesc="Additional plugins for Abiword"
   depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
            'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
+  conflicts=('abiword-libre-plugins')
+  replaces=('abiword-libre-plugins')
+  provides=("abiword-libre-plugins=$pkgver")
+  
   cd "${srcdir}/${_pkgbase}-${pkgver}/plugins"
+  
   for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 295e67725..7ec4d7c1e 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 10828 2010-02-02 18:05:28Z jlichtblau $
+# $Id$
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: leif_thande <leif.thande@gmail.com>
 # Contributor: tranquility <trankas@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 _pkgname=atool
 pkgname=atool-libre
-pkgver=0.37.0
-pkgrel=4
+pkgver=0.38.0
+pkgrel=3
 pkgdesc="A script for managing file archives of various types"
 arch=('any')
 url="http://www.nongnu.org/atool/"
@@ -20,25 +21,25 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives'
             'cpio: for using atool with cpio archives'
             'gzip: for using atool with gzip compressed archives'
             'lha: for using atool with lha, lharc and similar archives'
-            'lzma-utils: for using atool with lzma compressed archives'
+            'xz: for using atool with lzma compressed archives'
             'lzop: for using atool with lzop compressed archives'
             'p7zip: for using atool with 7z archives'
             'tar: for using atool with tar archives'
             'zip: for using atool for creating zip archives'
-    	    'unzip: for using atool for unpacking archives')
-source=(http://savannah.nongnu.org/download/atool/atool-${pkgver}.tar.gz)
-md5sums=('2607e9b19518af4145be8a6bed454477')
+            'unzip: for using atool for unpacking archives')
+
+source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
+sha256sums=('b967195facbe5e7c6535ac117aaa7f633b0eca174137c30c36a5200efb80047d')
 
 
 build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}
 
-	./configure --prefix=/usr
+  ./configure --prefix=/usr
 }
 
 package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}
 
-	make prefix=${pkgdir}/usr install || return 1
+  make prefix=${pkgdir}/usr install
 }
-