Moved to EAPI=3 for PREFIX support, imported prefix patches from overlay, removed epause

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

4 files changed, 388 insertions, 2 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 381c91bf9540..420183e23a26 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/blas-atlas
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.97 2010/02/19 02:35:21 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.98 2010/03/07 16:56:06 jlec Exp $
+
+*blas-atlas-3.9.23-r1 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/blas-atlas-3.9.3-darwin-make-top.patch,
+  +blas-atlas-3.9.23-r1.ebuild:
+  Moved to EAPI=3 for PREFIX support, imported prefix patches from overlay,
+  removed epause
 
 *blas-atlas-3.9.23 (18 Feb 2010)
 
diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest
index 05acf750fd1a..355c5f84becd 100644
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX atlas-3.7.39-decl-fix.patch 2791 RMD160 b84743fb2f255719197f7481c8826e7b2360044f SHA1 80008056fcafdbefb9e3538ef962c93d5a0df1ca SHA256 d5a8c69c2e196e946c61003b6bf3088b05a6b13b428efa8be8ef7eb54bdf3670
 AUX atlas-3.9.0-decl-fix.patch 2465 RMD160 d1e52b25e04d0f4a3417cc45777a9eb2f114e27d SHA1 7f82b74e9f4366021981a5a1406b344f6ce57469 SHA256 14b20fddedb6948d5caf517a20d702bbbcd8be8771cf1a19c2400dfa2865cf79
 AUX atlas-3.9.23-ger-fix.patch 482 RMD160 b3b8e9098fb900e290dd6900111ee9818b705fd2 SHA1 78ea66da83bf9dca9b9b6fb66acd3b0835e572b9 SHA256 9439b1734414517027a01e2b78667968e353be47d97230792e7b1eda267e2b39
 AUX atlas-asm-gentoo.patch 408 RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da SHA1 493d066be68c66cca1f0c906d588da8983ec7afa SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b
+AUX blas-atlas-3.9.3-darwin-make-top.patch 4931 RMD160 89d85aa6b8fba376dd668304347efa381919183b SHA1 5af62292b9816153e5f0bc64b53c5b7162a12d25 SHA256 6757a9de70bf3420f9d1f0921ecd9e4fcabf01e162ef7533294c180fa49939e5
 AUX blas.pc.in 306 RMD160 7abfdd07326f3148c0b7c86f1ac756cb694826f9 SHA1 8de7ea35f2d6a59974ba01d7a026b42b86ea501e SHA256 869e5f1c35de42834e0f4cf796b05b9868f1dac69ac0af58bbece3a407387b5e
 AUX cblas.pc.in 317 RMD160 8e2533a8851382cbadab717fb3b28f70f132fddf SHA1 d7d2570c89939bb5501f41d2e25eeaccb965d701 SHA256 0becefff7156c3666fc504bd6004bdf1495fd1a47e2e2d588c160d8d4333e942
 AUX eselect.blas-threaded 170 RMD160 fde5f96232b46cec6b4f875de198333e7b108a44 SHA1 c8e263c6d96e297d93e8e08938dc2d152421e474 SHA256 ec1f9091e9b2f3e17740fb0806fbcf4a07efd0d768db63cec39b2d14b61e511d
@@ -23,7 +27,15 @@ EBUILD blas-atlas-3.8.0.ebuild 6972 RMD160 92cbaab9269dd4a1efa2741e9730bec922ed9
 EBUILD blas-atlas-3.8.2.ebuild 6684 RMD160 1ed4af049074291479e2fcc50b9f522e94e97514 SHA1 a90f8ca025a262489e3e4f9827ae295c306f97b3 SHA256 860ea917bd58d7279011f6c87c62c188ba1b029cba4b3b9dbe40e84010c6484a
 EBUILD blas-atlas-3.9.21-r1.ebuild 7410 RMD160 f0a0515babbb06ddd289834ff4c7aa574b44136f SHA1 35aebeb3d374df1677cd6ac6c3b9f6318c8fb0bb SHA256 c97fa0672e479425fa3c550c1a90033ae00ed9326b295c907fa4f2f56b0cb114
 EBUILD blas-atlas-3.9.21.ebuild 7376 RMD160 77d6cde1c8cdc4da6a0941a0df56925930d5aaf0 SHA1 5320d395d55aac519b15ae671c00c5f6d0316158 SHA256 ff840b98c98dacebac43a24b76fb3e95dd1919dd4a7f13f6698eb02aaa5cff27
