sse* use flags only add to CFLAGS variable, so disable them as we do that via, err, CFLAGS... Add pch use flag.

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)

3 files changed, 15 insertions, 12 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 671886536368..b44fac0de356 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.74 2012/05/28 20:13:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.75 2012/06/03 08:42:59 dilfridge Exp $
+
+  03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.0.ebuild,
+  metadata.xml:
+  sse* use flags only add to CFLAGS variable, so disable them as we do that
+  via, err, CFLAGS... Add pch use flag.
 
 *opencv-2.4.0 (28 May 2012)
 
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 519a2f82f51a..918fccbee392 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -17,8 +17,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 	<flag name="ipp">Enable Intel Integrated Primitive support</flag>
 	<flag name="sse3">Enable optimization for SSE3 capable chips</flag>
 	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-	<flag name="sse41">Enable optimization for SSE4.1 capable chips</flag>
-	<flag name="sse42">Enable optimization for SSE4.2 capable chips</flag>
 	<flag name="tbb">Add support for the Intel threadingbuildingblocks library</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/opencv/opencv-2.4.0.ebuild b/media-libs/opencv/opencv-2.4.0.ebuild
index 63e3c6f7ed54..b05372b398c1 100644
--- a/media-libs/opencv/opencv-2.4.0.ebuild
+++ b/media-libs/opencv/opencv-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2012/05/28 20:13:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild,v 1.2 2012/06/03 08:42:59 dilfridge Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ 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 png python qt4 sse sse2 sse3 ssse3 sse41 sse42 tbb test tiff v4l xine"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl pch png python qt4 tbb test tiff v4l xine"
 
 RDEPEND="
 	app-arch/bzip2
@@ -123,15 +123,15 @@ src_configure() {
 	# install examples
 		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
 	# build options
-		-DENABLE_PRECOMPILED_HEADERS=OFF			# for my sanity
+		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
 		-DENABLE_OMIT_FRAME_POINTER=OFF				# dito
 		-DENABLE_FAST_MATH=OFF					# dito
-		$(cmake-utils_use_enable sse)
-		$(cmake-utils_use_enable sse2)
-		$(cmake-utils_use_enable sse3)
-		$(cmake-utils_use_enable ssse3)
-		$(cmake-utils_use_enable sse41)
-		$(cmake-utils_use_enable sse42)
+		-DENABLE_SSE=OFF					# these SSE options do nothing but
+		-DENABLE_SSE2=OFF					# add params to CFLAGS
+		-DENABLE_SSE3=OFF
+		-DENABLE_SSSE3=OFF
+		-DENABLE_SSE41=OFF
+		-DENABLE_SSE42=OFF
 		-DOPENCV_EXTRA_C_FLAGS_RELEASE=""			# black magic
 	)