From: Donnie Berkholz Date: Wed, 11 Oct 2006 01:01:39 +0000 (+0000) Subject: (#150763) Fix patch and install cblas.h (Sebastien Fabbro). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2593d00b08832e82bd90bb8650d7ac064d5cf8bd;p=gentoo.git (#150763) Fix patch and install cblas.h (Sebastien Fabbro). Package-Manager: portage-2.1.2_pre2-r5 --- 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 ; + 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 ; files/cblas-reference-20030223-autotool.patch: diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest index 5a0024439ca1..b901b9334f00 100644 --- a/sci-libs/cblas-reference/Manifest +++ b/sci-libs/cblas-reference/Manifest @@ -6,10 +6,10 @@ AUX cblas-gentoo.patch 687 RMD160 14e3ca4538042c63546d541d7298bc0e79bf7cb7 SHA1 MD5 f8daaa79dae0bb8839299cda34628ff1 files/cblas-gentoo.patch 687 RMD160 14e3ca4538042c63546d541d7298bc0e79bf7cb7 files/cblas-gentoo.patch 687 SHA256 86fa7726411a32a231bf17ce3dd3d47410b013c4b63a46e255c77dafd211aa5d files/cblas-gentoo.patch 687 -AUX cblas-reference-20030223-autotool.patch 8374 RMD160 2f5989582f0e5b4322f8e4ffecb71a4b7c134a5e SHA1 12d97a95e03acbe184926122c6e9834cbff26fdf SHA256 291f21c4e5d4bfad1aa68c8ce1268de90af9fe206e4a4386d098ce44006e893c -MD5 b0432fbbc9935f5cadf52c899904339d files/cblas-reference-20030223-autotool.patch 8374 -RMD160 2f5989582f0e5b4322f8e4ffecb71a4b7c134a5e files/cblas-reference-20030223-autotool.patch 8374 -SHA256 291f21c4e5d4bfad1aa68c8ce1268de90af9fe206e4a4386d098ce44006e893c files/cblas-reference-20030223-autotool.patch 8374 +AUX cblas-reference-20030223-autotool.patch 8390 RMD160 f8648d865d84286446583b874cb07a0059dafa1c SHA1 faaf74e981734b7e6ee93b58ef102b37776fd006 SHA256 e221a2772445a60415a71a5fe8e2c157b1c81c6583dfce7e849afe4c6f253837 +MD5 daa2eebbaf591a2ce5f77859995887ea files/cblas-reference-20030223-autotool.patch 8390 +RMD160 f8648d865d84286446583b874cb07a0059dafa1c files/cblas-reference-20030223-autotool.patch 8390 +SHA256 e221a2772445a60415a71a5fe8e2c157b1c81c6583dfce7e849afe4c6f253837 files/cblas-reference-20030223-autotool.patch 8390 AUX eselect-reference 161 RMD160 a9e46d774bcb10e156a887bf04a4bb0698df5234 SHA1 8416ad16252d77869436d0702e2ccadce728745d SHA256 91cf48fe44b0c4f54738b2a138d1bdc091388b67d33802552d7186b011d80aad MD5 bddabfc29eb0e9bfb0a74c07c190a890 files/eselect-reference 161 RMD160 a9e46d774bcb10e156a887bf04a4bb0698df5234 files/eselect-reference 161 @@ -23,14 +23,18 @@ EBUILD cblas-reference-20030223-r2.ebuild 1373 RMD160 cead3f3bfc9d801ff9f62eb2d7 MD5 f47fe96ee22f55513bae9dbadd190dcc cblas-reference-20030223-r2.ebuild 1373 RMD160 cead3f3bfc9d801ff9f62eb2d7ebcd5c0188bf0a cblas-reference-20030223-r2.ebuild 1373 SHA256 edfb8df026a99415c8fe627fd4d1a2dda227e21a6497ab9e98c7b3f2443971e7 cblas-reference-20030223-r2.ebuild 1373 +EBUILD cblas-reference-20030223-r3.ebuild 1376 RMD160 14068c1fe18c0c8a9a7e38fa34ad6cd5dbbe63f2 SHA1 974d7e9e3bd780ad08c00dfd87ef3bc5d54d7b53 SHA256 4718a35f37c7694d483cb101deeef9ba560fa0739baa062c716d100de3d13494 +MD5 edef5f68833d7c1783488bba35a918b8 cblas-reference-20030223-r3.ebuild 1376 +RMD160 14068c1fe18c0c8a9a7e38fa34ad6cd5dbbe63f2 cblas-reference-20030223-r3.ebuild 1376 +SHA256 4718a35f37c7694d483cb101deeef9ba560fa0739baa062c716d100de3d13494 cblas-reference-20030223-r3.ebuild 1376 EBUILD cblas-reference-20030223.ebuild 1779 RMD160 f2368ef71324c4c4595eee9cd1e1cbd6b2a404bb SHA1 66a74f8f73575ac7938cb001c65bd47897daf8cc SHA256 9f8bac3f77ce71c5bd3545fb9f2a20e50dd7f0a54c3fb6a91127c6b05b67ad41 MD5 dd690f46e41715bb9bd05ef914f6fe18 cblas-reference-20030223.ebuild 1779 RMD160 f2368ef71324c4c4595eee9cd1e1cbd6b2a404bb cblas-reference-20030223.ebuild 1779 SHA256 9f8bac3f77ce71c5bd3545fb9f2a20e50dd7f0a54c3fb6a91127c6b05b67ad41 cblas-reference-20030223.ebuild 1779 -MISC ChangeLog 2177 RMD160 3fe16ede7b24a6ecca05cfe116661071b22cbba7 SHA1 0fd2a2f3b1217327219e4897810da4f68ec69f64 SHA256 fe5ff5239e5aa2704f559560cffaaf64525be47eddfff1e0069b20101d2c0960 -MD5 95e6a9b71797a89ddc59b7a38391f37c ChangeLog 2177 -RMD160 3fe16ede7b24a6ecca05cfe116661071b22cbba7 ChangeLog 2177 -SHA256 fe5ff5239e5aa2704f559560cffaaf64525be47eddfff1e0069b20101d2c0960 ChangeLog 2177 +MISC ChangeLog 2427 RMD160 d03c3b49e8507f5c65fd83c2ec8fd8e4abc41bc0 SHA1 a6e680f2d94a78ce7827bace87cfdee89fa9b90e SHA256 7271f98a4fae6476a72038e27f765324dea2cf68f4c568c6ef613b57995daa22 +MD5 095e2ce604a77054dec9ceb0e407d74a ChangeLog 2427 +RMD160 d03c3b49e8507f5c65fd83c2ec8fd8e4abc41bc0 ChangeLog 2427 +SHA256 7271f98a4fae6476a72038e27f765324dea2cf68f4c568c6ef613b57995daa22 ChangeLog 2427 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 @@ -44,3 +48,6 @@ SHA256 f0caa7a78f2290eb3c627ec8fa5ea9c6cb5eb5b0b5db9e982ff1dfcb66f0a204 files/di MD5 961baa7d756d594d303cb43c47e0aee2 files/digest-cblas-reference-20030223-r2 208 RMD160 5e8239ac5c04544a04f8ec6b1a15e2d5f2d630e6 files/digest-cblas-reference-20030223-r2 208 SHA256 f0caa7a78f2290eb3c627ec8fa5ea9c6cb5eb5b0b5db9e982ff1dfcb66f0a204 files/digest-cblas-reference-20030223-r2 208 +MD5 961baa7d756d594d303cb43c47e0aee2 files/digest-cblas-reference-20030223-r3 208 +RMD160 5e8239ac5c04544a04f8ec6b1a15e2d5f2d630e6 files/digest-cblas-reference-20030223-r3 208 +SHA256 f0caa7a78f2290eb3c627ec8fa5ea9c6cb5eb5b0b5db9e982ff1dfcb66f0a204 files/digest-cblas-reference-20030223-r3 208 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