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

Conflicts:
	community/clementine/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	testing/binutils/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glibc/PKGBUILD
	testing/linux-api-headers/PKGBUILD

11 files changed, 149 insertions, 37 deletions

diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD
index 32f7ebcb0..4a019dfba 100644
--- a/community/clementine/PKGBUILD
+++ b/community/clementine/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 55879 2011-09-24 16:48:26Z stephane $
+# $Id: PKGBUILD 61276 2011-12-28 00:29:21Z stephane $
 #Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
+#Contributor: BlackEagle <ike.devolder@gmail.com>
 #Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=clementine
-pkgver=0.7.1
-pkgrel=7
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="A music player and library organizer"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice')
+depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
+         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
+         'qjson' 'libcdio' 'protobuf')
 makedepends=('cmake' 'boost')
 optdepends=('gstreamer0.10-base-plugins: for more open formats'
             'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
             'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries'
             'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
-source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
-        clementine-0.7.1-fix-devicekit.patch)
-sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142'
-          'd595e2746949363680e0d64fe2fb97b524c8d27c')
+source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('ba49c686ea5759e33d6b89179965503fd369cf30')
 install=clementine.install
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF
+   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
    make
 }
 
diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD
index a174d3eb9..4556016c0 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 52225 2011-07-22 05:51:08Z ttopper $
+# $Id: PKGBUILD 61262 2011-12-27 10:18:54Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3status
-pkgver=2.3
+pkgver=2.4
 pkgrel=1
 pkgdesc="Generates status bar to use with dzen2 or xmobar"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('wireless_tools' 'confuse' 'alsa-lib')
 makedepends=('asciidoc')
 install=i3status.install
 options=('docs')
-source=(http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2)
-md5sums=('6a74863c525908be4465c0353ed5b999')
+source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2")
+md5sums=('5854250c6bd4f2d1def986efc516aeb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
new file mode 100644
index 000000000..7983e7bad
--- /dev/null
+++ b/community/luaposix/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 61274 2011-12-27 22:28:27Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Laszlo Papp <djszapi at archlinux us>
+# Contributor: Donald Ephraim Curtis <dcurtis@gmail.com>
+
+pkgname=luaposix
+pkgver=5.1.15
+pkgrel=1
+pkgdesc='A POSIX library for Lua programming language'
+arch=('i686' 'x86_64')
+url='http://luaforge.net/projects/luaposix/'
+license=('GPL' 'LGPL')
+depends=('lua')
+options=('!libtool')
+source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('c492541a768302fb67ad14a294306f3a')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+              --libdir=/usr/lib/lua/5.1 \
+              --datadir=/usr/share/lua/5.1 
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make PREFIX=/usr DESTDIR="$pkgdir/" install
+
+  # examples
+  install -d "$pkgdir/usr/share/$pkgname/examples"
+  install -D -m 644 *.lua "$pkgdir/usr/share/$pkgname/examples"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index 2748143b3..d8f99ecc3 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 58662 2011-11-17 11:26:44Z lfleischer $
+# $Id: PKGBUILD 61280 2011-12-28 01:40:23Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=mixxx
-pkgver=1.9.2
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Free, open source software for digital DJ'ing."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mixxx.org'
 license=('GPL')
 depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
-         'qt>=4.5' 'taglib')
+         'qt>=4.5' 'taglib' 'qtwebkit')
 makedepends=('mesa' 'scons' 'libshout')
 source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
-md5sums=('f84095951f66b12af5cf45d19200ff82')
+md5sums=('d92bf422491fa92adf7ed6c2998e67fb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index b222d50b4..97626639c 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59194 2011-11-21 14:53:22Z lfleischer $
+# $Id: PKGBUILD 61278 2011-12-28 01:38:00Z seblu $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
-pkgver=3.0.18
+pkgver=3.0.19
 pkgrel=1
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src
         'privoxy'
         'privoxy.logrotate.d'
         'privoxy.conf.d')
