header move, #316769

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 9 insertions, 51 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index 194d050bcc25..bca1b5c6236b 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/clapack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.3 2010/03/31 19:46:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.4 2010/04/25 09:40:16 jlec Exp $
+
+*clapack-3.2.1-r2 (25 Apr 2010)
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> -clapack-3.2.1.ebuild,
+  -clapack-3.2.1-r1.ebuild, +clapack-3.2.1-r2.ebuild:
+  header move, #316769
 
   31 Mar 2010; Justin Lecher <jlec@gentoo.org> clapack-3.2.1.ebuild,
   clapack-3.2.1-r1.ebuild:
diff --git a/sci-libs/clapack/clapack-3.2.1-r1.ebuild b/sci-libs/clapack/clapack-3.2.1-r2.ebuild
index c2a0b4e3476d..a1b55e57a7ae 100644
--- a/sci-libs/clapack/clapack-3.2.1-r1.ebuild
+++ b/sci-libs/clapack/clapack-3.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r1.ebuild,v 1.2 2010/03/31 19:46:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r2.ebuild,v 1.1 2010/04/25 09:40:16 jlec Exp $
 
 EAPI="3"
 
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/include
+	insinto /usr/include/${PN}
 	doins INCLUDE/${PN}.h || die
 	dolib.so lib${PN}.so.${PV} || die
 	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.$(get_version_component_range 1-2) || die
diff --git a/sci-libs/clapack/clapack-3.2.1.ebuild b/sci-libs/clapack/clapack-3.2.1.ebuild
deleted file mode 100644
index a1dce61dc6de..000000000000
--- a/sci-libs/clapack/clapack-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1.ebuild,v 1.2 2010/03/31 19:46:29 jlec Exp $
-
-EAPI="3"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="f2c'ed version of LAPACK"
-HOMEPAGE="http://www.netlib.org/clapack/"
-SRC_URI="http://www.netlib.org/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libf2c-20081126[static-libs]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}"/CLAPACK-${PV}
-
-src_prepare() {
-	rm -rf F2CLIBS BLAS
-
-	sed \
-		-e "s:^CC.*$:CC = $(tc-getCC):g" \
-		-e "s:^CFLAGS.*$:CFLAGS = ${CFLAGS}:g" \
-		-e "s:^LOADER.*$:LOADER = $(tc-getCC):g" \
-		-e "s:^LOADOPTS.*$:LOADOPTS = ${LDFLAGS}:g" \
-		-e "s:^F2CLIB.*$:F2CLIB = ${EPREFIX}/usr/$(get_libdir)/libf2c.a:g" \
-		-e "s:LAPACKLIB.*$:LAPACKLIB = libclapack.a:g" \
-		make.inc.example > make.inc
-
-	sed \
-		-e 's:"f2c.h":<f2c.h>:g' \
-		-i SRC/*.c || die
-}
-
-src_compile() {
-	emake -C INSTALL F2CLIB="${EPREFIX}"/usr/$(get_libdir)/libf2c.a || die "compile failed"
-	emake -C SRC || die "compile failed"
-}
-
-src_install() {
-	insinto /usr/include
-	doins INCLUDE/${PN}.h || die
-	dolib.a lib${PN}.a || die
-}