Version bump and removed old ebuilds.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-4 i686)

4 files changed, 194 insertions, 7 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 085305e115b1..073ef7e1eb1a 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 2004-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.64 2008/06/07 16:44:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.65 2008/07/21 13:44:27 markusle Exp $
+
+*lapack-atlas-3.9.0 (20 Jul 2008)
+
+  20 Jul 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/atlas-3.9.0-disable-ilaenv.patch,
+  +files/atlas-3.9.0-upstream-fixes.patch, -lapack-atlas-3.8.1.ebuild,
+  +lapack-atlas-3.9.0.ebuild:
+  Version bump and removed old ebuilds.
 
 *lapack-atlas-3.8.2 (07 Jun 2008)
 
diff --git a/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch b/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch
new file mode 100644
index 000000000000..a75457153b56
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/atlas-3.9.0-disable-ilaenv.patch
@@ -0,0 +1,147 @@
+diff -Naur ATLAS/makes/Make.Flp ATLAS.new/makes/Make.Flp
+--- ATLAS/makes/Make.Flp	2008-07-20 13:48:42.000000000 -0400
++++ ATLAS.new/makes/Make.Flp	2008-07-20 13:47:53.000000000 -0400
+@@ -5,10 +5,10 @@
+ 
+ ilaobj = icmax1.o ilaver.o iparmq.o izmax1.o lsamen.o
+ 
+-sobj = ATL_f77wrap_ilaenv.o ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o \
++sobj = ATL_f77wrap_sgesv.o ATL_f77wrap_sgetnb.o \
+        ATL_f77wrap_sgetrf.o ATL_f77wrap_sgetri.o ATL_f77wrap_sgetrs.o \
+        ATL_f77wrap_slauum.o ATL_f77wrap_sposv.o ATL_f77wrap_spotrf.o \
+-       ATL_f77wrap_spotrs.o ATL_f77wrap_strtri.o ieeeck.o ilaenv.o sgesv.o \
++       ATL_f77wrap_spotrs.o ATL_f77wrap_strtri.o ieeeck.o sgesv.o \
+        sgetrf.o sgetri.o sgetrs.o slauum.o sposv.o spotrf.o spotri.o spotrs.o \
+        strtri.o
+ 
+@@ -65,9 +65,9 @@
+ dobj = ATL_f77wrap_dgesv.o ATL_f77wrap_dgetnb.o ATL_f77wrap_dgetrf.o \
+        ATL_f77wrap_dgetri.o ATL_f77wrap_dgetrs.o ATL_f77wrap_dlauum.o \
+        ATL_f77wrap_dposv.o ATL_f77wrap_dpotrf.o ATL_f77wrap_dpotrs.o \
+-       ATL_f77wrap_dtrtri.o ATL_f77wrap_ilaenv.o dgesv.o dgetrf.o dgetri.o \
+-       dgetrs.o dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o \
+-       ilaenv.o
++       ATL_f77wrap_dtrtri.o dgesv.o dgetrf.o dgetri.o \
++       dgetrs.o dlauum.o dposv.o dpotrf.o dpotri.o dpotrs.o dtrtri.o ieeeck.o 
++       
+ 
+ dlaobj = dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequ.o dgbsv.o \
+          dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \
+@@ -122,9 +122,9 @@
+ cobj = ATL_f77wrap_cgesv.o ATL_f77wrap_cgetnb.o ATL_f77wrap_cgetrf.o \
+        ATL_f77wrap_cgetri.o ATL_f77wrap_cgetrs.o ATL_f77wrap_clauum.o \
+        ATL_f77wrap_cposv.o ATL_f77wrap_cpotrf.o ATL_f77wrap_cpotrs.o \
+-       ATL_f77wrap_ctrtri.o ATL_f77wrap_ilaenv.o cgesv.o cgetrf.o cgetri.o \
+-       cgetrs.o clauum.o cposv.o cpotrf.o cpotri.o cpotrs.o ctrtri.o ieeeck.o \
+-       ilaenv.o
++       ATL_f77wrap_ctrtri.o cgesv.o cgetrf.o cgetri.o \
++       cgetrs.o clauum.o cposv.o cpotrf.o cpotri.o cpotrs.o ctrtri.o ieeeck.o 
++       
+ 
+ claobj = cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o cgbsvx.o \
+          cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \
+@@ -171,10 +171,10 @@
+          cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \
+          cunmtr.o cupgtr.o cupmtr.o scsum1.o slamch.o
+ 
+-zobj = ATL_f77wrap_ilaenv.o ATL_f77wrap_zgesv.o ATL_f77wrap_zgetnb.o \
++zobj = ATL_f77wrap_zgesv.o ATL_f77wrap_zgetnb.o \
+        ATL_f77wrap_zgetrf.o ATL_f77wrap_zgetri.o ATL_f77wrap_zgetrs.o \
+        ATL_f77wrap_zlauum.o ATL_f77wrap_zposv.o ATL_f77wrap_zpotrf.o \
+-       ATL_f77wrap_zpotrs.o ATL_f77wrap_ztrtri.o ieeeck.o ilaenv.o zgesv.o \
++       ATL_f77wrap_zpotrs.o ATL_f77wrap_ztrtri.o ieeeck.o zgesv.o \
+        zgetrf.o zgetri.o zgetrs.o zlauum.o zposv.o zpotrf.o zpotri.o zpotrs.o \
+        ztrtri.o
+ 
+@@ -228,7 +228,7 @@
+ lib : dlib slib zlib clib
+ clean : dclean sclean zclean cclean iclean
+ iclean :
+-	rm -f $(ilaobj) ilaenv.o ieeeck.o
++	rm -f $(ilaobj) ieeeck.o
+ 
+ sclean :
+ 	rm -f $(sobj) slib.grd slalib.grd $(slaobj)
+@@ -460,12 +460,8 @@
+ 	$(ICC) $(ICCFLAGS) -o $@ -c -DDCPLX $(mySRCdir)/f77wrap/ATL_f77wrap_getnb.c
+ 
+ 
+-ATL_f77wrap_ilaenv.o : $(mySRCdir)/f77wrap/ATL_f77wrap_ilaenv.c
+-	$(ICC) $(ICCFLAGS) -o $@ -c $(mySRCdir)/f77wrap/ATL_f77wrap_ilaenv.c
+ ieeeck.o : $(mySRCdir)/ieeeck.f
+ 	$(F77) -o $@ -c $(F77FLAGS) $(mySRCdir)/ieeeck.f
+-ilaenv.o : $(mySRCdir)/ilaenv.f
+-	$(F77) -o $@ -c $(F77FLAGS) $(mySRCdir)/ilaenv.f
+ 
+ #
+ #  All the rest of these files are compiled directly from netlib LAPACK
+diff -Naur ATLAS/makes/Make.lpsrc ATLAS.new/makes/Make.lpsrc
+--- ATLAS/makes/Make.lpsrc	2008-07-20 13:48:42.000000000 -0400
++++ ATLAS.new/makes/Make.lpsrc	2008-07-20 13:46:37.000000000 -0400
+@@ -1,15 +1,11 @@
+ include Make.inc
+ mySRCdir = $(SRCdir)/src/lapack
+ 
+-iobj = ATL_ilaenv.o
+-
+ include $(INCSdir)/gentoo_libtool.inc
+ 
+ all : lib
+ lib : dlib slib zlib clib
+ clean : sclean dclean cclean zclean iclean
+-iclean :
+-	rm -f $(iobj)
+ 
+ sobj = ATL_sgetrf.o ATL_sgetrfC.o ATL_sgetrfR.o ATL_sgetri.o ATL_sgetriC.o \
+        ATL_sgetriR.o ATL_sgetrs.o ATL_slaswp.o ATL_slauum.o ATL_slauumCL.o \
+@@ -20,8 +16,8 @@
+ incdep = $(INCSdir)/atlas_lapack.h
+ slib : 
+ 	$(PMAKE) slib.grd
+-slib.grd : $(sobj) $(iobj)
+-	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(sobj) $(iobj)
++slib.grd : $(sobj) 
++	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(sobj) 
+ 	$(RANLIB) $(LAPACKlib)
+ 	touch slib.grd
+ 
+@@ -104,8 +100,8 @@
+ incdep = $(INCSdir)/atlas_lapack.h
+ dlib : 
+ 	$(PMAKE) dlib.grd
+-dlib.grd : $(dobj) $(iobj)
+-	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(dobj) $(iobj)
++dlib.grd : $(dobj) 
++	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(dobj)
+ 	$(RANLIB) $(LAPACKlib)
+ 	touch dlib.grd
+ 
+@@ -189,8 +185,8 @@
+ incdep = $(INCSdir)/atlas_lapack.h
+ clib : 
+ 	$(PMAKE) clib.grd
+-clib.grd : $(cobj) $(iobj)
+-	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(cobj) $(iobj)
++clib.grd : $(cobj) 
++	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(cobj) 
+ 	$(RANLIB) $(LAPACKlib)
+ 	touch clib.grd
+ 
+@@ -280,8 +276,8 @@
+ incdep = $(INCSdir)/atlas_lapack.h
+ zlib : 
+ 	$(PMAKE) zlib.grd
+-zlib.grd : $(zobj) $(iobj)
+-	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(zobj) $(iobj)
++zlib.grd : $(zobj) 
++	$(ARCHIVER) $(ARFLAGS) $(LAPACKlib) $(zobj) 
+ 	$(RANLIB) $(LAPACKlib)
+ 	touch zlib.grd
+ 
+@@ -362,6 +358,3 @@
+ zclean :
+ 	rm -f $(zobj)
+ 
+-ATL_ilaenv.o : $(mySRCdir)/ATL_ilaenv.c $(incdep)
+-	$(DKC) $(DKCFLAGS) $(CDEFS) -c -o ATL_ilaenv.o $(mySRCdir)/ATL_ilaenv.c
+-
diff --git a/sci-libs/lapack-atlas/files/atlas-3.9.0-upstream-fixes.patch b/sci-libs/lapack-atlas/files/atlas-3.9.0-upstream-fixes.patch
new file mode 100644
index 000000000000..a0e548f10d73
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/atlas-3.9.0-upstream-fixes.patch
@@ -0,0 +1,21 @@
+diff -Naur ATLAS/src/auxil/ATL_ptflushcache.c ATLAS.new/src/auxil/ATL_ptflushcache.c
+--- ATLAS/src/auxil/ATL_ptflushcache.c	2008-07-17 21:24:53.000000000 -0400
++++ ATLAS.new/src/auxil/ATL_ptflushcache.c	2008-07-18 18:40:37.000000000 -0400
+@@ -88,7 +88,7 @@
+      }
+      fct[i].N = N;
+      fct[i].dp = cache+i*N;
+-     ATL_ptCF(fct+i);
++     ATL_ptCF(fct+i-1);
+      dret = fct[i].dret;
+      for (i=0; i < ATL_NTHREADS-1; i++)
+      {
+@@ -133,7 +133,7 @@
+    {
+       ATL_assert(!pthread_create(tp+i, &attr, ATL_ptCLF, fp));
+    }
+-   ATL_FlushAreaByCL(fp);   /* should be redundant, do to be safe */
++   ATL_FlushAreasByCL(fp);   /* should be redundant, do to be safe */
+    for (i=0; i < ATL_NTHREADS; i++)
+    {
+       ATL_assert(!pthread_join(tp[i], NULL));
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.8.1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.0.ebuild
index 8b6f309081ba..dea9225fe6c3 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.8.1.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 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.8.1.ebuild,v 1.3 2008/04/23 08:37:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.0.ebuild,v 1.1 2008/07/21 13:44:27 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator
 
 MY_PN="${PN/lapack-/}"
-PATCH_V="3.7.39"
+PATCH_V="3.9.0"
 L_PN="lapack"
 L_PV="3.1.1"
 BlasRelease=$(get_version_component_range 1-3)
@@ -45,6 +45,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.patch.bz2
 	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-upstream-fixes.patch
+	epatch "${FILESDIR}"/${MY_PN}-${PATCH_V}-disable-ilaenv.patch
 
 	# make sure the compile picks up the proper includes
 	sed -i \
@@ -67,14 +69,23 @@ src_unpack() {
 		archselect="-b 32"
 	fi
 
+	# 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="$(tc-getCC)" \
+		--cc="${c_compiler}" \
 		--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}" \
+		-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"
@@ -98,7 +109,7 @@ src_unpack() {
 src_compile() {
 	# build atlas' part of lapack
 	cd "${BLD_DIR}"
-	for d in src/lapack interfaces/lapack/C/src interfaces/lapack/F77/src; do
+	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