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

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 49 insertions, 23 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/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=""