Version bump and removed old ebuilds. Also fixed missing quoting in all ebuilds.

(Portage version: 2.1.3.12)

18 files changed, 338 insertions, 953 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 62ba86a77dd8..fd36296f1b2a 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 2004-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.46 2007/07/24 16:20:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.47 2007/10/10 10:04:59 markusle Exp $
+
+*lapack-atlas-3.7.39 (09 Oct 2007)
+
+  09 Oct 2007; Markus Dittrich <markusle@gentoo.org>
+  lapack-atlas-3.6.0.ebuild, -lapack-atlas-3.6.0-r1.ebuild,
+  -lapack-atlas-3.6.0-r2.ebuild, lapack-atlas-3.7.11.ebuild,
+  lapack-atlas-3.7.11-r1.ebuild, -lapack-atlas-3.7.31.ebuild,
+  -lapack-atlas-3.7.32.ebuild, lapack-atlas-3.7.34.ebuild,
+  +files/lapack.pc.in, +files/eselect.lapack.atlas,
+  +lapack-atlas-3.7.39.ebuild:
+  Version bump and removed old ebuilds. Also fixed missing
+  quoting in all ebuilds.
 
 *lapack-atlas-3.7.34 (24 Jul 2007)
 
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1
deleted file mode 100644
index ae05840d1f54..000000000000
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 743b75ec473ab0f0edda6b649aa89060 atlas3.6.0-shared-libs.patch.bz2 5140
-RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 atlas3.6.0-shared-libs.patch.bz2 5140
-SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89 atlas3.6.0-shared-libs.patch.bz2 5140
-MD5 df2ee2eb65d1c08ee93d04370172c262 atlas3.6.0.tar.bz2 1687723
-RMD160 e7d40a6677ce7c4442df7152150aecf812020713 atlas3.6.0.tar.bz2 1687723
-SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8 atlas3.6.0.tar.bz2 1687723
-MD5 c35802e688f28f8f65632fb93aad69d8 lapack-20020531-20021004.patch.bz2 59736
-RMD160 126a579d242664dce53d23cdd7bef935e81b5031 lapack-20020531-20021004.patch.bz2 59736
-SHA256 19bcae60fcec3742563d8b27e21da52677b18520c54cf0cb7a51537ec3dbd29c lapack-20020531-20021004.patch.bz2 59736
-MD5 a24f59304f87b78cdc7da2ae59c98664 lapack-3.0.tgz 4991992
-RMD160 630f9d7b4b37b0d39bccd4816198271b7e9e0cce lapack-3.0.tgz 4991992
-SHA256 393613641f80745e7e8445fd0f3e4f5f66a5e340c8115cd4d780b0f53e2b31a6 lapack-3.0.tgz 4991992
-MD5 4192870be88e09ba8c6a805eb31fcfb4 lapack-gentoo.patch 1272
-RMD160 2bc28b1c8bbc7b77d977562e3550097bdb2a379b lapack-gentoo.patch 1272
-SHA256 376b738c66dbbd8b116c3a48b99c1202dbd5c1c6c94865cf9df10ed48b78fb43 lapack-gentoo.patch 1272
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2
deleted file mode 100644
index ae05840d1f54..000000000000
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 743b75ec473ab0f0edda6b649aa89060 atlas3.6.0-shared-libs.patch.bz2 5140
-RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 atlas3.6.0-shared-libs.patch.bz2 5140
-SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89 atlas3.6.0-shared-libs.patch.bz2 5140
-MD5 df2ee2eb65d1c08ee93d04370172c262 atlas3.6.0.tar.bz2 1687723
-RMD160 e7d40a6677ce7c4442df7152150aecf812020713 atlas3.6.0.tar.bz2 1687723
-SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8 atlas3.6.0.tar.bz2 1687723
-MD5 c35802e688f28f8f65632fb93aad69d8 lapack-20020531-20021004.patch.bz2 59736
-RMD160 126a579d242664dce53d23cdd7bef935e81b5031 lapack-20020531-20021004.patch.bz2 59736
-SHA256 19bcae60fcec3742563d8b27e21da52677b18520c54cf0cb7a51537ec3dbd29c lapack-20020531-20021004.patch.bz2 59736
-MD5 a24f59304f87b78cdc7da2ae59c98664 lapack-3.0.tgz 4991992
-RMD160 630f9d7b4b37b0d39bccd4816198271b7e9e0cce lapack-3.0.tgz 4991992
-SHA256 393613641f80745e7e8445fd0f3e4f5f66a5e340c8115cd4d780b0f53e2b31a6 lapack-3.0.tgz 4991992
-MD5 4192870be88e09ba8c6a805eb31fcfb4 lapack-gentoo.patch 1272
-RMD160 2bc28b1c8bbc7b77d977562e3550097bdb2a379b lapack-gentoo.patch 1272
-SHA256 376b738c66dbbd8b116c3a48b99c1202dbd5c1c6c94865cf9df10ed48b78fb43 lapack-gentoo.patch 1272
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.31 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.31
deleted file mode 100644
index 88f250a923d4..000000000000
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.31
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4d28b9a878db79ba5567c76d225097a1 atlas-3.7.23-shared-libs.patch.bz2 6324
-RMD160 b3fd87430994d09860a6fd1d494934e90c0ecf41 atlas-3.7.23-shared-libs.patch.bz2 6324
-SHA256 895ed8243f23074ad0a343c3aded59468e2f3d6acfa886c840f7f81d32718241 atlas-3.7.23-shared-libs.patch.bz2 6324
-MD5 219e93443a1ba2b5abb90790f465a7ec atlas3.7.31.tar.bz2 2170687
-RMD160 03caaf973816a078bee679bb9f2fe4ef5a0d52d7 atlas3.7.31.tar.bz2 2170687
-SHA256 5bdb01d669c948df3cadf3090f0f2f601c4c3ebd6d40ff5eedf6b3b495358d2e atlas3.7.31.tar.bz2 2170687
-MD5 5feace3f4507a92ef822b2e0b50151d7 lapack-lite-3.1.1.tgz 5332509
-RMD160 d81baafd1f0f9859d9f75ac9b658f743544b5f5b lapack-lite-3.1.1.tgz 5332509
-SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437 lapack-lite-3.1.1.tgz 5332509
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.32 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.32
deleted file mode 100644
index 665db3f5d607..000000000000
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.32
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4d28b9a878db79ba5567c76d225097a1 atlas-3.7.23-shared-libs.patch.bz2 6324
-RMD160 b3fd87430994d09860a6fd1d494934e90c0ecf41 atlas-3.7.23-shared-libs.patch.bz2 6324
-SHA256 895ed8243f23074ad0a343c3aded59468e2f3d6acfa886c840f7f81d32718241 atlas-3.7.23-shared-libs.patch.bz2 6324
-MD5 c0106c5759125f7042393d903f861b61 atlas3.7.32.tar.bz2 2230912
-RMD160 b6ebc3cf8996af221315705f017fc2b9ca070c31 atlas3.7.32.tar.bz2 2230912
-SHA256 95babc9bdfe2ff5c1f2c7e3ea2ee034437031dcded1a155a6651fec9a945208d atlas3.7.32.tar.bz2 2230912
-MD5 5feace3f4507a92ef822b2e0b50151d7 lapack-lite-3.1.1.tgz 5332509
-RMD160 d81baafd1f0f9859d9f75ac9b658f743544b5f5b lapack-lite-3.1.1.tgz 5332509
-SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437 lapack-lite-3.1.1.tgz 5332509
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.39 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.39
new file mode 100644
index 000000000000..6b2cc90aa97c
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.39
@@ -0,0 +1,9 @@
+MD5 2923b57b4d67a25c2b76f5f32dba75f2 atlas-3.7.39-shared-libs.patch.bz2 6612
+RMD160 83d1167768e67128beccb88e6e291e0b63fd7837 atlas-3.7.39-shared-libs.patch.bz2 6612
+SHA256 c4f1c572a4506931c937d71f5b72709b36066e3c33b856a8a19444f72d2f9528 atlas-3.7.39-shared-libs.patch.bz2 6612
+MD5 45d548ee43d419225d2e7fdaf603618b atlas3.7.39.tar.bz2 2464374
+RMD160 286b71b0f35f3f78d06855d669b1a10f838abf30 atlas3.7.39.tar.bz2 2464374
+SHA256 e7529a6ddae7b59063caaa90d7e617c4192fdd6e24c45ed1991ed80debc0e56b atlas3.7.39.tar.bz2 2464374
+MD5 5feace3f4507a92ef822b2e0b50151d7 lapack-lite-3.1.1.tgz 5332509
+RMD160 d81baafd1f0f9859d9f75ac9b658f743544b5f5b lapack-lite-3.1.1.tgz 5332509
+SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437 lapack-lite-3.1.1.tgz 5332509
diff --git a/sci-libs/lapack-atlas/files/eselect.lapack.atlas b/sci-libs/lapack-atlas/files/eselect.lapack.atlas
new file mode 100644
index 000000000000..7478b51547ac
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/eselect.lapack.atlas
@@ -0,0 +1,4 @@
+lapack/atlas/liblapack.so /usr/@LIBDIR@/liblapack.so
+lapack/atlas/liblapack.so.0 /usr/@LIBDIR@/liblapack.so.0
+lapack/atlas/liblapack.a /usr/@LIBDIR@/liblapack.a
+../lapack/atlas/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
diff --git a/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch b/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch
index 295cc2b0f4d3..7df026709d24 100644
--- a/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch
+++ b/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch
@@ -1,41 +1,58 @@
-diff -Naur lapack-lite-3.1.1/INSTALL/Makefile.am lapack-lite-3.1.1.new/INSTALL/Makefile.am
---- lapack-lite-3.1.1/INSTALL/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ lapack-lite-3.1.1.new/INSTALL/Makefile.am	2007-03-08 23:57:43.000000000 -0500
-@@ -0,0 +1,23 @@
-+if DO_TEST
-+noinst_PROGRAMS = \
-+	testlsame \
-+	testslamch \
-+	testdlamch \
-+	testsecond \
-+	testdsecnd \
-+	testieee
-+endif
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2007-08-14 10:28:36.000000000 +0100
+@@ -0,0 +1,26 @@
++AC_PREREQ(2.61)
++AC_INIT(lapack, 3.1.1, lapack@cs.utk.edu)
++AM_INIT_AUTOMAKE([foreign])
 +
