Exporting the F90 variable to make sure fortran compiler is defined, bug #327977

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 15 insertions, 286 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 4856b1283065..aaf591593171 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.55 2010/07/11 15:58:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.56 2010/07/13 17:04:16 bicatali Exp $
+
+  13 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> -scipy-0.7.1.ebuild,
+  -scipy-0.7.2.ebuild, scipy-0.7.2-r1.ebuild:
+  Exporting the F90 variable to make sure fortran compiler is defined, bug
+  #327977
 
   11 Jul 2010; Justin Lecher <jlec@gentoo.org> scipy-0.7.1.ebuild,
   scipy-0.7.2.ebuild, scipy-0.7.2-r1.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 4cf4a99f831f..68230f41a6b3 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -7,17 +7,14 @@ AUX scipy-0.7.1-weave.patch 413 RMD160 ef71432902d2ae914a9c5fbccf23ee4bb5f77802
 AUX scipy-0.7.2-optimize.patch 1878 RMD160 59e8da9aa98c803683dd61889c9c93d5a8eaac13 SHA1 33bb4b2df3b21a8ad7211ae6de7f4224264c162e SHA256 8ea93099edd954625a272dd216cd462f5281f9b93ccfa89ec97720ee7b08ce12
 DIST scipy-0.7-html.zip 5723344 RMD160 2629be4420fcad20bd7d9f080e01e4dcf7639c10 SHA1 3db044ef8603578e15754ae890a6e2fddcdadae9 SHA256 35e2e4e4a7aaba8c348175366c120b1a802951abe50af10458c532631e0133bb
 DIST scipy-0.7-ref.pdf 3380649 RMD160 88bda2a06bc20627afbb0354fbe57c1b82dda7eb SHA1 091e1df2d28ee85428c50ee268db56146be96746 SHA256 4acbd75979fabfea9ff9d0cf60e06520c1f4d372f5369add8294f72303d3d0e0
-DIST scipy-0.7.1.tar.gz 4538765 RMD160 b3cb0b40a739cd8b61182f123581d57443b9401a SHA1 ab637e29743cc0c42903a8815043f85d13fb9e42 SHA256 08830d6363a8753ca1376dd22da86d164902711c5feaf0f768b5ee086b3ecd5f
 DIST scipy-0.7.2.tar.gz 4557178 RMD160 456e4ab9d69f9d4056bca6b52474b72bea37b122 SHA1 c3223df023008ee339cf1d3fad74d4566af69c8a SHA256 cae80f12e8b8e72fb2ca2007077e3948af9abc6f2011fe01a68137aea0ef46be
-EBUILD scipy-0.7.1.ebuild 4229 RMD160 a5a2e2e48d713d76730c43a431923dc99ea1b183 SHA1 c608d286bfdb7557150c3c25ce165b110ed9e71d SHA256 30780d06bd3a519f5aa147739e971733ed83cc000c4040b96ec0acc4ed4fa62f
-EBUILD scipy-0.7.2-r1.ebuild 4220 RMD160 df651665d69722d526ab7c12be6a5c272ba7c1eb SHA1 c1c40768a49e9f2e05906eb05f0c14577a04fedd SHA256 0c3d64fe37844fbd64bf7373571085a82a0ff9699b1f8a35939114d9cc5b26fc
-EBUILD scipy-0.7.2.ebuild 4170 RMD160 4c16f265ec072043e8c4a485dce4325c07bdc382 SHA1 68c0ec4ac193d0f73b2d9eb15805cfaafa3b1a4d SHA256 ae0b1d82bb0d5a4b0c6daebc6ca9417b54c43b593412afe69b774ca957e5dc80
-MISC ChangeLog 11429 RMD160 6e8c3293c208e7c9a3382311318c311bf5f83016 SHA1 b53af4199d59b88460e42df106e85433cd89b681 SHA256 147cf4b8eba268e1895d6ade03d4c4447cf2adb65e2699e623e5284aa2675c6a
+EBUILD scipy-0.7.2-r1.ebuild 4248 RMD160 2b86430a78e72347a05330babb7826bb78028905 SHA1 644d5a4251d5579fdc0a8009b3f91ead8610cf3f SHA256 7612c39ff887665322fa4c1eeab814eb1673fc40b31e05f653b10caa545d6c19
+MISC ChangeLog 11641 RMD160 7d8919880dc68e08dcf16682c76ba1b5a015f158 SHA1 0b7072625fe4e16e9ef208150e6c309496fd86dd SHA256 72ecf873aa69b297f8279a27e7f471231b82ebcad979378c646db3b9c1aad956
 MISC metadata.xml 697 RMD160 05eb973594c8fe27be71e813f2a2294cf9e3f46e SHA1 1dbbb06751c0fc5760618d8998f9d169b3f774ae SHA256 1bfca083b6aa7c4fbd95b638daa2158b2eaa5cb93fe7a99abe9a2bc08b21e48e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw56jAACgkQgAnW8HDreRYAXACgm9SZvgS0/vysT3bCY4iZjo88
