Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.

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

3 files changed, 31 insertions, 23 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 60af5742cc7d..6a8731990fda 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.117 2014/12/26 18:18:22 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.118 2015/02/27 22:24:32 mgorny Exp $
+
+  27 Feb 2015; Michał Górny <mgorny@gentoo.org> opencv-2.4.9.ebuild:
+  Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
 
   26 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   -files/opencv-2.4.5-javamagic.patch, -opencv-2.4.5.ebuild,
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 3a6b1efe98df..18066eeda02a 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -8,24 +8,25 @@ AUX opencv-2.4.8-javamagic.patch 1165 SHA256 b13037b93683ee8e6f535cbbd8742005e67
 AUX opencv-2.4.9-cuda.patch 7247 SHA256 94f01e58038306a6f699d867936038c9815f965f31075c268e80ad30aab33cc2 SHA512 b8d7a18e00359a985f389eecf779b2d648ea88f2508c31f1895eb0d9ef9ce2924866054a2df0bb452ba161c3ba254e4cb9717c1275392a2e8691b9b34c245e9b WHIRLPOOL 6bc5b4afb724a6450228eae6e6920ee57d36f2d1bb50c09a6bd7230f870224d75367d3a9dbd0f02d1bacb1fa48d6e2d331d363716cc547fb85b67b48985dc5fb
 AUX opencv-2.4.9-libav10.patch 22417 SHA256 7c95f31c8242b239c2cb3259e2bdecad4a56d1dfd8d6087e71265ab6123aeb8c SHA512 e6ce98f788df2cfa32861d62c21296e4a3cea7a8b6747bc945cf80267a23aa207f94b30c000bddf6ccea69fc22edef635ee33cd3dd683a4b790bcca49e068a93 WHIRLPOOL 887a684bdc0994b8a5bf6a83aca4e94eca45c5a65ab5bfda873156b4cb8c9ab3b3bc6a5a75a8a2016f4416e47ab4f6f9a3b6776ac10af3ca57d9a4e2c3b08c9c
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
-EBUILD opencv-2.4.9.ebuild 6024 SHA256 ccf39ba57b99084398ed11768b1db5f689525e2541852f4ea54d5d655259b2fe SHA512 c629f56a0569179e0dea0c32dcc0998ad89614cb74145b04431935b2248d0434ce3d183a408adb2f726fb8beca6b5de55ffbf1875c09fafd1c64199ba29e9a20 WHIRLPOOL 84ba5133619970efa59e3bf1c5db32db76aaca325e4c8b900257f25abe92c5b859025c351becd208614b8aa66d7c6fca2d3adc358828b2baf4ca3b0a0b71e607
-MISC ChangeLog 19483 SHA256 0732a8d36f86d0b62683dc52d45cf7edbf31a1439255c18b4a4df561fad7aad7 SHA512 7f49be6d9a8a5272f953d1ac99b1dbbeb2c4b22f2706f31e835eeeba305e0190f26dbbbb857948f824e056466d26cb7702e827ab90c9681390ea9838f99d29b6 WHIRLPOOL 6e5a56c8d9f55421d5f551fd536c3583fe7f6f8936158c555848c051fe03c56f030b64c4da6be1cffd7f49abb653c7aff4eb0d20933fb96c9d7e73f159087cb1
+EBUILD opencv-2.4.9.ebuild 6089 SHA256 e253bc9ce6663253135dd2deed47c7c8bb8d54a493341f0d406fcf06986524f8 SHA512 074c8a5b80f96bc0c5ce91b077c31935588b9e8da470ef0fec283a38bd4dc35f28783163c357b4c7d426296e8ba0b29e7756bbcd3e2247c2617c099771484338 WHIRLPOOL 33b3dafe6d2263c23f703f1e0bb4d5d1cd6568a03fc33fe6228b82526f7dcf17140d9e1fec9007901d54521cf206ee9ed935b227ddf48df5733edbfce012f468
+MISC ChangeLog 19693 SHA256 27c1031a62ceeda5b0e65b78fd19365f56a4e76c91db71682d86e6fb10d063e1 SHA512 75d4cd3f2bc5496749e01c7abd55cd568da19575f2e63ee8041514066aa979a89c4e598e005d51a5ceb858c4db26fa4490d4b7a50f2a3c806184b9e3ed6bc067 WHIRLPOOL b8f0ad7f941ca2346d937ca3b4f98d892b73fdc72f3d84df2c9d3b70c1db3ed8b394b4e2cf0b803bda6cf9f9b570496dd172e70d14e6b1236ae2d39f308bb4ef
 MISC metadata.xml 1230 SHA256 8ac77d1094c6a1d2f83c13693a34e3c7745e4b55d99d44d7471ed0d847bae369 SHA512 4a3191076a5e9c211ffbff7ea6870214c1533193d7a26d0937f78b00d80f4874561dbe76d05c63dbde820db2e49603d048fcb6a34cb704bb0f5e7cb33f645be0 WHIRLPOOL 87825beff89509383be4fc077471c3c91e0b3956ea19b2f7373310404f0e27c1d394309d996ce3763f63f611a61b9d8e7e6c3b82c50a0cf4c56b399accc396a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUnaZ/RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JO/D/9Zq17QcxE9AGalQCgfNxvLJlLJVTJOClBlFDjegbrUue4dbLcRcNcKfh8A
