Introduce USE=libav to control the preferred implementation.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 69 insertions, 10 deletions

diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 1822e865fd82..c40ccd56cfde 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/ffmpeg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.66 2014/12/12 10:42:25 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.67 2015/02/01 22:28:05 mgorny Exp $
+
+*ffmpeg-0.10.3-r1 (01 Feb 2015)
+*ffmpeg-9-r2 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +ffmpeg-0.10.3-r1.ebuild,
+  +ffmpeg-9-r2.ebuild:
+  Introduce USE=libav to control the preferred implementation.
 
   12 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   USE='vaapi' is now global, removing it's description from metadata
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 83bf31548421..d104125895b5 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+EBUILD ffmpeg-0.10.3-r1.ebuild 842 SHA256 51d7b4937bb8cb397622e6373823965ca0b8a6d9a068fcfef126001963a39721 SHA512 a76e1eb20b712030550902aca3b3bf4fea272408d98836b57e2c36e7c15a469565c9a415a3664e2ff34fbba880d363080713a6e301e3292bfc652c167529b2db WHIRLPOOL 1d90a7f4f1fca8c99f818e80f136c3b51d3b17d4c1ed3e561ebe19069241a856d4a5d254a635b3eef74b60db3447dce0a74d0d3b90d4bf11fe0d3c7e2f1fa6ae
 EBUILD ffmpeg-0.10.3.ebuild 815 SHA256 9582756377f91175539daedfa9fcb67ff3bb6dc37c46c381ca82048eb3fa68f8 SHA512 2a90051549b383383aeceb3c508b37651e0efcbe24c786b8327daf7fa738c3c05562db14050e06f6eb1b90ff2cf4e6fad70b38700029ff00d6a16f0e17148b8b WHIRLPOOL e22ebbf97680891c7a0ac243f2e19df152951b786492bf3bb0a13a818dac2995e32e46a0cc58e235d7a3012b9738f91d2777b54585aafc44bc9fa16275cee193
 EBUILD ffmpeg-9-r1.ebuild 891 SHA256 51a2b9ad13368b0cf5f3c97bab6d4b2d31c60d21e1717ec89d384adc96feb3b0 SHA512 2d329b39ec34196408abdfa86975fa5e12912d52047bc59b62ca89c30343935efbba2899f7ce01005a57fbc7a345f1f7ee280b3fcdf6bcdc18f50e2184fa7dbe WHIRLPOOL 773d7061c9a55f785861bb81fc0dad40d881371a5cc47910ef9cc6f518c0903d759003e8b747caf41eb7465f41f91a3d7849da5d53911018b0898433b168ea23
+EBUILD ffmpeg-9-r2.ebuild 917 SHA256 3921576616002d5ba4b727811a1c86c1689e92f4d1e0e0c619dd99147837ece4 SHA512 617b56e9cc1055fa9cd9b570a0e5d5b784c6ac4fb20561f065a6422ce7c86d12c3c071d3f22dd75e95c17059e6700c2f698acaa1e67778fa64adb389fc6373db WHIRLPOOL 4ed219b82dfb2a5602b9e0c098f06c4755522c80682f87e296fe169d78ce3d5c7338405c4e369cd808e76f749a1213c9940a42527dffce2d5b3ac638ed257f0c
 EBUILD ffmpeg-9.ebuild 815 SHA256 38eee7458e056cb8503c6cf816477ad27117577b80ab0eee392ea4f799ff6328 SHA512 68e9ff80c3bbace2e595470989dabff6f68daf8232481c55f65936e97be828b066530bbd68e9f6303656023dd9cc911b24bd86d145909b94f2cac32e6909bbb7 WHIRLPOOL b240e4cdbbc0456c97b51335e95905308d92c80a3cd58622d6ad5fdbedcc39b5ecd6170003191928bc8972808d8f1e9a88fca63d008059413fa4a734fe6ff3c0
