4 files changed, 46 insertions, 39 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index e0f352df61f8..5cee0a0870a5 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/ffmpeg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.47 2012/12/05 13:34:39 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.48 2013/01/16 12:40:02 scarabeus Exp $
+
+*ffmpeg-9 (16 Jan 2013)
+
+  16 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> +ffmpeg-9.ebuild,
+  -ffmpeg-0.10.2-r1.ebuild:
+  Add new virtual for 1.1/9 series. Masked. Also it has switched dep order as
+  will be announced upon unmasking.
 
   05 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> ffmpeg-0.10.2-r1.ebuild,
   ffmpeg-0.10.3.ebuild:
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index a1a459262ae7..f78c31b510e9 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD ffmpeg-0.10.2-r1.ebuild 729 SHA256 72f4f73919922d858dc0c80b34ad6a077f097d0a09868e81d276bbd2cfbec56c SHA512 c0009ccdec97b29df8cea413824647e79940f9d2efb851015f7b6fabcd478414b67e1e1bbfd1d41e8f66a0524f6544f851ecd4ba9132c7ba917fe02e134cfaf4 WHIRLPOOL 86d1462969da1945498e584e13a09bea4946d35efb659ad641f5de2b3dfc48b4f30a9cd82ee0160c33702f17c17684f01e073b107ce49747bee413e11108a837
 EBUILD ffmpeg-0.10.3.ebuild 814 SHA256 9e612f60929a7103b0d623b6ea4642865d3f4332b3e746862d0b538b14895ebe SHA512 f16430f416ec3272b7d35b0c6ae358e388448758e40f52fdbc083e1833ede143d6d0851fc17486f83089c0869d8b180b2ef5bc7885483c4a5c9c9792fa12547a WHIRLPOOL b8b6010f4f53c5679369538a5f2406761805bba41b0ea402bfa960afdcaf069c11e8235d10f173394c4cb5a38de7b95be047ee5ccbdef33106c912772564d295
-MISC ChangeLog 6939 SHA256 f73a2125227b2b84e253992de631cf9e662e904d1fb67676e64609ff22086736 SHA512 31fc9ff745e615118bb7eea58bb4a2b67f90bc682d5ea18f85aedf969a4357e85687c5bd617d80aaf4457b2d1ee4a204fa42d80b92bb4aa7f8e4e98328cc9152 WHIRLPOOL ed2a60feac51a5939d423ec4d96f0df8fd1773442fdb9c6187d981d4f7d895368de751ce3ba7f821e2d0e3e3c54c7d38abe7206f24a1941798e3fcd402b0aa01
+EBUILD ffmpeg-9.ebuild 810 SHA256 d23ce0674cc2c59fcf298537907e455679a5d798260afbfdffc170caf680ddff SHA512 95cd07c1089019fef57e342b7ff3bdd201abb295661b6ec256d4299a4486c22ea8918f26a48193f55c38acca4146e4cf6e9f502ad2b5cfe588499e2454151cb3 WHIRLPOOL 4dc236a116beb1b934cd94b2ccf7b04f61d511fafcfe0148efcd0b86549ddb31557397a6d8cafbda9a0a773820c0aa4441df142e2285a55c4f6cc7d461cdaec0
+MISC ChangeLog 7180 SHA256 8edcbee7669615a895a4608effc4cbb2916baca80fb601d0dca5ebb5bb16e563 SHA512 b0d93f2f2a60e378709437b14a17701e8eb4ec4149f9d716b8265c969326ffb91c886c3e0a992d7ce9c85665ecfdf44f2a477fef1a1585c24db509559223694b WHIRLPOOL fcd734c1bcc34058b18c5d176b6dda59bf2c5cfcda8033b99472cadab3b3b42ecbcec7ed2b3a00bbfeb835f6c6a496e53f7c0cfa6b444bf51a4abfc521db5496
 MISC metadata.xml 325 SHA256 167c6aa1e2783183cce1097fbda1211acf17f3c0a7c764a652ea5d0655dc6b74 SHA512 517ea4a95f320f5ec1a66dc37b5b6229575b410b2459c1d559d64f7eb45802f1b625cef9898cae89d97d5da09d13182b4dd487751f37178a46eaceeacf14aa90 WHIRLPOOL e2d30f2d302770fbd99bcbdb1f890902474e6f1a404046de728f8a275017f22055fab8695a3ecd9ea272886a8869efa9b807a1ba55c7e3ca22731f05bab6cf3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQv01mAAoJEOSiRoyO7jvohLgP/1ts/3jFFotQtvFPqggJsOh3
