diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-07-17 20:13:28 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-07-17 20:13:28 +0000 |
| commit | 5863ef0a4280d2fc41144b363bd61a6ae5868115 (patch) | |
| tree | 1b6b9852545e06b9b3b55c4bc868e7133fe3da51 /media-libs/opencv | |
| parent | Version bump. Keyword amd64-linux and x86-linux (diff) | |
| download | gentoo-2-5863ef0a4280d2fc41144b363bd61a6ae5868115.tar.gz gentoo-2-5863ef0a4280d2fc41144b363bd61a6ae5868115.tar.bz2 gentoo-2-5863ef0a4280d2fc41144b363bd61a6ae5868115.zip | |
Python is always needed now, useflag makes no sense. Bug 419577
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.4.2.ebuild | 19 |
2 files changed, 12 insertions, 12 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 706731891096..3b1aab403dc4 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.78 2012/07/16 22:13:14 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.79 2012/07/17 20:13:28 dilfridge Exp $ + + 17 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.2.ebuild: + Python is always needed now, useflag makes no sense. Bug 419577 *opencv-2.4.2 (16 Jul 2012) diff --git a/media-libs/opencv/opencv-2.4.2.ebuild b/media-libs/opencv/opencv-2.4.2.ebuild index 1086e6602a92..51bd955752f3 100644 --- a/media-libs/opencv/opencv-2.4.2.ebuild +++ b/media-libs/opencv/opencv-2.4.2.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v 1.1 2012/07/16 22:13:14 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.2.ebuild,v 1.2 2012/07/17 20:13:28 dilfridge Exp $ -EAPI=3 - -PYTHON_DEPEND="python? 2:2.6" +EAPI=4 +PYTHON_DEPEND="2:2.6" inherit base toolchain-funcs cmake-utils python @@ -17,10 +16,11 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" -IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl pch png python qt4 tbb testprograms tiff v4l xine" +IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl pch png qt4 tbb testprograms tiff v4l xine" RDEPEND=" app-arch/bzip2 + dev-python/numpy sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 ) eigen? ( dev-cpp/eigen:2 ) @@ -39,7 +39,6 @@ RDEPEND=" ipp? ( sci-libs/ipp ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) - python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 @@ -67,10 +66,8 @@ PATCHES=( S=${WORKDIR}/${MY_P} pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi + python_set_active_version 2 + python_pkg_setup } src_prepare() { @@ -150,7 +147,7 @@ src_configure() { mycmakeargs+=( "-DWITH_CUFFT=OFF" ) fi - if use python && use examples; then + if use examples; then mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) else mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) |