Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ascii/PKGBUILD
	community/shapelib/PKGBUILD
	core/e2fsprogs/PKGBUILD

8 files changed, 65 insertions, 50 deletions

diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index 959969ea2..c4b1c55bc 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -3,15 +3,15 @@
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=ascii
-pkgver=3.11
-pkgrel=2.1
+pkgver=3.12
+pkgrel=1
 pkgdesc="Utility for conversion between various byte representations and the ASCII character table"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.catb.org/~esr/ascii"
 license=('BSD')
 depends=('glibc')
 source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz")
-md5sums=('ba8a9392f8aa8c6b7a52923fba870579')
+md5sums=('d06267813ac83ed511b7330f43fcc4ee')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 9b7681a75..03ad2c151 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92611 2013-06-10 02:46:36Z fyan $
+# $Id: PKGBUILD 93040 2013-06-23 03:02:10Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.1e.20130608
+pkgver=0.1f
 _commit=66b7498a7530a1c47dabbe05c0726a9188353217
 pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
@@ -14,7 +14,8 @@ optdepends=('pidgin: Multi-protocol instant messaging client'
 	    'telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
-source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit")
+#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit")
+source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver")
 md5sums=('SKIP')
 
 build()
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index d35f348f8..7ef4d64bd 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90424 2013-05-12 10:14:44Z andrea $
+# $Id: PKGBUILD 93061 2013-06-23 17:21:00Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://rekonq.kde.org/'
@@ -16,7 +16,7 @@ optdepends=('kdebase-konqueror: search engines support'
             'qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('f84fe975e79cbdcd218eb73d5371ee5ca0e11a2aea0d1d890ba9f24a505cf65c')
+sha256sums=('1c552bad65c640bcd1a7550d45ad37ad93e16e75f14cf71685363e04f4c2a658')
 
 build(){
   mkdir build
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index d08ab923b..da73f52d4 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,33 +1,43 @@
-# $Id: PKGBUILD 90199 2013-05-08 13:40:53Z bpiotrowski $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# $Id: PKGBUILD 93041 2013-06-23 03:50:51Z foutrelis $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=shapelib
 pkgver=1.3.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc='simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
 options=('!libtool')
-source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
-        LICENSE)
+source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        "LICENSE")
 sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
             '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  sed -ri "s:^(CFLAGS\s*=\s*):\1 ${CFLAGS} :" Makefile
   
+  sed -i -e s:'-fPIC':"${CFLAGS} -fPIC": Makefile
   make lib
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
   # The Makefile won't install it correctly, this is easier.
   install -D -m644 libshp.a "$pkgdir/usr/lib/libshp.a"
   install -D -m644 shapefil.h "$pkgdir/usr/include/libshp/shapefil.h"
+  install -dm755 "$pkgdir"/usr/{lib,include}
+
+  # Fix the broken makefile
+  sed -i -e s:/usr/local:${pkgdir}/usr: Makefile
+  sed -i -e s:/usr/bin/install:/bin/install: Makefile
+  make lib_install
+  
+  # Fix world readable bit not set
+  chmod 644 $pkgdir/usr/include/shapefil.h
+
   install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 4dba9fb7f..361c29a4c 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 88762 2013-04-22 09:40:39Z tpowa $
+# $Id: PKGBUILD 93065 2013-06-23 17:40:20Z seblu $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.12
-pkgrel=2
+pkgver=4.2.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts-headers'
+makedepends=('linux-lts'
+             'linux-lts-headers'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,40 +33,38 @@ build() {
 }
 
 package_virtualbox-host-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-host-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules-lts.install"
 }
 
 package_virtualbox-guest-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules-lts.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
index d2984a743..82bda9855 100644
--- a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
@@ -1,16 +1,18 @@
-EXTRAMODULES='extramodules-3.0-lts'
+VERSION=''
 
 post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
index 07ecf7311..6c1a57d3a 100644
--- a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
@@ -1,18 +1,20 @@
-EXTRAMODULES='extramodules-3.0-lts'
+VERSION=''
 
 post_install() {
 cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
+  depmod $VERSION
+  echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index dc4eac812..e3862c973 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93018 2013-06-22 10:01:54Z tpowa $
+# $Id: PKGBUILD 93064 2013-06-23 17:40:06Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.12
-pkgrel=9
+pkgver=4.2.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')