Add USE flags to pull in the correct encoders used by the audio profiles installed by this ebuild (bug #389119, thanks to James Broadhead <jamesbroadhead@gmail.com> for reporting). No revbump; there is no change to the files installed by this ebuild.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 32 insertions, 5 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index 6f207f08b36f..6fcb420f6f9a 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.244 2011/10/05 17:43:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.245 2011/11/03 18:28:03 tetromino Exp $
+
+  03 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-media-2.32.0-r1.ebuild, metadata.xml:
+  Add USE flags to pull in the correct encoders used by the audio profiles
+  installed by this ebuild (bug #389119, thanks to James Broadhead
+  <jamesbroadhead@gmail.com> for reporting). No revbump; there is no change to
+  the files installed by this ebuild.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   gnome-media-2.32.0-r1.ebuild:
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
index b11d5ed2fb9e..783d67388e3b 100644
--- a/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2011/10/05 17:43:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild,v 1.7 2011/11/03 18:28:03 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,10 +13,10 @@ 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"
+IUSE="aac flac mp3 pulseaudio speex twolame vorbis"
 
 # FIXME: automagic dev-util/glade:3 support
-RDEPEND="dev-libs/libxml2:2
+COMMON_DEPEND="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
@@ -28,7 +28,23 @@ RDEPEND="dev-libs/libxml2:2
 	>=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}
+# Specific gst plugins are used by the default audio encoding profiles
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:0.10[flac?,vorbis?]
+	aac? (
+		media-plugins/gst-plugins-faac:0.10
+		media-plugins/gst-plugins-ffmpeg:0.10 )
+	mp3? (
+		media-libs/gst-plugins-ugly:0.10
+		media-plugins/gst-plugins-taglib:0.10
+		media-plugins/gst-plugins-lame:0.10 )
+	speex? (
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-speex:0.10 )
+	twolame? (
+		media-plugins/gst-plugins-taglib:0.10
+		media-plugins/gst-plugins-twolame:0.10 )"
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.11
diff --git a/gnome-extra/gnome-media/metadata.xml b/gnome-extra/gnome-media/metadata.xml
index da6fd63d0085..dadc120c3bde 100644
--- a/gnome-extra/gnome-media/metadata.xml
+++ b/gnome-extra/gnome-media/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="twolame">Allow encoding MPEG Audio Layer 2 (MP2) files using
+		twolame</flag>
+</use>
 </pkgmetadata>