Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 32 insertions, 13 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 49dc7feb2..953cd18b1 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,14 +4,14 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgbase=libretools
-pkgname=(libretools libretools-mips64el)
+pkgname=(libretools libretools-mips64el librelib libregit)
 pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130611
-_libretools_commit=e6944bc03f587ad177c6b825e3f4c116fb9b9b12
-_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
+pkgver=20130914
+_libretools_commit=ab8dc8d4204d198f01e1fc7f59498a2794df829f
+_devtools_commit=6fbdc4eb481302541cf8fa282fb3453e4c5d0d16
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -19,20 +19,37 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta
 
 pkgrel=1
 arch=('any')
-makedepends=(emacs) # emacs --batch is used during the build to process text
+makedepends=(emacs ronn) # emacs --batch is used during the build to process text
 checkdepends=(sh-roundup)
 
 build() {
   cd "$srcdir"
   ln -sf devtools-par-$_devtools_commit devtools-par
   cd "$srcdir/$pkgbase-$_libretools_commit"
-  make build-libretools build-libretools-mips64el build-doc
+  make build-libretools build-libretools-mips64el build-librelib build-doc
 }
 
 check() {
   cd "$srcdir/$pkgbase-$_libretools_commit"
 
-  make check TESTENVFLAGS='--no-network --no-sudo'
+  SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
+}
+
+package_librelib() {
+  pkgdesc="Shell library portion of libretools"
+  depends=(
+    wget # `aur` and `lib/blacklist.sh`
+  )
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-librelib DESTDIR="$pkgdir"
+}
+
+package_libregit() {
+  depends=("librelib=$pkgver" git)
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libregit DESTDIR="$pkgdir"
 }
 
 package_libretools() {
@@ -42,13 +59,13 @@ package_libretools() {
   conflicts=(devtools)
 
   depends=(
+    "librelib=$pkgver"
     arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir` (also mips-add in -mips64el)
+    git # `createworkdir`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
     tokyocabinet # `treepkg`
-    wget # `aur` and `lib/blacklist.sh`
   )
   optdepends=('namcap: to check package files')
 
@@ -58,11 +75,13 @@ package_libretools() {
 
 package_libretools-mips64el() {
   pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  depends=("$pkgbase=$pkgver")
+  depends=("$pkgbase=$pkgver"
+    git # mips-add
+  )
 
   cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('3d5645488481fab48954e194274f70ac'
-         'b28b1492fda205be7c577fc03cbc3399')
+md5sums=('91b1d56254bd61f1266ee2cb20e671a3'
+         'f44ca55997ab9598b7f1a8aeb2379b52')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index ff6a238fe..d46990da8 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -21,7 +21,7 @@ post_upgrade() {
 pre_remove() {
 	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
 		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-		sed -i '/libre::/d'
+		sed -i '/libre::/d' etc/makepkg.conf
 	else
 		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
 	fi