amd64 stable wrt #295475. Revision bump to skip sci-libs/ipp depend for -r0.

(Portage version: 2.2_rc54/cvs/Linux x86_64)

3 files changed, 88 insertions, 6 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index b77cabead6f7..8e1450c4d226 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.14 2009/10/16 14:53:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.15 2009/12/04 14:02:12 ssuominen Exp $
+
+*opencv-2.0.0-r1 (04 Dec 2009)
+
+  04 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> opencv-2.0.0.ebuild,
+  +opencv-2.0.0-r1.ebuild:
+  amd64 stable wrt #295475. Revision bump to skip sci-libs/ipp depend for
+  -r0.
 
 *opencv-2.0.0 (16 Oct 2009)
 
diff --git a/media-libs/opencv/opencv-2.0.0-r1.ebuild b/media-libs/opencv/opencv-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..1279af8e1dd3
--- /dev/null
+++ b/media-libs/opencv/opencv-2.0.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuild,v 1.1 2009/12/04 14:02:12 ssuominen Exp $
+
+EAPI=2
+inherit cmake-utils
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) Intel"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k
+mmx octave openmp png python sse sse2 sse3 test tiff v4l xine"
+
+RDEPEND="sys-libs/zlib
+	ipp? ( sci-libs/ipp )
+	python? ( >=dev-lang/python-2.5
+		deprecated? ( dev-lang/swig ) )
+	ieee1394? ( sys-libs/libraw1394
+		media-libs/libdc1394:2 )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	gstreamer? ( media-libs/gstreamer )
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg2k? ( media-libs/jasper )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	xine? ( media-libs/xine-lib )
+	octave? ( sci-mathematics/octave
+		dev-lang/swig )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_enable openmp)
+		$(cmake-utils_use ipp USE_IPP)
+		$(cmake-utils_use mmx USE_MMX)
+		-DUSE_O3=OFF
+		-DUSE_OMIT_FRAME_POINTER=OFF
+		$(cmake-utils_use sse USE_SSE)
+		$(cmake-utils_use sse2 USE_SSE2)
+		$(cmake-utils_use sse3 USE_SSE3)
+		$(cmake-utils_use_with ieee1394 1394)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with gstreamer)
+		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with jpeg2k jasper)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with tiff)
+		-DWITH_UNICAP=OFF
+		$(cmake-utils_use_with v4l)
+		$(cmake-utils_use_with xine)"
+
+	if use python; then
+		mycmakeargs="${mycmakeargs}
+			$(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)"
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index 92945f308bdd..894a4fe93dfa 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.2 2009/10/16 15:19:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.3 2009/12/04 14:02:12 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils
@@ -13,12 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 
 LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) Intel"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k
 mmx octave openmp png python sse sse2 sse3 test tiff v4l xine"
 
 RDEPEND="sys-libs/zlib
-	ipp? ( sci-libs/ipp )
 	python? ( >=dev-lang/python-2.5
 		deprecated? ( dev-lang/swig ) )
 	ieee1394? ( sys-libs/libraw1394
@@ -48,7 +47,7 @@ src_configure() {
 		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
 		$(cmake-utils_use_build test TESTS)
 		$(cmake-utils_use_enable openmp)
-		$(cmake-utils_use ipp USE_IPP)
+		-DUSE_IPP=OFF
 		$(cmake-utils_use mmx USE_MMX)
 		-DUSE_O3=OFF
 		-DUSE_OMIT_FRAME_POINTER=OFF