[gentoo-commits] proj/sci:master commit in: sci-libs/atlas/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     08d6661fe7f7f57f390abe0bacf1d64e40ff8725
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 04:26:15 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 04:26:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08d6661f

sci-libs/atlas: bump

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/atlas/ChangeLog                           |    6 +
 .../{atlas-3.9.52.ebuild => atlas-3.9.67.ebuild}   |  209 ++++++++++----------
 2 files changed, 113 insertions(+), 102 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index c702930..d0d6ed2 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.9.67 (16 Feb 2012)
+
+  16 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.52.ebuild,
+  +atlas-3.9.67.ebuild:
+  bump
+
 *atlas-3.9.63 (24 Jan 2012)
 
   24 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/atlas/atlas-3.9.52.ebuild b/sci-libs/atlas/atlas-3.9.67.ebuild
similarity index 73%
rename from sci-libs/atlas/atlas-3.9.52.ebuild
rename to sci-libs/atlas/atlas-3.9.67.ebuild
index 86157c9..7292674 100644
--- a/sci-libs/atlas/atlas-3.9.52.ebuild
+++ b/sci-libs/atlas/atlas-3.9.67.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
-inherit eutils toolchain-funcs versionator alternatives-2
+inherit eutils toolchain-funcs fortran-2 versionator alternatives-2
 
-LAPACKP=lapack-3.3.1
+LAPACKP=lapack-3.4.0_p20120215.tar.bz2
 
 DESCRIPTION="Automatically Tuned Linear Algebra Software"
 HOMEPAGE="http://math-atlas.sourceforge.net/"
 SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