-g6EAoJ4RBK8dLLkl2Q3Kise301FMrU8h
-=E+LW
+iEYEARECAAYFAkw8nJkACgkQ1ycZbhPLE2BLawCgg2GTYu2sZM+Mj1eB23/X1Y7X
+nXUAoKpN7XyvarCe7zVsnJVpd/znj+yg
+=oaC6
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild
deleted file mode 100644
index 6d10cb970c1a..000000000000
--- a/sci-libs/scipy/scipy-0.7.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.12 2010/07/11 15:58:34 jlec Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7 3.*"
-
-inherit eutils distutils flag-o-matic toolchain-funcs versionator
-
-SP="${PN}-$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${SP}.x/${PN}-html.zip -> ${SP}-html.zip
-		http://docs.scipy.org/doc/${SP}.x/${PN}-ref.pdf -> ${SP}-ref.pdf
-	)"
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
-
-LICENSE="BSD"
-
-SLOT="0"
-IUSE="doc umfpack"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND=">=dev-python/numpy-1.2
-	virtual/cblas
-	virtual/lapack
-	umfpack? ( sci-libs/umfpack )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	umfpack? ( dev-lang/swig )
-	doc? ( app-arch/unzip )"
-#	test? ( dev-python/nose )
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-# buggy tests
-RESTRICT="test"
-
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
-
-pkg_setup() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC=$(tc-getFC)
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77=$(tc-getFC)
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${SP}-html.zip -d html || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
-	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
-	epatch "${FILESDIR}"/${PN}-0.7.1-weave.patch
-	cat > site.cfg <<-EOF
-		[DEFAULT]
-		library_dirs = /usr/$(get_libdir)
-		include_dirs = /usr/include
-		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas lapack| sed -e \
-			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
-		atlas_libs = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		lapack_libs = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[blas_opt]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[lapack_opt]
-		library_dirs = $(pkg-config --libs-only-L \
-			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-	EOF
-}
-
-src_compile() {
-	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
-		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
-		grep -q ^ERROR test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install ${SCIPY_FCONFIG}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html || die
-		doins  "${DISTDIR}"/${SP}*pdf || die
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.7.2-r1.ebuild b/sci-libs/scipy/scipy-0.7.2-r1.ebuild
index 9ed1a7e32504..b2cd7652c285 100644
--- a/sci-libs/scipy/scipy-0.7.2-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.5 2010/07/11 15:58:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.6 2010/07/13 17:04:16 bicatali Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -54,9 +54,10 @@ pkg_setup() {
 	[[ ${CHOST} == *-darwin* ]] \
 		&& append-ldflags -bundle "-undefined dynamic_lookup" \
 		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC=$(tc-getFC)
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
 	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77=$(tc-getFC)
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
 	export SCIPY_FCONFIG="config_fc --noopt --noarch"
 }
 
diff --git a/sci-libs/scipy/scipy-0.7.2.ebuild b/sci-libs/scipy/scipy-0.7.2.ebuild
deleted file mode 100644
index 37f087591e42..000000000000
--- a/sci-libs/scipy/scipy-0.7.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2.ebuild,v 1.4 2010/07/11 15:58:34 jlec Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7 3.*"
-
-inherit eutils distutils flag-o-matic toolchain-funcs versionator
-
-SP="${PN}-$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${SP}.x/${PN}-html.zip -> ${SP}-html.zip
-		http://docs.scipy.org/doc/${SP}.x/${PN}-ref.pdf -> ${SP}-ref.pdf
-	)"
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
-
-LICENSE="BSD"
-
-SLOT="0"
-IUSE="doc umfpack"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND=">=dev-python/numpy-1.2
-	virtual/cblas
-	virtual/lapack
-	umfpack? ( sci-libs/umfpack )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	umfpack? ( dev-lang/swig )
-	doc? ( app-arch/unzip )"
-#	test? ( dev-python/nose )
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-# buggy tests
-RESTRICT="test"
-
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
-
-pkg_setup() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC=$(tc-getFC)
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77=$(tc-getFC)
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${SP}-html.zip -d html || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
-	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
-	epatch "${FILESDIR}"/${PN}-0.7.1-weave.patch
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat > site.cfg <<-EOF
-		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas lapack| sed -e \
-			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-		atlas_libs = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		lapack_libs = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[blas_opt]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):${libdir}
-		libraries = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[lapack_opt]
-		library_dirs = $(pkg-config --libs-only-L \
-			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):${libdir}
-		libraries = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-	EOF
-}
-
-src_compile() {
-	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
-		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
-		grep -q ^ERROR test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install ${SCIPY_FCONFIG}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html || die
-		doins  "${DISTDIR}"/${SP}*pdf || die
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}