Fix OpenCV dependencies (new useflag, migration to python-single-r1)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

5 files changed, 43 insertions, 22 deletions

diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog
index b4f6fc344745..004e5eca6bdd 100644
--- a/media-libs/openimageio/ChangeLog
+++ b/media-libs/openimageio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openimageio
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.25 2013/10/25 12:37:01 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.26 2014/01/24 21:46:13 dilfridge Exp $
+
+  24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  openimageio-1.1.1.ebuild, openimageio-1.1.7.ebuild, openimageio-1.3.5.ebuild:
+  Fix OpenCV dependencies (new useflag, migration to python-single-r1)
 
 *openimageio-1.3.5 (25 Oct 2013)
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 563635eb5d0f..400895cd3731 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -5,19 +5,27 @@ AUX openimageio-1.1.1-x86-build.patch 317 SHA256 e1eef902ac86f8b7dba660cfc6ed87b
 DIST openimageio-1.1.1.tar.gz 8217144 SHA256 a1cf6251edb597d31ccec3a74f516c3c9ce6e116dfb5edb3e4bd87d528d4700d SHA512 cf3e1371c6f0333f40506b08dc3fa6c0acecfb149e2e99159e893825e0d838db8ac1150e316e3568024568ed19bbcb473b4f38a61779a03fe9706ee476ec5943 WHIRLPOOL 78420497e1b65140f439e67c295102de5def4ed92eac1bf7b3b417d79d4634a0b149d08eafb8127aa1c5f1eb770334a14b244bee1f7af61ef31dc2abb2309aae
 DIST openimageio-1.1.7.tar.gz 8300700 SHA256 81ad2ab957b93155d092700d2356b2f3bb6ae010dff3077bf1403905790cc13d SHA512 5596bbd57e569e5e9437e65e7d8e45e634c20eee62cc3115f72ec57664e5cc222137c248c3302d89df58ac1efabd198adfdc867a59945cc2324bff5be18ee2c8 WHIRLPOOL cab7c2d604d890b314cdfbd912754790e5d54c9ae2094ab3caff09313bc89e09b6b9795d6ea12903fed2550c5a00dca2cf5579ec6f80a8271775b84db3bd0cfa
 DIST openimageio-1.3.5.tar.gz 13472488 SHA256 18c9297e0d8b582191619a66ae6b7d9db2780f4874464ea462b22321c568a1af SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95 WHIRLPOOL d994fa07626667fa1c00ec221f7cdc5bb482fb321deb84e23fd87bc323d09372db955a338b0a6e030b7af4fcc22ecdb22b270dc2bbce532be39ed9ca2cbb3df6
