Refactor to not include version in the virtual as per what Samuli told on -dev. Drop versioned virtuals. Force due to stable keywords (same as ffmpeg has).

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

4 files changed, 30 insertions, 45 deletions

diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 7534b3ded257..19116642baa0 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.1 2011/03/23 13:41:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.2 2011/03/26 14:26:58 scarabeus Exp $
+
+*ffmpeg-0.1 (26 Mar 2011)
+
+  26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> +ffmpeg-0.1.ebuild,
+  -ffmpeg-0.6.ebuild, -ffmpeg-9999.ebuild:
+  Refactor to not include version in the virtual as per what Samuli told on
+  -dev. Drop versioned virtuals.
 
 *ffmpeg-9999 (23 Mar 2011)
 *ffmpeg-0.6 (23 Mar 2011)
diff --git a/virtual/ffmpeg/ffmpeg-0.1.ebuild b/virtual/ffmpeg/ffmpeg-0.1.ebuild
new file mode 100644
index 000000000000..aa6db6503a5f
--- /dev/null
+++ b/virtual/ffmpeg/ffmpeg-0.1.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.1.ebuild,v 1.1 2011/03/26 14:26:58 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"
+
+DEPEND="
+	|| (
+		media-video/libav[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
+		media-video/ffmpeg[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
+	)
+"
+RDEPEND="${DEPEND}"
diff --git a/virtual/ffmpeg/ffmpeg-0.6.ebuild b/virtual/ffmpeg/ffmpeg-0.6.ebuild
deleted file mode 100644
index 258739f4bd33..000000000000
--- a/virtual/ffmpeg/ffmpeg-0.6.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.6.ebuild,v 1.1 2011/03/23 13:41:40 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"
-
-DEPEND="
-	|| (
-		=media-video/libav-0.6*[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
-		=media-video/ffmpeg-0.6*[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
-	)
-"
-RDEPEND="${DEPEND}"
diff --git a/virtual/ffmpeg/ffmpeg-9999.ebuild b/virtual/ffmpeg/ffmpeg-9999.ebuild
deleted file mode 100644
index a2bd8fd5fbb0..000000000000
--- a/virtual/ffmpeg/ffmpeg-9999.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-9999.ebuild,v 1.1 2011/03/23 13:41:40 scarabeus Exp $
-
-EAPI=4
-
-DESCRIPTION="Virtual package for FFmpeg implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS=""
-IUSE="X encode mp3 sdl theora threads vdpau x264"
-
-DEPEND="
-	|| (
-		=media-video/libav-9999*[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
-		=media-video/ffmpeg-9999*[X=,encode=,mp3=,sdl=,theora=,threads=,vdpau=,x264=]
-	)
-"
-RDEPEND="${DEPEND}"