header move, #316769

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 14 insertions, 57 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/Manifest b/sci-libs/clapack/Manifest
index 7497ead73b9a..e2183bbbd343 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -3,14 +3,13 @@ Hash: SHA1
 
 AUX 3.2.1-solib.patch 843 RMD160 f76ed36c38045e6a77d0fd8f5660a02793ee0b5b SHA1 6fda41f47b9f4373a407fa22f5926658c6912544 SHA256 4f2e7a20a9d5c9b9801dd8e313d9bc4d3206ae7da6661a14c2f82d9cbb2e72c4
 DIST clapack-3.2.1.tgz 7221385 RMD160 5882b199595ae0ce6769cd65cb83cfeb7dcac528 SHA1 fdab49c89a1843643fdfa9121f16361e23711540 SHA256 f1c214f97033deff6e91dee72be56cd14d872a097e35a1ef1beeadaf4e1921bc
-EBUILD clapack-3.2.1-r1.ebuild 1538 RMD160 74e872de2632c8b050d0d06168d9942552009825 SHA1 cf2c58578edf4d37a93f18800f83b07748baf75c SHA256 a288c221be7814b3b64cae8df927e126c96452cbaa3eca0b283814dfa0f2ad4a
-EBUILD clapack-3.2.1.ebuild 1226 RMD160 d6afb01eba3b77e51d4592e17fbb4ec36ef93219 SHA1 2cfca719cf417377fd1e77d7c34f9e1c48c47f82 SHA256 375e968a7a6e10ce3f0dd5b1ffcf35af5eb1a92a4b4eb208586c30ad83a713e5
-MISC ChangeLog 731 RMD160 193feb84d02b7c4e73c033829019cdee66de60cd SHA1 826c61a7228cad8b13db234dfa3c283d6f59f9c2 SHA256 e73797d71323718121712d121636a025c6b2bd2f757d219d1b2108b1b187f485
+EBUILD clapack-3.2.1-r2.ebuild 1544 RMD160 3e61910680dbb57e316705330e796fd1ed456073 SHA1 6117683296ea4136f240930e423d29b0be096ab1 SHA256 8e41637befd64a4678e37261de995efe357121b91686a0378c10c1f45a3ac73f
+MISC ChangeLog 912 RMD160 9f20224cab6957f5280107b775aa39b554f5b99d SHA1 278c5477a523ce9c7ea9193adf90cc47f93a0e66 SHA256 0c36b9eac3033014dfc22d6ba5682680f9301e450c5fdf69ae0b8aaf4c325ac0
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEUEARECAAYFAkuzppsACgkQgAnW8HDreRaH4ACdH3ZuIqZnQ+K+h7HO3GDWCDa7
-ZuYAmLSDLJSZqoKOSOU/h4trUitkaks=
-=Zm1q
+iEYEARECAAYFAkvUDgYACgkQgAnW8HDreRZXcgCfXvXOgHBu5+STJDbFrCetYj0m
+VO0AoK3UWyBPqX5LPnT6tOPoN/yEf7sd
+=ph0p
 -----END PGP SIGNATURE-----
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
-}