-+testlsame_SOURCES = lsame.f lsametst.f
-+testslamch_SOURCES = slamch.f lsame.f slamchtst.f
-+testdlamch_SOURCES = dlamch.f lsame.f dlamchtst.f
-+testsecond_SOURCES = second_INT_CPU_TIME.f secondtst.f
-+testdsecnd_SOURCES = dsecnd_INT_CPU_TIME.f dsecndtst.f
-+testieee_SOURCES = tstiee.f
++AC_LANG(Fortran 77)
++AC_PROG_F77
++AC_PROG_LIBTOOL
 +
-+EXTRA_DIST = \
-+	lawn81.pdf \
-+	lawn81.ps \
-+	lawn81.tex \
-+	org2.ps \
-+	psfig.tex
-diff -Naur lapack-lite-3.1.1/Makefile.am lapack-lite-3.1.1.new/Makefile.am
---- lapack-lite-3.1.1/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ lapack-lite-3.1.1.new/Makefile.am	2007-03-08 23:57:43.000000000 -0500
-@@ -0,0 +1,3 @@
++AC_F77_FUNC(sgemm)
++
++PKG_PROG_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++   PKG_CHECK_MODULES([BLAS], [blas])
++else
++   AC_CHECK_LIB(blas, $sgemm)
++   BLAS_LIBS=-lblas
++   AC_SUBST(BLAS_LIBS)
++fi
++
++AC_ARG_VAR(NOOPT_FFLAGS, Fortran 77 compiler flags to use for unoptimized files)
++
++AC_CONFIG_FILES([Makefile
++                 SRC/Makefile
++                 INSTALL/Makefile
++  		 lapack.pc])
++AC_OUTPUT
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2007-08-14 11:39:34.000000000 +0100
+@@ -0,0 +1,6 @@
 +SUBDIRS = INSTALL SRC
 +
-+EXTRA_DIST = README
-diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.am
---- lapack-lite-3.1.1/SRC/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ lapack-lite-3.1.1.new/SRC/Makefile.am	2007-03-08 23:58:18.000000000 -0500
-@@ -0,0 +1,306 @@
++pkgconfigdir = $(libdir)
++pkgconfig_DATA = lapack.pc
++
++EXTRA_DIST = README lapack.pc
+--- lapack.pc.in 	1970-01-01 01:00:00.000000000 +0100
++++ lapack.pc.in	2007-08-17 11:39:19.000000000 +0100
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: Linear Algebra PACKage FORTRAN 77 reference implementation
++Version: @PACKAGE_VERSION@
++Requires: blas
++URL: http://www.netlib.org/lapack/
++Libs: -llapack
+--- SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ SRC/Makefile.am	2007-08-02 15:15:59.000000000 +0100
+@@ -0,0 +1,292 @@
 +lib_LTLIBRARIES = \
 +	liblapack.la
 +
@@ -45,7 +62,6 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +ALLAUX_SOURCES = ilaenv.f ieeeck.f lsamen.f xerbla.f iparmq.f \
 +	../INSTALL/ilaver.f ../INSTALL/lsame.f
 +
-+if SINGLE
 +SINGLE_NOOPT_SOURCES = \
 +	slaruv.f ../INSTALL/slamch.f
 +
@@ -65,9 +81,7 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	slasr.f  slasrt.f slassq.f slasv2.f spttrf.f sstebz.f sstedc.f \
 +	ssteqr.f ssterf.f slaisnan.f sisnan.f \
 +	../INSTALL/second_INT_CPU_TIME.f
-+endif
 +
-+if DOUBLE
 +DOUBLE_NOOPT_SOURCES = \
 +	dlaruv.f ../INSTALL/dlamch.f
 +
@@ -87,9 +101,7 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	dlasr.f  dlasrt.f dlassq.f dlasv2.f dpttrf.f dstebz.f dstedc.f \
 +	dsteqr.f dsterf.f dlaisnan.f disnan.f \
 +	../INSTALL/dsecnd_INT_CPU_TIME.f
-+endif
 +
-+if S
 +S_SOURCES = \
 +	sgbbrd.f sgbcon.f sgbequ.f sgbrfs.f sgbsv.f  \
 +	sgbsvx.f sgbtf2.f sgbtrf.f sgbtrs.f sgebak.f sgebal.f sgebd2.f \
@@ -138,9 +150,7 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	stptrs.f \
 +	strcon.f strevc.f strexc.f strrfs.f strsen.f strsna.f strsyl.f \
 +	strti2.f strtri.f strtrs.f stzrqf.f stzrzf.f sstemr.f
