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

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

4 files changed, 101 insertions, 2 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/Manifest b/gnome-extra/gnome-media/Manifest
index 71dd506518af..f6d7987f5673 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-media-2.30.0-lamemp3enc.patch 1196 RMD160 4dc9df3ddf49985b02c623dc8a4bef033a5752dd SHA1 2440963d6ae65addcb779609a7dca1ce1ea35a0a SHA256 0e12477ed7d8e94bb342f60205d5dc438f611915f1029141603c6f6f3322b6f4
 AUX gnome-media-2.30.0-microphone-icon.patch 1109 RMD160 8fcfb5a0bebd64fec8e16d455c5b7ee8b05b47df SHA1 f4593423110dd80afe511b069654621d273f7e99 SHA256 ea2c50ea6945598ca7c0ef495acc2934da19fb3fddea824160b46a339e16ccff
+AUX gnome-media-2.32.0-gvc-channel.patch 690 RMD160 4b3f300287c7bca073dd9e719d83d734ce251658 SHA1 b6dab90f2e10b03d022e5456a14ccbc208034944 SHA256 51e59fb42114d70118f4b750a06a33e0e40b0a03ed6509dc1348c641cc274d74
 DIST gnome-media-2.30.0.tar.bz2 2707711 RMD160 9ba6f6fdc25afa34072e80ca4102800d7d75e2bc SHA1 c077f1c0a4ef97908c7bb36e41477c77069fdcd0 SHA256 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
 DIST gnome-media-2.32.0.tar.bz2 2814365 RMD160 c24ec7d76ca1c63610ca78f6291b2abb19f05a3c SHA1 63fd51515338e4a67d0bd2871ff4d554245bc57c SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6
 EBUILD gnome-media-2.30.0-r1.ebuild 2130 RMD160 1eab328b6f7ea4e32de84bebb21f44715e238c0b SHA1 98e0f7715261df05620684252c5ad0ca8a1659ee SHA256 2abae8f3255b62c85835f0690e0aacdbe341a6b3972afeecc114120e818866bb
+EBUILD gnome-media-2.32.0-r1.ebuild 1992 RMD160 d6d405a209752397ae19f456e14c321e6859e0b0 SHA1 a6a19857a6e49842b3eae3bcc299e1624c9309ad SHA256 9d61dca74af4aca4159a715d36b86e311bbe9e2f7a17687b5b0aa9584b666eed
 EBUILD gnome-media-2.32.0.ebuild 1854 RMD160 3d3b281cfa3f8a3f50eadc8522035f9bd56cd54d SHA1 8f7e3d3041086d0a631b31dcb92973d4bfc36460 SHA256 8fdfef02947784b99ff7e2bdee415ea74aa5cbf8d1ffaa759ae40262766e907b
-MISC ChangeLog 30539 RMD160 4ca6fe5b487902b790e777b512e1bd21950d74d3 SHA1 bfc18c154648737308c2aef76687bac3693a0113 SHA256 be3393eba0b8d3f49dce89f31456b976ae6d2f6e07d15a48f52e81ca01011d0f
+MISC ChangeLog 30800 RMD160 9a2f81802376f2f51d430f9babe93a92a6c0fa96 SHA1 5520d90fe6f5e320f995470fa74bd2ec6df80567 SHA256 7a78cb3153b9b05db4bca0d0a5cc51acd8a06117a821022bef4f7b47f7c958ae
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2E78gACgkQCaWpQKGI+9SdawCfefl0YT+kfufb2ty7++haeW0t
+/KAAnjzh5aPT69Ehn+Gv8hdOaO3cYoQU
+=DkTN
+-----END PGP SIGNATURE-----
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
+}