-PZOTcIp60wbS9NNVdEsME2SKbqdALkWFr5LgmEC4IrTfxwpG670GniVc6ZltLluj
-y5VcXUWwAo5+CMX2vIHSvnC5yb88FxQg8e2A0d5pxALy/ZcmQG5HB0LJWRe06KzA
-X4lEm4JQx6sUR22+N3FjFQK8SbWrOMxp4g2+Bt7tLiUamDDEl0SYh8D7bydMK5Hi
-t2PocQBAZJkq3UAXH5VIXH65OtoGv234xKTosWDD5EknBkYXxTf+7KzFzXHtW0LE
-ywdUYsc5UkV2zHQlaVa2VfywE9lVDf9QIrxJ/OAdzk5+SwVQ8Jbf5OsNyo9UFZKo
-fOCkkqMZa0Q/yWQ/EdNS16H5bFxV8AByEPQpU17QZ+xsAYhBTXcrK9vM0w9WBerB
-RV4Q3wFOa7FXiR7kcO8jD8tGNUz72gjkI8DJTy7NxG7GUzMvlDKX6jo99aFAkc4l
-rWckFU0p6eyc/JdbgOmdUuM8KudK5kzgTe8vJ4aJjaEr24EQNemmclM75DCL/o2Z
-/GfJA0iHT1pCaKtUu8O6yE25t8LJ1SalWAiqlrg8NfRJLLRyPUT46aK254/AYv7G
-kvTyoSRFdfztulsLQDGVnfOQ7AymYPMld8R0tyX+0nSn3a0rh4nclhUYh3vUw31R
-iQi0xnIIg9mdjEmkaoMt
-=qXj/
+iQIcBAEBCAAGBQJQ9p+mAAoJEOSiRoyO7jvouOkP/1FEqf21N2d2+CC/g+7EjZZb
+ayWY5lDQ8sfsHi5LWLEC9oz2vZOvyk5P3ZVCHim3tDrhQyKWF4vPlLOmNNisIeHy
+AaGgA49knsfSvZ9zX9gUtuJ54qFAOYGhHSpugKf3TeRZhmvzyz79/8vMJOoya6l9
+7q/GK8sljcjwkm6nQyN8L7rD1t2/LVj28/A6oR1BPYmLv1Y1eCZf6ib/LOLewLX/
+6mfPJ0z8bQE4TZv6ooH2D5tNs0iVwobpXs6fd9g/Zb6dL/3DKhI4IzsbBUxUxvtY
+qhlJaQjG+JUpQuMk2w4rJzhrP8XcmRMth9xW2mX31YbxlgGSJpkjCdOzXGV/hJng
+lfyEdecv6+qqDVXV3h+Esd0dUAsVOj1vuLioTqrgmo1CX7Dl5omf/+WREnI05hHg
+gntdA1uCfZXtsh8r4oH/YHPg5MTDFa8lTgZtvzREkL7v1AF315Oj7GhGaZ/QpSed
+o04uT5oBGQa8yU7isZLTHDKagDb9WtIaSBjlGdF3/J9PWGx+XJ69heL7XSABVONi
+UV2ofZC9vMgYUEKnb4cpTsBCqooVP9KEfmAP7+cTEHY7z7ZcT/lXuqjQ2jdoXFXi
+ENsmNDLymZhjFXcxcJM0IEM/oXz6j0TG8eUydscUPDT6+07KgJIPDgAw6xPo1is+
+/wDHnHBzw3lqsL836+MI
+=grEG
 -----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
deleted file mode 100644
index 914e8ed83f5d..000000000000
--- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.11 2012/05/18 00:21:34 ssuominen 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 ~amd64-fbsd ~x86-fbsd"
-IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	|| (
-		>=media-video/ffmpeg-0.10.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=]
-		>=media-video/libav-0.8.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=]
-	)
-"
-DEPEND=""
diff --git a/virtual/ffmpeg/ffmpeg-9.ebuild b/virtual/ffmpeg/ffmpeg-9.ebuild
new file mode 100644
index 000000000000..8f4abd053fbb
--- /dev/null
+++ b/virtual/ffmpeg/ffmpeg-9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9.ebuild,v 1.1 2013/01/16 12:40:02 scarabeus Exp $
+
+EAPI=4
+
+DESCRIPTION="Virtual package for FFmpeg implementation"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264"
+
+RDEPEND="
+	|| (
+		>=media-video/libav-9[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+		>=media-video/ffmpeg-1.1[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+	)
+"
+DEPEND=""