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

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

4 files changed, 31 insertions, 28 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/Manifest b/media-libs/opencv/Manifest
index 6129f76879fc..8b8a0eccb042 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -13,23 +13,23 @@ DIST OpenCV-2.3.1a.tar.bz2 32669613 RMD160 f2f459bf7c163acb90427db2b0b425ab8008c
 DIST OpenCV-2.4.0.tar.bz2 47156770 RMD160 49aae35880d3765676a9f556bd8b152c45acafd7 SHA1 6b868608c1df91dc935c90b725764a70d73bce13 SHA256 3b5fedb2fc6ad0aa1509676468f571ba21456679e7d48a8242a096d62e2c6ac9
 EBUILD opencv-2.3.1a-r1.ebuild 4210 RMD160 b6f0a9bb0ee28dcdb70ca13b1c28b6f44508bbc8 SHA1 e8f7bc14da4d8b113aab75f4b441875194fdf5cf SHA256 725e02dea14c43c3fc5fc25970dbc884af6229211b78a174cdb587e45369cc09
 EBUILD opencv-2.3.1a-r20.ebuild 4253 RMD160 1dade03db32a14a20037deae7a2ca810e18a89bb SHA1 14ef77d1a7e39a9c8a4367034b08923abd7c3e29 SHA256 0101773f11add8197935bf854c0290f50fc3f735233d48d545a1bbe3f4fbc314
-EBUILD opencv-2.4.0.ebuild 4703 RMD160 db11bbb5ada6668f2c6d5cb8114f2fd1b771a495 SHA1 9fa63c18c18ed3dcfa517a59baa6019bfa24a850 SHA256 9503ec310dd9c5abd1afb2218579a5e7242ecc0ad74098632b0abfe0e1eb4d4b
-MISC ChangeLog 13297 RMD160 d02cd98e8eab4ed3de1bf3b907804a198c664869 SHA1 69d2ffd7d8c3da096c4472c00a412c3970c35c54 SHA256 f7a38c134d6cbd8af7f153157085e1d09843d6fe12fe933ee449d3271a3dc67c
-MISC metadata.xml 1326 RMD160 a510fea1c3f533a64e922a0ca8c0ce32ee504b9c SHA1 b60adc1fbc121435822f9099a087f7bbebf38e2e SHA256 75d8cc0544b751177fc2d9875fc02296107f05311819295cd9486f944e32f3ff
+EBUILD opencv-2.4.0.ebuild 4662 RMD160 ba4827bb9c5e78de7a90210e15860fc1d6da2935 SHA1 688feb8cea313f5237e20ae7de60f72030bb12d0 SHA256 ab4d8fa7831af39f7dc6078ee045f76f1ad2f9c27f5ee9b33525341d2a2a4316
+MISC ChangeLog 13508 RMD160 cd6da7c03ea2b0118ae463a01d133c5ce949b232 SHA1 e45053e629293a409e389b8afaf77534852710e3 SHA256 e1b36004871a147e57767480789426121e7eb79706abd36ca8ad91d955e2dccb
+MISC metadata.xml 1182 RMD160 e5f8aaf699070fd9355545209c97c98199e03be0 SHA1 730e322f1886b1075041053212c595255eb67d4c SHA256 e358416489dab38465c1e17fba55b8805a520e6c1ca5d429ee0442ab105e1548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPw9zLAAoJENwGBM22xffe2dkP+weC8D+eQelIqbR45nFtY2Gt
-vaZ4PO1oqCBKGL7EJedyQuIvaNJSIYezPUcT66WkPYd7W2LON3sMIAyS0Ka36BpU
-HaA5w9nBqNFnYkqjIGYpuKXhNqewOFe9EwDp9NUnTEzpXZAz858oVwXIbFH4vrFD
-jYk6z0kVehOFjLQu12G3pjFiHAaRvJP/UyX30lX8YDQmPv3jr4EtgDhbcHhkmZvS
-N3hA74Eq79zASeeMDKtpi85XaKZM2fKWA8P0MlD0vJo41y2Yg+dHOx9hK6byFnVp
-UvP1Yh7//byukXullG8KtH/2R7mEThmHw8cu5CJPdeAnFXiSF02hAX3RGVDKSptL
-1UkWa510vu0h/Q3ORy8KvexyG8NyInjcTZ5BzgOvEKHlZbDlmJWgt8Y690YndM3v
-riyApEAxC7T7sydkCT3TNJueB+GH8Y8PMNirwvvF/tAlwt/2wKtmvq0lIh54Spkk
-GdTESPTXZ4vWTnZ5KIic47RCSiaC+FoRpCX45uNni1bKVbOv3rlLHPN+noylQ/Bk
-F2rwecpzXNiAnl5Gwkv5C5TxS1jbTbLMQzlSce8ZUVUK1q2739YhqdvnuaYuyhwU
-bL7vqX/dj2M1Z+6TRddzoHa9el5JUIR7N6zMhDMOMKvY3fzgnR4UFXuFoNOMSTED
-383f2/WKr4ZEbGPmjXzy
-=ZwcN
+iQIcBAEBCgAGBQJPyyPWAAoJENwGBM22xffeSysP/2CHTt4yRYcIZ1FeDnninJuz
+oHOiTB7AY9F9TL/bO9hW6hDGV5PNO1m0S6qnaHKui9703P4TAfSWeFMU7qj6Q3XI
+N3+uvM/XQw2d2j6gNQ0EohtEhIJeK+/jqRdK+Wc9OfAvb4sYIYG/hlpJWhTLriBj
+nqlHOkDmg1Yjgj5tVh1Ltq8Vuaj/6OIaS6NtpceAbaJPmUMb9g0szY2fPXKkjm6g
+JBV8B0k2fdVm3I5VD5Puh73T2vTAVvSPUR18NlWi2Ybr46YKoZIyBI9f8mahFnfk
+WtUAGdJHgtGBMmimNYBrVAH5kSlMBwQ4KDVcVDBmHZO/CzywCiMcC5WGdb5jVkGV
+0hk/QAmddqDbjGV7AVENhBUqMrxaUwWrDFt8SGzBtqayVa5fZu5i2LspfIinNp8H
+XBDlsKGqi8SCPTUPNtTsnjdX7W4ZVsJ/4JEgUFI0SMtCqBn0RBc4NZxFGvLoBKK6
+ST7LdtJgBCuBJX9f1A1gV2mxMQeYEsAni0Ue0qBlA68z88H2hFvgnNk/4JhImzWV
+O/IP1qYgGiYCYx7DwRBgXQRKQIRdw6hYAsshkjUo9rsq5QoCWKBuq/GaRYpiZuOu
+33hMlGAl7bOReeX8V4CUUhabUAxZIKlTRjBJNhisMil/7WTiAo56Lk1XuzW2l3qg
+u9TWz4daiOxPfzf1mHt9
+=SR0v
 -----END PGP SIGNATURE-----
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
 	)