Add new version for Gnome 2.30

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

5 files changed, 142 insertions, 5 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index b266a3c5adb8..f7708c4fb63d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.215 2010/06/04 20:31:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.216 2010/06/13 19:14:28 pacho Exp $
+
+*gnome-media-2.30.0-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gnome-media-2.30.0-r1.ebuild,
+  +files/gnome-media-2.30.0-lamemp3enc.patch,
+  +files/gnome-media-2.30.0-microphone-icon.patch:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gnome-media-2.28.5.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index a4e9dfb00842..15d1ffc9b5cb 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -4,18 +4,22 @@ Hash: SHA1
 AUX gnome-media-2.26.0-automagic-canberra.patch 5039 RMD160 8d5b3e756ad5356c45fc930dc0154075521f7377 SHA1 fa1806db43e539549912c3f63ad5ed471417c077 SHA256 f80d00374c8d409c8f4d37812b20644c0e64a3525af843b445d3695933610c00
 AUX gnome-media-2.26.0-connection-failed-pulseaudio.patch 11836 RMD160 cd79ee85240c24bf1c37acbef45c9bf466e11d94 SHA1 22dee433e50c4ac7c43ccf3b771018d0518bf13d SHA256 1b5307eb87975117582a99e53998af08a24a14ef62de0343e27c18a7f179145b
 AUX gnome-media-2.26.0-missing-cddbslave-cflags.patch 764 RMD160 5d788ac6ac1d0bad8907afb359334900b3ef520d SHA1 6daf0b299767b3feea72b320c2be308de667f2f9 SHA256 3b15659c984d623ae440d35cd0f7f1e7389774412f4e3d2bb34fa9efe09a58db
+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
 DIST gnome-media-2.24.0.1.tar.bz2 2344888 RMD160 695f4cf9b170a381c243846749f5fad916f8bbca SHA1 2704b4cd13b7f776a358e517a5baf5d97455b85b SHA256 bfa79a9bea5ba6f73a6b0a232917bc7eefbed69819e42d0b09372b0c7ed3e853
 DIST gnome-media-2.26.0.tar.bz2 2662523 RMD160 0720cf0394148d8dc3cf6423a8b817a70f1486ed SHA1 23ec588fdf5df3eef542278952fe78ed032d354a SHA256 39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
 DIST gnome-media-2.28.5.tar.bz2 2604259 RMD160 0cd577401f2ba85bf10728dd04becbd0a6840d19 SHA1 3403d490869b218759db334d71ad713ff39a2cdc SHA256 1d6a34b54aa01e811ac32ed7d24432b3beaffffc2c6278de412c7931f5488153
+DIST gnome-media-2.30.0.tar.bz2 2707711 RMD160 9ba6f6fdc25afa34072e80ca4102800d7d75e2bc SHA1 c077f1c0a4ef97908c7bb36e41477c77069fdcd0 SHA256 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
 EBUILD gnome-media-2.24.0.1-r1.ebuild 1852 RMD160 752d2795c249bcc136fb74db89e49b47c1c26129 SHA1 434060fbe4959c772bfc4a184a464d4d045bad33 SHA256 cf4d3694e664c4ff86788bfbd56a1160eb521c481f244c5f469d8dd3db1b3f58
 EBUILD gnome-media-2.26.0-r1.ebuild 2809 RMD160 faf3eaec654ce13c3f84d37b0440e9849201af15 SHA1 03bb9b60dce1d66c830dcb7f275d4a84cb6c85b1 SHA256 84bd147c6764ae59a0b306ff13501664695566345dffcd33119f0403a50b280b
 EBUILD gnome-media-2.28.5.ebuild 2069 RMD160 6dd3548c281aefc350cffc3566aec8768579d314 SHA1 3b77ad0f839b59182b6d6cee8cf183349caa4043 SHA256 fba1ec87949ab9021e0cd9b9c336c3804fd4ed98971e392897974a4ad918bb97
-MISC ChangeLog 27425 RMD160 a9c3bdecfbf3c52a6eece2af0c40580542d7b8ba SHA1 93461353bd1a82300c8823682574ed5a0014fa1a SHA256 96f8fe46b27dcc3f872ae9ecc6dc27a1cae68b9b26d170878b61954564913ccc
+EBUILD gnome-media-2.30.0-r1.ebuild 2087 RMD160 fb3a20d7e194f982a5dae0c7477bfe8faf3fe1f6 SHA1 9d9cf87e66674f591933c2689f8913437dfc5ae2 SHA256 fba3868292da94360143a3584d1291b33a5359706833f6bf50d6bcb443fd7e68
+MISC ChangeLog 27671 RMD160 7dc9ec0d1bf9ad52bee7d34e66ed30797ab1eaa7 SHA1 a054a75a451ced9766f3a94649431eb15ad93207 SHA256 585122a54f05fc27a8d3b6a9e0e086a951f8002927a829f5b8ba6ca8b770886e
 MISC metadata.xml 339 RMD160 bbf6402aadd2e37cf510214bd63b56627d88c19a SHA1 c1844224e92e5f691b8f59c9811bb8fe35751932 SHA256 0c92a127c7c041ad9eb833dc79524111e674facc15bd482f4ac0eb048f7d63f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJYiUACgkQkKaRLQcq0GI23ACeIkJ/OOWgyKrlpkzumxtvH8VS
