Move back to versioned virtuals as discussed on dev ml. So chop chop with migration now :). Force... stable keywords following ffmpeg ones...

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 62 insertions, 25 deletions

diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 26adc7836b03..43ba333492e2 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.4 2011/03/27 09:49:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.5 2011/03/31 07:35:20 scarabeus Exp $
+
+*ffmpeg-0.5 (31 Mar 2011)
+
+  31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -ffmpeg-0.ebuild,
+  +ffmpeg-0.5.ebuild, +ffmpeg-0.6.ebuild:
+  Move back to versioned virtuals as discussed on dev ml. So chop chop with
+  migration now :)
 
   27 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> ffmpeg-0.ebuild:
   Do not set DEPEND. Per bug #360711.
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 54490c39da3a..7d7730153db6 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,3 +1,14 @@
-EBUILD ffmpeg-0.ebuild 637 RMD160 5f6be044d2e779e4744f55d26139746a309a3d54 SHA1 88999e942dbed708fe678a9ae73f1ade2c06026a SHA256 9d8905ea587842f7f79e7eef8f184026f89b776f7c6cbdc51e48e9597622bea6
-MISC ChangeLog 1175 RMD160 1dc469e1e99fd852e616b1597901d86169062301 SHA1 f8c852f22ce8b485e410b321df50999f4389ada6 SHA256 05a188c0ebea4b2d15e7ec54cd4afa0bb86894bbf5c1c1812cd6eb4b674d9e52
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD ffmpeg-0.5.ebuild 544 RMD160 0520864d5fceb7858b90fd0a38d3f99f23aa3d5c SHA1 a8acf3dc50a6e345bf58b84cecef933dcda4f02a SHA256 814ded5a948d8f31cde61136ba7a67bfde3e08fae67775ca0bf91af7daf9e9e7
+EBUILD ffmpeg-0.6.ebuild 653 RMD160 aae3ad7cbf8bb47f3ade93f382b1ff4ad348be91 SHA1 61e82188517629719541cd5c545cc6eb7ccaad75 SHA256 91f5a671be4f7e9d210975751a5652c691065e0514ca2ed505165b4f46580bf6
+MISC ChangeLog 1413 RMD160 8c22817f24ba3a8724f41f450571e0540f3ec4e6 SHA1 1561e0925acd84cdb3440f437f55bcc003686890 SHA256 93b4ef4f6f1bc04736e658fd36940d00ea316a196557394b2426c46298e0d3d2
 MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2ULoMACgkQHB6c3gNBRYckMwCeLBNkWyygpLtIP/Ue0v13SdbM
+QhwAn0iMjpPjhMmKVND6RJi7t7uX9VqE
+=b+0d
+-----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.5.ebuild b/virtual/ffmpeg/ffmpeg-0.5.ebuild
new file mode 100644
index 000000000000..659c17d93c01
--- /dev/null
+++ b/virtual/ffmpeg/ffmpeg-0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.5.ebuild,v 1.1 2011/03/31 07:35:20 scarabeus Exp $
+
+EAPI=4
+
+DESCRIPTION="Virtual package for FFmpeg implementation"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="X encode mp3 sdl theora threads vdpau x264"
+
+RDEPEND="
+	>=media-video/ffmpeg-0.5[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
+"
+DEPEND=""
diff --git a/virtual/ffmpeg/ffmpeg-0.6.ebuild b/virtual/ffmpeg/ffmpeg-0.6.ebuild
new file mode 100644
index 000000000000..899ebc6c2587
--- /dev/null
+++ b/virtual/ffmpeg/ffmpeg-0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.6.ebuild,v 1.3 2011/03/31 07:35:20 scarabeus Exp $
+
+EAPI=4
+
+DESCRIPTION="Virtual package for FFmpeg implementation"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="X encode mp3 sdl theora threads vaapi vdpau x264"
+
+RDEPEND="
+	|| (
+		>=media-video/libav-0.6[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
+		>=media-video/ffmpeg-0.6[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
+	)
+"
+DEPEND=""
diff --git a/virtual/ffmpeg/ffmpeg-0.ebuild b/virtual/ffmpeg/ffmpeg-0.ebuild
deleted file mode 100644
index 0584fb675c26..000000000000
--- a/virtual/ffmpeg/ffmpeg-0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.ebuild,v 1.3 2011/03/27 11:59:10 chithanh Exp $
-
-EAPI=4
-
-DESCRIPTION="Virtual package for FFmpeg implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="X encode mp3 sdl theora threads vaapi vdpau x264"
-
-RDEPEND="
-	|| (
-		media-video/libav[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
-		media-video/ffmpeg[X=,encode=,mp3=,sdl=,theora=,threads=,vaapi=,vdpau=,x264=]
-	)
-"
-DEPEND=""