Merge branch 'master' of vparabola:~/abslibre-pre-mips64el

Conflicts:
	community/csfml/PKGBUILD
	community/evolution-rss/PKGBUILD
	community/inn/PKGBUILD
	community/libssh2/PKGBUILD
	community/perl-xml-dom/PKGBUILD
	community/php52/PKGBUILD
	community/python-pysfml/PKGBUILD
	community/skype-call-recorder/PKGBUILD
	extra/ipod-sharp/PKGBUILD
	extra/madwifi-utils/PKGBUILD
	extra/madwifi/PKGBUILD

5 files changed, 51 insertions, 23 deletions

diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD
index 53a6d7de3..85be7ae08 100644
--- a/multilib/lib32-libcap/PKGBUILD
+++ b/multilib/lib32-libcap/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgbasename=libcap
 pkgname=lib32-$_pkgbasename
-pkgver=2.19
-pkgrel=4
+pkgver=2.21
+pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities (32-bit)"
 arch=(x86_64 'mips64el')
 url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('lib32-attr' $_pkgbasename)
 makedepends=('gcc-multilib')
 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('9caa6dafc9e3db4cbaecdb8e48f23fa2')
+md5sums=('61966ef40f2dee8731b69db895e4548d')
 
 build() {
   cd ${srcdir}/${_pkgbasename}-${pkgver}
diff --git a/multilib/lib32-libjpeg-turbo/PKGBUILD b/multilib/lib32-libjpeg-turbo/PKGBUILD
new file mode 100644
index 000000000..09102ad96
--- /dev/null
+++ b/multilib/lib32-libjpeg-turbo/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 48100 2011-05-28 16:27:44Z bluewind $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
+
+_pkgbasename=libjpeg-turbo
+pkgname=lib32-$_pkgbasename
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)"
+arch=('x86_64')
+url="http://libjpeg-turbo.virtualgl.org/"
+license=('GPL' 'custom')
+depends=('lib32-glibc' $_pkgbasename)
+makedepends=('nasm' gcc-multilib)
+provides=('lib32-libjpeg=8.0.2')
+conflicts=('lib32-libjpeg')
+replaces=('lib32-libjpeg')
+options=('!libtool')
+source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz)
+md5sums=('03b9c1406c7bfdc204313c2917ce6962')
+
+build() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure
+  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD
index 3545cd2b4..6099cd8c2 100644
--- a/multilib/lib32-udev/PKGBUILD
+++ b/multilib/lib32-udev/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=('lib32-udev')
-pkgver=166
+pkgver=171
 pkgrel=1
 arch=('x86_64' 'mips64el')
 pkgdesc="The userspace dev tools (udev) (32-bit)"
@@ -14,7 +14,7 @@ options=(!makeflags !libtool)
 depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev')
 makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2)
-md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb')
+md5sums=('bdf4617284be2ecac11767437417e209')
 
 build() {
   export CC="gcc -m32"
diff --git a/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch b/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch
deleted file mode 100644
index 0f6eba68e..000000000
--- a/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/npw-viewer.sh
-+++ src/npw-viewer.sh
-@@ -5,6 +5,11 @@
- OS="`uname -s | tr '[A-Z]' '[a-z]'`"
- ARCH="`uname -m`"
- 
-+# Adobe Flash can be confised by by a recent GTK+ that may use custom
-+# window structure instead of native X Window. Revert to the old dumb
-+# behavior and use native X window for all objects. (bnc#537788)
-+export GDK_NATIVE_WINDOWS=1
-+
- if test -z "$TARGET_OS"; then
-     echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized"
-     exit 1
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 60b95fce0..bdd3d02d8 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 46925 2011-05-13 19:38:18Z bluewind $
+# $Id: PKGBUILD 48109 2011-05-28 20:43:37Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.3.20
-pkgrel=1
+pkgver=1.3.21
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('2d9fe8755172a21ddc453d720a497ad9')
+md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@@ -26,6 +26,7 @@ depends=(
   libxrandr       lib32-libxrandr
   libxdamage      lib32-libxdamage
   libxxf86dga     lib32-libxxf86dga
+  libxi           lib32-libxi
   alsa-lib        lib32-alsa-lib
   desktop-file-utils
 )