update libre/libretools

1 files changed, 14 insertions, 19 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index d67658e7e..67c9a8d59 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,16 +4,16 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=libretools
-pkgname=(libretools libretools-mips64el librelib gitget xbs)
+pkgname=(libretools librelib gitget xbs)
 pkgdesc="Programs for Parabola development"
 url="https://projects.parabola.nu/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20150526
-_libretools_commit=a608070d29143f11826725ae0261bf0dcd902bc2
-_devtools_commit=b04dc724f01f47107b31b791950d22c27aca7d9b
-md5sums=('81c7681cb6e8b94fa87e18cd8e4ef61a'
-         '84ce76368ddca3bd02198ebc4e85ab3f')
+pkgver=20150607
+_libretools_commit=9c26929bb8f7279620bff5db68ee9291eef393b3
+_devtools_commit=c271ab745f80167f452ee6afa1ff430c2f1523b0
+md5sums=('32fab6c2c214bc1a233b55fa8a767b2b'
+         'ffee2c79249bd9727826c39946934a08')
 
 _packages_url=https://projects.parabola.nu/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -28,7 +28,7 @@ build() {
   cd "$srcdir"
   ln -sf devtools-par-$_devtools_commit devtools-par
   cd "$srcdir/$pkgbase-$_libretools_commit"
-  make build-libretools build-libretools-mips64el build-librelib build-doc
+  make
 }
 
 check() {
@@ -63,6 +63,8 @@ package_gitget() {
 
 package_xbs() {
   pkgdesc='A tool for working with arbitrary ABS-like build systems'
+  backup=(etc/xbs/xbs.conf
+          etc/xbs/xbs-abs.conf)
   license=(GPL2)
   depends=(
     "gitget=$pkgver" # `helper-abslibre`
@@ -75,9 +77,13 @@ package_xbs() {
 }
 
 package_libretools() {
-  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
+  backup=(etc/libretools.conf
+          etc/libretools.d/chroot.conf
+          etc/libretools.d/librefetch.conf)
   install=libretools.install
   conflicts=(devtools)
+  conflicts=(libretools-mips64el)
+  replaces=(libretools-mips64el)
 
   depends=(
     "librelib=$pkgver"
@@ -96,14 +102,3 @@ package_libretools() {
   cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools install-doc DESTDIR="$pkgdir"
 }
-
-package_libretools-mips64el() {
-  pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  license=(GPL3)
-  depends=("$pkgbase=$pkgver"
-    git # mips-add
-  )
-
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-  make install-libretools-mips64el DESTDIR="$pkgdir"
-}