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

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

1 files changed, 9 insertions, 8 deletions

diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 23078e19e..e68efbb37 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 173078 2012-12-10 11:38:58Z jgc $
+# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z 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.6.3
-pkgrel=2.1
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 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
+         hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
          clutter-gtk python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus vala grilo pylint dbus-glib libzeitgeist)
+makedepends=(intltool libnautilus-extension vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl)
 [ "$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=('ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60'
+sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
@@ -34,10 +34,11 @@ build() {
 }
 
 package_totem() {
-  groups=(gnome-extra)
+  groups=(gnome)
   install=totem.install
   optdepends=('gst-plugins-ugly: Extra media codecs'
-              'gst-ffmpeg: Extra media codecs'
+              'gst-libav: Extra media codecs'
+              'lirc-utils: Infrared Remote Control plugin'
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin'
               'libzeitgeist: Zeitgeist plugin')