diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-24 21:46:13 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-24 21:46:13 +0000 |
| commit | 31c5ec2c7fb22a78f5ce17563083509a20f18204 (patch) | |
| tree | bce9642011996ede7af7ab76a6d36000ae184a12 /media-libs/openimageio | |
| parent | Fix OpenCV dependencies (new useflag, migration to python-single-r1) (diff) | |
| download | gentoo-2-31c5ec2c7fb22a78f5ce17563083509a20f18204.tar.gz gentoo-2-31c5ec2c7fb22a78f5ce17563083509a20f18204.tar.bz2 gentoo-2-31c5ec2c7fb22a78f5ce17563083509a20f18204.zip | |
Fix OpenCV dependencies (new useflag, migration to python-single-r1)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'media-libs/openimageio')
| -rw-r--r-- | media-libs/openimageio/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-1.1.1.ebuild | 9 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-1.1.7.ebuild | 9 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-1.3.5.ebuild | 9 |
4 files changed, 24 insertions, 11 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/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 |