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

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

1 files changed, 14 insertions, 47 deletions

diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD
index 6217a30d3..1f0927322 100644
--- a/extra/gnome-media/PKGBUILD
+++ b/extra/gnome-media/PKGBUILD
@@ -1,71 +1,38 @@
-# $Id: PKGBUILD 104482 2011-01-03 16:03:30Z ibiru $
+# $Id: PKGBUILD 111636 2011-02-27 21:57:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=gnome-media
-pkgname=(gnome-media gnome-media-pulse)
-pkgver=2.32.0
-pkgrel=3
+pkgname=gnome-media
+pkgver=2.91.2
+pkgrel=2
 pkgdesc="GNOME Media Tools"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('gstreamer0.10-good-plugins>=0.10.24' 'gstreamer0.10-base-plugins>=0.10.30' 'libcanberra>=0.25' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.1' 'libunique>=1.1.6' 'libpulse')
+depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
+replaces=('gnome-media-pulse')
 options=('!libtool' '!emptydirs')
 install=gnome-media.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome_volume_control_fix_channel_bars.patch)
-sha256sums=('2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6'
-            '51e59fb42114d70118f4b750a06a33e0e40b0a03ed6509dc1348c641cc274d74' )
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('4aadc834d04c3d6f573fad667a69c6dc9668240e759cbd8cfb14d053d8e4da5f')
 
 build() {
-  cd "${srcdir}"
-  patch -Np0 -i "${srcdir}/gnome_volume_control_fix_channel_bars.patch"
-  cp -a "${pkgbase}-${pkgver}"{,-pulse}
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
-  cd "${pkgbase}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-media \
       --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-pulseaudio
-  make
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-pulse"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-media \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --enable-pulseaudio
+      --disable-scrollkeeper
   make
 }
 
-_commonpackage() {
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 
-  # remove it from Xfce menu that ships its own thingy
-  echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/gnome-volume-control.desktop
-}
-
-package_gnome-media() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  _commonpackage
-}
-
-package_gnome-media-pulse() {
-  pkgdesc+=" with PulseAudio support"
-  depends+=(libpulse)
-  groups=(pulseaudio-gnome)
-  conflicts=(gnome-media)
-  provides=("gnome-media=${pkgver}-${pkgrel}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-pulse"
-  _commonpackage
-
-  # Install missing icon
-  install -Dm644 \
-    gst-mixer/icons/16x16/status/audio-input-microphone-muted.png \
-    "${pkgdir}/usr/share/icons/hicolor/16x16/status/audio-input-microphone-muted.png"
+  rm -rf "${pkgdir}/usr/share/sounds/"
 }