-md5sums=('baf0b13bb591ec6e1ba15b720ddea65c'
+md5sums=('57acc79059565cc42eda67982842785d'
          '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
          '79480f311313cc43974f6cbe6b672927'
          '27830ef79418e277b90c1c1fa933f876')
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index eb6c882d1..d1358029e 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -1,24 +1,32 @@
-# $Id: PKGBUILD 40227 2011-02-22 02:15:34Z stephane $
+# $Id: PKGBUILD 61264 2011-12-27 15:33:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jose Negron <josenj.arch@mailnull.net>
 
 pkgname=sdcc
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('bash' 'gcc-libs')
-makedepends=('gputils' 'flex' 'bison' 'patch')
+depends=('bash' 'gcc-libs' 'boost-libs')
+makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
 optdepends=('python')
 url="http://sdcc.sourceforge.net/"
 options=(!strip)
 source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('20fbd49a3421e09fe65577c45524c89e')
+md5sums=('92202e970071a8b506fea62a913bd2d2')
 
 build() {
   cd $srcdir/$pkgname
   LDFLAGS="-lm" ./configure --prefix=$pkgdir/usr
+
+  # gcc -O2 bug workaround
+  [ $CARCH == "i686" ] && (
+	cd src &&
+	make SDCCy.h &&
+	gcc -g -O0  -I. -I.. -I./../support/util -c SDCCicode.c -o SDCCicode.o
+  )
+
   make
   make install
   strip $pkgdir/usr/bin/* || true
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index 0d7c36aa6..cf6abf2ea 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55957 2011-09-26 19:23:41Z schiv $
+# $Id: PKGBUILD 61284 2011-12-28 02:21:17Z seblu $
 # Maintainer: Ray Rashif <schiv@archlinux.org
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=tellico
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tellico-project.org/"
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 3c326284e..b71dd9630 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48643 2011-06-03 16:57:46Z stephane $
+# $Id: PKGBUILD 61282 2011-12-28 01:58:33Z seblu $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -6,8 +6,8 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=yaz
-pkgver=4.1.7
-pkgrel=2
+pkgver=4.2.24
+pkgrel=1
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
@@ -15,7 +15,7 @@ url="http://www.indexdata.dk/yaz"
 depends=('openssl' 'libxslt' 'icu')
 options=('!libtool')
 source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('d4b94fc70bfc105fc034c4b51b7b5cae')
+md5sums=('204486e174159e70c4ce6341e7af3b0a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 333ad967f..be447b2ae 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144063 2011-12-02 20:54:47Z ibiru $
+# $Id: PKGBUILD 145696 2011-12-28 00:18:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
-pkgver=3.1.5
-pkgrel=2
+pkgver=3.1.6
+pkgrel=1
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
@@ -14,7 +14,7 @@ makedepends=('ctags' 'boost')
 options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3117ee47c1c6b0668667e20d2aca3757')
+md5sums=('44856c15a5dc8694e30d92f640ed348f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD
new file mode 100644
index 000000000..216379b31
--- /dev/null
+++ b/testing/valgrind/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 145691 2011-12-27 10:54:37Z allan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=valgrind
+pkgver=3.7.0
+pkgrel=2
+pkgdesc="A tool to help find memory-management problems in programs"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://valgrind.org/"
+depends=('glibc>=2.15' 'glibc<2.16' 'perl')
+makedepends=('gdb')
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.7.0-glibc-2.15.patch)
+md5sums=('a855fda56edf05614f099dca316d1775'
+         'f534b79b358cdced0319b375aafde4d5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+  else
+    ./configure --prefix=/usr --mandir=/usr/share/man
+  fi
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch
new file mode 100644
index 000000000..fa400b953
--- /dev/null
+++ b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch
@@ -0,0 +1,30 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
++++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,17 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.15)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
++$as_echo "2.15 family" >&6; }
++
++$as_echo "#define GLIBC_2_15 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
++
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+@@ -6422,7 +6433,7 @@
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
+ esac