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

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 25 insertions, 3 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/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"