-MISC ChangeLog 9302 SHA256 d0bb9f1d26a2941e89736523c7c6178dd9f0604fbdbd729cf6156b7092c71b08 SHA512 36f90cd0f7d7ba0855cfe88214a3438d72bf1a5096df2c238886319d1ee6c416675333cf61137eb5ea95673faf4de1263b291ddaebe2636109f7f007c4a6c57e WHIRLPOOL d758e5a91079cb8a4de98155ae73b8dc1e43d3450b10d223f99030ab477aecd0dd08795c35f7d4fdd7e8278a1458a0cf48d2376954091848e2ed2faf923b2b9f
+MISC ChangeLog 9523 SHA256 7ec1eb7f59482d2f57d808d45d13bc4a081a353d07fbb1d4a0c5b3160b8adafe SHA512 5037c0887433f101198cd3442d940600f7984ce021e7a2148d6c46fb25e73603df63bd6ea9247d5d1a467b03aa0b454e49f9ef41f9cee754d6e229aa514b9f11 WHIRLPOOL fa8e2b2e06bcf03dabdf5f481972f42b89d1326923d4dbe7bc405c103c1f706db30d3120caa47916caf4cdee16370e997205a63afc6f47d5e60150e23e2edc43
 MISC metadata.xml 320 SHA256 f4cee0195510c2d92956159b74fa151185cffe4e7c76dd6ef4945b5b1a26b033 SHA512 ce90e9f47cb2247b3a00cc540fa2617e10f561492d71009eb0e5632bc96c87c0627356f59d67af8212ed8baae1e445bb31c1bb5e913376a5fe569950ce8e3433 WHIRLPOOL 94e4acdbe32f647d6f3e6716a4e2e6871c383904f917e691a6580c841a2a107ff6f6aba118006f6777c5b01ca62af06ffffb6a391dd650189f0ba3f11d455ed5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUisaRAAoJECo/aRed9267VdYH/0K6oAYn9z7oLwl+8a+jchfC
-Es8v1x/WNjtVM/JIs6bbADykS8XHsWiNlPDu96jMjjT5bvGtcYyKrOpuieRxFo4v
-01epjWVPo8QmNASJpWLIh0mDOY6DvlhRP7+Ru8dhllSxnNGRLRCMwzDAk9GMewLX
-iIpmX+wUKXuiE3dBMyvxXnVsnJaAvFJO33/7GZBcbadgcti25xTlGd3xnxmtLx5J
-PpNCcyzl29WjftiHRnCkYyEN5TWypF5Oto0QMKINq9rYHImimyLKsOf3zKE348Fe
-/oednMMqGhU1r/CipSY/LvBjf30Yt+bRhO05ueO/Nja/A8pl+eO37kPti5hNaos=
-=uWcS
+iQJ8BAEBCABmBQJUzqh2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOM9UP/jgpQV14V0Hkox/NYaHoAr+i
+1jPtTJvF13t+fr/O8HZdsDC0wNoljCmAh9eRjqoneeO0jCH1olvRu/wJxTYYJ5vC
+r28t7v4Jyf/M3SUnXbTOlx9iGmmfLu7VenKCCZOqkuxDuAbO2ViBg2KENRsC8B8a
+tHsF3GJAWAbp7kRzlaaVDPif9rKBpjiY/j6bBCZPVIE6+llmd1tdwlmCs4ZR86cC
+sGOhQIrcPVRCVC55a0RjLltb+Gt1g+GJk5EXSiLZUQsbvOnOTMAU5xcrw0S+tGIi
+30PMkcKAmSCrTre1XBQhX5ZkIr2gCnNm27LN2hUtyRje1jIryPZPXdsXbBLF1V4O
+Yj2JYS72Gcwu6fdTJ3mEvH31UOCTamoMAVAiZBG4TEE5ISV4snpXihn5+ApEHcoJ
+PuOk2hKLc0zLqQnCzua5evzqZg+5Y9vdbNgQ5wpkxhZ7jYHsNwkAMlL25Hyhq+ku
+h38jYlNGic5GV5uYaS+hHU/CpxURs/AMr+HPlAi8b/bgGQzXg4bpz3lCZp/y+QaP
+tSHM+UccMzoaSlebojfbXcado7PLMVlhfw7EtY001p9yfuUJgz0YElOrZnl6itFp
+oeeG7TQctcBhMLQ7ud43F9A1G9YRohNM4pFhcUAuBVaPBeD7zPV80SVGzmFP/2WQ
+NZiFlxp5oR4ZQGbIOFK4
+=gzfT
 -----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..f29abd47f7d6
--- /dev/null
+++ b/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild,v 1.1 2015/02/01 22:28:05 mgorny 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 libav mp3 sdl speex theora threads truetype vaapi vdpau x264"
+
+RDEPEND="
+	!libav? ( >=media-video/ffmpeg-0.10.3:0[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+	libav? ( >=media-video/libav-0.8.4[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+"
+DEPEND=""
diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
new file mode 100644
index 000000000000..1e77f1dc54aa
--- /dev/null
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9-r2.ebuild,v 1.1 2015/02/01 22:28:05 mgorny Exp $
+
+EAPI=5
+
+inherit multilib-build
+
+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 libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
+
+RDEPEND="
+	libav? ( >=media-video/libav-9.12[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+"
+DEPEND=""