Need fortran enabled in gcc and cmake configure script, bug 365493

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

5 files changed, 42 insertions, 19 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 53e86cde875b..fcde9d9db272 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2011/04/30 19:37:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.30 2011/05/01 17:53:38 dilfridge Exp $
+
+  01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild,
+  +files/opencv-2.2.0-fortran.patch:
+  Need fortran enabled in gcc and cmake configure script, bug 365493
 
 *opencv-2.2.0-r10 (30 Apr 2011)
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 380116a4347b..c237347c41f6 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -8,6 +8,7 @@ AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b9628860
 AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
 AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
 AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
+AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
 AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
 AUX opencv-2.2.0-libpng1.5.patch 1461 RMD160 31db2e4df582c30a6787b3c8d6081c7e6f204e5b SHA1 7025f170a11f286dd2b81e392c3662bc1ab11d9e SHA256 c44a5127cad582a94ea8ad375b5f979f5fb34cde41009319d1265ca4c4d495ca
 AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1 SHA1 cf1cd90150686961a6c2f4d1f2d08d3e4c3cfbdb SHA256 09e62d9d60cc1e7490bc1ed416085fefd933a9a89bc3c6cffe24569166430a25
@@ -19,24 +20,24 @@ DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db2
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
 EBUILD opencv-2.0.0.ebuild 2341 RMD160 95014760a935f3f421219f11af4b9f472c8ff11e SHA1 5ddf2e3492ee55d8c476a9f11a9da68881b4eb69 SHA256 a0a42ef185d9252339bf3010224ac21effbf6efaa59900c0021af07b4bea2097
 EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
-EBUILD opencv-2.2.0-r10.ebuild 4176 RMD160 74e67b11b2302152dccb51e59b5069bfd0d03799 SHA1 abc1dbef2e3ed93dfe755b4b753dc13add15be23 SHA256 8f40c02814199b7cb5ff8f50451f145fb38ac39f8852c61ab2eb10c10e405eec
-EBUILD opencv-2.2.0.ebuild 4132 RMD160 64bb51d729258410f25d0005b659a8f6b51b6e86 SHA1 f6beb277026f637db10744f5c2516f5f77f4b275 SHA256 4c1dc3b27a58b1a6c85e14d9655fc9eb7cad4dad5457d6f961629bf745a0ff75
-MISC ChangeLog 5538 RMD160 2f11d46a51da9a1264f69d053c7c9add8c3ae7c0 SHA1 f8f3588beefaaf427f95a9eddc5fc1461d72054d SHA256 c2c049b9596e0af92356072ad2db8e5fd5ce0c62648edd32e191c03359f6ed1b
+EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
+EBUILD opencv-2.2.0.ebuild 4190 RMD160 6d7346e9b96a4355bd06d91b7516a90e5ec41157 SHA1 f5faa6d2a9db683b4dcc1792b575d18a8374b872 SHA256 5269748cd44aeb217d43ac42aa860a5c8562ac84e3eeb4883537ae1adb35a652
+MISC ChangeLog 5750 RMD160 2d7574573c81815cf39745cd415ccc123c016211 SHA1 ca5fad2f346babcf69a45c8a9fa2afc07cb6c9f6 SHA256 c499d3b6fe905f5cb36cd2a5728ea2348b9182e7dcf6faadb2080699c91ef38e
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNvGVyAAoJENwGBM22xffeO5cP/3EbucbNiiBebnytK3c3aVVe
-tLIhrC2eAy1nkqYEP3pUggOgaRzI47NhmTQzzds9h+KsUj6wd2mbqqb92pYyELLZ
-+LSkvujvvOU1X7cU5k9tihPuYEUqZx56C0WCllxHNgK8RAGOyW6q11WX/0LZjd92
-0f41WePfxF16An0SZI+GToqZPBwb97GK/SUVomVaKfobNYQ8JzkFoc4RPPIfDYAE
-FfZBnu7qfwrbKuE5h+lMta3HxfNNSowQyHQAMl7372B/bLNjViFynA2FULu3v2sS
-3NsQIGlwQHjk20u9MuL6Quveu/cywOVRVxUC5T+vhCc3WWJMoQN+kNNIUqL3i4kC
-k8KKqUMBexIP4rWca4c5d2ocNK9GhK10VVHES1Hnq9+jFFHO3A3ngjGUbYaeBe5g
-XYsc0xL6EuyoNZIuRFPTXSPdIMlcdlQQEGC7Ut7l6Isq+S7W1S0VPGBkRocMXyMC
-1BdcIv1qm37ul/TpVe6wmRamFVg1tsL0QP4bbF95wtoxn5Mes/xooE0F9xxb7e4o
-AfQ9Trx85WO/UHo8dnrawsxH2CRu9jMjCyM+RjQwjG1DxmNLdAVrE3pHW67YSPwU
-HO6eQVDGydk5WTRNMmEm3cIKl739jFsjOMjqGw1Lh0a4KTNKwt/JkEUNZpDkTYU2
-1vpbsC+OJ0BlPpIIBTZm
-=Jx9e
+iQIcBAEBCgAGBQJNvZ69AAoJENwGBM22xffeP+4QAIegDo8Yp1x+JX4aPYYuPiVV
+yR6jvtUSjCoved/u7cK7zcDhPC0tHg0Wg32/y/AbxLDSaBJKahzDOE1Ior3xzjr/
+puqwPhD05dR4hEvP0bd0biTL/2AbYAds2N9FJ25qazcTAd4j/LxRckFlhLe2PNmn
+vPpXULC07/FZD6zNkbE32f5+iWM8nn1Ybl/f4975JDI3jfMiQ7wMUZNXS5DQOooN
++0F09HMlHMmcQbH/r8QPMbSDreYGD4Ilm32mZ3gXm3shtkbBUR5IpTClERXDhwPU
+UVeJb3HVma7m7VfmUxc4FCUBELXud9rDswMxQTElCmCmx7wK7AK1QQfDcoEK1fmE
+IOlje5g1Cd/VakNKWag/WYkDRjb/QHuhOwbIpYAWdOFu3vvU82SvL6JGYdxZL5Rw
+b1mZ8LMIrqRIXY2554fXL7DhEhRd6bCoU0dPWbCEH8cZ3VdX3oTPSlQqhk44TzwN
+TASUO9mgd/CxkCl1OVJTkQROiB/4mZi2PbfA9MUmkp78s5YrQFqXaLIs4Z/h7B16
+dAWSBaW7MsdoDATAXXhSpSTK8+zb06zoYs3WR/HvtZhxwZF5fYE2Eris7RZLd5AH
+t4tvEJGtbuRKVwXO5N8r8y0CdqFXYM6lgX4kCjWs/mpIiNgo+9DN529iZemsArwW
+l3UolrsamlhqsTlPp/3V
+=0TXm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.2.0-fortran.patch b/media-libs/opencv/files/opencv-2.2.0-fortran.patch
new file mode 100644
index 000000000000..3ebe57056c23
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-fortran.patch
@@ -0,0 +1,13 @@
+diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0.orig/CMakeLists.txt	2010-12-05 04:35:23.000000000 +0100
++++ OpenCV-2.2.0/CMakeLists.txt	2011-05-01 19:49:06.901193498 +0200
+@@ -3,6 +3,9 @@
+ #