-LDpcuyEdIO9bmauoUEE6wfr1zl56F5rhIX1OEdIqoiQLllaL7ItMk7Po9Iqhea6a
-7xpzYx32nLjq4teh7TD2rPeGmZiF70XL4PkquA5CGddGeVBk5m/d0mKccEjzd4ap
-cksxnXbxe/zur8j9aEgVeb0mEtKuqtMS2R0OlFljtgHFhtTtNL7NvuBhF6Tu4g0u
-jqgE272PUMmrQijeajzC3rPQyRXstAOdaud+Fk/aGxU1JbzpMjiNbWu6aZUOuqi3
-0h2GYTE15owHhpgIhpUzTF9pkl5gvATHUBBBKBUkTncwAQRWyYXB9NU8KrsbxhGc
-Zb29Tn/oSL0JJHq9jCq6lbVmsESvA9yef8RxZDej3BqexGTbCqI92wqiI8wFKX9v
-fwXbBQvWqdcX7KGUSk09nXNYNFmvH041pAZIIA0hHMFiC4fxREb56iR5QWHK25gv
-cc7L6HkazWWvK7vaz82LBPNp/5b0heaX2gYOe8kmLYbZEplkWVE+XUDMHfwQ5L0E
-+A3Da3PW+eV+LlRBC2g1JJMBoGB5Dt5okDosKRAPArwlyRy8WBbr30hh/9XRspzm
-koVuHtct5YwTyxS4v++t9hygIPA+OGqAoTU4X67M9dH4E9v26w==
-=joxQ
+iQJ8BAEBCABmBQJU8O6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOz7kP/0B19TTji0JyjQ5NzNIne839
+c9ojjcsbvtXgyZRG1SJDqbQ9CKuj9zd1OVLcUkS/k+RswjHtk6CjAsQ/hHw3uy0S
+SgGMufPkvli3w3mLH3W/QWoGTTIKGjyhaWelDds7Y3AK2jw6vzggH9LhtOGmTCga
+ky/8cZvMt5doHp9+GigMhg6+Iq0j6CQBNVzbHrtSOeCncXEGT31EEcDtjrE3qZfG
+LeiS0MtbhPUMft6qi97SdXcgQVl4EFldRbI2zuvbYG7H2ScvMVmYbmSrGF7hCum7
+s2axDnyOi142cZo4TfsqizS7vLgJxRN5FL5imQOFczNGN8UZCnC20eFxSnFEWwwo
+HyUL0aHRTOIEkYlx/hh3VoGT97Ziim722HBkNmeCmNxy9+6ElMZLZSaRi/oEm36u
+5AdjfLyAfu4t8y9xUo62DeWKeAz4IjId5SMTE3KcBgMgNtqtLQ9CMl33379KSdnZ
+lTKpNBlfaq1rS4iNkG1L+HufM8NvyzDgQukvgOTR68agswauB+bVYa/0j7FUNvAp
+qOeQFPG9ueP0LK1oCpj2ZcfyWFsQWF2625aeqqVju3WVYfY2ZqRNe1qr3ScwJAVL
+wAIyi0F4HH4zLyBmBSa0nwfEdbCk3oLkIcKcPoG8HHiaXRIkJhT9xPUeQ2una5Ti
+2choBzB14obzZGaB7hEM
+=/dOF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.9.ebuild b/media-libs/opencv/opencv-2.4.9.ebuild
index 409904c43b5f..7e7b14d9c7a1 100644
--- a/media-libs/opencv/opencv-2.4.9.ebuild
+++ b/media-libs/opencv/opencv-2.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.8 2014/11/25 08:43:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.9 2015/02/27 22:24:32 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
 LICENSE="BSD"
 SLOT="0/2.4"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux"
-IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -30,7 +30,10 @@ RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	gstreamer? (
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10