-EBUILD openimageio-1.1.1.ebuild 2408 SHA256 19b68aaf32bbe4f86ad5da2b0242189d9f1be2b7c1bf038c741fb9e7781ab537 SHA512 9a8eb89af4573ed056b736bd6ebbbc76fc202ff760ec6590821f9a5594d6cca5650cb6e30986f10c61e1f15e298d7f7922bdad2a48847d1db44dd221ef848d5b WHIRLPOOL 6f9d2fa5a018d58077e12822dad6888fdf1803ec78a43e97545cecdbc3746a31407a8516f44bbcea5f6453a8b9d08c017e84cac78fde62ec7da6accfa0966e83
-EBUILD openimageio-1.1.7.ebuild 2427 SHA256 db257689ade0d7d85ddd0db33a3efc07b3a3fdf55a02aa99b68e99e642181b24 SHA512 1349ed3bef2fb77a673f42796f3f0b18abfc76124495ec70f605c63b9140542076f8506e63f7bb97be77f436bea585ac7e612932e2cc02cb59a6064c915a14c8 WHIRLPOOL 6d1dc1933496f207446e27b8301dd86a42d407c0d1d0cbd485a221e781fd5839190eaab1bf3d0100d7bd31d0656aab92d197122f535079272c28191c9b85f0ef
-EBUILD openimageio-1.3.5.ebuild 2638 SHA256 a8ce1f3f06a28e8378f4e312a4b90d5ba0527ba6c03684eee3020ecaea212434 SHA512 9d99fd856348f206bc999a1b5158b3aedd9d3217695fb420c16e45e1eafd1b73daf5d8029b78bb64d08b104c6ca219aeeb50d1af18786ec0fe70cdf750621a9e WHIRLPOOL ee125360fa39d612c7c87443150b52407e1f323b123f1af0938997e33afab927cad4f740f0204e0d52ab2df11092fd2f004e811da1ab484eb5175246116a910b
-MISC ChangeLog 4381 SHA256 d0279c4abbda3427dd852abedee66a423c9b0e6b18d2d850f38efc1a598ad2fd SHA512 ef250277dcab592e9b7176fa37e2b091c171bc3b97c973289afa7a2c823432f4f8c0b3c2a91931f4ce85d9b2d3f1c840fc2870ca5904ceadc0b47819f97bf35e WHIRLPOOL 019bf0ce5d2dd1ccc055c7c8b35cb0694166087d3ce6b8b010f9edcf421ce05d73aaf13579a6611a5abfc37b93b1b0001abc9a72442824eb0ed3a45e9d79c8d4
+EBUILD openimageio-1.1.1.ebuild 2485 SHA256 32fd2d12451913e6a074870a37ff2fcb9c2607c677a0654e7996bbd076999523 SHA512 29aff99a85d872ab45b195075b6b69bfb1b4163c65e850f60f4e8327155c80bcbfe51241225db1fa7648c29f50ac3280a03f2e194fe6731b3337083735174c1a WHIRLPOOL 7e3175d58ec9cf86b2746da78330d846c2dd2fe02e9e15742b1fcfda8776d4e455c3fbb315c3e6fbf0ad410fdca1d8a4feab507fd8a4fd13e053938749cfdbac
+EBUILD openimageio-1.1.7.ebuild 2533 SHA256 6477a9975ee47e56d95b09523ef1e538d62f7b6da8a294e02ac944a888145075 SHA512 c768b5351c9453cd7c5c4d4fe7e7e3d06689e184d2c8a9673e300a180b65321db667715404000d4b4b422d05c8d3578d458756cdd2ed8e2a2561a337305a6520 WHIRLPOOL a76c339bec31bdb09b739dd3bae52daad6aa9c62283e00ea6ee2818d06166989991d4368cee65dc114716322a9f492bd35bedfac8ca680d058d50fa5270d5649
+EBUILD openimageio-1.3.5.ebuild 2738 SHA256 9dfbaedb92a9a5b47b2e14c5717178da62c679e7dc2358e372e33ac6da65ca53 SHA512 0d782dc7ab74f9f07ea363d619f3a216f3e68686c297ac3a80a01db16098d66786221931aa6263b0557118933c83dc953a5dc7709caea40e91aa16f57d78ff1d WHIRLPOOL 670f86953977b3d680430d7cd3384a5c229dc12581fc0367d236ab46a0bb9389f21974d16cc44feb4cc2de737d0741d862a17e1e3b2b95c198d4f5e515ce8bb8
+MISC ChangeLog 4590 SHA256 f586af006fe651ea635bf953c16ae51c3a50831ac0d8aa667d17b659d900c667 SHA512 61dad82b44d59ad42718c0699baef998322f401817702812bee3acf88492cfe8210a6fff4ba0dff232471de1102b6ffb0b897aca1e02fc9b86f1573ab4b66e78 WHIRLPOOL 3f7d4566da47be2d40900784a1dc2519322b40ffe6be8a2270a4a0be7f3a286d18646d837ec307cb6df4e919cca9c327e2c43d58ffad98cccd31c97c88d171f1
 MISC metadata.xml 359 SHA256 0d29ab025f985325637787e98553556e060ca761df59aa3059d571d9c336ff7e SHA512 741b5d2cd80a0aef053e8c903b9853cf3960c13517870b690cd8effd8f8c1258f173d7f5b0138e5511d3ebd3f1288a33a9d4eb08e715b44a27ac0988376c7a49 WHIRLPOOL 8b929e6a8c9c54c69d0b1592c4f54fde4ee3673d1c8cc49eb681fbe859883958dc17987699404876b6f328c3c43f19da4c5b014b4d000f0ac7044ae5503b0e6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSamXqAAoJEEdUh39IaPFN+zcH/1v0LUvzC1QYT2gFqujhVfLr
