Pull modplug (#462300 by Richard H) and vaapi plugins, drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 161 insertions, 144 deletions

diff --git a/media-plugins/gst-plugins-meta/ChangeLog b/media-plugins/gst-plugins-meta/ChangeLog
index 59dff0f79d2c..c958951c8c80 100644
--- a/media-plugins/gst-plugins-meta/ChangeLog
+++ b/media-plugins/gst-plugins-meta/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-meta
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/ChangeLog,v 1.120 2014/10/11 12:23:08 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/ChangeLog,v 1.121 2015/01/18 10:10:49 pacho Exp $
+
+*gst-plugins-meta-1.0-r3 (18 Jan 2015)
+*gst-plugins-meta-0.10-r10 (18 Jan 2015)
+
+  18 Jan 2015; Pacho Ramos <pacho@gentoo.org> +gst-plugins-meta-0.10-r10.ebuild,
+  +gst-plugins-meta-1.0-r3.ebuild, -gst-plugins-meta-0.10-r8.ebuild,
+  -gst-plugins-meta-1.0-r1.ebuild:
+  Pull modplug (#462300 by Richard H) and vaapi plugins, drop old
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org>
   gst-plugins-meta-0.10-r9.ebuild:
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 2eb5e4fbfe84..bf9f6a608b6a 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD gst-plugins-meta-0.10-r8.ebuild 3152 SHA256 7c3a108923bfd50b4af16e3e24f8657d1fba679866f57376d9b0c2cfd1fd3f29 SHA512 25ead42b2b09d84a5dd0724d03d3f91360f05f40ee0e2d7aacb7e7ebef7384d43dab80985ba27d8ef1202539b1b7d03de20859b10277b681646835c9c3e62387 WHIRLPOOL 3f48063104472b4618f208562ee1ec25da8d31bfc260be74be5b5c8e8d165f292dc179f6e357eb5d62f9befe8a660905d786ef304144773fb08aee383c183b6c
+EBUILD gst-plugins-meta-0.10-r10.ebuild 4627 SHA256 d9d128dc752c9dc6714f150b103944ce4d4aad3d504df705ff6f634a2840a580 SHA512 f2bc6fa364e74b2d0d96cde53b5492180e03d99f393ce28bf775331b581fc7034d5489b6bc1590bdcd999ccc37f0af0a06aafeccf5ad9b28d742c9af0041cf8f WHIRLPOOL 7f140649a34c0ce89accd283e757750597d34c224979f01ffa549f31aa436fdc54aa9a30411e729d517779719655505b929de40393cb149f76c31dd58559525f
 EBUILD gst-plugins-meta-0.10-r9.ebuild 4531 SHA256 203d292be07efb205ed0c36cadeac7d5a0c9ecbb5d380dd764af0c29afb34428 SHA512 55349f3285d3ef09922b3dfa1fc047776108056a9baca9c8be0dc74ac6921a051e1ea48413da5f8197819ee1e6a07e46ce10cffad06fab1b6e0613a5fc6c1efe WHIRLPOOL 55993d45fe5806f33ec7d57ee2330a704d7041332b2bcc03c0ab4d02089cad97cffe1374a710868300391d394848c8f3f7ccb3ed3dd5fcd9c45391155a696fb3
-EBUILD gst-plugins-meta-1.0-r1.ebuild 2723 SHA256 b9118add03af29841a521f40afb0cf039d080cc9b62475479b65ea230317668e SHA512 dd9d094c4124b4765343d912b57b8fd03f19bf1aa80a5442ba7d28f724bd0e910bac7e87cdd46d0523b0c3bb3375d67b9c984cb8550108b388965ec40032f4c2 WHIRLPOOL 7310eff89e77bed85fed1d7d11e1ffdf642b52f26aac1357d3dde2a89eae177eb5ef98efa9740f105579cab29ea802ab8825059dc566b34c4a3bcea3643da57c
 EBUILD gst-plugins-meta-1.0-r2.ebuild 3801 SHA256 4f71dcc434a817adc9a897de35f6511e467ec97e0be85057b08d470debf07063 SHA512 b07dd87014bbaed27507272f20ee1de20c7af8062826466065441273e11eaeff27c074e4c485a4b77ebb9eb2834fd327dcf6edb196604762075a9c6fa011ad6f WHIRLPOOL 62014a70b625ac48c9bac49c5784cdc2bd76e72cc64e86dbf911c3edde8e419a7be5bfd8338bade4054a55b8409f622cee7e52b3bdc3b06005d2dc0ecd7d24e1
-MISC ChangeLog 17166 SHA256 e567110e6395fdf743e0faaaf5b5e1aab72e4f2029655ca31dd0e2e9bfce107e SHA512 5c8c0ca971b92aa25090c98c555dfd6e065da5f2473550c830b816fe8d87060b7c0ff8f9c55ea2d1130bffe5b8673b23906e74429db2f36271a361edcc1e7cc1 WHIRLPOOL c35bcc63166245d3038818a8e5d9a336b6b365e8aa9ece6bd17689e620075c6d2c4c2f0e9fa2e32886c7b544c7570d39be65221f0512f441f1918f9407f49690
+EBUILD gst-plugins-meta-1.0-r3.ebuild 3981 SHA256 353869da87e40223e1059886ae1da29db2a60114688b0720053a1bc63c1d3b8a SHA512 31af7b5cd7a7334ebd1dc14124dfe145a34bd060cdca7103a968137f8d5e5fddadf432f76b28c26fda072d705a505d072760c1b118bba61c0c2a6674c38cc74b WHIRLPOOL 0ef18d795d4d172231a69ece4f52be9284008ca3b17e75aaf0960a15b3b633272787deeaaa6938962c75d3230f26d467668145de22d6ecc2a54b49e4f7ce1288
+MISC ChangeLog 17498 SHA256 c847e8b2b4246d34c5e4e72868c72b3556014a118762af995c85598b3d3d990d SHA512 d89dc1ab38dfeb482732d20f43a07a65fe485c0cc6a2f06ba40a9cc6e2440c64e6623826b204b1220532252f72033d3b753e2d876c4606fa4e5fa1def2445614 WHIRLPOOL 4d761a5762deb2f36cf215021df3533f3bfe8eb3fe4b37bf66a08e841bf4c8b72492e94c65b4160a3be6fe15e3263cbafeff946a906fc93f23f00d1635eb4e0d
 MISC metadata.xml 864 SHA256 54c1412338ca40f560bdbede70a29396e2965d8c0e5b02b668b2ff764a77995c SHA512 9918f9daa9ff3a602cff95f6f630a8d68369a249ca66135bfa5fa99816c78f0f6667782b891b0f4bd92d3d52b7f1972a407c8888723ee2a22691672fd0202a6b WHIRLPOOL 0ce5cf51b406943736afdba8624719e85d15a76997e113a7ed10315555a7b88cc07e62e21122b64047853d7460fff75f468a1de3be34e94de57ed545db187357
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5IS4ACgkQkKaRLQcq0GLFowCeOjbZISZBc1N2aVV5x94kd+kw
-2QYAoIwi+bjbF93KWXQLXlCwskPM7TYY
-=M8VT
+iEYEAREIAAYFAlS7hqoACgkQCaWpQKGI+9TEywCeLjbNAD1fbb0pUHWKpN84z1qf
+xSkAn2dQU2Ul5rdp3XRo4Gdj0SiFAgmP
+=af7D
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild
new file mode 100644
index 000000000000..04893750f694
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 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-r10.ebuild,v 1.1 2015/01/18 10:10:49 pacho Exp $
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg musepack ogg opus oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X x264 xv xvid"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND=">=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-0.10.31:0.10[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-plugins/gst-plugins-alsa-0.10.36:0.10[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-0.10.36:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-0.10.19:0.10[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-0.10.23:0.10[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-0.10.23-r1:0.10[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-0.10.19:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-0.10.19:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-0.10.19:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10.13_p201211:0.10[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-0.10.19:0.10[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-0.10.36:0.10[${MULTILIB_USEDEP}] )
+	mms? ( >=media-plugins/gst-plugins-libmms-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-0.10.23-r1:0.10[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-0.10.19:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mad-0.10.19:0.10[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[${MULTILIB_USEDEP}] )
+	musepack? ( >=media-plugins/gst-plugins-musepack-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-plugins/gst-plugins-ogg-0.10.36:0.10[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-0.10.23:0.10[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	theora? ( >=media-plugins/gst-plugins-theora-0.10.36-r1:0.10[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-0.10.23:0.10[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.36:0.10[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vp8-0.10.23-r1:0.10[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10.31:0.10[${MULTILIB_USEDEP}] )
+	X? ( >=media-plugins/gst-plugins-x-0.10.36:0.10[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-0.10.19:0.10[${MULTILIB_USEDEP}] )
+	xv? ( >=media-plugins/gst-plugins-xvideo-0.10.36:0.10[${MULTILIB_USEDEP}] )
+	xvid? ( >=media-plugins/gst-plugins-xvid-0.10.23:0.10[${MULTILIB_USEDEP}] )"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r8.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r8.ebuild
deleted file mode 100644
index 6d806f297d80..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 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-r8.ebuild,v 1.18 2013/04/01 18:25:12 ago Exp $
-
-EAPI="4"
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 mpeg musepack ogg opus oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X x264 xv xvid"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-good:0.10
-	a52? ( media-plugins/gst-plugins-a52dec:0.10 )
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	alsa? ( media-plugins/gst-plugins-alsa:0.10 )
-	cdda? ( || (
-		media-plugins/gst-plugins-cdparanoia:0.10
-		media-plugins/gst-plugins-cdio:0.10 ) )
-	dts? ( media-plugins/gst-plugins-dts:0.10 )
-	dv? ( media-plugins/gst-plugins-dv:0.10 )
-	dvb? (
-		media-plugins/gst-plugins-dvb:0.10
-		>=media-libs/gst-plugins-bad-0.10.6:0.10 )
-	dvd? (
-		media-libs/gst-plugins-ugly:0.10
-		media-plugins/gst-plugins-a52dec:0.10
-		media-plugins/gst-plugins-dvdread:0.10
-		media-plugins/gst-plugins-mpeg2dec:0.10
-		>=media-plugins/gst-plugins-resindvd-0.10.14:0.10 )
-	ffmpeg? ( media-plugins/gst-plugins-ffmpeg:0.10 )
-	flac? ( media-plugins/gst-plugins-flac:0.10 )
-	http? ( media-plugins/gst-plugins-soup:0.10 )
-	jack? ( media-plugins/gst-plugins-jack:0.10 )
-	lame? ( media-plugins/gst-plugins-lame:0.10 )
-	libass? ( media-plugins/gst-plugins-assrender:0.10 )
-	libvisual? ( media-plugins/gst-plugins-libvisual:0.10 )
-	mms? ( media-plugins/gst-plugins-libmms: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 )
-	ogg? ( media-plugins/gst-plugins-ogg:0.10 )
-	opus? ( media-plugins/gst-plugins-opus:0.10 )
-	oss? ( media-plugins/gst-plugins-oss:0.10 )
-	pulseaudio? ( media-plugins/gst-plugins-pulse:0.10 )
-	theora? ( media-plugins/gst-plugins-theora:0.10 )
-	taglib? ( media-plugins/gst-plugins-taglib:0.10 )
-	v4l? ( media-plugins/gst-plugins-v4l2:0.10 )
-	vcd? (
-		media-plugins/gst-plugins-mplex:0.10
-		media-plugins/gst-plugins-mpeg2dec:0.10 )
-	vorbis? ( media-plugins/gst-plugins-vorbis:0.10 )
-	vpx? ( media-plugins/gst-plugins-vp8:0.10 )
-	wavpack? ( media-plugins/gst-plugins-wavpack:0.10 )
-	X? ( media-plugins/gst-plugins-x:0.10 )
-	x264? ( media-plugins/gst-plugins-x264:0.10 )
-	xv? ( media-plugins/gst-plugins-xvideo:0.10 )
-	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins.  Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r1.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r1.ebuild
deleted file mode 100644
index ff8a937c944a..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 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-1.0-r1.ebuild,v 1.18 2013/03/03 12:52:27 ago Exp $
-
-EAPI="5"
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 mpeg ogg opus oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X x264"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[alsa?,ogg?,theora?,vorbis?,X?]
-	media-libs/gst-plugins-good:1.0
-	a52? ( media-plugins/gst-plugins-a52dec:1.0 )
-	aac? ( media-plugins/gst-plugins-faad:1.0 )
-	cdda? ( || (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 ) )
-	dts? ( media-plugins/gst-plugins-dts:1.0 )
-	dv? ( media-plugins/gst-plugins-dv:1.0 )
-	dvb? (
-		media-plugins/gst-plugins-dvb:1.0
-		media-libs/gst-plugins-bad:1.0 )
-	dvd? (
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-dvdread:1.0
-		media-plugins/gst-plugins-mpeg2dec:1.0
-		media-plugins/gst-plugins-resindvd:1.0 )
-	ffmpeg? ( media-plugins/gst-plugins-libav:1.0 )
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	http? ( media-plugins/gst-plugins-soup:1.0 )
-	jack? ( media-plugins/gst-plugins-jack:1.0 )
-	lame? ( media-plugins/gst-plugins-lame:1.0 )
-	libass? ( media-plugins/gst-plugins-assrender:1.0 )
-	libvisual? ( media-plugins/gst-plugins-libvisual:1.0 )
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mp3? (
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-mad:1.0 )
-	mpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
-	opus? ( media-plugins/gst-plugins-opus:1.0 )
-	oss? ( media-plugins/gst-plugins-oss:1.0 )
-	pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 )
-	taglib? ( media-plugins/gst-plugins-taglib:1.0 )
-	v4l? ( media-plugins/gst-plugins-v4l2:1.0 )
-	vcd? (
-		media-plugins/gst-plugins-mplex:1.0
-		media-plugins/gst-plugins-mpeg2dec:1.0 )
-	vpx? ( media-plugins/gst-plugins-vpx:1.0 )
-	wavpack? ( media-plugins/gst-plugins-wavpack:1.0 )
-	x264? ( media-plugins/gst-plugins-x264:1.0 )"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins.  Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild
new file mode 100644
index 000000000000..13bf511eb687
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 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-1.0-r3.ebuild,v 1.1 2015/01/18 10:10:49 pacho Exp $
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.2.3:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-1.2.3:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-1.2.3:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	mms? ( >=media-plugins/gst-plugins-libmms-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-1.2.4-r1:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mad-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-plugins/gst-plugins-vaapi-0.5.8-r1:1.0[${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-1.2.3:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-1.2.3:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-1.2.3:1.0[${MULTILIB_USEDEP}] )
+"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.