+ #    From the off-tree build directory, invoke:

+ #      $ cmake <PATH_TO_OPENCV_ROOT>

++

++ENABLE_LANGUAGE(Fortran)

++

+ #

+ #

+ #   - OCT-2008: Initial version <joseluisblancoc@gmail.com>

diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
index da43ef12187b..474bb64b9388 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.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.2.0-r10.ebuild,v 1.1 2011/04/30 19:37:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.2 2011/05/01 17:53:38 dilfridge Exp $
 
 EAPI=3
 
@@ -25,6 +25,7 @@ RESTRICT=test
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
+	sys-devel/gcc[fortran]
 	sys-libs/zlib
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
@@ -64,6 +65,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-convert_sets_to_options.patch"
+	"${FILESDIR}/${P}-fortran.patch"
 	"${FILESDIR}/${P}-ffmpeg01.patch"
 	"${FILESDIR}/${P}-ffmpeg02.patch"
 	"${FILESDIR}/${P}-gcc46.patch"
diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 204a75bd6858..5971bff4af1c 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.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.2.0.ebuild,v 1.2 2011/04/30 19:37:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.3 2011/05/01 17:53:38 dilfridge Exp $
 
 EAPI=3
 
@@ -25,6 +25,7 @@ RESTRICT=test
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
+	sys-devel/gcc[fortran]
 	sys-libs/zlib
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
@@ -63,6 +64,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-convert_sets_to_options.patch"
+	"${FILESDIR}/${P}-fortran.patch"
 	"${FILESDIR}/${P}-ffmpeg01.patch"
 	"${FILESDIR}/${P}-ffmpeg02.patch"
 	"${FILESDIR}/${P}-gcc46.patch"