diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-24 21:32:21 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-24 21:32:21 +0000 |
| commit | ac85cc65e16a4862bab3c5a701378adba49c055f (patch) | |
| tree | 32b2fb442119b7928f31e187d7d56ed22d92b525 /dev-python/simplecv | |
| parent | enable automake >= 1.14, bug#498718, thanks to wojtek (diff) | |
| download | gentoo-2-ac85cc65e16a4862bab3c5a701378adba49c055f.tar.gz gentoo-2-ac85cc65e16a4862bab3c5a701378adba49c055f.tar.bz2 gentoo-2-ac85cc65e16a4862bab3c5a701378adba49c055f.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 'dev-python/simplecv')
| -rw-r--r-- | dev-python/simplecv/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/simplecv/simplecv-1.3.ebuild | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-python/simplecv/ChangeLog b/dev-python/simplecv/ChangeLog index 1df99590fb6f..563af00b17c6 100644 --- a/dev-python/simplecv/ChangeLog +++ b/dev-python/simplecv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/simplecv -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/simplecv/ChangeLog,v 1.2 2013/12/23 04:26:15 jsbronder Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/simplecv/ChangeLog,v 1.3 2014/01/24 21:32:21 dilfridge Exp $ + + 24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> simplecv-1.3.ebuild: + Fix OpenCV dependencies (new useflag, migration to python-single-r1) 23 Dec 2013; Justin Bronder <jsbronder@gentoo.org> simplecv-1.3.ebuild: Depend on python-imaging over imaging diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild index ac7a7d648779..7602db75228c 100644 --- a/dev-python/simplecv/simplecv-1.3.ebuild +++ b/dev-python/simplecv/simplecv-1.3.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/dev-python/simplecv/simplecv-1.3.ebuild,v 1.2 2013/12/23 04:26:15 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/simplecv/simplecv-1.3.ebuild,v 1.3 2014/01/24 21:32:21 dilfridge Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -22,7 +22,7 @@ DEPEND=" test? ( dev-python/nose[${PYTHON_USEDEP}] )" RDEPEND=" - >=media-libs/opencv-2.2 + || ( <media-libs/opencv-2.4.8 >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] ) dev-python/numpy[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] |