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

Conflicts:
	community/projectm/PKGBUILD
	core/udev/PKGBUILD
	extra/libdmapsharing/PKGBUILD
	multilib/lib32-udev/PKGBUILD
	multilib/wine/PKGBUILD

10 files changed, 65 insertions, 37 deletions

diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 28365ff5e..29c80bbd3 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120785 2011-04-26 15:12:27Z ibiru $
+# $Id: PKGBUILD 125706 2011-05-28 10:53:12Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'clutter-gst'
+depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst'
          'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
 groups=('gnome-extra')
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 494341f87..a03a3630e 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $
+# $Id: PKGBUILD 125696 2011-05-28 10:41:59Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME3 web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss'
          'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme')
+         'hicolor-icon-theme' 'seed')
 makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
@@ -23,7 +23,8 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \
-      --enable-network-manager
+      --enable-network-manager \
+      --enable-seed
   make
 }
 
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 6b666f476..fe6d43a9e 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119590 2011-04-12 15:33:34Z eric $
+# $Id: PKGBUILD 125742 2011-05-29 04:00:08Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.5
+pkgver=2.4.6
 pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,8 +20,8 @@ optdepends=('evince: for print preview'
 options=('!libtool' '!makeflags')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('94168fe959743fc342812ac3a01814a1')
-sha1sums=('4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126')
+md5sums=('b7d5fbb1bddf3618c97ebeeb76408ebe')
+sha1sums=('b6d4a6bc327ef5a260d070215a14a3180b474ad8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index 2347fc4f7..fb532e990 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 117405 2011-04-01 16:34:19Z ibiru $
+# $Id: PKGBUILD 125725 2011-05-28 15:53:41Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libdmapsharing
-pkgver=2.9.7
+pkgver=2.9.12
 pkgrel=1
-pkgdesc="Libdmapsharing is a library you may use to access and share DMAP content"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="A library that implements the DMAP family of protocols"
+arch=('i686' 'x86_64')
 url="http://www.flyn.org/projects/libdmapsharing/index.html"
 license=('LGPL2.1')
 depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2')
 options=('!libtool')
 source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5eeded6d82ed2c2f6f310b9bd484798c')
+md5sums=('ec34948df21e9ba0656c917b10fed1c3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --with-mdns=avahi
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 1bf49cf8f..7b918c9ec 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108496 2011-01-31 15:55:57Z jgc $
+# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.8.7
+pkgver=4.8.8
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('97e30989a56ab813453b71261849c200'
+md5sums=('b3a961d2e0ff3331745220984c70b6a9'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
@@ -32,6 +32,10 @@ build() {
       --enable-optimize \
       --disable-debug ${confflags}
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   NSPR_LIBS=`./config/nspr-config --libs`
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index d0768b67a..88c740808 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 109101 2011-02-06 10:02:09Z andyrtr $
+# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=nss
-pkgver=3.12.9
+pkgver=3.12.10
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
@@ -11,14 +11,14 @@ _nsprver=4.8.7
 depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh')
 makedepends=('perl')
 replaces=('nss-nspr')
+options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-options=('!strip')
-md5sums=('bd32f183ca28440c1744650be31a9ccc'
+md5sums=('027954e894f02732f4e66cd854261145'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f'
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
index 1d7d537dd..5211c17d2 100644
--- a/extra/ntrack/PKGBUILD
+++ b/extra/ntrack/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118407 2011-04-06 16:43:17Z andrea $
+# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ntrack
 pkgver=13
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A network connectivity tracking library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,17 @@ url="http://launchpad.net/ntrack/"
 license=('LGPL')
 depends=('qt' 'libnl' 'gcc-libs')
 makedepends=('python2')
-optdepends=('python2')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz")
-md5sums=('90596b924a108f8b4eea52239ba64369')
-options=('!libtool')
+source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
+        'dead-loop-fix.patch')
+md5sums=('90596b924a108f8b4eea52239ba64369'
+         '02bda6ae15ef04b6a7d9273c37752681')
+options=('!libtool' '!emptydirs')
 
 build() {
   cd "${srcdir}/${pkgname}-0${pkgver}"
+
+  patch -p0 -i "${srcdir}"/dead-loop-fix.patch
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch
new file mode 100644
index 000000000..133bb4ace
--- /dev/null
+++ b/extra/ntrack/dead-loop-fix.patch
@@ -0,0 +1,14 @@
+=== modified file 'modules/ntrack-libnl.c'
+--- modules/ntrack-libnl.c	2011-04-25 16:28:19 +0000
++++ modules/ntrack-libnl.c	2011-04-25 17:25:24 +0000
+@@ -394,6 +394,9 @@
+ 		if (rtnl_link_get_ifindex(link) > iindex)
+ 			break;
+ 		i = i->next;
++
++		if (i == linklist)
++			break;
+ 	}
+ 	return result;
+ }
+
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index a2a7721cf..92c049e73 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 121957 2011-04-30 20:53:21Z eric $
+# $Id: PKGBUILD 125726 2011-05-28 15:54:25Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1
-pkgrel=3
+pkgver=2.90.1.git20110528
+pkgrel=1
 pkgdesc="An iTunes-like music player/libary"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -20,8 +20,8 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
 options=('!libtool' '!emptydirs' '!strip')
 install=rhythmbox.install
 #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110426.tar.xz)
-sha256sums=('513cfa653cf68a05b1fe5f6e41744af4baed0d0fff169000b3153effa232e23d')
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8e73675d36a90950034862e1aaa8db96267c8c4563823983d3ee2dc239c0a4f0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 1a636f80e..e54d2ecb6 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125527 2011-05-26 14:21:55Z giovanni $
+# $Id: PKGBUILD 125719 2011-05-28 14:45:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -18,7 +18,8 @@ depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
            'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
 makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
+             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
+             'lirc-utils' 'gnutls' 'libcaca')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'