Fixing for prefix

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

3 files changed, 220 insertions, 5 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index d55d4cba702b..68b9cec976be 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.80 2010/04/15 20:21:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.81 2010/04/20 18:41:05 jlec Exp $
+
+*lapack-atlas-3.9.23-r3 (20 Apr 2010)
+
+  20 Apr 2010; Justin Lecher <jlec@gentoo.org>
+  +lapack-atlas-3.9.23-r3.ebuild:
+  Fixing for prefix
 
 *lapack-atlas-3.9.23-r2 (15 Apr 2010)
 
diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index 016e605e76ac..2093b34a6ce2 100644
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -23,14 +23,15 @@ EBUILD lapack-atlas-3.8.2.ebuild 5805 RMD160 b2d24df4d09dd0b87cc6c4ac61a2ac1efff
 EBUILD lapack-atlas-3.9.21-r1.ebuild 6304 RMD160 fc24eeb5df853020b48285e22b228953bf52f24e SHA1 579038f7ccee639d1b21f49aa621e5f052ea016b SHA256 ed8139f8d66c37e341dd1105583dd1f6156de70af35f1bb0afb5d0ffd27d32a2
 EBUILD lapack-atlas-3.9.21.ebuild 6301 RMD160 e57ad595ffcc270339ddabe94c4d1b6aeddf8946 SHA1 7ceb637d8f861b4f766039535c9871526635800b SHA256 98ae66548aa7ef96bdf43afd2440aabd410f3852eb13333cb92a150a915a992c
 EBUILD lapack-atlas-3.9.23-r2.ebuild 6785 RMD160 0d114c878109dfac1f6a7c572a534ae08a31bca3 SHA1 1aa4b46cc9947dc09cb5cbf5c1963c565ae2c5ff SHA256 925593c2e5354c9c4946d9cb42768214ce65725d0963539336c8b9bd8ea95389
+EBUILD lapack-atlas-3.9.23-r3.ebuild 6698 RMD160 9ee8942e1324b48725cbc19ef8f0d0648d92eb07 SHA1 28a75cd7156f8b63817d9b21187068405e63d93a SHA256 92c1511d7bc29fc31e44eebd12c74a29dcb6d81fa9380fc13c1132aa867fcacf
 EBUILD lapack-atlas-3.9.23.ebuild 6324 RMD160 69928cb54951e6f63240c451ea55684f179211ed SHA1 980d0e4947bfa298968fda5101d13741ed0553f0 SHA256 7e03c46171a5c2687b542de5483b1d31940b51ec1962892508238b3ec0f4e98f
 EBUILD lapack-atlas-3.9.3.ebuild 6311 RMD160 fb1e017c8465ccc8e1bebb3d4761f73bae2f01b9 SHA1 92f4761a3459761f818c1c722cf54f56a0e62a28 SHA256 e309572202518c4bffb03a076db785e2a3b351b42b4676ce717c8aed97c42982
-MISC ChangeLog 17576 RMD160 3d290c4bdcb6fa3097b0a70a45dd6d95bad1f2d0 SHA1 8a9a4ea209ea633af0ad957d0a348172ccb7ab67 SHA256 05959cff28211e296813306c64a0d69b78c2e70c85b24c3f28d31ec9d5dc7212
+MISC ChangeLog 17717 RMD160 cbf400a6a44a5ec34036f11107b1aa7e278fd3f4 SHA1 d7d1fbd7bc543d0c60151fa7196b6a21755ac080 SHA256 604fd61ef2df283b438f3cdcd095c07795d8ac44d415efc9c1f2b74694d4d74b
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvHduMACgkQgAnW8HDreRYeRACgz7SFitztokGBsmMb71nWWox7
-C7kAnRmKbUsXocoOQj/KBHdtbQkaBKVV
-=IEgQ
+iEYEARECAAYFAkvN9UcACgkQgAnW8HDreRavjQCgmCoFABIDgKA8Ea3Yh4eX5y7h
+Ud4AoKCYtoBEEPVbxyt5vsxxblGWqtuR
+=Di94
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild
new file mode 100644
index 000000000000..b680b38a7fe0
--- /dev/null
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23-r3.ebuild
@@ -0,0 +1,208 @@
+# 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.23-r3.ebuild,v 1.1 2010/04/20 18:41:05 jlec Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator
+
+MY_PN="${PN/lapack-/}"
+PATCH_V="3.9.21"
+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}-${PATCH_V}-shared-libs.2.patch.bz2
+	mirror://gentoo/${L_PN}-reference-${L_PV}-autotools.patch.bz2"
+
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+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="/usr/$(get_libdir)/${L_PN}/${MY_PN}"
+S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2
+	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_V}-lam.patch
+
+	# make sure the compile picks up the proper includes
+	sed -i \
+		-e "s|INCLUDES.*=|INCLUDES = -I${EPREFIX}/usr/include/atlas/|"  \
+		"${S}"/CONFIG/src/SpewMakeInc.c \
+		|| die "failed to append proper includes"
+
+	cp "${FILESDIR}"/eselect.lapack.atlas "${T}"/
+	sed -i -e "s:/usr:${EPREFIX}/usr:" \
+		"${T}"/eselect.lapack.atlas || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.lapack.atlas || die
+		sed -e /LIBTOOL/s/libtool/glibtool/ -i CONFIG/src/SpewMakeInc.c
+		epatch "${FILESDIR}"/${PN}-3.9.3-darwin-make-top.patch
+	fi
+
+	mkdir "${BLD_DIR}" || die "failed to generate build directory"
+	cd "${BLD_DIR}"
+	cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war"
+	sed -i -e '1c\#! '"${EPREFIX}"'/bin/bash' war
+	cd "${S_LAPACK}"
+	epatch "${WORKDIR}"/${L_PN}-reference-${L_PV}-autotools.patch
+	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-test-fix.patch
+	eautoreconf
+}
+
+src_configure() {
+	BLAS_LIBS="$(pkg-config --libs blas cblas)"
+
+	cd "${BLD_DIR}"
+	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="${ED}"/usr \
+		--libdir="${ED}"/usr/$(get_libdir)/atlas \
+		--incdir="${ED}"/usr/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}"
+	# set up the testing routines
+	sed -e "s:g77:${FORTRANC}:" \
+		-e "s:-funroll-all-loops -O3:${FFLAGS} ${BLAS_LIBS}:" \
+		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} ${BLAS_LIBS}:" \
+		-e "s:../../blas\$(PLAT).a:${BLAS_LIBS}:" \
+		-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"
+	cd "${S_LAPACK}"
+	econf || die "Failed to configure reference lapack lib"
+}
+
+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
+
+	cd "${S_LAPACK}"
+	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/
+
+	local flibs
+	[[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran
+	[[ ${FORTRANC} == g77 ]] && flibs=-lg2c
+	../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \
+	"${BLAS_LIBS}" -latlas ${flibs} \
+	-o "${S_LAPACK}"/SRC/liblapack.la *.lo -rpath "${EPREFIX}/${RPATH}" \
+		|| die "Failed to create liblapack.la"
+
+	# making pkg-config file
+	sed -e "s:@LIBDIR@:$(get_libdir)/lapack/atlas:" \
+		-e "s:=/usr:=${EPREFIX}/usr:" \
+		-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 "${ED}/${RPATH}" \
+		|| die "Failed to install lapack-atlas library"
+
+	ESELECT_PROF=atlas
+	eselect lapack add $(get_libdir) "${T}"/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="${EROOT}"/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
+}