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.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 39 insertions, 14 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/Manifest b/gnome-extra/gnome-media/Manifest
index 6c2e5f2744a5..743292e201c4 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -7,16 +7,14 @@ AUX gnome-media-2.32.0-gvc-channel.patch 690 RMD160 4b3f300287c7bca073dd9e719d83
 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 2155 RMD160 cf21714819ec693c340a09069ced24dc9b0755b8 SHA1 6b8fe4e230261a1a8ca54306e3e81df127876344 SHA256 cfc8ddd1d8f2b33903cc11c0d06f708212de79b22488b7318b387064b9669355
-EBUILD gnome-media-2.32.0-r1.ebuild 1988 RMD160 7e69ca9ebc4c32f41554b663f3da1a0cc740f7e9 SHA1 940ed5e1d9793344a481ccbe411a0302b8d0ae2e SHA256 26a7bcbd2d296a79123c789ef0c9e9cbb13dec3d4bba288f3b5eb0243af54461
+EBUILD gnome-media-2.32.0-r1.ebuild 2577 RMD160 03393d35d45f4e654b93acec2543b21d679d3982 SHA1 cba9f95b75bc23da06aa0abdfe215f2f3e397ee9 SHA256 b3ff4357f8ba044fe355dcae7059d046b0ff40335ca4819b06988e89b10de1bf
 EBUILD gnome-media-2.32.0.ebuild 1872 RMD160 59958dde4cd37661ec04e55a4c1d2b4e7fe71e84 SHA1 b6ab096c85e69a50ee57bf63d908b496afb42d6f SHA256 031d433b4743cb0eff197d55f7efed3b65fe77615a00e77212b1e233f073ba56
-MISC ChangeLog 31760 RMD160 eb77433a0aba15debc3afd41e36f5925121aa38f SHA1 c559636fdacc702cc0f792d059fa96b7d24f4bb1 SHA256 29158d809d02e1e8cb5d984ca8ae85afa13c0f884e1143906709115ee7922151
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+MISC ChangeLog 32124 RMD160 940998b27ae8fb660027248d8e87b137928d0815 SHA1 6b624acfd303c70b3da170cad1badcb5ecf1248a SHA256 37f05e168d2809b793bb51cdb2cbc2eebba70f4109831b89498642065ed21764
+MISC metadata.xml 262 RMD160 bf55b10dc025acd11da20309b2d0bd2a178d21f9 SHA1 cdd85a8b21f4d1bfb58a9cab84ac3b08a90c8dc5 SHA256 42eae4d6a844319a18ef286c46ebd42bf18b415e5acffb38b77a4c5f6f9bd95b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6Ml1YACgkQIiMqcbOVdxSzwAP/V5DGOlza2Y74NvPUvIE97cqa
-6XyRiK0zJzSh8QEmGIpnbNAZWWVNNmCVasRAX4z5CetWJ2tjEjFp+7P79cvCs59I
-FnJSWO3HHseY/EQBxSFPoET/kcG7G5XZ/0c4Y6cVqicuVhjv40Jtn5YfgQOnykjm
-JRbo2DdFmeYCdXQ3oU4=
-=G8YO
+iF4EAREIAAYFAk6y3TkACgkQdjK8w9WeBnCSNAD/QcTL9d1SJgSZKc+hl3wY1aEE
+78OQLNVBTshpRefWfnsBAIWv0n4pYkn2/WczPpGaz2eRuAiCr0LEUJTPMONtkEUh
+=tI0O
 -----END PGP SIGNATURE-----
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>