Properly compare gcc version, bug 390983

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 94f9824dd36951bf46b2ea8cd16ccf6acdc2462a..bbb2fcd2f5769a1883737e95598a9b1ce501d966 100644 (file)
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.60 2011/11/22 22:38:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.61 2011/11/29 23:29:07 dilfridge Exp $
+
+  29 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild:
+  Properly compare gcc version, bug 390983
 
   22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild,
   -opencv-2.3.0-r1.ebuild, opencv-2.3.1a.ebuild:

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 2663931f47c3f6fad5b5f36512e35ed90c5174b4..316b0c982f7cae2fddeae08508bd5c5f645b7bd5 100644 (file)
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -13,23 +13,23 @@ AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2e
 DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
 DIST OpenCV-2.3.1a.tar.bz2 32669613 RMD160 f2f459bf7c163acb90427db2b0b425ab8008cde5 SHA1 9784e6824c5f677fac82ae83a2f366743adb3299 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
 EBUILD opencv-2.3.0.ebuild 4166 RMD160 505fa5edf33e9035b341c6e9629a0e6eb79222a5 SHA1 adf050ca2678d21d4f354612edab4f014903e324 SHA256 9efe9a986c378f0e9fa826fa0bd5c91f891e0a82b161e5e4949d31137f9c6983
-EBUILD opencv-2.3.1a.ebuild 4197 RMD160 6c7b7cbf8cc6605dab23ecf1eb3fb8a997132512 SHA1 414e98fce2eed96865e1b6ae1effabc281e2c65d SHA256 b46f602ed5fbcf6174df029995106aa935222b3a8658ced701d36c0561476fcd
-MISC ChangeLog 10789 RMD160 183e2fc3fc6f63185dafc2add00d69af32d183e6 SHA1 99838139ef3341917e311ce94872e6ef38b83f0c SHA256 a4bd5ebe32f40112a39d6fa3ba325b22a9102b25a8a1fa7a49a39e9649c4a6c4
+EBUILD opencv-2.3.1a.ebuild 4199 RMD160 211a3d9721312b7e59d04c42b17d53a5ebb0b231 SHA1 2ec07d52ab7e807e84e4a7b1c83dca9f258d7d4b SHA256 d1ec6d564987d9283c55adcb520d715b4fcb013a89e4249df3536a7a15cfaea3
+MISC ChangeLog 10912 RMD160 c8514ce6dbff49f129eec4ac10704baea193f0d8 SHA1 5fe6c6ee46f60332dbc0e822c69e27b6f170ff98 SHA256 1809e9f1803d0324c53d87e1eb7952dcbaf3f3d540cdb1311fe14537faabf7d3
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOzCSJAAoJENwGBM22xffenP0QAKv5YQ3a49Uh5k0ID3zMSXvR
-PysJEFMuenakHp2HekusAxyNq7tGd+SHgXBylPwW3fjeAE17WSNM/iYdMZ1CzPmV
-2+TwlvCP9EOsFrJ/DC609/hb+xss4VnHC3+uXdXUGxr7bXcHjKcwggdSFkxtnP8l
-encxFqkMLmEEaDkHQU887QFM7vG8M8V1JEZeqzZj+FE6CPTP0uKfTTAwK5+S/Qlo
-kY9vzBd4zI4jPvwKnZe15z1O5KWaGaA1AbiYRYBv6AYKMZGMNqje5V3JGk0wZUhT
-mbO2CWPfEOSCDENAUqAA8UhkuAbeZKBesYFTO6Zu4SOIs7F3udfLgr8uKl9/ZQ6F
-IvYeDRwsb634EHGx7gIjB+bX5dS19TNjjMZDQFL1ffmvNcb+LRNl50Au7giOYnlo
-lED8iuz/NRpg82C0sn5QnYoln0sgaD6AgUW3WUlRhKWKX/FyX49rXvRK+Qq2Jo55
-sJ5ciqD2x/Kp6jBfm1En7L9ChN0S2F52TfQVx5uvp85TCt4kh74ngItwyrVPftbF
-+Ip0qHat0cAu3ZHVeCMWgeVFXZKJj6OytFseOejq+1mAWUlQUY2bLcr6hwohDkgl
-zsdatiGlBz/KP157c8+KNPhN269hH5geVC1n71/PquFEz9OXTkLySXicytceAi2H
-oyYjAbNzgMVhs81BHVFu
-=6hEg
+iQIcBAEBCgAGBQJO1WrLAAoJENwGBM22xffeUbkP/23EWX6LUJrsW0yByflCjmI1
+xd5WMYOq4ybgvsXJ93Gc84h5dahqobBrRYGj1z/2EMA+RnR0y/WLHnJ88e8EiCnh
+4tkkJ+2NCW0sdCT9elQ0ynTpsSOaI2y/U7jO3InhHqYc73Hbbz5hC14G/ijMc/Ms
+v2bow6TOlf4N+RP8TwUwvJgvIMaei9vSn0sOfp5qqd+O5CLjn3+kRSCLkYVFE9OR
+uwF0qxAvLs+aSXMmqW/GOaQnumYlplYX1y/ss8JpqsT3y48mZyxG14NIXIgdTa7n
+1luwPfDY8M9ot07iF7cPKx4qCN1JbTJPLY5EY6lzm8/4v5l/r1Nagghw1JY+KO7x
+JqIFpbUdhtaU09C+jTvjRTAFjTm6PNqL+o/TrxyWCMpi6899nAQFhfWqyZbaIspL
+NkbOXXjekIGfmyaW1cEznYVKp5LR00Nzc109eAib0NAiRkEU+k7gfLAevO2Un/Yb
+Ar4AHcJvn0bYDE2oGU3GnN6t9jcFKkaFACpYsN3P9Cxp/JSFWJiTMIRnibnVW7OR
+c6PmecaqhCQr5P/JIRlT0pfvas/4kvm3Ijzo9GUpSNrp9nsT57qyYaNRwrgPvXRQ
+2iwWk05Ko65Jyy9gZ6jM+RjBvJOhlIOp6d095oSkrylhN6cph//yybOm+pv/5YhE
+aSiHP9TYC0lsolt9AcEp
+=ceMP
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index c086523fff0a81eb1f32fcffb0297f07576fb24d..9e7d7d5cc7d28f9ce65ec5629b90c6e67208def7 100644 (file)
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.4 2011/11/22 22:38:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.5 2011/11/29 23:29:07 dilfridge Exp $
 
 EAPI=3
 
@@ -114,7 +114,7 @@ src_configure() {
        )
 
        if use cuda; then
-               if [ "$(gcc-version)" > "4.4" ]; then
+               if [[ "$(gcc-version)" > "4.4" ]]; then
                        ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
                        mycmakeargs+=( "-DWITH_CUDA=OFF" )
                else