Fix sliders not working properly (bug #359489 by JC Greca), reorder dependencies and fix slots.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

3 files changed, 88 insertions, 1 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index bb5bd449e038..6cd02c10e4bf 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.235 2011/03/12 19:08:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.236 2011/03/19 18:02:42 pacho Exp $
+
+*gnome-media-2.32.0-r1 (19 Mar 2011)
+
+  19 Mar 2011; Pacho Ramos <pacho@gentoo.org> +gnome-media-2.32.0-r1.ebuild,
+  +files/gnome-media-2.32.0-gvc-channel.patch:
+  Fix sliders not working properly (bug #359489 by JC Greca), reorder
+  dependencies and fix slots.
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gnome-media-2.32.0.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #353436
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.32.0-gvc-channel.patch b/gnome-extra/gnome-media/files/gnome-media-2.32.0-gvc-channel.patch
new file mode 100644
index 000000000000..9d3de0331e27
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.32.0-gvc-channel.patch
@@ -0,0 +1,12 @@
+diff -aur gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c
+--- gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c	2010-09-28 15:46:15.000000000 +0100
++++ gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c	2010-12-31 15:14:23.964994328 +0000
+@@ -449,7 +449,7 @@
+                 /* Switch side scroll to vertical */
+                 if (direction == GDK_SCROLL_RIGHT)
+                         direction = GDK_SCROLL_UP;
+-                else if (GDK_SCROLL_LEFT)
++                else if (direction == GDK_SCROLL_LEFT)
+                         direction = GDK_SCROLL_DOWN;
+         }
+ 
diff --git a/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..d3db2397663b
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild,v 1.1 2011/03/19 18:02:42 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="pulseaudio"
+
+# FIXME: automagic dev-util/glade:3 support
+RDEPEND="dev-libs/libxml2:2
+	>=dev-libs/glib-2.18.2:2
+	>=x11-libs/gtk+-2.18.0:2
+	>=gnome-base/gconf-2.6.1:2
+	>=media-libs/gstreamer-0.10.23:0.10
+	>=media-libs/gst-plugins-base-0.10.23:0.10
+	>=media-libs/gst-plugins-good-0.10:0.10
+	>=media-libs/libcanberra-0.13[gtk]
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-gconf-0.10.1:0.10
+	>=dev-libs/libunique-1:1
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.16[glib] )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35.0"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix sliders not working properly, upstream bug #645242
+	epatch "${FILESDIR}/${PN}-2.32.0-gvc-channel.patch"
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--enable-profiles
+		$(use_enable pulseaudio)
+		$(use_enable !pulseaudio gstmix)"
+	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn
+	ewarn "If you cannot play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+	if use pulseaudio; then
+		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
+		ewarn "If you do not use pulseaudio, you do not want this"
+	fi
+}