10 files changed, 60 insertions, 127 deletions
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
deleted file mode 100644
index 07878d1c0..000000000
--- a/libre-testing/libretools/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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=20130605
-_libretools_commit=adc6865b29b31a32cce195d6912af039ef7eab77
-_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
-
-_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)
-
-pkgrel=1
-arch=('any')
-makedepends=(emacs) # 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
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-
-  make check TESTENVFLAGS='--no-network --no-sudo'
-}
-
-package_libretools() {
-  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
-  install=libretools.install
-  replaces=(chroottools)
-  conflicts=(devtools)
-
-  depends=(
-    arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir` (also mips-add in -mips64el)
-    openssh # `librerelease`
-    rsync # `librerelease` and `makechrootpkg.sh`
-    subversion # `diff-unfree`
-    tokyocabinet # `treepkg`
-    wget # `aur` and `lib/blacklist.sh`
-  )
-  optdepends=('namcap: to check package files')
-
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-  make install-libretools install-doc DESTDIR="$pkgdir"
-}
-
-package_libretools-mips64el() {
-  pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  depends=("$pkgbase=$pkgver")
-
-  cd "$srcdir/$pkgbase-$_libretools_commit"
-  make install-libretools-mips64el DESTDIR="$pkgdir"
-}
-
-md5sums=('60a3bb7d86f1591658b74ed482bc0423'
-         'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install
deleted file mode 100644
index ff6a238fe..000000000
--- a/libre-testing/libretools/libretools.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9f67689df..07878d1c0 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,38 +4,64 @@
 
 pkgbase=libretools
 pkgname=(libretools libretools-mips64el)
-pkgver=20130117
 pkgdesc="Programs for Parabola development"
-url="https://projects.parabolagnulinux.org/libretools.git/"
-license=('GPL3+' 'GPL2')
+url="https://projects.parabolagnulinux.org/packages/libretools.git/"
+license=('GPL3' 'GPL2')
 
-pkgrel=3
+pkgver=20130605
+_libretools_commit=adc6865b29b31a32cce195d6912af039ef7eab77
+_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
+
+_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)
+
+pkgrel=1
 arch=('any')
-groups=(base-devel)
-depends=(openssh rsync git wget tokyocabinet)
-conflicts=(chroottools)
-source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar)
+makedepends=(emacs) # emacs --batch is used during the build to process text
+checkdepends=(sh-roundup)
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  make
+  cd "$srcdir"
+  ln -sf devtools-par-$_devtools_commit devtools-par
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make build-libretools build-libretools-mips64el build-doc
+}
+
+check() {
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+
+  make check TESTENVFLAGS='--no-network --no-sudo'
 }
 
 package_libretools() {
-  backup=(etc/libretools.conf etc/libretools.d/chroot.conf)
+  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
   install=libretools.install
+  replaces=(chroottools)
+  conflicts=(devtools)
+
+  depends=(
+    arch-install-scripts # `archroot` uses `pacstrap`
+    git # `createworkdir` (also mips-add in -mips64el)
+    openssh # `librerelease`
+    rsync # `librerelease` and `makechrootpkg.sh`
+    subversion # `diff-unfree`
+    tokyocabinet # `treepkg`
+    wget # `aur` and `lib/blacklist.sh`
+  )
+  optdepends=('namcap: to check package files')
 
-  cd "$srcdir/$pkgbase-$pkgver"
-  make install-libretools DESTDIR="$pkgdir"
-  install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto
+  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-$pkgver"
+  cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('77dcfb2fbf5b8a9894a13c5e6151b693')
+md5sums=('60a3bb7d86f1591658b74ed482bc0423'
+         'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 50f03ee88..ff6a238fe 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,26 +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() {
-  cat <<EOF
-Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide
-and follow instructions there before using libretools.
-
-If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg
-and install libretools-\$arch if avaliable
-
-EOF
+	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() {
-  cat <<EOF
-Check your /etc/libretools.conf, it has changed substantially.
-
-If using fullpkg, you should install libretools-\$arch if avaliable
-
-EOF
+	post_install
 }
 
-# vim:set ts=2 sw=2 et:
+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/libre-testing/ronn/PKGBUILD b/libre/ronn/PKGBUILD
index 4bd097048..4bd097048 100644
--- a/libre-testing/ronn/PKGBUILD
+++ b/libre/ronn/PKGBUILD
diff --git a/libre-testing/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD
index ad9aefc36..ad9aefc36 100644
--- a/libre-testing/ruby-hpricot/PKGBUILD
+++ b/libre/ruby-hpricot/PKGBUILD
diff --git a/libre-testing/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD
index d7090cc0d..d7090cc0d 100644
--- a/libre-testing/ruby-mustache/PKGBUILD
+++ b/libre/ruby-mustache/PKGBUILD
diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
index 76e4b58bd..76e4b58bd 100644
--- a/libre-testing/ruby-rdiscount/PKGBUILD
+++ b/libre/ruby-rdiscount/PKGBUILD
diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD
index 7c17669d3..7c17669d3 100644
--- a/libre-testing/sh-roundup/PKGBUILD
+++ b/libre/sh-roundup/PKGBUILD
diff --git a/libre-testing/sh-roundup/makefile-fix.patch b/libre/sh-roundup/makefile-fix.patch
index b97bebf23..b97bebf23 100644
--- a/libre-testing/sh-roundup/makefile-fix.patch
+++ b/libre/sh-roundup/makefile-fix.patch