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

3 files changed, 90 insertions, 2 deletions

diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
new file mode 100644
index 000000000..88960ddba
--- /dev/null
+++ b/libre-testing/libretools/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+
+pkgbase=libretools
+pkgname=(libretools libretools-mips64el)
+pkgdesc="Programs for Parabola development"
+url="https://projects.parabolagnulinux.org/packages/libretools.git/"
+license=('GPL3+' 'GPL2')
+
+pkgver=20130503
+_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d
+_devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c
+
+pkgrel=1
+arch=('any')
+
+_packages_url=https://projects.parabolagnulinux.org/packages
+source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
+	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
+
+build() {
+  cd "$srcdir"
+  ln -sf devtools-par-$_devtools_commit devtools-par
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make build-libretools build-libretools-mips64el build-doc
+}
+
+package_libretools() {
+  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
+  install=libretools.install
+  groups=(base-devel)
+
+  depends=(
+    arch-install-scripts # `archroot` uses `pacstrap`
+    git # `createworkdir`
+    openssh # `librerelease`
+    rsync # `librerelease` and `makechrootpkg.sh`
+    subversion # `diff-unfree`
+    tokyocabinet # `treepkg`
+    wget # `aur` and `pkgbuild-check-nonfree`
+  )
+  optdepends=('namcap: to check package files')
+  makedepends=(emacs) # emacs --batch is used during the build to process text
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools install-doc DESTDIR="$pkgdir"
+}
+
+package_libretools-mips64el() {
+  pkgdesc="Scripts for Parabola development (for mips64el architecture)"
+  backup=('etc/libretools.d/mips64el.conf')
+  depends=("$pkgbase=$pkgver")
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools-mips64el DESTDIR="$pkgdir"
+}
+
+md5sums=('dabae9bb6040431e8e2b84871a027237'
+         'c5cd04723119762701db766cb8f6e5ef')
diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install
new file mode 100644
index 000000000..ff6a238fe
--- /dev/null
+++ b/libre-testing/libretools/libretools.install
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+
+# arg 1:  the new package version
+post_install() {
+	if grep -q 'libre::' etc/makepkg.conf; then
+		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+	else
+		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
+		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
+	fi
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
+		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+		sed -i '/libre::/d'
+	else
+		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
+	fi
+}
diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD
index 6794b3aca..e125f83e9 100644
--- a/pcr/babeld/PKGBUILD
+++ b/pcr/babeld/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer (AUR): Yann Lopez <arch at lonewulf dot net>
 # Maintainer (Parabola): fauno <fauno@parabola.nu>
 pkgname=babeld
-pkgver=1.3.5
+pkgver=1.3.6
 pkgrel=1
 pkgdesc="Loop-free distance-vector routing protocol"
 arch=(i686 x86_64 mips64el)
@@ -28,5 +28,5 @@ package() {
 
   install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE
 }
-md5sums=('55f3df2429f4cf7816fce312591ba488'
+md5sums=('5dfccfeb2db5d8244c2fd2dc301e89a0'
          'SKIP')