-+wIXBEVbCCdsxiblIylY8bc+5TT0ej8zAPdxtzG/4zQSKGl4tnLLajXOUwQyJx9z
-bICxt+WyKoq6XYEGjrpZphFWOC9qj/OskNfi5xWt9hhQ/lCBIUSU2nZpaAeE52+q
-sB2tpLO37Lf2h7f8YkArsthoGO3yyFghOvskhpVRiz/1XUJ5QEP4ji0a+XVkwQwP
-ilgezLIDN1+4u6c678A5msDotJiSe19JzbyHoRimN2LEVawjzwn07wm8LMwGa5wB
-HygoPHCQ7oI2jEo4SQuo+klWrPOFbdjy/F2cpRwqWlhHHXrZazkYrsrk8X9diSw=
-=yAQH
+iQJ8BAEBCABmBQJS4t99XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcdi0P/0IMk7qxuo/+8s0GHy1xvttd
+rQC6ZrAuOICMNFjT5Zy4YqlVK5+nOEchJl7w87Z/2sG1nOFaH4iMTxOMfTNtn22Z
+fkZcZnrER5NZQD2zaSsk3DINheCJeFNkzFr3d3fPBrRowdemREigJ9XXCPoWN3xA
+wPjkCjzxi6s0nBk5EUTHHd7xHOyxnSo0W0J65MhxCDDLENjTMHOjuhQh3LfxUjfi
+Iu2344nTQcolvHQSi8SnFQUEZH2Ox2yzyE5ZZ9fg/VmY09ByJPPHgyknIqQ3i3Zf
+mBcRWykaKUUdlG3VqtyHRrHTmyGR10Uj9AcvGGPtzWrd++2vKwOjGUdzt4slVuI/
+Ui5Wh5YmLW8le326a/fnhOyh+o2pI+aYCj2jXAy3OrlNDb0uHSpCRSl5oKLKj8Kh
+Ezdec2ikTMA1PMRCBqvsqYnQWMlSof5EoAQSWe+u/XatUKU6OMXGGH4PchZrRaoD
+t/tjNmAwUWelII6Dvx8RCtXDCzDkcxW3GWcKUDKQrL5rjYmMWGsHPdJywZf/JDN+
+EcjqY5NwT5WK5Dyd5b//1tjPH+rK2BxyMgsgUdI8PE6cB40T+z4TbmkApxC5MyTu
+j6QQcL0d0gNace8nS2UvanQlU6hGMora21AniB6Frdlyt3GApDmvN35JGXPez03z
+LOmTLfsAQq3dECTKBwE5
+=b25s
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openimageio/openimageio-1.1.1.ebuild b/media-libs/openimageio/openimageio-1.1.1.ebuild
index 687d1e8605cb..3c332d47ad89 100644
--- a/media-libs/openimageio/openimageio-1.1.1.ebuild
+++ b/media-libs/openimageio/openimageio-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.1.ebuild,v 1.11 2013/06/13 12:32:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.1.ebuild,v 1.12 2014/01/24 21:46:13 dilfridge Exp $
 
 EAPI=5
 
@@ -32,7 +32,10 @@ RDEPEND="dev-libs/boost[python?]
 	virtual/jpeg
 	jpeg2k? ( >=media-libs/openjpeg-1.5:0 )
 	colorio? ( >=media-libs/opencolorio-1.0.7 )
-	opencv? ( >=media-libs/opencv-2.3 )
+	opencv? (
+		>=media-libs/opencv-2.3
+		|| ( <media-libs/opencv-2.4.8 >media-libs/opencv-2.4.8[python?] )
+	)
 	opengl? (
 		virtual/glu
 		virtual/opengl
diff --git a/media-libs/openimageio/openimageio-1.1.7.ebuild b/media-libs/openimageio/openimageio-1.1.7.ebuild
index 710ad1bf5276..ba6d18a20078 100644
--- a/media-libs/openimageio/openimageio-1.1.7.ebuild
+++ b/media-libs/openimageio/openimageio-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.7.ebuild,v 1.4 2013/06/13 12:32:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.7.ebuild,v 1.5 2014/01/24 21:46:13 dilfridge Exp $
 
 EAPI=5
 
@@ -32,7 +32,10 @@ RDEPEND="dev-libs/boost[python?]
 	virtual/jpeg
 	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
 	colorio? ( >=media-libs/opencolorio-1.0.7:= )
-	opencv? ( >=media-libs/opencv-2.3:= )
+	opencv? (
+		>=media-libs/opencv-2.3:=
+		python? ( || ( <media-libs/opencv-2.4.8 >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] ) )
+	)
 	opengl? (
 		virtual/glu
 		virtual/opengl
diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild
index e527944980a7..e35dac43f18e 100644
--- a/media-libs/openimageio/openimageio-1.3.5.ebuild
+++ b/media-libs/openimageio/openimageio-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.3.5.ebuild,v 1.1 2013/10/25 12:37:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.3.5.ebuild,v 1.2 2014/01/24 21:46:13 dilfridge Exp $
 
 EAPI=5
 
@@ -33,7 +33,10 @@ RDEPEND="dev-libs/boost[python?]
 	gif? ( media-libs/giflib )
 	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
 	colorio? ( >=media-libs/opencolorio-1.0.7:= )
-	opencv? ( >=media-libs/opencv-2.3:= )
+	opencv? (
+		>=media-libs/opencv-2.3:=
+		python? ( || ( <media-libs/opencv-2.4.8 >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] ) )
+	)
 	opengl? (
 		virtual/glu
 		virtual/opengl