Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

3 files changed, 21 insertions, 19 deletions

diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index fb6f2155d..39ef02531 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 150691 2012-02-20 11:01:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 156988 2012-04-23 09:10:41Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.2.2
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
 url="http://www.gnome.org"
@@ -12,19 +13,21 @@ license=('GPL2' 'custom')
 depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
          'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
          'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
-         'clutter-gtk' 'mx')
-makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'lirc-utils'
+         'clutter-gtk' 'mx' 'python2-gobject' 'pylint')
+makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils'
              'libepc' 'bluez' 'vala' 'grilo')
 [ "$CARCH" = "mips64el" ] && {
 makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner'
              'libepc' 'bluez' 'vala' 'grilo')
 }
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        browser-plugins.ini)
+sha256sums=('eadf138068c2e31bf8fe31b3d63536cb0fe32f834fcf4fbfb453a3fff5eec7ef'
+            'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/totem \
@@ -48,11 +51,11 @@ package_totem() {
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin')
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
 
   rm -r "$pkgdir/usr/lib/mozilla"
-  rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
+  rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
 
   sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
     $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
@@ -63,12 +66,15 @@ package_totem() {
 package_totem-plugin() {
   pkgdesc="Totem plugin for web browsers"
   depends=("totem=$pkgver")
+  backup=(etc/totem/browser-plugins.ini)
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
   make -C browser-plugin \
     plugindir=/usr/lib/mozilla/plugins \
     xptdir=/usr/lib/mozilla/plugins \
     DESTDIR="$pkgdir" install
+  
+  install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
 }
diff --git a/extra/totem/browser-plugins.ini b/extra/totem/browser-plugins.ini
new file mode 100644
index 000000000..cf3014997
--- /dev/null
+++ b/extra/totem/browser-plugins.ini
@@ -0,0 +1,2 @@
+[Plugins]
+application/x-shockwave-flash.disabled=true
diff --git a/extra/totem/totem.install b/extra/totem/totem.install
index 07cb42dcb..7f0fc704b 100644
--- a/extra/totem/totem.install
+++ b/extra/totem/totem.install
@@ -1,13 +1,7 @@
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91) < 0 )); then
-    usr/sbin/gconfpkg --uninstall totem
-  fi
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {