Revision bump including latest gstreamer volume control support patch by Brian Cameron, it fixes volume update issue reported in bug #327609 by Morse.

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

3 files changed, 100 insertions, 5 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 8cb4ce8dfdec..41612a064625 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.49 2010/06/23 11:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.50 2010/07/13 09:16:52 pacho Exp $
+
+*gnome-settings-daemon-2.30.2-r1 (13 Jul 2010)
+
+  13 Jul 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-settings-daemon-2.30.2-r1.ebuild:
+  Revision bump including latest gstreamer volume control support patch by
+  Brian Cameron, it fixes volume update issue reported in bug #327609 by
+  Morse.
 
 *gnome-settings-daemon-2.30.2 (23 Jun 2010)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index b8fd0b319ed0..238661ca3703 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -12,17 +12,19 @@ DIST gnome-settings-daemon-2.28.1.tar.bz2 1174173 RMD160 f73e361e92101f5ca03f663
 DIST gnome-settings-daemon-2.28.2-gst-vol-control-support.patch.lzma 6246 RMD160 d37caea466d7ac24b4e5a131f57d929544e0eb1f SHA1 7d26882ee6faadc998e06d8fe125a73cea42f887 SHA256 3d034426eea678f729f204abfb97c255f1eb4eee5fd31d73febe5b9d0dcc7b05
 DIST gnome-settings-daemon-2.28.2.tar.bz2 1170507 RMD160 95699e49a129aefcf61401a6a5329bfa04ef43db SHA1 0887a0839f3d6c4e06af4a95184dabafa754503a SHA256 48af430e10032a8e385f80229acc2bbda0e6d4abef46629e9640f9a6987f1bbe
 DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158
+DIST gnome-settings-daemon-2.30.2-gst-vol-control-support.patch.bz2 7255 RMD160 cc5c5a0f095dd0fdb321a338f0939f42f62133cd SHA1 1ece288911360df06d4f1d97166621a5e5d076c7 SHA256 0ddc872fccfd14cfac7620ca76c4333145dc67b541b6554f276c69bef267c394
 DIST gnome-settings-daemon-2.30.2.tar.bz2 1250365 RMD160 a4547cdb13c2c5dc8f690cf198853129514adaab SHA1 75fe75eaa7d6197514c1de8b8c47c869f2bade2c SHA256 7cd22dab52f52900ee13a5bc0c1a186e91d33e77f5333c4622f84d85e4eb71f4
 EBUILD gnome-settings-daemon-2.26.1-r2.ebuild 2075 RMD160 37871c1a520edf5a24b45c545ec212b07a4e0e15 SHA1 534ed6062f3ee20e8ba793fd2999c14c7ff4ccb2 SHA256 56f248061808e633d2d48c0320974f294e49309b20943ac490b758af6ffe7919
 EBUILD gnome-settings-daemon-2.28.1.ebuild 2246 RMD160 8ca0fcaf5e01c31156e21ccc1f6bd0b39c823d6a SHA1 61b24555b2f5c3e84a5a2237f61183b209b63ecc SHA256 8bbc87f91311a28016f82c051cd602ff12a94dc90831a5b76472157a7ba80d55
 EBUILD gnome-settings-daemon-2.28.2.ebuild 2202 RMD160 b1d4fdd7701500b526369eb42cb49027a71a33c4 SHA1 aadaab9c258d781f6ce827acde2354fcd223afbc SHA256 e2ed7ff5b06148825405afebd57862863fb7eea938ce1e16d7f38eb3c1c15d7e
+EBUILD gnome-settings-daemon-2.30.2-r1.ebuild 2305 RMD160 475f9a8828cdfcd509685c73adf36e6d65715f54 SHA1 4a9d390e78c6381f469f2a0bd92cd256ffadbf93 SHA256 9354e7f2c8b656ee2a531a45420e01f9a8fcd819fd601def996fba48de4833d6
 EBUILD gnome-settings-daemon-2.30.2.ebuild 2216 RMD160 333c4c79c508dd7dc1ee2b116b08e976ac1c41d3 SHA1 bb37a2826ec3c55a8bce3f5340fa1dc5c2391e1a SHA256 23cca078ff8b971ef05b4058a19b1ac1c86b51eedc5758d775b720033c861980
-MISC ChangeLog 9247 RMD160 63ee1469e74f8608ef47d8dc69351a2ba0e7486b SHA1 08ef9f64695fd99af154bd7623eb70d55a892e83 SHA256 428f7bf2346b486764ad874e1314d40fccac5543fc454610bb8319618a9ef864
+MISC ChangeLog 9542 RMD160 faa7e9875ec364b68c4fe1bec69a25b319998281 SHA1 1be1886ba2f7297464e166cb9ef9edf0044c51ed SHA256 6fd97978ddc25926f45c9fbb0ea11737358e534c4fcb8d89118b034429ec0173
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwh784ACgkQCaWpQKGI+9TIKACfTqOlaxcLYFEa3ZUR9yFkNpOR
-yLEAniOGyx1hWiC5979m5qDnCg9SWWgL
-=JF+V
+iEYEARECAAYFAkw8LwwACgkQCaWpQKGI+9TaTwCfV1nhJbgzKgb269PyffRSlfXN
+zW4AnRjcja2jcYF2bpjUcH6YesTwKzGe
+=1W6d
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2-r1.ebuild
new file mode 100644
index 000000000000..bc80cd7eefc4
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.30.2-r1.ebuild,v 1.1 2010/07/13 09:16:52 pacho Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify pulseaudio"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.16
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/libgnomekbd-2.29.5
+	>=gnome-base/gnome-desktop-2.29.92
+
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-5.0
+	media-libs/fontconfig
+
+	libnotify? ( >=x11-libs/libnotify-0.4.3 )
+	pulseaudio? (
+		>=media-sound/pulseaudio-0.9.15
+		media-libs/libcanberra[gtk] )
+	!pulseaudio? (
+		>=media-libs/gstreamer-0.10.1.2
+		>=media-libs/gst-plugins-base-0.10.1.2 )"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-2.22
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+# README is empty
+DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_enable pulseaudio pulse)
+		$(use_enable !pulseaudio gstreamer)"
+
+	if use pulseaudio; then
+		elog "Building volume media keys using Pulseaudio"
+	else
+		elog "Building volume media keys using GStreamer"
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Restore gstreamer volume control support, upstream bug #571145
+	epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch"
+	echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! use pulseaudio; then
+		elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
+		elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
+	fi
+}