update libre/libretools

1 files changed, 29 insertions, 17 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 5e4a3267a..4a90c444e 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)
+pkgname=(libretools libretools-mips64el librelib gitget xbs)
 pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20140515
-_libretools_commit=22bb572086ff1c1667d553ac8233fc053a1556f2
-_devtools_commit=d732aae2ca57430f3dd95c0ed4dcc05df4014f91
-md5sums=('fd9d872b8fe28e8d64d76b3ef2d0b6ec'
-         '615db785531757d3a849614bb117fba4')
+pkgver=20141001
+_libretools_commit=42ed1183c123e9afb7fddadbbc4e62d89f82b63d
+_devtools_commit=33f227ec628f30b70ee5b1412fd47564325b4b4c
+md5sums=('854a89ca27dedb4efb52a876b6827812'
+         'db5d0c0889a9f6e481c634d4f36eda49')
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -21,8 +21,8 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta
 
 pkgrel=1
 arch=('any')
-makedepends=(emacs ronn) # emacs --batch is used during the build to process text
-checkdepends=(sh-roundup)
+makedepends=(emacs ruby-ronn) # emacs --batch is used during the build to process text
+checkdepends=(sh-roundup git)
 
 build() {
   cd "$srcdir"
@@ -61,24 +61,36 @@ package_gitget() {
   make install-gitget DESTDIR="$pkgdir"
 }
 
+package_xbs() {
+  pkgdesc='A tool for working with arbitrary ABS-like build systems'
+  license=(GPL2)
+  depends=(
+    "gitget=$pkgver" # `helper-abslibre`
+    "librelib=$pkgver"
+    subversion # `helper-abs`
+  )
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-xbs DESTDIR="$pkgdir"
+}
+
 package_libretools() {
   backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
   install=libretools.install
-  replaces=(chroottools)
-  conflicts=(devtools chroottools)
+  conflicts=(devtools)
 
   depends=(
     "librelib=$pkgver"
-    "gitget=$pkgver" # `createworkdir`
-    "systemd>=212" # force newer systemd
-    arch-install-scripts # `archroot` uses `pacstrap`
+    "xbs=$pkgver" # `createworkdir`, `librestage`
+    arch-install-scripts # `mkarchroot` uses `pacstrap`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
-    subversion # `diff-unfree`
-    tokyocabinet # `treepkg`
-    wget # `aur`
+    systemd # systemd-nspawn
+    tokyocabinet # `toru`
+    #namcap # Namcap is currently dissabled in libremakepkg :(
+    #subversion # `diff-unfree` # ignore because of xbs
+    #wget # `aur` # ignore because of librelib
   )
-  optdepends=('namcap: to check package files')
 
   cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools install-doc DESTDIR="$pkgdir"