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

3 files changed, 20 insertions, 77 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index dec731c97..6efc06b90 100755..100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,102 +1,45 @@
 # Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 
 pkgbase=libretools
 pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=$(date -u +%Y%m%d)
-pkgrel=2
-pkgdesc="Scripts for easing Parabola's tasks"
-arch=('any')
+pkgver=20121107
+pkgdesc="Scripts for Parabola development"
 url="http://parabolagnulinux.org"
 license=('GPL3+')
-depends=(openssh rsync git wget)
-optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)')
-makedepends=(git)
-install=libretools.install
-source=()
-md5sums=()
 
-_gitroot="http://projects.parabolagnulinux.org/libretools.git"
-_gitname="libretools"
+pkgrel=1
+arch=('any')
+depends=(openssh rsync git wget devtools)
+install=libretools.install
+source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar.bz2)
 
 build() {
-  cd "$srcdir"
- ## Git checkout
-  if [ -d $srcdir/${_gitname} ] ; then
-    msg "Git checkout:  Updating existing tree"
-    cd ${_gitname} && git pull ${_gitroot}
-    msg "Git checkout:  Tree has been updated"
-  else
-    msg "Git checkout:  Retrieving sources"
-    git clone ${_gitroot}  
-  fi
-  msg "Checkout completed"
- ## Build
+  cd "$srcdir/$pkgbase-$pkgver"
+  make
 }
 
 package_libretools() {
   backup=(etc/libretools.conf)
 
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
-
-  install -d ${pkgdir}/usr/bin
-  install -d ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/abslibre-commit        ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/add-mips64el           ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/aur                    ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/buildenv               ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/chcleanup              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/createworkdir          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/diff-unfree            ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg                ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg-build          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg-find           ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/is_built               ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/is_unfree              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/lb                     ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/libreaddiff            ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librebasebuilder       ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librechroot            ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/librecommit            ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librediff              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/libremakepkg           ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/libremessages          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/libremkchroot          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librerelease           ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librerepkg             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librestage             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru                   ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru-path              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru-utils             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru-where             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/updateabslibre         ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/update-cleansystem     ${pkgdir}/usr/sbin
-  
-  install -d ${pkgdir}/usr/share/pacman
-  install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
+  cd "$srcdir/$pkgbase-$pkgver"
+  make install-libretools DESTDIR="$pkgdir"
+  install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto
 }
 
 package_libretools-pr() {
   backup=('etc/libretools.d/prtools.conf')
 
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prtools/prtoru ${pkgdir}/usr/bin
+  cd "$srcdir/$pkgbase-$pkgver"
+  make install-libretools-pr DESTDIR="$pkgdir"
 }
 
 package_libretools-mips64el() {
   backup=('etc/libretools.d/mips64el.conf')
 
-  install -d ${pkgdir}/etc/libretools.d
-  install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/mips64el/mips-add ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/mips64el/mipsrelease ${pkgdir}/usr/bin
+  cd "$srcdir/$pkgbase-$pkgver"
+  make install-libretools-mips64el DESTDIR="$pkgdir"
 }
+
+md5sums=('d80cc433cc627b2d7aa1c37f794d2ef9')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 69a0f2467..69a0f2467 100755..100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 649cb962d..9c5f6242c 100755
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -24,4 +24,4 @@ package() {
         ))
 }
 
-md5sums=('5e50a4ec73267a732d153c1079e9b021')
+md5sums=('cc8ed9a33d0c58fcecc3323f831f687e')