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

Conflicts:
	community/percona-server/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	core/util-linux/PKGBUILD
	extra/colord/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdm/PKGBUILD
	extra/gnome-color-manager/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-dictionary/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-search-tool/PKGBUILD
	extra/gnome-system-log/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/json-glib/PKGBUILD
	extra/libgnome-keyring/PKGBUILD
	extra/nautilus-open-terminal/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/seahorse/PKGBUILD
	extra/totem/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	extra/yelp/PKGBUILD

1 files changed, 14 insertions, 20 deletions

diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index c0f6c0c7a..7926b2eca 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 162987 2012-07-04 17:04:09Z ibiru $
+# $Id: PKGBUILD 169975 2012-10-30 22:59:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.4.3
+pkgver=3.6.2
 pkgrel=1
-pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
+pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
-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' 'python2-gobject')
-makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata'
-             'libepc' 'bluez' 'vala' 'grilo' 'pylint')
+license=(GPL2 custom)
+depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
+         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
+         clutter-gtk mx python2-gobject gst-plugins-bad)
+makedepends=(intltool gnome-doc-utils nautilus vala grilo pylint)
 [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini)
-sha256sums=('fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db'
+sha256sums=('d23ceda705b67f3f039064da3bec0bb744490cc3c327538f756d99238e6c52e1'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
@@ -36,17 +34,13 @@ build() {
 }
 
 package_totem() {
-  groups=('gnome-extra')
+  groups=(gnome-extra)
   install=totem.install
-  optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-              'gstreamer0.10-bad-plugins: Extra media codecs'
-              'gstreamer0.10-ffmpeg: Extra media codecs')
-  [ "$CARCH" != "mips64el" ] && optdepends+=('lirc-utils: Infrared Remote Control plugin')
-  optdepends+=('libepc: Publish Playlist plugin'
-              'libgdata: YouTube Browser plugin'
-              'bluez: Bemused plugin'
+  optdepends=('gst-plugins-ugly: Extra media codecs'
+              'gst-ffmpeg: Extra media codecs'
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin')
+  [ "$CARCH" != "mips64el" ] && optdepends+=('lirc-utils: Infrared Remote Control plugin')
 
   cd "$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
@@ -55,7 +49,7 @@ package_totem() {
   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}
+    $pkgdir/usr/lib/totem/totem/totem-bugreport.py
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
 }