-GkEAnRjMHRrgtiJKuyfF7XbIHzi9L+sh
-=YfCM
+iEYEARECAAYFAkwVLhkACgkQCaWpQKGI+9SHRACffuYJbD+Qb5URz3LgD8kEYd7/
+sCAAn3mensTDvTYtrOLG8aUfNW4W6ItY
+=VTQz
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.30.0-lamemp3enc.patch b/gnome-extra/gnome-media/files/gnome-media-2.30.0-lamemp3enc.patch
new file mode 100644
index 000000000000..6a0230b48fff
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.30.0-lamemp3enc.patch
@@ -0,0 +1,26 @@
+From d81e10b63f5a38a5004ff2486e679608cb7dbab9 Mon Sep 17 00:00:00 2001
+From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
+Date: Sat, 29 May 2010 05:54:58 +0000
+Subject: profiles: Use lamemp3enc and xingmux instead of the deprecated lame element
+
+The lame element has a broken interface and results in worse
+quality encodings. The xingmux element is added to allow correct
+duration reporting and seeking for VBR files.
+
+Fixes bug #619642.
+---
+diff --git a/profiles/gnome-audio-profiles.schemas.in.in b/profiles/gnome-audio-profiles.schemas.in.in
+index bd5ab06..d29ac57 100644
+--- a/profiles/gnome-audio-profiles.schemas.in.in
++++ b/profiles/gnome-audio-profiles.schemas.in.in
+@@ -496,7 +496,7 @@
+       <applyto>/system/gstreamer/@GST_MAJORMINOR@/audio/profiles/mp3/pipeline</applyto>
+       <owner>gnome-media</owner>
+       <type>string</type>
+-      <default>audio/x-raw-int,rate=44100,channels=2 ! lame name=enc mode=0 vbr-quality=6 ! id3v2mux</default>
++      <default>audio/x-raw-int,rate=44100,channels=2 ! lamemp3enc name=enc target=0 quality=6 ! xingmux ! id3v2mux</default>
+       <locale name="C">
+         <short>The partial GStreamer pipeline used</short>
+         <long>
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.30.0-microphone-icon.patch b/gnome-extra/gnome-media/files/gnome-media-2.30.0-microphone-icon.patch
new file mode 100644
index 000000000000..9e9a0686cbfc
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.30.0-microphone-icon.patch
@@ -0,0 +1,27 @@
+From 23f2b45b0d152c115efbcdb72f37c2a75351bbf6 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 10 Jun 2010 13:56:39 +0000
+Subject: Show a microphone icon even if the stream has no ID
+
+Just because the stream has no ID doesn't mean that we shouldn't
+show the microphone icon.
+---
+diff --git a/gnome-volume-control/src/gvc-applet.c b/gnome-volume-control/src/gvc-applet.c
+index 8de0f43..1b311e4 100644
+--- a/gnome-volume-control/src/gvc-applet.c
++++ b/gnome-volume-control/src/gvc-applet.c
+@@ -94,8 +94,10 @@ maybe_show_status_icons (GvcApplet *applet)
+                         const char *id;
+ 
+                         id = gvc_mixer_stream_get_application_id (s);
+-                        if (id == NULL)
+-                                continue;
++                        if (id == NULL) {
++                                show = TRUE;
++                                break;
++                        }
+ 
+                         if (!g_str_equal (id, "org.gnome.VolumeControl") &&
+                             !g_str_equal (id, "org.PulseAudio.pavucontrol")) {
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild
new file mode 100644
index 000000000000..f7bcc875a149
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 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.30.0-r1.ebuild,v 1.1 2010/06/13 19:14:28 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="pulseaudio"
+
+RDEPEND=">=dev-libs/glib-2.18.2:2
+	>=x11-libs/gtk+-2.15.1:2
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2.6.1
+	>=media-libs/gstreamer-0.10.23
+	>=media-libs/gst-plugins-base-0.10.23
+	>=media-libs/gst-plugins-good-0.10
+	>=dev-libs/libunique-1
+
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	>=media-libs/libcanberra-0.4[gtk]
+	dev-libs/libxml2
+	>=media-libs/gst-plugins-base-0.10.23:0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-gconf-0.10.1"
+DEPEND="${RDEPEND}
+	>=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"
+
+DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--enable-profiles
+		$(use_enable pulseaudio)
+		$(use_enable !pulseaudio gstmix)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Use lamemp3enc and xingmux instead of the deprecated lame element
+	epatch "${FILESDIR}/${P}-lamemp3enc.patch"
+
+	# Show a microphone icon even if the stream has no ID
+	epatch "${FILESDIR}/${P}-microphone-icon.patch"
+}
+
+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
+}