Depend on nvidia-cuda-toolkit-4.1 and relax gcc requirements accordingly, bug 418157

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

3 files changed, 26 insertions, 20 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index d50d819936b4..a9e97da6eb1c 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.76 2012/06/03 08:45:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.77 2012/06/03 08:50:43 dilfridge Exp $
+
+  03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.0.ebuild:
+  Depend on nvidia-cuda-toolkit-4.1 and relax gcc requirements accordingly, bug
+  418157
 
   03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.0.ebuild,
   metadata.xml:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 8c3358a48ec6..02c2b2cbd03a 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 4678 RMD160 b1fbdd0c6338c98bbab0dfc229cf0cf7dd2e8914 SHA1 16cb655bfad54fd98d1d97b904d92742e9cd1fc8 SHA256 0353136d9dcad537ceca6c4c6b567c27967df24bc72155deca2fcadec670bc49
-MISC ChangeLog 13679 RMD160 e797fde896ded5233ccc4bebc8b08956e516c024 SHA1 80497961f001d96746b03c5b5c3daee7e7fdf679 SHA256 149e8f96f9a17de01bf038ccd8709b348d37b1ef0b42dbeab1ce943de9d914d9
+EBUILD opencv-2.4.0.ebuild 4757 RMD160 48a6cf53f2de76bfac452ca853d3ba1ac8ff4127 SHA1 bb43ac77214816e091d7f060a9b9185c68a9c61b SHA256 2ad46ec2adf5ee6939bd95d89d0f14d92817f9071e592f9aef74401f1ac02276
+MISC ChangeLog 13847 RMD160 de716ad403a7ee6665b6890e811773cefe18a18a SHA1 bf001662c2ffd7ee7b96d59951a4e264be677fcf SHA256 12b7a44f41981a80ddf50fb522219f17cd4cbf6bafe52ddd775ae76c40b0d6a1
 MISC metadata.xml 1276 RMD160 5aee28cc09fd1bf2e0fed812eb6f0274537e7f6e SHA1 62223eacc77124f101ab40344243239668b6a36f SHA256 136997ca68983dcc93f04a622699777946a73407f0a689cb9a0cab2760e42226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPyyR+AAoJENwGBM22xffeKX4QAI+OXhmII9A3DalBJ0mP+H+O
-H62RLuUuTah1geu125htAqSpYfAoNB4nOYQiFwQn6mPTunNF9/1DgBiPuc4P+baH
-xOhoFo1OAGR4TU58x8CFfKk6wBkZruKK8s62zVh5YqBmSo2otftEyQ2hkENZ9y5g
-mD6ftMVzZe0gBXPScmCnAV+E+jKTakGbN25+I+1SwFnRHcFy430s9KrrM+36kXgq
-LSHIhyFed7xeVr4lU019WoacZ8ZIb5CP9rSUw1fHqHuxdATrTEXc0QwWnqvtOxyX
-JcSbc7A3KFaQ2ci0Oidn+IbYp96rQsTFdon0yskaWRewQu+UGVf8A5paAjxRZiLa
-pC7vMpf/mUoNu80ZxVRl+Kgp95oDL9qQEWzWBVFqNiYJ0Zs0CpZ0R1SwdHS4U4dz
-YMr7/gkxP2K30ZQYXFRYFq8VmIL30kLUaj8/jmqdf3iGveH03EZLoyPcslhsGDjJ
-2vU8Fb93HDy+UamKDpdwfzf/b0P/NAy4ZSs0eOkKzuWY4wxXEl9PRjOm6JUeIVI+
-H3OYHnWjHq9GanSNKeYiLKK7/pTuFWoTUr9/lIY1QiM4WX0IAhH6RnYuewIlK8Zw
-Gmy9Jxo7m168zczMt2TqMio+qqo8iNZbrn+add9lK1Y7M7jJ9uuPHSoVpFS6BIsh
-UH01cpI16p629jGQNFcw
-=wUof
+iQIcBAEBCgAGBQJPyyWlAAoJENwGBM22xffensoP/2A+5kSzVcMFE548xZ/dBf3J
+3mEDZ7wNbbXMlhsc8sA8x+nqzZcTZ3ofwagxIeqJEV/CLxlkPBcgithF2FeLyUrs
+BB7E4uxSGqo/n4y25q+gnJjBvaod7bHeOieOdD9wTERbRT0DlAOS+xFWJly0GZx5
+b2Vykc7Piji9x/P/LYD21d9QGMCJcrDKzKwsZxBkb0r8Crt1PI7v4pQUDnySZ/99
+l3WZoDZPi7t4TD1qWQC0h7i9XZCST2diziV4LQyCmGFDvyx9hg1r2vxzwUfFu0Tc
+5h/WlykRpT7DibPm7ZYv/KRah1Tc4bhZcMU+bY2JSpOhUgdzgwZQiTcWLam35eiW
+hyRXsnP1M1Ttl3evAizjDByVXnshdJW6RJxO5zokjz5xElxNfzMjWuO6LLqD/gBm
+KSyAfWzsczm6lhzq/C70PL84J+Jcu5gt7c8TY3PlT0QJBm8ftJ92Xz91kTs76lvt
+HJ5Ej2CFDIVLjoZtBDXXLCD5rdnecvpQKNCgpkDC+50zZ2FcSqVr+iZFMH6v/m7a
+40x+LFibg6vitP+6RBPXwnlXBCAh8blE3HtLEzMDR7PdI8OlLLbejuhz4Gpmk5sX
+O1bARlqL8jg5yKCrx1ITiiuqQ+CqGkRGfLe3D+batjmsnMsq8cR3nTKgcVGvnQos
+nDIUfd0k8bqB1pHXBnQU
+=QpFS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.0.ebuild b/media-libs/opencv/opencv-2.4.0.ebuild
index 503d272c40c8..c7cfcdfc151d 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.3 2012/06/03 08:45:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild,v 1.4 2012/06/03 08:50:43 dilfridge Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k open
 RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.1 )
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
@@ -136,8 +136,8 @@ src_configure() {
 	)
 
 	if use cuda; then
-		if [[ "$(gcc-version)" > "4.4" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
+		if [[ "$(gcc-version)" > "4.5" ]]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.6 do not play well together. Disabling CUDA support."
 			mycmakeargs+=( "-DWITH_CUDA=OFF" )
 			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
 			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
@@ -148,6 +148,8 @@ src_configure() {
 		fi
 	else
 		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
 	fi
 
 	if use python && use examples; then