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).

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

5 files changed, 32 insertions, 48 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/Manifest b/virtual/ffmpeg/Manifest
index c74415746141..32767c4e6105 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,4 +1,3 @@
-EBUILD ffmpeg-0.6.ebuild 642 RMD160 9a3b3ce8d9cdda7e43c2c4213a9180d537418228 SHA1 04b3008b6f32df2403675fb5a81cd8a83c8ded98 SHA256 b03f28e0c0005627e6550e7a250fb331659b49f339f8a988ef2f53d0179519e3
-EBUILD ffmpeg-9999.ebuild 589 RMD160 28caa0d32375e9bd3c7ddde8df5d191aa878fccd SHA1 6b53e28118c470966325f8882097ca3fe3c0de10 SHA256 dc8556b2b0912e4abbe4d27c83dcdb627ed7fe6e0e0a030a348b886a15c14214
-MISC ChangeLog 624 RMD160 664fe4f652b22efbaf7ba6dcc10e7a13d340a7be SHA1 a230643901a9be8ab15ff228060914e0e03c819b SHA256 67416435212443071803ad55112c360a8621cc113953f9fdbd7b3e5dfa404cc8
+EBUILD ffmpeg-0.1.ebuild 629 RMD160 30ed932af3987fb474075bb3bde4a7136ca73c50 SHA1 c53ad02d566adbf9aeab06e870920937c1e987c7 SHA256 4e4859d2ffd2b5d9b5c3b851a59a0ca0dc048969e8781857880e7e00827b8544
+MISC ChangeLog 879 RMD160 fda18f8d7eb81e4d89243f6e76f3df2a4022e603 SHA1 8ecb96b0f874cfe3708e797a6c0c2c000c7d2a7b SHA256 a4176e39999b384099f38480f96e546cded6979b4a4d137feaa39e3f1f90b148
 MISC metadata.xml 356 RMD160 f49a377695011eebee33635e86aa774012cc6b50 SHA1 fae2f8e5355912f11839c5229172d39e4e0c9f13 SHA256 17f805ca0c5d5243d0b3403c3959d84271a6c86c70c1dbbf26847ed3f83160b6
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}"