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

15 files changed, 37 insertions, 50 deletions

diff --git a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
index 0349036ec..dd426fad7 100644
--- a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
@@ -40,9 +40,6 @@ build() {
 package() {
 
 	cd ${srcdir}/${_pkgname}-${pkgver}
-# Compat symlinks
-    ln -s ${_sysroot}/usr/lib ${pkgdir}${_sysroot}/lib
-    ln -s ${_sysroot}/lib ${pkgdir}${_sysroot}/lib32
 	
 	make DESTDIR=${pkgdir} install
 
diff --git a/kernels/aufs3-libre/PKGBUILD b/kernels/aufs3-libre/PKGBUILD
index 64bc71c9e..6c593e2c2 100644
--- a/kernels/aufs3-libre/PKGBUILD
+++ b/kernels/aufs3-libre/PKGBUILD
@@ -1,16 +1,17 @@
 # Contributor: Paul Mattal <pjmattal@elys.com>
 # Maintainer: Calimero <calimeroteknik@free.fr>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgname=aufs3-libre
 pkgver=3.2_20120109
-pkgrel=1
+pkgrel=2
 
 # Set to whatever the tree of your aufs-libre-friendly kernel is, and set the right dependency.
 #_kernver=${pkgver%_*}-LIBRE
 #depends=('aufs_friendly')
 
-_kernver=3.2-aufs_friendly
+_kernver=3.2-LIBRE-AUFS_FRIENDLY
 depends=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers')
 
 pkgdesc="Another UnionFS implementation"
diff --git a/kernels/aufs3-libre/aufs3-libre.install b/kernels/aufs3-libre/aufs3-libre.install
index 6e92c8e9a..e08b76b54 100644
--- a/kernels/aufs3-libre/aufs3-libre.install
+++ b/kernels/aufs3-libre/aufs3-libre.install
@@ -1,5 +1,5 @@
 post_install() {
-  KERNEL_VERSION=3.2-aufs_friendly
+  KERNEL_VERSION=3.2-LIBRE-AUFS_FRIENDLY
   depmod $(cat /lib/modules/extramodules-$KERNEL_VERSION/version)
 }
 
diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD
index 49b0adba1..41ccc96bb 100644
--- a/kernels/linux-libre-aufs_friendly/PKGBUILD
+++ b/kernels/linux-libre-aufs_friendly/PKGBUILD
@@ -6,6 +6,7 @@
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 # In order to just get linux-libre as it used to be, with the exported symbols for AUFS-libre:
 
@@ -17,12 +18,12 @@
 # Comment this line
 pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support
 
-_kernelname=${pkgname#linux-libre}
+_kernelname=-LIBRE-AUFS_FRIENDLY
 _basekernel=3.2
 _sublevel=9
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -205,10 +206,6 @@ package_linux-libre-aufs_friendly() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
index eb2293d00..09ca175a6 100644
--- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
+++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-aufs_friendly
-KERNEL_VERSION=3.2.9-1-LIBRE-AUFS_FRIENDLY
+KERNEL_VERSION=3.2.9-2-LIBRE-AUFS_FRIENDLY
 
 post_install () {
   # updating module dependencies
@@ -14,7 +14,7 @@ post_install () {
   fi
 
   # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
+  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-aufs_friendly" ]; then
     loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 47f4e371c..6f14461fe 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -6,11 +6,12 @@
 # Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgbase=linux-libre-rt
 pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel with RT support
 # pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux-libre}
+_kernelname=-LIBRE-RT
 _basekernel=3.2
 _releasever=6
 _rtpatchver=rt13
@@ -136,10 +137,6 @@ package_linux-libre-rt() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 5c40a32e9..79c6aea4d 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -1,8 +1,8 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
-KERNEL_NAME=
-KERNEL_VERSION=3.2.2-LIBRE
+KERNEL_NAME=-rt
+KERNEL_VERSION=3.2.6-2-LIBRE-RT
 
 post_install () {
   # updating module dependencies
@@ -12,7 +12,7 @@ post_install () {
   mkinitcpio -p linux-libre${KERNEL_NAME}
 
   # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
+  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-rt" ]; then
     loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 1dd0325fd..72d62953e 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -4,11 +4,12 @@
 # Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgbase=linux-libre-xen
 pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kernel with Xen guest support
 # pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux-libre}
+_kernelname=-LIBRE-XEN
 _basekernel=3.2
 pkgver=${_basekernel}.9
 pkgrel=2
@@ -131,10 +132,6 @@ package_linux-libre-xen() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 63985389f..609bf0a79 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.2.9-1-LIBRE-XEN
+KERNEL_VERSION=3.2.9-2-LIBRE-XEN
 
 post_install () {
   # updating module dependencies
@@ -12,7 +12,7 @@ post_install () {
   mkinitcpio -p linux-libre${KERNEL_NAME}
 
   # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
+  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-xen" ]; then
     loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
diff --git a/~mtjm/h-client/PKGBUILD b/libre/h-client/PKGBUILD
index 4df7f5f28..e77a2437e 100644
--- a/~mtjm/h-client/PKGBUILD
+++ b/libre/h-client/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 
 pkgname=h-client
-_pkgver=0.0a0.dev-r80
+_pkgver=0.0a0.dev-r107
 pkgver=${_pkgver/-/.}
 pkgrel=1
 pkgdesc="A client for an h-source server (such as http://www.h-node.com)"
@@ -10,9 +10,15 @@ url="https://savannah.nongnu.org/projects/h-client/"
 license=('GPL3')
 depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
 options=(!emptydirs)
-# Official source is in SVN, this is made by "python2 setup.py sdist".
-source=("http://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
-sha512sums=('d148084be40aa741f012ba49285ea428b4d6c032a015f732e1a7987f8125acd04a033df97e4536cc9587a3535f701305e4d44f641479e99d0e49a0da652abf2a')
+# Official source is in SVN, this is made by "python2 setup.py sdist"
+# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0).
+source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
+sha512sums=('d820871fcf3f92e6e31aa02273ae413bf066524eaf245f1d4cf7dc8b0ba5799eb07bf86dd28861c8878c73147bbcae563668cb3a6fa9c3382c751e6717d85f0c')
+
+build() {
+  cd "$srcdir/hclient-${_pkgver}"
+  make
+}
 
 check() {
   cd "$srcdir/hclient-${_pkgver}"
@@ -21,10 +27,8 @@ check() {
 
 package() {
   cd "$srcdir/hclient-${_pkgver}"
-  # Remove tests, they aren't useful after installation.
-  rm -rf {,build/lib/}tests_hclient
-  rm -rf {,build/lib/}hclient.egg-info
   python2 setup.py install --root="$pkgdir/" --optimize=1
+  make DESTDIR="$pkgdir" prefix=/usr install-data
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 49963eb05..a55354717 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=3.1.6
 _basever=3.1
 pkgrel=2
 pkgdesc="Kernel Libre headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
 provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}")
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 5ff568522..fb028fc2b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -2,11 +2,12 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgbase=linux-libre-lts
 pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux-libre}
+_kernelname=-LIBRE-LTS
 _basekernel=3.0
 _sublevel=23
 pkgver=${_basekernel}.${_sublevel}
@@ -180,10 +181,6 @@ package_linux-libre-lts() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 2de3804e6..f4f5fd6ad 100644
--- 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.23-1-LIBRE-LTS
+KERNEL_VERSION=3.0.23-2-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5b8430f86..8e2cbd99e 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -5,16 +5,17 @@
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
 
 pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
-_kernelname=${pkgname#linux-libre}
+_kernelname=-LIBRE
 _basekernel=3.2
 _sublevel=9
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -190,10 +191,6 @@ package_linux-libre() {
 
   # set correct depmod command for install
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index ea00c881c..9e530d55f 100644
--- 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.2.9-1-LIBRE
+KERNEL_VERSION=3.2.9-3-LIBRE
 
 post_install () {
   # updating module dependencies