(#150763) Fix patch and install cblas.h (Sebastien Fabbro).

(Portage version: 2.1.2_pre2-r5)

4 files changed, 82 insertions, 15 deletions

diff --git a/sci-libs/cblas-reference/ChangeLog b/sci-libs/cblas-reference/ChangeLog
index 7f5d5b0b523c..759b6037d944 100644
--- a/sci-libs/cblas-reference/ChangeLog
+++ b/sci-libs/cblas-reference/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/cblas-reference
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.11 2006/10/06 22:00:58 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.12 2006/10/11 01:01:39 dberkholz Exp $
+
+*cblas-reference-20030223-r3 (11 Oct 2006)
+
+  11 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  files/cblas-reference-20030223-autotool.patch,
+  +cblas-reference-20030223-r3.ebuild:
+  (#150763) Fix patch and install cblas.h (Sebastien Fabbro).
 
   06 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   files/cblas-reference-20030223-autotool.patch:
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild
new file mode 100644
index 000000000000..0d7fd34ade33
--- /dev/null
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/cblas-reference-20030223-r3.ebuild,v 1.1 2006/10/11 01:01:39 dberkholz Exp $
+
+inherit autotools eutils fortran multilib
+
+MyPN="${PN/-reference/}"
+
+DESCRIPTION="C interface to the BLAS"
+LICENSE="public-domain"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/blas
+	app-admin/eselect-cblas"
+DEPEND="${RDEPEND}"
+
+FORTRAN="gfortran g77 ifc"
+
+S="${WORKDIR}/CBLAS"
+
+src_unpack() {
+	unpack ${A}
+	# Must patch before changing to S. Patches that create new files
+	# will happily apply anywhere.
+	epatch "${FILESDIR}"/${P}-autotool.patch
+	cd "${S}"
+	eautoreconf
+}
+
+src_install() {
+	TOP_PATH="${DESTTREE}/$(get_libdir)/blas"
+	RPATH="${TOP_PATH}/reference"
+
+	make DESTDIR="${D}" install || die "install failed"
+
+	# Fix for switching
+	dodir ${RPATH}
+	mv ${D}/usr/$(get_libdir)/libcblas* ${D}/${RPATH}
+
+	dodoc "${S}"/README || die "failed to install docs"
+
+	eselect cblas add $(get_libdir) ${FILESDIR}/eselect-reference reference
+}
+
+pkg_postinst() {
+	if [[ -z "$(eselect cblas show)" ]]; then
+		eselect cblas set reference
+	fi
+
+	elog "Configuration now uses eselect rather than blas-config."
+}
diff --git a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch b/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
index c1ac96aeecb3..0e441e5ce2d1 100644
--- a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
+++ b/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
@@ -1,6 +1,6 @@
-diff -urN CBLAS.orig/configure.ac CBLAS/configure.ac
---- CBLAS.orig/configure.ac	1969-12-31 16:00:00.000000000 -0800
-+++ CBLAS/configure.ac	2006-05-17 00:06:17.000000000 -0700
+diff -Nur CBLAS.orig/configure.ac CBLAS/configure.ac
+--- CBLAS.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ CBLAS/configure.ac	2006-10-10 17:20:23.000000000 +0100
 @@ -0,0 +1,65 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
@@ -64,12 +64,12 @@ diff -urN CBLAS.orig/configure.ac CBLAS/configure.ac
 +AC_SUBST(TESTING)
 +
 +AC_CONFIG_FILES([Makefile
-+                 src/Makefile
++		 src/Makefile
 +                 testing/Makefile])
 +AC_OUTPUT
-diff -urN CBLAS.orig/Makefile.am CBLAS/Makefile.am
---- CBLAS.orig/Makefile.am	1969-12-31 16:00:00.000000000 -0800
-+++ CBLAS/Makefile.am	2006-05-17 00:01:22.000000000 -0700
+diff -Nur CBLAS.orig/Makefile.am CBLAS/Makefile.am
+--- CBLAS.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ CBLAS/Makefile.am	2006-10-10 17:24:37.000000000 +0100
 @@ -0,0 +1,15 @@
 +SUBDIRS = src $(TESTING)
 +
@@ -86,11 +86,12 @@ diff -urN CBLAS.orig/Makefile.am CBLAS/Makefile.am
 +example2_SOURCES = cblas_example2.c
 +
 +EXTRA_DIST = README
-diff -urN CBLAS.orig/src/Makefile.am CBLAS/src/Makefile.am
---- CBLAS.orig/src/Makefile.am	1969-12-31 16:00:00.000000000 -0800
-+++ CBLAS/src/Makefile.am	2006-05-16 23:05:41.000000000 -0700
-@@ -0,0 +1,240 @@
+diff -Nur CBLAS.orig/src/Makefile.am CBLAS/src/Makefile.am
+--- CBLAS.orig/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ CBLAS/src/Makefile.am	2006-10-10 17:49:31.000000000 +0100
+@@ -0,0 +1,239 @@
 +lib_LTLIBRARIES = libcblas.la
++pkginclude_HEADERS = cblas.h
 +
 +AM_CFLAGS = -DADD_
 +
@@ -328,9 +329,9 @@ diff -urN CBLAS.orig/src/Makefile.am CBLAS/src/Makefile.am
 +	$(ZLEV3_SOURCES)
 +
 +libcblas_la_LIBADD = $(FLIBS)
-diff -urN CBLAS.orig/testing/Makefile.am CBLAS/testing/Makefile.am
---- CBLAS.orig/testing/Makefile.am	1969-12-31 16:00:00.000000000 -0800
-+++ CBLAS/testing/Makefile.am	2006-05-16 23:59:08.000000000 -0700
+diff -Nur CBLAS.orig/testing/Makefile.am CBLAS/testing/Makefile.am
+--- CBLAS.orig/testing/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ CBLAS/testing/Makefile.am	2006-10-10 17:35:55.000000000 +0100
 @@ -0,0 +1,73 @@
 +noinst_PROGRAMS = \
 +	xscblat1 \
diff --git a/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r3 b/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r3
new file mode 100644
index 000000000000..823a069b1666
--- /dev/null
+++ b/sci-libs/cblas-reference/files/digest-cblas-reference-20030223-r3
@@ -0,0 +1,3 @@
+MD5 716329646ac933592a7cbdbeae9d3d06 cblas.tgz 197694
+RMD160 77bd5111659f55540c72f9fcd9277d97bd1ea33b cblas.tgz 197694
+SHA256 9b49d7177fda62b6141bf2ca29e475e86f0b12d8f72e0b944058d02b439dd52a cblas.tgz 197694