-+endif
 +
-+if C
 +C_SOURCES = \
 +	cbdsqr.f cgbbrd.f cgbcon.f cgbequ.f cgbrfs.f cgbsv.f  cgbsvx.f \
 +	cgbtf2.f cgbtrf.f cgbtrs.f cgebak.f cgebal.f cgebd2.f cgebrd.f \
@@ -194,9 +204,7 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	cungrq.f cungtr.f cunm2l.f cunm2r.f cunmbr.f cunmhr.f cunml2.f \
 +	cunmlq.f cunmql.f cunmqr.f cunmr2.f cunmr3.f cunmrq.f cunmrz.f \
 +	cunmtr.f cupgtr.f cupmtr.f icmax1.f scsum1.f cstemr.f
-+endif
 +
-+if D
 +D_SOURCES = \
 +	dgbbrd.f dgbcon.f dgbequ.f dgbrfs.f dgbsv.f  \
 +	dgbsvx.f dgbtf2.f dgbtrf.f dgbtrs.f dgebak.f dgebal.f dgebd2.f \
@@ -247,9 +255,7 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	dtrcon.f dtrevc.f dtrexc.f dtrrfs.f dtrsen.f dtrsna.f dtrsyl.f \
 +	dtrti2.f dtrtri.f dtrtrs.f dtzrqf.f dtzrzf.f dstemr.f \
 +	dsgesv.f dlag2s.f slag2d.f
-+endif
 +
-+if Z
 +Z_SOURCES = \
 +	zbdsqr.f zgbbrd.f zgbcon.f zgbequ.f zgbrfs.f zgbsv.f  zgbsvx.f \
 +	zgbtf2.f zgbtrf.f zgbtrs.f zgebak.f zgebal.f zgebd2.f zgebrd.f \
@@ -308,7 +314,6 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	zunmtr.f zupgtr.f \
 +	zupmtr.f izmax1.f dzsum1.f zstemr.f \
 +	zcgesv.f zlag2c.f clag2z.f
-+endif
 +
 +liblapack_noopt_la_FFLAGS = \
 +	$(NOOPT_FFLAGS)
@@ -317,9 +322,7 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	$(SINGLE_NOOPT_SOURCES) \
 +	$(DOUBLE_NOOPT_SOURCES)
 +
-+liblapack_la_LIBADD = liblapack-noopt.la
-+
-+liblapack_la_LDFLAGS = -lblas
++liblapack_la_LIBADD = liblapack-noopt.la @BLAS_LIBS@
 +
 +liblapack_la_SOURCES = \
 +	$(ALLAUX_SOURCES) \
@@ -342,76 +345,29 @@ diff -Naur lapack-lite-3.1.1/SRC/Makefile.am lapack-lite-3.1.1.new/SRC/Makefile.
 +	$(LIBTOOL) --tag=F77 --mode=compile $(F77) $(liblapack_noopt_la_FFLAGS) -c -o liblapack_noopt_la-slamch.lo `test -f '../INSTALL/slamch.f' || echo '$(srcdir)/'`../INSTALL/slamch.f
 +liblapack_noopt_la-dlamch.lo: ../INSTALL/dlamch.f
 +	$(LIBTOOL) --tag=F77 --mode=compile $(F77) $(liblapack_noopt_la_FFLAGS) -c -o liblapack_noopt_la-dlamch.lo `test -f '../INSTALL/dlamch.f' || echo '$(srcdir)/'`../INSTALL/dlamch.f
