Version bump (fixes bug #281688).

(Portage version: 2.1.7.16/cvs/Linux x86_64)

3 files changed, 241 insertions, 2 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index c27c9e704ee5..710bd8509084 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/lapack-atlas
-# Copyright 2004-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.73 2009/01/14 19:14:03 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.74 2010/01/21 22:39:16 markusle Exp $
+
+*lapack-atlas-3.9.21 (21 Jan 2010)
+
+  21 Jan 2010; Markus Dittrich <markusle@gentoo.org>
+  +lapack-atlas-3.9.21.ebuild, +files/lapack-atlas-3.9.21-lam.patch:
+  Version bump (fixes #281688).
 
   14 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/lapack.pc.in,
   lapack-atlas-3.9.3.ebuild:
diff --git a/sci-libs/lapack-atlas/files/lapack-atlas-3.9.21-lam.patch b/sci-libs/lapack-atlas/files/lapack-atlas-3.9.21-lam.patch
new file mode 100644
index 000000000000..6a2dc75d3ad4
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/lapack-atlas-3.9.21-lam.patch
@@ -0,0 +1,38 @@
+diff -Naur ATLAS/makes/Make.Flp ATLAS.new/makes/Make.Flp
+--- ATLAS/makes/Make.Flp	2010-01-11 13:19:20.000000000 -0500
++++ ATLAS.new/makes/Make.Flp	2010-01-20 12:24:06.000000000 -0500
+@@ -9,7 +9,7 @@
+        ATL_f77wrap_slarfb.o ATL_f77wrap_slarft.o ATL_f77wrap_slauum.o \
+        ATL_f77wrap_sposv.o ATL_f77wrap_spotrf.o ATL_f77wrap_spotrs.o \
+        ATL_f77wrap_strtri.o ieeeck.o sgelqf.o sgeqlf.o sgeqrf.o sgerqf.o \
+-       sgesv.o sgetrf.o sgetri.o sgetrs.o slamc3.o slamch.o slarfb.o slarft.o \
++       sgesv.o sgetrf.o sgetri.o sgetrs.o slarfb.o slarft.o \
+        slauum.o sposv.o spotrf.o spotri.o spotrs.o strtri.o
+ dobj = ATL_f77wrap_dgelqf.o ATL_f77wrap_dgeqlf.o ATL_f77wrap_dgeqrf.o \
+        ATL_f77wrap_dgerqf.o ATL_f77wrap_dgesv.o ATL_f77wrap_dgetnb.o \
+@@ -17,7 +17,7 @@
+        ATL_f77wrap_dlarfb.o ATL_f77wrap_dlarft.o ATL_f77wrap_dlauum.o \
+        ATL_f77wrap_dposv.o ATL_f77wrap_dpotrf.o ATL_f77wrap_dpotrs.o \
+        ATL_f77wrap_dtrtri.o dgelqf.o dgeqlf.o dgeqrf.o dgerqf.o dgesv.o \
+-       dgetrf.o dgetri.o dgetrs.o dlamc3.o dlamch.o dlarfb.o dlarft.o \
++       dgetrf.o dgetri.o dgetrs.o dlarfb.o dlarft.o \
+        dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o
+ cobj = ATL_f77wrap_cgelqf.o ATL_f77wrap_cgeqlf.o ATL_f77wrap_cgeqrf.o \
+        ATL_f77wrap_cgerqf.o ATL_f77wrap_cgesv.o ATL_f77wrap_cgetnb.o \
+@@ -331,16 +331,6 @@
+ ATL_f77wrap_zgetnb.o : $(mySRCdir)/f77wrap/ATL_f77wrap_getnb.c
+ 	$(ICC) $(ICCFLAGS) -o $@ -c -DDCPLX $(mySRCdir)/f77wrap/ATL_f77wrap_getnb.c
+ 
+-slamch.o : $(mySRCdir)/lamch.c
+-	$(ICC) $(ICCFLAGS) -o $@ -c -DSREAL $(mySRCdir)/lamch.c
+-slamc3.o : $(mySRCdir)/slamc3.f
+-	$(F77) $(F77FLAGS) $(F77NOOPT) -o $@ -c $(mySRCdir)/slamc3.f
+-dlamch.o : $(mySRCdir)/lamch.c
+-	$(ICC) $(ICCFLAGS) -o $@ -c -DDREAL $(mySRCdir)/lamch.c
+-dlamc3.o : $(mySRCdir)/dlamc3.f
+-	$(F77) $(F77FLAGS) $(F77NOOPT) -o $@ -c $(mySRCdir)/dlamc3.f
+-
+-
+ ieeeck.o : $(mySRCdir)/ieeeck.f
+ 	$(F77) -o $@ -c $(F77FLAGS) $(mySRCdir)/ieeeck.f
+ 
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild
new file mode 100644
index 000000000000..0949183c7a6f
--- /dev/null
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.21.ebuild,v 1.1 2010/01/21 22:39:16 markusle Exp $
+
+inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator
+
+MY_PN="${PN/lapack-/}"
+PATCH_V="3.9.0"
+L_PN="lapack"
+L_PV="3.1.1"
+BlasRelease=$(get_version_component_range 1-3)
+
+DESCRIPTION="F77 and C LAPACK implementations using available ATLAS routines"
+LICENSE="BSD"
+HOMEPAGE="http://math-atlas.sourceforge.net/"
+SRC_URI1="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2"
+SRC_URI2="http://www.netlib.org/${L_PN}/${L_PN}-lite-${L_PV}.tgz"
+SRC_URI="${SRC_URI1} ${SRC_URI2}
+	mirror://gentoo/${MY_PN}-${PV}-shared-libs.patch.bz2
+	mirror://gentoo/${L_PN}-reference-${L_PV}-autotools.patch.bz2"
+
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="virtual/blas
+	virtual/cblas
+	app-admin/eselect-lapack
+	~sci-libs/blas-atlas-${BlasRelease}"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/libtool-1.5"
+RDEPEND="${CDEPEND}
+	doc? ( app-doc/lapack-docs )"
+
+FORTRAN="g77 gfortran ifc"
+
+S="${WORKDIR}/ATLAS"
+S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}"
+BLD_DIR="${S}/gentoo-build"
+RPATH="${DESTTREE}/$(get_libdir)/${L_PN}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.patch.bz2
+	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
+	epatch "${FILESDIR}"/${P}-lam.patch
+
+	# make sure the compile picks up the proper includes
+	sed -i \
+		-e "s|INCLUDES.*=|INCLUDES = -I/usr/include/atlas/|"  \
+		"${S}"/CONFIG/src/SpewMakeInc.c \
+		|| die "failed to append proper includes"
+
+	BLD_DIR="${S}"/gentoo-build
+	mkdir "${BLD_DIR}"  || die "failed to generate build directory"
+	cd "${BLD_DIR}"
+	cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war"
+
+	# force proper 32/64bit libs
+	local archselect
+	if use amd64 || use ppc64; then
+		archselect="-b 64"
+	elif use alpha; then
+		archselect=""
+	else
+		archselect="-b 32"
+	fi
+
+	# Remove -m64 on alpha, since the compiler doesn't support it
+	use alpha && sed -i -e 's/-m64//g' "${S}"/CONFIG/src/probe_comp.c
+
+	# unfortunately, atlas-3.9.0 chokes when passed
+	# x86_64-pc-linux-gnu-gcc and friends instead of
+	# plain gcc. Hence, we'll have to workaround this
+	# until it is fixed by upstream
+	local c_compiler=$(tc-getCC)
+	if [[ "${c_compiler}" == *gcc* ]]; then
+		c_compiler="gcc"
+	fi
+
+	../configure \
+		--cc="${c_compiler}" \
+		--cflags="${CFLAGS}" \
+		--prefix="${D}/${DESTTREE}" \
+		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
+		--incdir="${D}/${DESTTREE}"/include \
+		-C ac "${c_compiler}" -F ac "${CFLAGS}" \
+		-C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \
+		-Ss pmake "\$(MAKE) ${MAKEOPTS}" \
+		-Si cputhrchk 0 ${archselect} \
+		|| die "configure failed"
+
+	cd "${S_LAPACK}"
+	epatch "${WORKDIR}"/${L_PN}-reference-${L_PV}-autotools.patch
+	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-test-fix.patch
+	eautoreconf
+
+	# set up the testing routines
+	sed -e "s:g77:${FORTRANC}:" \
+		-e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \
+		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \
+		-e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \
+		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.so -Wl,-rpath,${S_LAPACK}/SRC/.libs:" \
+		-e "s:EXT_ETIME$:INT_CPU_TIME:" \
+		make.inc.example > make.inc \
+		|| die "Failed to set up make.inc"
+}
+
+src_compile() {
+	# build atlas' part of lapack
+	cd "${BLD_DIR}"
+	for d in src/lapack interfaces/lapack/C/src interfaces/lapack/F77/src interfaces/lapack/C2F/src; do
+		cd "${BLD_DIR}"/${d}
+		make lib || die "Failed to make lib in ${d}"
+	done
+
+	# build rest of lapack
+	S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV}
+	cd "${S_LAPACK}"
+	econf || die "Failed to configure reference lapack lib"
+	emake || die "Failed to make reference lapack lib"
+
+	cd "${S_LAPACK}"/SRC
+	einfo "Copying liblapack.a/*.o to ${S_LAPACK}/SRC"
+	cp -sf "${BLD_DIR}"/gentoo/liblapack.a/*.o .
+	einfo "Copying liblapack.a/*.lo to ${S_LAPACK}/SRC"
+	cp -sf "${BLD_DIR}"/gentoo/liblapack.a/*.lo .
+	einfo "Copying liblapack.a/.libs/*.o to ${S_LAPACK}/SRC"
+	cp -sf "${BLD_DIR}"/gentoo/liblapack.a/.libs/*.o .libs/
+
+	RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN}
+	local flibs
+	[[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran
+	[[ ${FORTRANC} == g77 ]] && flibs=-lg2c
+	../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \
+		$(pkg-config --libs blas cblas) -latlas ${flibs} \
+		-o liblapack.la *.lo -rpath "${RPATH}" \
+		|| die "Failed to create liblapack.la"
+
+	# making pkg-config file
+	sed -e "s:@LIBDIR@:$(get_libdir)/lapack/atlas:" \
+		-e "s:@PV@:${PV}:" \
+		-e "s:@EXTLIBS@:-lm ${flibs}:g" \
+		"${FILESDIR}"/lapack.pc.in > "${S}"/lapack.pc \
+		|| die "sed lapack.pc failed"
+}
+
+src_install () {
+	dodir "${RPATH}"
+
+	cd "${S_LAPACK}"/SRC
+	../libtool --mode=install cp liblapack.la "${D}/${RPATH}" \
+		|| die "Failed to install lapack-atlas library"
+
+	ESELECT_PROF=atlas
+	eselect lapack add $(get_libdir) "${FILESDIR}"/eselect.lapack.atlas ${ESELECT_PROF}
+
+	insinto /usr/include/atlas
+	doins "${S}"/include/clapack.h || die "Failed to install clapack.h"
+	dosym atlas/clapack.h /usr/include/clapack.h
+
+	cd "${S}"
+	dodoc README doc/AtlasCredits.txt doc/ChangeLog \
+		|| die "Failed to install docs"
+
+	insinto /usr/$(get_libdir)/lapack/atlas
+	doins "${S}"/lapack.pc || die "Failed to install lapack.pc"
+}
+
+src_test() {
+	cd "${S_LAPACK}"/TESTING/MATGEN
+	emake || die "Failed to create tmglib.a"
+	cd ..
+	emake || die "lapack-reference tests failed"
+}
+
+pkg_postinst() {
+	local current_lib=$(eselect lapack show | cut -d' ' -f2)
+	# this snippet works around the eselect bug #189942 and makes
+	# sure that users upgrading from a previous lapack-atlas
+	# version pick up the new pkg-config files
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		local configfile="${ROOT}"/etc/env.d/lapack/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect lapack set ${ESELECT_PROF}
+		elog "lapack has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected lapack is ${current_lib}"
+		elog "To use blas ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${ESELECT_PROF}"
+	fi
+}