Merge branch 'master' of ssh://gparabola/srv/git/abslibre

9 files changed, 34 insertions, 91 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/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 294c5afbf..68dfccc79 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.6.5
+_kernver=3.6.6
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _pkgver=2012-10-03
 pkgver=20121003
-pkgrel=4
+pkgrel=5
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index ffda9f21f..65bae7c0b 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.50
+_kernver=3.0.51
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _pkgver=2012-10-03
 pkgver=20121003
-pkgrel=5
+pkgrel=6
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 1bcdb57fd..b7ffda209 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=50
+_sublevel=51
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.49 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '8c0723e49160ecd399205f9bbb8ee076'
+         'fb3c742b1f8b01131534a22348cfa712'
          'aed25ab047e1c0b020a1516c235c6a74'
          '7d37e8ce0f4bd5a957172b12ae742ea0'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'fba8d3ccd4a7e5b1132c9e20f60df1df')
+         'e2cc9f33fb26b254b6b65f8981aebf13')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index c961f9a99..75238bf66 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.50-1-LIBRE-LTS
+KERNEL_VERSION=3.0.51-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index d5b44814f..0487c2e84 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.6
-_sublevel=5
+_sublevel=6
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.6.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         'a126c193c6fbb3acff00c426493897df'
+         '887e4a0fd0fb10da9410f5d1a75466b8'
          'e4a3a4677e1fac6ecf0e0fb44c41ca08'
          '68fc36a4efb6ade0eca409b9444fef0c'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +43,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'ba95fd06943438f0cf54d1818e034fcc')
+         '16173f50a1a39e908825fe6fe90ac103')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 30b5abc90..8a3791240 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.6.5-1-LIBRE
+KERNEL_VERSION=3.6.6-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
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')