-diff -Naur lapack-lite-3.1.1/configure.ac lapack-lite-3.1.1.new/configure.ac
---- lapack-lite-3.1.1/configure.ac	1969-12-31 19:00:00.000000000 -0500
-+++ lapack-lite-3.1.1.new/configure.ac	2007-03-08 23:57:43.000000000 -0500
-@@ -0,0 +1,69 @@
-+#                                               -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ(2.59)
-+AC_INIT(lapack, 3.0+, lapack@cs.utk.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+
-+# Checks for programs.
-+AC_PROG_INSTALL
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
-+
-+AC_ARG_ENABLE(single-real,        AS_HELP_STRING([--disable-single-real],
-+             [Enable single real precision (default: enabled)]),
-+             [S=$enableval], [S=yes SINGLE=yes])
-+
-+AC_ARG_ENABLE(double-real,        AS_HELP_STRING([--disable-double-real],
-+             [Enable double real precision (default: enabled)]),
-+             [D=$enableval], [D=yes DOUBLE=yes])
-+
-+AC_ARG_ENABLE(single-complex,        AS_HELP_STRING([--disable-single-complex],
-+             [Enable single complex precision (default: enabled)]),
-+             [C=$enableval], [C=yes SINGLE=yes])
-+
-+AC_ARG_ENABLE(double-complex,        AS_HELP_STRING([--disable-double-complex],
-+             [Enable double complex precision (default: enabled)]),
-+             [Z=$enableval], [Z=yes DOUBLE=yes])
-+
-+AC_ARG_ENABLE(tests,        AS_HELP_STRING([--enable-tests],
-+             [Build test programs (default: disabled)]),
-+             [DO_TEST=$enableval], [DO_TEST=no])
-+
-+AC_ARG_VAR(NOOPT_FFLAGS, Fortran 77 compiler flags to use for unoptimized files)
-+
-+if test "x$S" = "xno" \
-+	&& test "x$D" = "xno" \
-+	&& test "x$C" = "xno" \
-+	&& test "x$Z" = "xno"; then
-+	AC_MSG_ERROR([You must enable at least one precision!])
-+fi
+--- INSTALL/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ INSTALL/Makefile.am	2007-08-02 11:43:17.000000000 +0100
+@@ -0,0 +1,23 @@
++check_PROGRAMS = \
++	testlsame \
++	testslamch \
++	testdlamch \
++	testsecond \
++	testdsecnd \
++	testieee
 +
-+if test "x$DO_TEST" = "xyes"; then
-+	TESTING=testing
-+fi
++TESTS = $(check_PROGRAMS)
 +
-+AM_CONDITIONAL([SINGLE], [test "x$SINGLE" = "xyes"])
-+AM_CONDITIONAL([DOUBLE], [test "x$DOUBLE" = "xyes"])
-+AM_CONDITIONAL([S], [test "x$S" = "xyes"])
-+AM_CONDITIONAL([D], [test "x$D" = "xyes"])
-+AM_CONDITIONAL([C], [test "x$C" = "xyes"])
-+AM_CONDITIONAL([Z], [test "x$Z" = "xyes"])
-+AM_CONDITIONAL([DO_TEST], [test "x$DO_TEST" = "xyes"])
-+AC_SUBST(TESTING)
++testlsame_SOURCES = lsame.f lsametst.f
++testslamch_SOURCES = slamch.f lsame.f slamchtst.f
++testdlamch_SOURCES = dlamch.f lsame.f dlamchtst.f
++testsecond_SOURCES = second_INT_CPU_TIME.f secondtst.f
++testdsecnd_SOURCES = dsecnd_INT_CPU_TIME.f dsecndtst.f
++testieee_SOURCES = tstiee.f
 +
-+AC_CONFIG_FILES([
-+                 INSTALL/Makefile
-+                 Makefile
-+                 SRC/Makefile])
-+#                 BLAS/SRC/Makefile
-+#                 TESTING/EIG/Makefile
-+#                 TESTING/LIN/Makefile
-+#                 TESTING/MATGEN/Makefile
-+#                 TESTING/Makefile
-+#                 TIMING/EIG/EIGSRC/Makefile
-+#                 TIMING/EIG/Makefile
-+#                 TIMING/LIN/LINSRC/Makefile
-+#                 TIMING/LIN/Makefile
-+#                 TIMING/Makefile])
-+AC_OUTPUT
++EXTRA_DIST = \
++	lawn81.pdf \
++	lawn81.ps \
++	lawn81.tex \
++	org2.ps \
++	psfig.tex
diff --git a/sci-libs/lapack-atlas/files/lapack.pc.in b/sci-libs/lapack-atlas/files/lapack.pc.in
new file mode 100644
index 000000000000..26b340a4d4af
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/lapack.pc.in
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/@LIBDIR@
+includedir=${prefix}/include
+
+Name: lapack
+Description: Automatically Tuned Linear Algebra Software F77 and C LAPACK implementation
+Version: @PV@
+URL: http://math-atlas.sourceforge.net/
+Requires: blas cblas
+Libs: -L${libdir} -llapack -latlas
+Libs.private: @EXTLIBS@
+Include: -I${includedir}
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild
deleted file mode 100644
index 0219ffb1979b..000000000000
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2007 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.6.0-r1.ebuild,v 1.5 2007/01/23 13:57:22 markusle Exp $
-
-inherit eutils flag-o-matic toolchain-funcs fortran
-
-DESCRIPTION="Full LAPACK implementation using available ATLAS routines"
-LICENSE="BSD"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN="${PN/lapack-/}"
-SRC_URI1="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2"
-SRC_URI2="http://www.netlib.org/lapack/lapack-3.0.tgz"
-SRC_URI="${SRC_URI1} ${SRC_URI2}
-	mirror://gentoo/lapack-20020531-20021004.patch.bz2
-	mirror://gentoo/lapack-gentoo.patch
-	mirror://gentoo/${MY_PN}3.6.0-shared-libs.patch.bz2"
-
-SLOT="0"
-IUSE="ifc doc"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="virtual/libc
-	>=sys-devel/libtool-1.5
-	~sci-libs/blas-atlas-3.6.0
-	sci-libs/lapack-config
-	ifc? ( dev-lang/ifc )"
-
-RDEPEND="virtual/libc
-	virtual/blas
-	ifc? ( dev-lang/ifc )" # Need Intel runtime libraries
-
-PROVIDE="virtual/lapack"
-
-FORTRAN="g77 ifc"
-
-S="${WORKDIR}/ATLAS"
-S_LAPACK="${WORKDIR}/LAPACK"
-
-TOP_PATH="${DESTTREE}/lib/lapack"
-# Path where libraries will be installed:
-RPATH="${TOP_PATH}/atlas"
-
-ifc_info() {
-	if [ -z "${IFCFLAGS}" ]
-	then
-		einfo
-		einfo "You may want to set some ifc optimization flags by running this"
-		einfo "ebuild as, for example:"
-		einfo
-		einfo "IFCFLAGS=\"-O3 -tpp7 -xW\" emerge lapack-atlas"
-		einfo "(Pentium 4 exclusive optimizations)."
-		einfo
-		einfo "ifc defaults to -O2, with code tuned for Pentium 4, but that"
-		einfo "will run on any processor."
-		einfo
-		einfo "Beware that ifc's -O3 is very aggressive, sometimes resulting in"
-		einfo "significantly worse performance."
-		einfo
-	fi
-}
-
-src_unpack() {
-	use ifc && ifc_info
-	unpack ${A}
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/unbuffered.patch
-	epatch "${DISTDIR}"/atlas3.6.0-shared-libs.patch.bz2
-	epatch "${DISTDIR}"/lapack-20020531-20021004.patch.bz2
-	epatch "${DISTDIR}"/lapack-gentoo.patch
-	cp "${FILESDIR}"/war "${S}"
-	chmod a+x "${S}"/war
-}
-
-atlas_fail() {
-	eerror
-	eerror "ATLAS auto-config failed."
-	eerror "Please run 'interactive=1 emerge lapack-atlas' to configure"
-	eerror "manually."
-	eerror
-	die "ATLAS auto-config failed."
-}
-
-src_compile() {
-	cd "${S}"
-	if [ -n "${interactive}" ]; then
-		echo "${interactive}"
-		make config CC="$(tc-getCC) -DUSE_LIBTOOL -DINTERACTIVE" || die
-	else
-		# Use ATLAS defaults for all questions:
-		(echo | make config CC="$(tc-getCC) -DUSE_LIBTOOL") || atlas_fail
-	fi
-
-	TMPSTR=$(ls Make.Linux*)
-	ATLAS_ARCH=${TMPSTR#'Make.'}
-
-	CC="libtool --mode=compile --tag=CC $(tc-getCC) -I/usr/include/atlas"
-
-	cd "${S}"/src/lapack/${ATLAS_ARCH}
-	make lib CC="${CC}" || die
-
-	cd "${S}"/interfaces/lapack/C/src/${ATLAS_ARCH}
-	make lib CC="${CC}" || die
-
-	cd "${S}"/interfaces/lapack/F77/src/${ATLAS_ARCH}
-
-	make lib CC="${CC}" F77="libtool --mode=compile --tag=F77 g77" || die
-
-	cd "${S_LAPACK}"
-	if use ifc; then
-		FC="ifc"
-		FFLAGS="${IFCFLAGS}"
-		NOOPT="-O0" # Do NOT change this. It is applied to two files with
-					# routines to determine machine constants.
-	else
-		FC="g77"
-		# g77 hates opts, esp. machine-specific
-		ALLOWED_FLAGS="-O -O1 -O2 -fstack-protector -fno-unit-at-a-time \
-						-pipe -g -Wall"
-		strip-flags
-		FFLAGS="${CFLAGS}"
-		NOOPT=""
-	fi
-	make lapacklib FORTRAN="libtool --mode=compile --tag=F77 ${FC}" OPTS="${FFLAGS}" \
-		NOOPT="${NOOPT}" || die
-
-	cd "${S_LAPACK}"/SRC
-	cp -sf "${S}"/gentoo/liblapack.a/*.o .
-	cp -sf "${S}"/gentoo/liblapack.a/*.lo .
-	cp -sf "${S}"/gentoo/liblapack.a/.libs/*.o .libs/
-
-	if use ifc; then
-		ifc ${FFLAGS} -shared .libs/*.o -Wl,-soname -Wl,liblapack.so.0 \
-			-o liblapack.so.0.0.0 -lblas -lcblas -latlas \
-			-L$(gcc-config -L) -lg2c || die
-		ar cru liblapack.a *.o || die
-		ranlib liblapack.a || die
-	else
-		libtool --mode=link --tag=CC $(tc-getCC) -o liblapack.la *.lo \
-			-rpath "${RPATH}" -lblas -lcblas -latlas -lg2c || die
-	fi
-}
-
-src_install () {
-	dodir "${RPATH}"
-
-	cd "${S_LAPACK}"/SRC
-	if use ifc; then
-		strip --strip-unneeded liblapack.so.0.0.0 || die
-		strip --strip-debug liblapack.a || die
-
-		exeinto "${RPATH}"
-		doexe liblapack.so.0.0.0 || die
-		dosym liblapack.so.0.0.0 ${RPATH}/liblapack.so.0 || die
-		dosym liblapack.so.0.0.0 ${RPATH}/liblapack.so || die
-
-		insinto "${RPATH}"
-		doins liblapack.a || die
-	else
-		libtool --mode=install install -s liblapack.la "${D}/${RPATH}" || die
-	fi
-
-	insinto "${TOP_PATH}"
-	doins "${FILESDIR}"/f77-ATLAS || die
-
-	insinto /usr/include/atlas
-	cd "${S}"/include
-	doins clapack.h || die
-
-	cd "${S}"
-	dodoc README || die
-	cd "${S}"/doc
-	dodoc AtlasCredits.txt ChangeLog || die
-	if use doc; then
-		dodoc lapackqref.ps || die
-	fi
-}
-
-pkg_postinst() {
-	/usr/bin/lapack-config ATLAS
-
-	einfo
-	einfo "To link with ATLAS LAPACK from C or Fortran, simply use:"
-	einfo
-	einfo "-llapack"
-	einfo
-	einfo "C users: your header is /usr/include/atlas/clapack.h"
-	einfo
-}
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild
deleted file mode 100644
index 6f2989cc1f9b..000000000000
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2007 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.6.0-r2.ebuild,v 1.5 2007/01/23 13:57:22 markusle Exp $
-
-inherit eutils flag-o-matic toolchain-funcs fortran
-
-DESCRIPTION="Full LAPACK implementation using available ATLAS routines"
-LICENSE="BSD"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-MY_PN="${PN/lapack-/}"
-SRC_URI1="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2"
-SRC_URI2="http://www.netlib.org/lapack/lapack-3.0.tgz"
-SRC_URI="${SRC_URI1} ${SRC_URI2}
-	mirror://gentoo/lapack-20020531-20021004.patch.bz2
-	mirror://gentoo/lapack-gentoo.patch
-	mirror://gentoo/${MY_PN}3.6.0-shared-libs.patch.bz2"
-
-SLOT="0"
-IUSE="ifc doc"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/libc
-	app-admin/eselect-lapack
-	virtual/blas
-	ifc? ( dev-lang/ifc )" # Need Intel runtime libraries
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.5
-	~sci-libs/blas-atlas-3.6.0"
-
-PROVIDE="virtual/lapack"
-
-FORTRAN="g77 ifc"
-
-S="${WORKDIR}/ATLAS"
-S_LAPACK="${WORKDIR}/LAPACK"
-
-TOP_PATH="${DESTTREE}/lib/lapack"
-# Path where libraries will be installed:
-RPATH="${TOP_PATH}/atlas"
-
-ifc_info() {
-	if [ -z "${IFCFLAGS}" ]
-	then
-		elog
-		elog "You may want to set some ifc optimization flags by running this"
-		elog "ebuild as, for example:"
-		elog
-		elog "IFCFLAGS=\"-O3 -tpp7 -xW\" emerge lapack-atlas"
-		elog "(Pentium 4 exclusive optimizations)."
-		elog
-		elog "ifc defaults to -O2, with code tuned for Pentium 4, but that"
-		elog "will run on any processor."
-		elog
-		elog "Beware that ifc's -O3 is very aggressive, sometimes resulting in"
-		elog "significantly worse performance."
-		elog
-	fi
-}
-
-src_unpack() {
-	use ifc && ifc_info
-	unpack ${A}
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/unbuffered.patch
-	epatch "${DISTDIR}"/atlas3.6.0-shared-libs.patch.bz2
-	epatch "${DISTDIR}"/lapack-20020531-20021004.patch.bz2
-	epatch "${DISTDIR}"/lapack-gentoo.patch
-	cp "${FILESDIR}"/war "${S}"
-	chmod a+x "${S}"/war
-}
-
-atlas_fail() {
-	eerror
-	eerror "ATLAS auto-config failed."
-	eerror "Please run 'interactive=1 emerge lapack-atlas' to configure"
-	eerror "manually."
-	eerror
-	die "ATLAS auto-config failed."
-}
-
-src_compile() {
-	cd "${S}"
-	if [ -n "${interactive}" ]; then
-		echo "${interactive}"
-		make config CC="$(tc-getCC) -DUSE_LIBTOOL -DINTERACTIVE" || die
-	else
-		# Use ATLAS defaults for all questions:
-		(echo | make config CC="$(tc-getCC) -DUSE_LIBTOOL") || atlas_fail
-	fi
-
-	TMPSTR=$(ls Make.Linux*)
-	ATLAS_ARCH=${TMPSTR#'Make.'}
-
-	CC="libtool --mode=compile --tag=CC $(tc-getCC) -I/usr/include/atlas"
-
-	cd "${S}"/src/lapack/${ATLAS_ARCH}
-	make lib CC="${CC}" || die
-
-	cd "${S}"/interfaces/lapack/C/src/${ATLAS_ARCH}
-	make lib CC="${CC}" || die
-
-	cd "${S}"/interfaces/lapack/F77/src/${ATLAS_ARCH}
-
-	make lib CC="${CC}" F77="libtool --mode=compile --tag=F77 g77" || die
-
-	cd "${S_LAPACK}"
-	if use ifc; then
-		FC="ifc"
-		FFLAGS="${IFCFLAGS}"
-		NOOPT="-O0" # Do NOT change this. It is applied to two files with
-					# routines to determine machine constants.
-	else
-		FC="g77"
-		# g77 hates opts, esp. machine-specific
-		ALLOWED_FLAGS="-O -O1 -O2 -fstack-protector -fno-unit-at-a-time \
-						-pipe -g -Wall"
-		strip-flags
-		FFLAGS="${CFLAGS}"
-		NOOPT=""
-	fi
-	make lapacklib FORTRAN="libtool --mode=compile --tag=F77 ${FC}" OPTS="${FFLAGS}" \
-		NOOPT="${NOOPT}" || die
-
-	cd "${S_LAPACK}"/SRC
-	cp -sf "${S}"/gentoo/liblapack.a/*.o .
-	cp -sf "${S}"/gentoo/liblapack.a/*.lo .
-	cp -sf "${S}"/gentoo/liblapack.a/.libs/*.o .libs/
-
-	if use ifc; then
-		ifc ${FFLAGS} -shared .libs/*.o -Wl,-soname -Wl,liblapack.so.0 \
-			-o liblapack.so.0.0.0 -lblas -lcblas -latlas \
-			-L$(gcc-config -L) -lg2c || die
-		ar cru liblapack.a *.o || die
-		ranlib liblapack.a || die
-	else
-		libtool --mode=link --tag=CC $(tc-getCC) -o liblapack.la *.lo \
-			-rpath "${RPATH}" -lblas -lcblas -latlas -lg2c || die
-	fi
-}
-
-src_install () {
-	dodir "${RPATH}"
-
-	cd "${S_LAPACK}"/SRC
-	if use ifc; then
-		strip --strip-unneeded liblapack.so.0.0.0 || die
-		strip --strip-debug liblapack.a || die
-
-		exeinto "${RPATH}"
-		doexe liblapack.so.0.0.0 || die
-		dosym liblapack.so.0.0.0 ${RPATH}/liblapack.so.0 || die
-		dosym liblapack.so.0.0.0 ${RPATH}/liblapack.so || die
-
-		insinto "${RPATH}"
-		doins liblapack.a || die
-	else
-		libtool --mode=install install -s liblapack.la "${D}/${RPATH}" || die
-	fi
-
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack atlas
-
-	insinto /usr/include/atlas
-	cd "${S}"/include
-	doins clapack.h || die
-
-	cd "${S}"
-	dodoc README || die
-	cd "${S}"/doc
-	dodoc AtlasCredits.txt ChangeLog || die
-	if use doc; then
-		dodoc lapackqref.ps || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect lapack show)" ]]; then
-		eselect lapack set atlas
-	fi
-
-	elog
-	elog "To link with ATLAS LAPACK from C or Fortran, simply use:"
-	elog
-	elog "-llapack"
-	elog
-	elog "C users: your header is /usr/include/atlas/clapack.h"
-	elog
-	elog "Configuration now uses eselect rather than lapack-config."
-}
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
index 40c8e5edd8a9..c5e0e5e3ef8e 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6.0.ebuild,v 1.12 2007/03/13 00:27:07 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild,v 1.13 2007/10/10 10:04:59 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -72,13 +72,13 @@ src_unpack() {
 	use ifc && ifc_info
 	unpack ${A}
 
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/unbuffered.patch
-	epatch ${DISTDIR}/atlas3.6.0-shared-libs.patch.bz2
-	epatch ${DISTDIR}/lapack-20020531-20021004.patch.bz2
-	epatch ${DISTDIR}/lapack-gentoo.patch
-	cp ${FILESDIR}/war ${S}
-	chmod a+x ${S}/war
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/unbuffered.patch
+	epatch "${DISTDIR}"/atlas3.6.0-shared-libs.patch.bz2
+	epatch "${DISTDIR}"/lapack-20020531-20021004.patch.bz2
+	epatch "${DISTDIR}"/lapack-gentoo.patch
+	cp "${FILESDIR}"/war "${S}"
+	chmod a+x "${S}"/war
 }
 
 atlas_fail() {
@@ -91,7 +91,7 @@ atlas_fail() {
 }
 
 src_compile() {
-	cd ${S}
+	cd "${S}"
 	if [ -n "${interactive}" ]
 	then
 		echo "${interactive}"
@@ -106,13 +106,13 @@ src_compile() {
 
 	CC="libtool --mode=compile --tag=CC $(tc-getCC) -I/usr/include/atlas"
 
-	cd ${S}/src/lapack/${ATLAS_ARCH}
+	cd "${S}"/src/lapack/${ATLAS_ARCH}
 	make lib CC="${CC}" || die
 
-	cd ${S}/interfaces/lapack/C/src/${ATLAS_ARCH}
+	cd "${S}"/interfaces/lapack/C/src/${ATLAS_ARCH}
 	make lib CC="${CC}" || die
 
-	cd ${S}/interfaces/lapack/F77/src/${ATLAS_ARCH}
+	cd "${S}"/interfaces/lapack/F77/src/${ATLAS_ARCH}
 
 	make lib CC="${CC}" F77="libtool --mode=compile --tag=F77 g77" || die
 
@@ -136,9 +136,9 @@ src_compile() {
 		NOOPT="${NOOPT}" || die
 
 	cd ${S_LAPACK}/SRC
-	cp -sf ${S}/gentoo/liblapack.a/*.o .
-	cp -sf ${S}/gentoo/liblapack.a/*.lo .
-	cp -sf ${S}/gentoo/liblapack.a/.libs/*.o .libs/
+	cp -sf "${S}"/gentoo/liblapack.a/*.o .
+	cp -sf "${S}"/gentoo/liblapack.a/*.lo .
+	cp -sf "${S}"/gentoo/liblapack.a/.libs/*.o .libs/
 
 	if use ifc
 	then
@@ -170,19 +170,19 @@ src_install () {
 		insinto ${RPATH}
 		doins liblapack.a
 	else
-		libtool --mode=install install -s liblapack.la ${D}/${RPATH}
+		libtool --mode=install install -s liblapack.la "${D}"/${RPATH}
 	fi
 
 	insinto ${TOP_PATH}
-	doins ${FILESDIR}/f77-ATLAS
+	doins "${FILESDIR}"/f77-ATLAS
 
 	insinto /usr/include/atlas
-	cd ${S}/include
+	cd "${S}"/include
 	doins clapack.h || die "failed to install clapack.h"
 
-	cd ${S}
+	cd "${S}"
 	dodoc README
-	cd ${S}/doc
+	cd "${S}"/doc
 	dodoc AtlasCredits.txt ChangeLog
 	if use doc;
 	then
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild
index dffee25e4b23..2548dd6f490c 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7.11-r1.ebuild,v 1.7 2007/01/23 13:57:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild,v 1.8 2007/10/10 10:04:59 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -74,15 +74,15 @@ src_unpack() {
 	einfo "Making ${PN} respect compiler settings"
 	sed -i \
 		-e "s:\(\t./xconfig\):\1 -m $(tc-getCC) -c $(tc-getCC) -f ${FORTRANC}:g" \
-		${S}/Makefile \
+		"${S}"/Makefile \
 		|| die "Failed to fix compilers"
 
 	if [[ $(gcc-major-version) -ge 4 ]]; then
 		einfo "Updating Makefiles for gcc-4"
 		sed -i \
 			-e "s:g2c:gfortran:g" \
-			${S}/Make.top \
-			${S}/makes/Make.lib \
+			"${S}"/Make.top \
+			"${S}"/makes/Make.lib \
 			|| die "Failed to update for gcc-4"
 	fi
 
@@ -92,7 +92,7 @@ src_unpack() {
 	else
 		libs="-lpthread -lg2c"
 	fi
-	sed -e "s/SHRD_LNK/${libs}/g" -i ${S}/Make.top || \
+	sed -e "s/SHRD_LNK/${libs}/g" -i "${S}"/Make.top || \
 	die "Failed to add addtional libs to shared object build"
 }
 
@@ -198,7 +198,7 @@ src_install () {
 		libtool --mode=install install -s liblapack.la "${D}/${RPATH}" || die
 	fi
 
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack atlas
+	eselect lapack add $(get_libdir) "${FILESDIR}"/eselect.lapack atlas
 
 	insinto /usr/include/atlas
 	cd "${S}"/include
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild
index 59a374e67f88..16ecf29d62a3 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7.11.ebuild,v 1.13 2007/01/23 13:57:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild,v 1.14 2007/10/10 10:04:59 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -75,15 +75,15 @@ src_unpack() {
 	einfo "Making ${PN} respect compiler settings"
 	sed -i \
 		-e "s:\(\t./xconfig\):\1 -m $(tc-getCC) -c $(tc-getCC) -f ${FORTRANC}:g" \
-		${S}/Makefile \
+		"${S}"/Makefile \
 		|| die "Failed to fix compilers"
 
 	if [[ $(gcc-major-version) -ge 4 ]]; then
 		einfo "Updating Makefiles for gcc-4"
 		sed -i \
 			-e "s:g2c:gfortran:g" \
-			${S}/Make.top \
-			${S}/makes/Make.lib \
+			"${S}"/Make.top \
+			"${S}"/makes/Make.lib \
 			|| die "Failed to update for gcc-4"
 	fi
 
@@ -93,7 +93,7 @@ src_unpack() {
 	else
 		libs="-lpthread -lg2c"
 	fi
-	sed -e "s/SHRD_LNK/${libs}/g" -i ${S}/Make.top || \
+	sed -e "s/SHRD_LNK/${libs}/g" -i "${S}"/Make.top || \
 	die "Failed to add addtional libs to shared object build"
 }
 
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.31.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.31.ebuild
deleted file mode 100644
index f97230f8be6c..000000000000
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.31.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2007 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.7.31.ebuild,v 1.2 2007/07/13 06:57:50 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs fortran
-
-MY_PN="${PN/lapack-/}"
-L_PN="lapack"
-L_PV="3.1.1"
-
-DESCRIPTION="Full LAPACK implementation 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}-3.7.23-shared-libs.patch.bz2"
-
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/blas
-	app-admin/eselect-lapack"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.5
-	~sci-libs/blas-atlas-3.7.31"
-
-PROVIDE="virtual/lapack"
-
-FORTRAN="g77 gfortran"
-
-S="${WORKDIR}/ATLAS"
-S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}"
-BLD_DIR="${S}/gentoo-build"
-RPATH="${DESTTREE}/$(get_libdir)/${L_PN}/${MY_PN}"
-
-pkg_setup() {
-	fortran_pkg_setup
-	echo
-	ewarn "Please make sure to disable CPU throttling completely"
-	ewarn "during the compile of lapack-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
-	epause 8
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	epatch "${DISTDIR}"/${MY_PN}-3.7.23-shared-libs.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-autotool.patch
-
-	cd "${S}"
-	mkdir ${BLD_DIR}  || die "failed to generate build directory"
-	cp "${FILESDIR}"/war "${BLD_DIR}" && chmod a+x "${BLD_DIR}"/war \
-		|| die "failed to install war"
-
-	# make sure the compile picks up the proper includes
-	sed -e "s|INCLUDES =|INCLUDES = -I/usr/include/atlas/|"  \
-		-e "s:= gcc:= $(tc-getCC) ${CFLAGS}:"  \
-		-i CONFIG/src/SpewMakeInc.c || \
-		die "failed to append proper includes"
-
-	# force proper 32/64bit libs
-	local archselect
-	if [[ "${ARCH}" == "amd64" || "${ARCH}" == "ppc64" ]]; then
-		archselect="-b 64"
-	elif [ "${ARCH}" == "alpha" ]; then
-		archselect=""
-	else
-		archselect="-b 32"
-	fi
-
-	# set up compiler/flags using atlas' native configure
-	local compdefs
-	compdefs="${compdefs} -C xc '$(tc-getCC)' -F xc '${CFLAGS}'"
-	compdefs="${compdefs} -C ic '$(tc-getCC)' -F ic '${CFLAGS}'"
-	compdefs="${compdefs} -C sk '$(tc-getCC)' -F sk '${CFLAGS}'"
-	compdefs="${compdefs} -C dk '$(tc-getCC)' -F dk '${CFLAGS}'"
-	compdefs="${compdefs} -C sm '$(tc-getCC)' -F sm '${CFLAGS}'"
-	compdefs="${compdefs} -C dm '$(tc-getCC)' -F dm '${CFLAGS}'"
-	compdefs="${compdefs} -C if '${FORTRANC}' -F if '${FFLAGS}'"
-	compdefs="${compdefs} -Ss pmake '\$(MAKE) ${MAKEOPTS}'"
-	compdefs="${compdefs} -Si cputhrchk 0 ${archselect}"
-
-	cd ${BLD_DIR} && ../configure ${compdefs} \
-		|| die "configure failed"
-
-	cd "${S_LAPACK}"
-	eautoreconf
-
-	# set up the testing routines
-	cp make.inc.example make.inc || die "Failed to copy make.inc"
-	sed -e "s:g77:${FORTRANC}:" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS}:" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS}:" \
-		-e "s:../../blas\$(PLAT).a:-lblas -lcblas:" \
-		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
-		-i make.inc || die "Failed to set up make.inc"
-}
-
-src_compile() {
-	# build atlas' part of lapack
-	cd "${BLD_DIR}"/src/lapack
-	make lib || die "Failed to make lib in ${BLD_DIR}/src/lapack"
-
-	cd "${BLD_DIR}"/interfaces/lapack/C/src
-	make lib || die "Failed to make lib in ${BLD_DIR}/interfaces/lapack/C/src"
-
-	cd "${BLD_DIR}"/interfaces/lapack/F77/src
-	make lib || die "Failed to make lib in ${BLD_DIR}/interfaces/lapack/F77/src"
-
-	# build rest of lapack
-	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/
-
-	# make sure shared libs link against proper libraries
-	if [[ ${FORTRANC} == "gfortran" ]]; then
-		libs="${LDFLAGS} -lpthread -lgfortran"
-	else
-		libs="${LDFLAGS} -lpthread -lg2c"
-	fi
-
-	../libtool --mode=link --tag=F77 ${FORTRANC} -lblas -lcblas \
-		-latlas ${libs} -o liblapack.la *.lo -rpath "${RPATH}" \
-		|| die "Failed to create liblapack.la"
-}
-
-src_install () {
-	dodir "${RPATH}"
-
-	cd "${S_LAPACK}"/SRC
-	../libtool --mode=install install -s liblapack.la \
-		"${D}/${RPATH}" \
-		|| die "Failed to install lapack-atlas library"
-
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack atlas
-
-	insinto /usr/include/atlas
-	cd "${S}"/include
-	doins clapack.h || die "Failed to install clapack.h"
-
-	cd "${S}"
-	dodoc README doc/AtlasCredits.txt doc/ChangeLog || \
-		die "Failed to install docs"
-	if use doc; then
-		dodoc doc/lapackqref.pdf || die "Failed to install docs"
-	fi
-}
-
-src_test() {
-	cd "${S_LAPACK}"/TESTING/MATGEN && emake || \
-		die "Failed to create tmglib.a"
-	cd ../ && emake || die "lapack-reference tests failed."
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect lapack show)" ]]; then
-		eselect lapack set atlas
-	fi
-
-	elog
-	elog "To link with ATLAS LAPACK from C or Fortran, simply use:"
-	elog
-	elog "-llapack"
-	elog
-	elog "C users: your header is /usr/include/atlas/clapack.h"
-	elog
-	elog "Configuration now uses eselect rather than lapack-config."
-}
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.32.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.32.ebuild
deleted file mode 100644
index c339d7e487a7..000000000000
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.32.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2007 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.7.32.ebuild,v 1.3 2007/07/13 06:57:50 mr_bones_ Exp $
-
-inherit eutils flag-o-matic toolchain-funcs fortran versionator
-
-MY_PN="${PN/lapack-/}"
-L_PN="lapack"
-L_PV="3.1.1"
-BlasRelease=$(get_version_component_range 1-3)
-
-DESCRIPTION="Full LAPACK implementation 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}-3.7.23-shared-libs.patch.bz2"
-
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/blas
-	app-admin/eselect-lapack"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.5
-	~sci-libs/blas-atlas-${BlasRelease}"
-
-PROVIDE="virtual/lapack"
-
-FORTRAN="g77 gfortran"
-
-S="${WORKDIR}/ATLAS"
-S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}"
-BLD_DIR="${S}/gentoo-build"
-RPATH="${DESTTREE}/$(get_libdir)/${L_PN}/${MY_PN}"
-
-pkg_setup() {
-	fortran_pkg_setup
-	echo
-	ewarn "Please make sure to disable CPU throttling completely"
-	ewarn "during the compile of lapack-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
-	epause 8
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	epatch "${DISTDIR}"/${MY_PN}-3.7.23-shared-libs.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-autotool.patch
-
-	cd "${S}"
-	mkdir ${BLD_DIR}  || die "failed to generate build directory"
-	cp "${FILESDIR}"/war "${BLD_DIR}" && chmod a+x "${BLD_DIR}"/war \
-		|| die "failed to install war"
-
-	# make sure the compile picks up the proper includes
-	sed -e "s|INCLUDES =|INCLUDES = -I/usr/include/atlas/|"  \
-		-e "s:= gcc:= $(tc-getCC) ${CFLAGS}:"  \
-		-i CONFIG/src/SpewMakeInc.c || \
-		die "failed to append proper includes"
-
-	# force proper 32/64bit libs
-	local archselect
-	if [[ "${ARCH}" == "amd64" || "${ARCH}" == "ppc64" ]]; then
-		archselect="-b 64"
-	elif [ "${ARCH}" == "alpha" ]; then
-		archselect=""
-	else
-		archselect="-b 32"
-	fi
-
-	# set up compiler/flags using atlas' native configure
-	local compdefs
-	compdefs="${compdefs} -C xc '$(tc-getCC)' -F xc '${CFLAGS}'"
-	compdefs="${compdefs} -C ic '$(tc-getCC)' -F ic '${CFLAGS}'"
-	compdefs="${compdefs} -C sk '$(tc-getCC)' -F sk '${CFLAGS}'"
-	compdefs="${compdefs} -C dk '$(tc-getCC)' -F dk '${CFLAGS}'"
-	compdefs="${compdefs} -C sm '$(tc-getCC)' -F sm '${CFLAGS}'"
-	compdefs="${compdefs} -C dm '$(tc-getCC)' -F dm '${CFLAGS}'"
-	compdefs="${compdefs} -C if '${FORTRANC}' -F if '${FFLAGS}'"
-	compdefs="${compdefs} -Ss pmake '\$(MAKE) ${MAKEOPTS}'"
-	compdefs="${compdefs} -Si cputhrchk 0 ${archselect}"
-
-	cd ${BLD_DIR} && ../configure ${compdefs} \
-		|| die "configure failed"
-
-	cd "${S_LAPACK}"
-	eautoreconf
-
-	# set up the testing routines
-	cp make.inc.example make.inc || die "Failed to copy make.inc"
-	sed -e "s:g77:${FORTRANC}:" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS}:" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS}:" \
-		-e "s:../../blas\$(PLAT).a:-lblas -lcblas:" \
-		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
-		-i make.inc || die "Failed to set up make.inc"
-}
-
-src_compile() {
-	# build atlas' part of lapack
-	cd "${BLD_DIR}"/src/lapack
-	make lib || die "Failed to make lib in ${BLD_DIR}/src/lapack"
-
-	cd "${BLD_DIR}"/interfaces/lapack/C/src
-	make lib || die "Failed to make lib in ${BLD_DIR}/interfaces/lapack/C/src"
-
-	cd "${BLD_DIR}"/interfaces/lapack/F77/src
-	make lib || die "Failed to make lib in ${BLD_DIR}/interfaces/lapack/F77/src"
-
-	# build rest of lapack
-	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/
-
-	# make sure shared libs link against proper libraries
-	if [[ ${FORTRANC} == "gfortran" ]]; then
-		libs="${LDFLAGS} -lpthread -lgfortran"
-	else
-		libs="${LDFLAGS} -lpthread -lg2c"
-	fi
-
-	../libtool --mode=link --tag=F77 ${FORTRANC} -lblas -lcblas \
-		-latlas ${libs} -o liblapack.la *.lo -rpath "${RPATH}" \
-		|| die "Failed to create liblapack.la"
-}
-
-src_install () {
-	dodir "${RPATH}"
-
-	cd "${S_LAPACK}"/SRC
-	../libtool --mode=install install -s liblapack.la \
-		"${D}/${RPATH}" \
-		|| die "Failed to install lapack-atlas library"
-
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack atlas
-
-	insinto /usr/include/atlas
-	cd "${S}"/include
-	doins clapack.h || die "Failed to install clapack.h"
-
-	cd "${S}"
-	dodoc README doc/AtlasCredits.txt doc/ChangeLog || \
-		die "Failed to install docs"
-	if use doc; then
-		dodoc doc/lapackqref.pdf || die "Failed to install docs"
-	fi
-}
-
-src_test() {
-	cd "${S_LAPACK}"/TESTING/MATGEN && emake || \
-		die "Failed to create tmglib.a"
-	cd ../ && emake || die "lapack-reference tests failed."
-}
-
-pkg_postinst() {
-	if [[ -z "$(eselect lapack show)" ]]; then
-		eselect lapack set atlas
-	fi
-
-	elog
-	elog "To link with ATLAS LAPACK from C or Fortran, simply use:"
-	elog
-	elog "-llapack"
-	elog
-	elog "C users: your header is /usr/include/atlas/clapack.h"
-	elog
-	elog "Configuration now uses eselect rather than lapack-config."
-}
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.34.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.34.ebuild
index c2c4d061b0e7..3ba29ab93383 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.34.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7.34.ebuild,v 1.2 2007/07/27 03:29:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.34.ebuild,v 1.3 2007/10/10 10:04:59 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran versionator
 
@@ -43,8 +43,6 @@ src_unpack() {
 
 	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.patch.bz2
 	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-autotool.patch
-	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-test-fix.patch
 
 	cd "${S}"
 	mkdir ${BLD_DIR}  || die "failed to generate build directory"
@@ -83,6 +81,8 @@ src_unpack() {
 		|| die "configure failed"
 
 	cd "${S_LAPACK}"
+	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-autotool.patch
+	epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-test-fix.patch
 	eautoreconf
 
 	# set up the testing routines
@@ -140,7 +140,7 @@ src_install () {
 		"${D}/${RPATH}" \
 		|| die "Failed to install lapack-atlas library"
 
-	eselect lapack add $(get_libdir) ${FILESDIR}/eselect.lapack atlas
+	eselect lapack add $(get_libdir) "${FILESDIR}"/eselect.lapack atlas
 
 	insinto /usr/include/atlas
 	cd "${S}"/include
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.39.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.39.ebuild
new file mode 100644
index 000000000000..06327c8c2acd
--- /dev/null
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.39.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2007 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.7.39.ebuild,v 1.1 2007/10/10 10:04:59 markusle Exp $
+
+inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator
+
+MY_PN="${PN/lapack-/}"
+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"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="virtual/blas
+	virtual/cblas
+	app-admin/eselect-lapack
+	~sci-libs/blas-atlas-${BlasRelease}
+	>=sys-devel/libtool-1.5"
+
+RDEPEND="${DEPEND}
+	dev-util/pkgconfig"
+# this has to wait until lapack-docs available on all arches
+#	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
+
+	# 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
+
+	../configure \
+		--cc="$(tc-getCC)" \
+		--cflags="${CFLAGS}" \
+		--prefix="${D}/${DESTTREE}" \
+		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
+		--incdir="${D}/${DESTTREE}"/include \
+		-C ac "$(tc-getCC)" -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 "${FILESDIR}"/${L_PN}-reference-${L_PV}-autotool.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:" \
+		-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; 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} \
+		$(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):" \
+		-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"
+
+	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)
+	# uncomment below when eselect bug #189942 is fixed, together with DEPEND
+	#if [[ -z ${current_p} || ${current_p} == ${ESELECT_PROF} ]]; then
+
+	# 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} ]]; then
+		local configfile="${ROOT}"/etc/env.d/lapack/lib/config
+		if [[ -e ${configfile} ]]; then
+			rm -f ${configfile}
+			eselect lapack set ${ESELECT_PROF}
+		fi
+	fi
+
+	if [[ -z ${current_lib} ]]; then
+		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
+}