Patch to recognize Gentoo gfortran version strings.

(Portage version: 2.1)

5 files changed, 79 insertions, 1 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index dc5c5c3a571b..ca52dbdce009 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.3 2006/04/01 20:23:26 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.4 2006/06/13 23:27:50 spyderous Exp $
+
+*numpy-0.9.6-r1 (13 Jun 2006)
+
+  13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.9.6-recognize-more-gfortran-versions.patch,
+  +numpy-0.9.6-r1.ebuild:
+  Patch to recognize Gentoo gfortran version strings.
 
   01 Apr 2006; Olivier Fisette <ribosome@gentoo.org> -numpy-0.9.4.ebuild,
   +numpy-0.9.6.ebuild:
diff --git a/dev-python/numpy/files/0.9.6-recognize-more-gfortran-versions.patch b/dev-python/numpy/files/0.9.6-recognize-more-gfortran-versions.patch
new file mode 100644
index 000000000000..2e8cfe44eaf2
--- /dev/null
+++ b/dev-python/numpy/files/0.9.6-recognize-more-gfortran-versions.patch
@@ -0,0 +1,17 @@
+diff -urN numpy-0.9.6.orig/numpy/distutils/fcompiler/gnu.py numpy-0.9.6/numpy/distutils/fcompiler/gnu.py
+--- numpy-0.9.6.orig/numpy/distutils/fcompiler/gnu.py	2006-06-13 15:48:53.000000000 -0700
++++ numpy-0.9.6/numpy/distutils/fcompiler/gnu.py	2006-06-13 15:49:26.000000000 -0700
+@@ -222,10 +222,12 @@
+ class Gnu95FCompiler(GnuFCompiler):
+ 
+     compiler_type = 'gnu95'
+-    version_pattern = r'GNU Fortran 95 \(GCC (?P<version>[^\s*\)]+)'
++    version_pattern = r'GNU Fortran ((\(GCC[^\)]*(\)\)|\)))|)\s*'\
++                      '(?P<version>[^\s*\)]+)'
+ 
+     # 'gfortran --version' results:
+     # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian 4.0.2-3))
++	# Gentoo: GNU Fortran 95 (GCC) 4.1.1 (Gentoo 4.1.1)
+ 
+     for fc_exe in map(find_executable,['gfortran','f95']):
+         if os.path.isfile(fc_exe):
diff --git a/dev-python/numpy/files/digest-numpy-0.9.6 b/dev-python/numpy/files/digest-numpy-0.9.6
index c1ad4cdc2d01..b694261d8023 100644
--- a/dev-python/numpy/files/digest-numpy-0.9.6
+++ b/dev-python/numpy/files/digest-numpy-0.9.6
@@ -1 +1,3 @@
 MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
+RMD160 17182408135857b2ada0db7579e2c81d2baf9eb6 numpy-0.9.6.tar.gz 951680
+SHA256 8527a12c5e4399e476fab497cf76729519e14be818ccc7479af3087facb06f58 numpy-0.9.6.tar.gz 951680
diff --git a/dev-python/numpy/files/digest-numpy-0.9.6-r1 b/dev-python/numpy/files/digest-numpy-0.9.6-r1
new file mode 100644
index 000000000000..b694261d8023
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-0.9.6-r1
@@ -0,0 +1,3 @@
+MD5 eac9ae05bd7511cecf1ffd12da0e1993 numpy-0.9.6.tar.gz 951680
+RMD160 17182408135857b2ada0db7579e2c81d2baf9eb6 numpy-0.9.6.tar.gz 951680
+SHA256 8527a12c5e4399e476fab497cf76729519e14be818ccc7479af3087facb06f58 numpy-0.9.6.tar.gz 951680
diff --git a/dev-python/numpy/numpy-0.9.6-r1.ebuild b/dev-python/numpy/numpy-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..77bfdc03d88f
--- /dev/null
+++ b/dev-python/numpy/numpy-0.9.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-0.9.6-r1.ebuild,v 1.1 2006/06/13 23:27:50 spyderous Exp $
+
+inherit eutils distutils
+
+DESCRIPTION="Numpy contains a powerful N-dimensional array object for Python."
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
+HOMEPAGE="http://numeric.scipy.org/"
+DEPEND=">=dev-lang/python-2.3
+	lapack? ( virtual/blas )
+	lapack? ( virtual/lapack )"
+IUSE="lapack"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PV}-recognize-more-gfortran-versions.patch
+	cd "${S}"
+	# note the default are fine to use with
+	# blas/lapack reference and mkl.
+	if use lapack; then
+		echo "[atlas]"  > site.cfg
+		echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg
+	else
+		echo "[DEFAULT]" > site.cfg
+		echo "library_dirs =" >> site.cfg
+		echo "include_dirs =" >> site.cfg
+		echo "src_dirs =" >> site.cfg
+		echo "[blas_opt] =" >> site.cfg
+		echo "[lapack_opt] =" >> site.cfg
+	fi
+}
+
+# he test only works after install
+# to be worked out.
+#src_test() {
+#	python -c "import numpy; numpy.test()" || \
+#		die "test failed!"
+#}
+
+src_install() {
+	distutils_src_install
+	dodoc numpy/doc/*
+}
+
+