+EBUILD blas-atlas-3.9.23-r1.ebuild 8079 RMD160 62a47351dd655f9a56d793c95bdc8dace1804690 SHA1 eaa9e6a714e69dbfe360019a221e53dd3d585447 SHA256 8271f48e841d587d13dc28dcaaec4713685411e3953d1fcc9c62676d8df6480c
 EBUILD blas-atlas-3.9.23.ebuild 7485 RMD160 bcc26674658257717d34af3fd5cf8de4f5635a53 SHA1 276c11cc5b929b36503dcb4ba6b3e1f13da79756 SHA256 963e4f468dd4b0fd302ac5d9ebab233da04622d6029d67678a82b67e3cfd0fdd
 EBUILD blas-atlas-3.9.3.ebuild 7255 RMD160 5780bbdc5c6dcfadae06b26a843e88884418205b SHA1 b13e442086dcc56e00fac6dc517550831087f9c7 SHA256 fb416e2bc9bed3b41d4f2107d97289ca1b730d74d80f1ea5c1f161d601de70d0
-MISC ChangeLog 20232 RMD160 20368b329e40d136a3652d62c98baeca37013b98 SHA1 59cedc3ac4056044baab555d9e73f990bd836faf SHA256 a971f576540ab14f101c694928db62e39f38ef3bce9efc909fd1d04e2a1e6fde
+MISC ChangeLog 20494 RMD160 8859c20a96726e54018abebbec2891c8ee715379 SHA1 b5e424701744c8e1efe7be9b79f0ece1bccda89e SHA256 c90358979ad795b436e9eb4814852d338fe067fc32d972bc34f4562fa3682db5
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuT2qwACgkQgAnW8HDreRZnQACgwzDXCTRW6Bvdg2tucxrtvkZU
+5N8AoIkiB8HknNhxfFhUJXIC78j5WCBJ
+=sSJf
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild
new file mode 100644
index 000000000000..101b325a8aab
--- /dev/null
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23-r1.ebuild,v 1.1 2010/03/07 16:56:06 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs fortran multilib
+
+DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
+HOMEPAGE="http://math-atlas.sourceforge.net/"
+MY_PN=${PN/blas-/}
+PATCH_V="3.9.21"
+SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
+	mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc"
+
+RDEPEND="app-admin/eselect-blas
+	app-admin/eselect-cblas
+	doc? ( app-doc/blas-docs )"
+DEPEND="app-admin/eselect-blas
+	app-admin/eselect-cblas
+	>=sys-devel/libtool-1.5"
+
+S="${WORKDIR}/ATLAS"
+BLD_DIR="${S}"/gentoo-build
+
+pkg_setup() {
+	# icc won't compile (as of icc-10.0.026)
+	# and will blow out $PORTAGE_TMPDIR
+	if [[ $(tc-getCC) = icc* ]]; then
+		eerror "icc compiler is not supported with sci-libs/blas-atlas"
+		die "blas-atlas won't compile with icc"
+	fi
+
+	FORTRAN="g77 gfortran ifc"
+	fortran_pkg_setup
+	echo
+	ewarn "Please make sure to disable CPU throttling completely"
+	ewarn "during the compile of blas-atlas. Otherwise, all atlas"
+	ewarn "generated timings will be completely random and the"
+	ewarn "performance of the resulting libraries will be degraded"
+	ewarn "considerably."
+	echo
+	ewarn "For users of <=gcc-4.1 only:"
+	ewarn "If you experience failing SANITY tests during"
+	ewarn "atlas' compile please try passing -mfpmath=387; this"
+	ewarn "option might also result in much better performance"
+	ewarn "than using then sse instruction set depending on your"
+	ewarn "CPU."
+	echo
+	ewarn "If blas-atlas fails during linking with a message"
+	ewarn "'relocation R_X86_64_32 .... recompile with -fPIC.'"
+	ewarn "please re-emerge libtool and then try again."
+	echo
+}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-ger-fix.patch
+	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
+
+	cp "${FILESDIR}"/eselect.{,c}blas.{,threaded-}atlas "${T}"/
+	sed -i -e "s:/usr:${EPREFIX}/usr:" \
+		"${T}"/eselect.{,c}blas.{,threaded-}atlas || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.{,c}blas.{,threaded-}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' \
+		-e '/^\$ARCHIVER \$@$/i\shift' war
+}
+
+src_configure() {
+	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}/${DESTTREE}" \
+		--libdir="${ED}/${DESTTREE}"/$(get_libdir)/atlas \
+		--incdir="${ED}/${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"
+
+	# fix LDFLAGS
+	sed -e "s|LDFLAGS =.*|LDFLAGS = ${LDFLAGS}|" \
+		-i "${BLD_DIR}"/Make.inc
+}
+
+src_compile() {
+	cd "${BLD_DIR}"
+
+	# atlas does its own parallel builds
+	# — and it fails parallel make, bug #294172
+	emake -j1 || die "emake failed"
+
+	RPATH="${DESTTREE}"/$(get_libdir)/blas
+	emake -j1 \
+		LIBDIR=$(get_libdir) \
+		RPATH="${RPATH}"/atlas \
+		shared || die "failed to build shared libraries"
+
+	# build shared libraries of threaded libraries if applicable
+	if [[ -d gentoo/libptcblas.a ]]; then
+		emake -j1 \
+			LIBDIR=$(get_libdir) \
+			RPATH="${RPATH}"/threaded-atlas \
+			ptshared || die "failed to build threaded shared libraries"
+	fi
+}
+
+src_test() {
+	# make check does not work because
+	# we don't build lapack libs
+	for i in F77 C; do
+		einfo "Testing ${i} interface"
+		cd "${BLD_DIR}"/interfaces/blas/${i}/testing
+		make sanity_test || die "emake tests for ${i} failed"
+		if [[ -d "${BLD_DIR}"/gentoo/libptf77blas.a ]]; then
+			make ptsanity_test || die "emake tests threaded for ${i}failed"
+		fi
+	done
+	echo "Timing ATLAS"
+	cd "${BLD_DIR}"
+	emake time || die "emake time failed"
+}
+
+src_install () {
+	dodir "${RPATH}"/atlas
+	cd "${BLD_DIR}"/gentoo/libs
+	cp -P libatlas* "${ED}/${DESTTREE}"/$(get_libdir) \
+		|| die "Failed to install libatlas"
+
+	# pkgconfig files
+	local extlibs="-lm"
+	local threadlibs
+	[[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran"
+	[[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c"
+	cp "${FILESDIR}"/blas.pc.in blas.pc
+	cp "${FILESDIR}"/cblas.pc.in cblas.pc
+	sed -i \
+		-e "s:=/usr:=${EPREFIX}/usr:" \
+		-e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \
+		-e "s:@PV@:${PV}:" \
+		-e "s:@EXTLIBS@:${extlibs}:g" \
+		-e "s:@THREADLIBS@:${threadlibs}:g" \
+		*blas.pc || die "sed *blas.pc failed"
+
+	cp -P *blas* "${ED}/${RPATH}"/atlas \
+		|| die "Failed to install blas/cblas"
+
+	ESELECT_PROF=atlas
+	eselect blas add $(get_libdir) "${T}"/eselect.blas.atlas ${ESELECT_PROF}
+	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.atlas ${ESELECT_PROF}
+
+	if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]];	then
+		dodir "${RPATH}"/threaded-atlas
+		cd "${BLD_DIR}"/gentoo/threaded-libs
+
+		# pkgconfig files
+		cp "${FILESDIR}"/blas.pc.in blas.pc
+		cp "${FILESDIR}"/cblas.pc.in cblas.pc
+		threadlibs="-lpthread"
+		sed -i \
+			-e "s:=/usr:=${EPREFIX}/usr:" \
+			-e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \
+			-e "s:@PV@:${PV}:" \
+			-e "s:@EXTLIBS@:${extlibs}:g" \
+			-e "s:@THREADLIBS@:${threadlibs}:g" \
+			*blas.pc || die "sed *blas.pc failed"
+
+		cp -P * "${ED}/${RPATH}"/threaded-atlas \
+			|| die "Failed to install threaded atlas"
+		ESELECT_PROF=atlas-threads
+
+		eselect blas add $(get_libdir) "${T}"/eselect.blas.threaded-atlas ${ESELECT_PROF}
+		eselect cblas add $(get_libdir) "${T}"/eselect.cblas.threaded-atlas ${ESELECT_PROF}
+	fi
+
+	insinto "${DESTTREE}"/include/atlas
+	doins \
+		"${S}"/include/cblas.h \
+		"${S}"/include/atlas_misc.h \
+		"${S}"/include/atlas_enum.h \
+		"${S}"/include/atlas_aux.h \
+		|| die "failed to install headers"
+
+	# These headers contain the architecture-specific
+	# optimizations determined by ATLAS. The atlas-lapack build
+	# is much shorter if they are available, so save them:
+	doins "${BLD_DIR}"/include/*.h \
+		|| die "failed to install timing headers"
+
+	# some docs
+	cd "${S}"/doc
+	dodoc INDEX.txt AtlasCredits.txt ChangeLog || die "dodoc failed"
+	# atlas specific doc (blas generic docs installed by blas-docs)
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins atlas*pdf cblasqref.pdf || die "doins docs failed"
+	fi
+}
+
+pkg_postinst() {
+	for p in blas cblas; do
+		local current_p=$(eselect ${p} show | cut -d' ' -f2)
+		# this snippet works around the eselect bug #189942 and makes
+		# sure that users upgrading from a previous blas-atlas
+		# version pick up the new pkg-config files
+		if [[ ${current_p} == ${ESELECT_PROF} \
+			  || ${current_p} == "threaded-atlas" \
+			  || -z ${current_p} ]]; then
+			local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+			[[ -e ${configfile} ]] && rm -f ${configfile}
+			eselect ${p} set ${ESELECT_PROF}
+			elog "${p} has been eselected to ${ESELECT_PROF}"
+		else
+			elog "Current eselected ${p} is ${current_p}"
+			elog "To use the ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+			elog "\t eselect ${p} set ${ESELECT_PROF}"
+		fi
+	done
+}
diff --git a/sci-libs/blas-atlas/files/blas-atlas-3.9.3-darwin-make-top.patch b/sci-libs/blas-atlas/files/blas-atlas-3.9.3-darwin-make-top.patch
new file mode 100644
index 000000000000..0b32a6fc41b8
--- /dev/null
+++ b/sci-libs/blas-atlas/files/blas-atlas-3.9.3-darwin-make-top.patch
@@ -0,0 +1,110 @@
+http://bugs.gentoo.org/211712
+
+--- Make.top
++++ Make.top
+@@ -27,70 +27,70 @@
+ 
+ 
+ shared: INSTALLER = cp
+-shared: libatlas.so libblas.so libcblas.so
++shared: libatlas.dylib libblas.dylib libcblas.dylib
+ 
+ shared-strip: INSTALLER = install -s
+-shared-strip: libatlas.so libblas.so libcblas.so
++shared-strip: libatlas.dylib libblas.dylib libcblas.dylib
+ 
+ ptshared: INSTALLER = cp
+-ptshared: libptblas.so libptcblas.so
++ptshared: libptblas.dylib libptcblas.dylib
+ 
+ ptshared-strip: INSTALLER = install -s
+-ptshared-strip: libptblas.so libptcblas.so
++ptshared-strip: libptblas.dylib libptcblas.dylib
+ 
+-libatlas.so:
++libatlas.dylib:
+ 	mkdir -p gentoo/libs
+ 	@echo
+ 	@echo Linking a really big library, please be patient...
+ 	@echo
+ 	cd gentoo/libatlas.a ; \
+-	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(LIBS) -o libatlas.la \
+-		*.lo -rpath /usr/$(LIBDIR) ; \
+-	libtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs
++	glibtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(LIBS) -o libatlas.la \
++		*.lo -rpath $(RPATH) ; \
++	glibtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs
+ 
+-libblas.so:
++libblas.dylib:
+ 	cd gentoo/libf77blas.a ; \
+-       	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(F77SYSLIB) -o libblas.la \
++       	glibtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(F77SYSLIB) -o libblas.la \
+        		../libs/libatlas.la *.lo -rpath $(RPATH); \
+-	rm -f .libs/libblas.so.0.0.0; \
+-	$(CC) -shared $(LDFLAGS) .libs/*.o $(F77SYSLIB) $(BLDdir)/gentoo/libs/libatlas.so \
+-       	      -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
+-	libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs
++	rm -f .libs/libblas.0.0.0.dylib; \
++	$(CC) -dynamiclib $(LDFLAGS) .libs/*.o $(F77SYSLIB) $(BLDdir)/gentoo/libs/libatlas.dylib \
++       	      -install_name $(RPATH)/libblas.0.dylib -o .libs/libblas.0.0.0.dylib; \
++	glibtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs
+ 
+-libcblas.so:
++libcblas.dylib:
+ 	cd gentoo/libcblas.a ; \
+-       	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o libcblas.la \
++       	glibtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o libcblas.la \
+ 		../libs/libatlas.la *.lo -rpath $(RPATH) ; \
+-       	rm -f .libs/libcblas.so.0.0.0; \
+-       	$(CC) -shared $(LDFLAGS) .libs/*.o $(BLDdir)/gentoo/libs/libatlas.so \
+-	       -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
+-       libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs
++       	rm -f .libs/libcblas.0.0.0.dylib; \
++       	$(CC) -dynamiclib $(LDFLAGS) .libs/*.o $(BLDdir)/gentoo/libs/libatlas.dylib \
++	       -install_name $(RPATH)/libcblas.0.dylib -o .libs/libcblas.0.0.0.dylib; \
++       glibtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs
+ 
+-libptblas.so:
++libptblas.dylib:
+ 	mkdir -p gentoo/threaded-libs
+ 	cd gentoo/libptf77blas.a ; \
+-	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(F77SYSLIB) -o libblas.la \
++	glibtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(F77SYSLIB) -o libblas.la \
+ 		../libs/libatlas.la *.lo -rpath $(RPATH); \
+-	rm -f .libs/libblas.so.0.0.0; \
+-	$(CC) -shared $(LDFLAGS) .libs/*.o  $(F77SYSLIB) $(BLDdir)/gentoo/libs/libatlas.so \
+-	      -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \
+-	libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/threaded-libs
++	rm -f .libs/libblas.0.0.0.dylib; \
++	$(CC) -dynamiclib $(LDFLAGS) .libs/*.o  $(F77SYSLIB) $(BLDdir)/gentoo/libs/libatlas.dylib \
++	      -install_name $(RPATH)/libblas.0.dylib -o .libs/libblas.0.0.0.dylib; \
++	glibtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/threaded-libs
+ 
+-libptcblas.so:
++libptcblas.dylib:
+ 	cd gentoo/libptcblas.a ; \
+-	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o libcblas.la \
++	glibtool --mode=link --tag=CC $(CC) $(LDFLAGS) -o libcblas.la \
+ 		../libs/libatlas.la *.lo -rpath $(RPATH); \
+-       	rm -f .libs/libcblas.so.0.0.0; \
+-       	$(CC) -shared $(LDFLAGS) .libs/*.o $(BLDdir)/gentoo/libs/libatlas.so \
+-	      -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \
+-       	libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/threaded-libs
++       	rm -f .libs/libcblas.0.0.0.dylib; \
++       	$(CC) -dynamiclib $(LDFLAGS) .libs/*.o $(BLDdir)/gentoo/libs/libatlas.dylib \
++	      -install_name $(RPATH)/libcblas.0.dylib -o .libs/libcblas.0.0.0.dylib; \
++       	glibtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/threaded-libs
+ 
+-liblapack.so:
++liblapack.dylib:
+ 	mkdir -p gentoo/libs
+ 	cd gentoo/liblapack.a ; \
+-       	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(F77SYSLIB) -o liblapack.la \
++       	glibtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(F77SYSLIB) -o liblapack.la \
+                 *.lo -rpath $(RPATH) -lblas -lcblas -latlas ; \
+-	libtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs
++	glibtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs
+ 
+ 
+ sanity_test :