Does not need fortran anymore, bug 392297

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

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index bbb2fcd2f5769a1883737e95598a9b1ce501d966..068d18eff12c27b6e47d4456b95ee519872696a2 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.61 2011/11/29 23:29:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.62 2011/11/29 23:43:45 dilfridge Exp $
+
+  29 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild:
+  Does not need fortran anymore, bug 392297
 
   29 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.1a.ebuild:
   Properly compare gcc version, bug 390983

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 316b0c982f7cae2fddeae08508bd5c5f645b7bd5..497f42cdf4f6d74f586900ae238551d1046f5e32 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 4199 RMD160 211a3d9721312b7e59d04c42b17d53a5ebb0b231 SHA1 2ec07d52ab7e807e84e4a7b1c83dca9f258d7d4b SHA256 d1ec6d564987d9283c55adcb520d715b4fcb013a89e4249df3536a7a15cfaea3
-MISC ChangeLog 10912 RMD160 c8514ce6dbff49f129eec4ac10704baea193f0d8 SHA1 5fe6c6ee46f60332dbc0e822c69e27b6f170ff98 SHA256 1809e9f1803d0324c53d87e1eb7952dcbaf3f3d540cdb1311fe14537faabf7d3
+EBUILD opencv-2.3.1a.ebuild 4168 RMD160 b01928a220ed028fb983b675c714e1d7f4fdb68f SHA1 6491a5cab7d2cfb1b3c465053bb9b42fbe372fa8 SHA256 57ce4152e4dbb3f0dc501745d8bd4784499889d9f147b5aadec928ad2dbc42bf
+MISC ChangeLog 11036 RMD160 7eeae591813cfcb498764e32619e00646fe26c69 SHA1 a1c83a29ca81809594ba9b1a888a325f8e61d3a0 SHA256 f4caa4a8307cb4f5e7609ea51848c52af8bc6919b8aacb6b6f55d9681eb501c4
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJO1W49AAoJENwGBM22xffedYAQAJcIWiZdB7I/2pgKKToYH5is
+4KTjXjKVUkHCeBWoBPphL+HXG1kMLSopN3HE/vFltI8+i/SPRDPQRFHoQ1hO/pwR
+ls5b3VpMOFWtK97sm9Lboqk+O4eJITAZjZ75xhXQozPf5rGV81pc4xoLd2j487HV
+Lu5JZFbD/YpO137PCmQDdr2Km8xvtIqYtNsiBPxsWq7xmeh5SKzlpBEcvZtR3qp8
+mVTVfKF76qVfCRjUZi/ryKVGzmraSPZoFXE9UlQuaT/9QdWUDsv7tFyj7rPkV10S
+Pmxx37cXzqqi2D4pJl6hW0tDiC/lBT3rCrrqF2s+29YDNV+69ztxxKfQPdo9iSII
+2Sl8PHGogdLl386PFgn989yfbeuY8kLE0BH+GNLQNVks5ukb71TtqCMte+C45Hvv
+D5oxZM68w2LKcbHeACsWVHSxuYUSHM95Sp9czDAVOlZxazLuh99SnOC2FO/5bTOm
+BzDvvPafbOMoKqd5oLKcel8AjHCCku/W/tKNv+FRXl25w5hr9U1t23c7p82UoqvI
+gCR0AuP8wda7fJDdJjHqtBo43xfG9p+z8KqfrXhfwzRZe1fwK3DENGocCWNC3rnK
+mpOwMQEupDrWLWtRqHVHIe+CAsM/gVAdPlcaY2ch9JrGB/8OjXnYXKkm9v+srkR4
+Y97F8txX+CcopE0eZzVb
+=5eea
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
index 9e7d7d5cc7d28f9ce65ec5629b90c6e67208def7..49745f87f01cd11714785572d224017cef55489d 100644 (file)
--- a/media-libs/opencv/opencv-2.3.1a.ebuild
+++ b/media-libs/opencv/opencv-2.3.1a.ebuild
@@ -1,12 +1,12 @@
 # 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.5 2011/11/29 23:29:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.6 2011/11/29 23:43:45 dilfridge Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base toolchain-funcs cmake-utils fortran-2 python
+inherit base toolchain-funcs cmake-utils python
 
 MY_P=OpenCV-${PV}
 
@@ -69,7 +69,6 @@ CMAKE_BUILD_TYPE="Release"
 S=${WORKDIR}/${MY_P/2.3.1a/2.3.1}
 
 pkg_setup() {
-       fortran-2_pkg_setup
        if use python; then
                python_set_active_version 2
                python_pkg_setup