-	fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP}.tgz ) )"
+	fortran? ( lapack? ( http://dev.gentoo.org/~bicatali/distfiles/${LAPACKP} ) )"
+#	fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP} ) )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,74 +24,120 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/ATLAS"
 
-atlas_configure() {
-	local mycc="$(tc-getCC)"
-	# http://sourceforge.net/tracker/?func=detail&aid=3301697&group_id=23725&atid=379483
-	[[ ${mycc} == *gcc* ]] && mycc=gcc
-	local myconf=(
-		"--prefix=${ED}/usr"
-		"--libdir=${ED}/usr/$(get_libdir)"
-		"--incdir=${ED}/usr/include"
-		"--cc=${mycc}"
-		"-C ac ${mycc}"
-		"-D c -DWALL"
-		"-F ac '${CFLAGS}'"
-		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
-	)
-
-	# OpenMP shown to decreased performance over POSIX threads
-	# (at least in 3.9.39, see atlas-dev mailing list)
-	if use threads; then
-		myconf+=( "-t -1" "-Si omp 0" )
+pkg_setup() {
+	if [[ -n $(type -P cpufreq-info) ]]; then
+		[[ -z $(cpufreq-info -d) ]] && return
+		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
+		local cpu=0
+		while [[ ${cpu} -lt ${ncpu} ]]; do
+			if ! $(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance); then
+				ewarn "CPU $cpu is not set to performance"
+				ewarn "Run cpufreq-set -r -g performance as root"
+				die "${PN} needs all cpu set to performance"
+			fi
+			cpu=$(( cpu + 1 ))
+		done
 	else
-		myconf+=( "-t  0" "-Si omp 0" )
+		ewarn "Please make sure to disable CPU throttling completely"
+		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
+		ewarn "generated timings will be completely random and the"
+		ewarn "performance of the resulting libraries will be degraded"
+		ewarn "considerably."
 	fi
+	use fortran && fortran-2_pkg_setup
+}
 
-	if use amd64 || use ppc64 || use sparc; then
-		if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
-			myconf+=( "-b 64" )
-		elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
-			myconf+=( "-b 32" )
+src_prepare() {
+	epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch
+	epatch "${FILESDIR}"/3.9.63-leaks.patch
+}
+
+src_configure() {
+	atlas_configure() {
+		# hack needed to trick the flaky gcc detection
+		local mycc="$(tc-getCC)"
+		[[ ${mycc} == *gcc* ]] && mycc=gcc
+
+		local myconf=(
+			"--prefix=${ED}/usr"
+			"--libdir=${ED}/usr/$(get_libdir)"
+			"--incdir=${ED}/usr/include"
+			"--cc=${mycc}"
+			"-C ac ${mycc}"
+			"-D c -DWALL"
+			"-F ac '${CFLAGS}'"
+			"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
+		)
+
+		# OpenMP shown to decreased performance over POSIX threads
+		# (at least in 3.9.x, see atlas-dev mailing list)
+		if use threads; then
+			myconf+=( "-t -1" "-Si omp 0" )
 		else
+			myconf+=( "-t  0" "-Si omp 0" )
+		fi
+
+		if use amd64 || use ppc64 || use sparc; then
+			if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
+				myconf+=( "-b 64" )
+			elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
+				myconf+=( "-b 32" )
+			else
+				myconf+=( "-b 64" )
+			fi
+		elif use ppc || use x86; then
+			myconf+=( "-b 32" )
+		elif use ia64; then
 			myconf+=( "-b 64" )
+		else #hppa alpha ...
+			myconf+=( "" )
 		fi
-	elif use ppc || use x86; then
-		myconf+=( "-b 32" )
-	elif use ia64; then
-		myconf+=( "-b 64" )
-	else #hppa alpha ...
-		myconf+=( "" )
-	fi
-	if use fortran; then
-		myconf+=(
-			"-C if $(tc-getFC)"
-			"-F if '${FFLAGS}'"
-		)
-		if use lapack; then
+		if use fortran; then
 			myconf+=(
-				"-Si latune 1"
-				"--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}.tgz"
+				"-C if $(tc-getFC)"
+				"-F if '${FFLAGS}'"
 			)
+			if use lapack; then
+				myconf+=(
+					"-Si latune 1"
+					"--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
+				)
+			else
+				myconf+=( "-Si latune 0" )
+			fi
 		else
-			myconf+=( "-Si latune 0" )
+			myconf+=( "-Si latune 0" "--nof77" )
 		fi
-	else
-		myconf+=( "-Si latune 0" "--nof77" )
-	fi
-	local confdir="${S}_${1}"; shift
-	myconf+=( $@ )
-	mkdir "${confdir}" && cd "${confdir}"
-	"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
+		local confdir="${S}_${1}"; shift
+		myconf+=( $@ )
+		mkdir "${confdir}" && cd "${confdir}"
+	# for debugging
+		echo ${myconf[@]} > myconf.out
+		"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
+	}
+
+	atlas_configure shared "-Fa alg -fPIC"
+	use static-libs && atlas_configure static
 }
 
-atlas_compile() {
-	pushd "${S}_${1}" > /dev/null
-	# atlas does its own parallel builds
-	emake -j1 build
-	cd lib
-	emake libclapack.a
-	[[ -e libptcblas.a ]] && emake libptclapack.a
-	popd > /dev/null
+src_compile() {
+	atlas_compile() {
+		pushd "${S}_${1}" > /dev/null
+		# atlas does its own parallel builds
+		emake -j1 build
+		cd lib
+		emake libclapack.a
+		[[ -e libptcblas.a ]] && emake libptclapack.a
+		popd > /dev/null
+	}
+
+	atlas_compile shared
+	use static-libs && atlas_compile static
+}
+
+src_test() {
+	cd "${S}_shared"
+	emake -j1 check time
 }
 
 # transform a static archive into a shared library and install them
@@ -132,48 +179,6 @@ atlas_install_pc() {
 	doins ${pcname}.pc
 }
 
-pkg_setup() {
-	if [[ -n $(type -P cpufreq-info) ]]; then
-		[[ -z $(cpufreq-info -d) ]] && return
-		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
-		local cpu=0
-		while [[ ${cpu} -lt ${ncpu} ]]; do
-			if ! $(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance); then
-				ewarn "CPU $cpu is not set to performance"
-				ewarn "Run cpufreq-set -r -g performance as root"
-				die "${PN} needs all cpu set to performance"
-			fi
-			cpu=$(( cpu + 1 ))
-		done
-	else
-		ewarn "Please make sure to disable CPU throttling completely"
-		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
-		ewarn "generated timings will be completely random and the"
-		ewarn "performance of the resulting libraries will be degraded"
-		ewarn "considerably."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch
-}
-
-src_configure() {
-	atlas_configure shared "-Fa alg -fPIC"
-	use static-libs && atlas_configure static
-}
-
-src_compile() {
-	atlas_compile shared
-	use static-libs && atlas_compile static
-}
-
-src_test() {
-	cd "${S}_shared"
-	emake -j1 check
-	emake -j1 time
-}
-
 src_install() {
 	cd "${S}_shared/lib"
 	# rename to avoid collision with other packages