Merge 'mad' and 'mp3' USEs as both plugins are needed for proper mp3 parsing. Thanks a lot to Leio for explanation.

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

3 files changed, 21 insertions, 7 deletions

diff --git a/media-plugins/gst-plugins-meta/ChangeLog b/media-plugins/gst-plugins-meta/ChangeLog
index 315355b031e7..4cc8210d4c78 100644
--- a/media-plugins/gst-plugins-meta/ChangeLog
+++ b/media-plugins/gst-plugins-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/ChangeLog,v 1.42 2011/01/30 19:08:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/ChangeLog,v 1.43 2011/01/31 18:22:43 pacho Exp $
+
+  31 Jan 2011; Pacho Ramos <pacho@gentoo.org> gst-plugins-meta-0.10-r5.ebuild:
+  Merge 'mad' and 'mp3' USEs as both plugins are needed for proper mp3 parsing.
+  Thanks a lot to Leio for explanation.
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org>
   gst-plugins-meta-0.10-r4.ebuild:
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 309b92c95123..c7d0dfdf2304 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 EBUILD gst-plugins-meta-0.10-r2.ebuild 1940 RMD160 64577ba1b3cea05ed1c9fabdf37830efce3f518b SHA1 a7a49b27f77e7ed8275e200ec7e4a11ba2db6420 SHA256 fc6abb57b8dc37bc477300cd4302a519a4f569f3500d77e4d08c578288c37699
 EBUILD gst-plugins-meta-0.10-r4.ebuild 2318 RMD160 804c1827cbb8256d1d75ac84c97e3a8e0b0d1ca4 SHA1 835b78ea67943342b372b035b2ba4d61bd368c0e SHA256 5d14f7af6f08c359ff55c8eb99864100ba4a4d35eb0a6d16ec035e7f552a3c24
-EBUILD gst-plugins-meta-0.10-r5.ebuild 2600 RMD160 23ca542e6e2acaad977709a7fffeb6c775ba7eaf SHA1 3402b5ba887433ea178275e359fb48eb1b1d1d26 SHA256 ada9f01c3d41d79ca8994282dcd6be27e29b3670afa4dd02fcae662583af7cd7
-MISC ChangeLog 5967 RMD160 4537c6236cc067255daf67bf3d19c6e3ee090563 SHA1 4e397564ea62be4743eaec75b01444f7a37e98b6 SHA256 88412dc58517356a05db1d027b775fd51e5bdca09b4d67e88a6f9b44f72766de
+EBUILD gst-plugins-meta-0.10-r5.ebuild 2590 RMD160 b0d8a8866c4b8c04a3d6bb2d2e2515cba5548d4d SHA1 c461d074407f49efbfda66bb171fe07ff3d16656 SHA256 6c57d093e3ed36e350bbe874c3b8fac17a0ccb1089c370639526a74c1796d0f2
+MISC ChangeLog 6165 RMD160 bbaae31595422788c3a441251cdd7142e85b3eeb SHA1 1eba51dfb42c4bf1e47494d1f0e89efb542c18d9 SHA256 28a195db20b2651dd217d1f8eea32a77c695e958f0534ec814af232280540716
 MISC metadata.xml 706 RMD160 3e8fba839fd446734e697bc4cc1ee534baf93b8d SHA1 2dd4813c5dc9f39d9a78462026d90f28dc6b2d85 SHA256 00ec31fd5c96eb054aa638b6d3707f99c4a7d3a2c74b8a55511cfdd8fe3f9cbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk1G/fkACgkQCaWpQKGI+9Q/4QCdFonHs0AHdubxe5562bDVvFZT
+QoAAoIIKnUjY4lUoxY6RXdVINMCsjHmh
+=BfZx
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.ebuild
index 6ec5fd4f2b54..2de615d41c1a 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.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/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.ebuild,v 1.3 2011/01/30 18:18:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.ebuild,v 1.4 2011/01/31 18:22:43 pacho Exp $
 
 DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
 HOMEPAGE="http://www.gentoo.org"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gentoo.org"
 LICENSE="GPL-2"
 SLOT="0.10"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aac a52 alsa dv dvb dvd esd ffmpeg flac lame mad mp3 mpeg musepack mythtv ogg oss pulseaudio taglib theora v4l v4l2 vorbis wavpack X xv"
+IUSE="aac a52 alsa dv dvb dvd esd ffmpeg flac lame mp3 mpeg musepack mythtv ogg oss pulseaudio taglib theora v4l v4l2 vorbis wavpack X xv"
 
 RDEPEND="=media-libs/gstreamer-0.10*
 	=media-libs/gst-plugins-base-0.10*
@@ -30,8 +30,8 @@ RDEPEND="=media-libs/gstreamer-0.10*
 	ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 )
 	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
 	lame? ( >=media-plugins/gst-plugins-lame-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	mp3? ( >=media-libs/gst-plugins-ugly-0.10 )
+	mp3? ( >=media-libs/gst-plugins-ugly-0.10
+		>=media-plugins/gst-plugins-mad-0.10 )
 	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 )
 	musepack? ( >=media-plugins/gst-plugins-musepack-0.10 )
 	mythtv? ( media-plugins/gst-plugins-mythtv )