Added installation of static library (see bug #224225) and fixed QA.

Package-Manager: portage-2.1.5.2

4 files changed, 23 insertions, 16 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index 27a580ad9617..771520cbec0c 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cfitsio
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.13 2008/01/24 15:18:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.14 2008/05/31 13:26:35 markusle Exp $
+
+  31 May 2008; Markus Dittrich <markusle@gentoo.org>
+  cfitsio-2.510-r1.ebuild, cfitsio-3.006.ebuild:
+  Added installation of static library (see bug #224225) and fixed general
+  QA things.
 
   24 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
   files/cfitsio-3.060-autotools.patch, cfitsio-3.060.ebuild:
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index e4835819ba68..f420412bf40d 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -4,8 +4,8 @@ AUX cfitsio-3.060-autotools.patch 8831 RMD160 c928ef54ee03b67d0f6816a8df1a1c92c8
 DIST cfitsio2510.tar.gz 2059679 RMD160 a22d276555dd55cdc871819528dc944d29291360 SHA1 758906d80ad155448014a57f9c92248b2211c624 SHA256 2d7bb11acd549be79255d2de971d3c1256c01d1508876f17fedbdac6dac17278
 DIST cfitsio3006.tar.gz 2121107 RMD160 76244e8fa523992f345ae1a7ab4f41ed6c6adb91 SHA1 ce850ea422c1ae86b19bcce4504dc216a29d1b07 SHA256 c156ee0becee8987a14229e705f0f9f39dd2b73bbc9e73bc5d69f43896cb9a63
 DIST cfitsio3060.tar.gz 2260799 RMD160 2c85f7fe1ddce8f83d5b2bdbf30c681fe0db0d87 SHA1 ec92c0d4402d2a7cf13f514c1be77665c43e0147 SHA256 3475679b6ef7a8494ceffec8255b9b2719251f16880da5d128b58c5de8954b46
-EBUILD cfitsio-2.510-r1.ebuild 1254 RMD160 aa015c02e06790fd433a6861ee0599ee6ebe779c SHA1 c2b5753734db05bc90bff8259da49bd0fde7e590 SHA256 504128d7b2ce6ea6641fae6ea930a697c456ca4ccf1470639a1acd824ab25d8c
-EBUILD cfitsio-3.006.ebuild 1287 RMD160 73a31741a94c9aa64a9ce4f8f1cb8e6af91ef84b SHA1 4659022a19fee241c270b6f53a3a3a127ae179b8 SHA256 b4e237ff98c3d930107370ec556f009ae5fc447a6300b9b63ca30afa417fa8ea
+EBUILD cfitsio-2.510-r1.ebuild 1287 RMD160 72708a9c3e3c5d08d2a1f23351f4053550c8a1de SHA1 9df770665d76e579befcb47c93773cc9eb359195 SHA256 64ace0ce49863a1a0fbe8d7849a011bae1c0e0d6ac5cda37c83950ca092d1e3c
+EBUILD cfitsio-3.006.ebuild 1320 RMD160 f97db7e15949babf9747306444b89cc432dfc753 SHA1 23cd9142830946389471ad0713a0952a862e2bdd SHA256 11197ffc7caccd24e07f6546d8bbbe6d45c565886622864980b2e983d68c6d5b
 EBUILD cfitsio-3.060.ebuild 1873 RMD160 db477363b74cbd6a02d1467429e38cb0335c00e9 SHA1 f4af9065f083756e97ab9ece6ee1e74f5314eeae SHA256 d2c16cda0622e29951b269b78f882b830cbf3115e6d6e39d46ad5771a94c1525
-MISC ChangeLog 3385 RMD160 5a4ba1e7bf10100999b341787d4d321de4846d99 SHA1 98fcd014b489d2ee8ff2f0012ae7ee33008c5728 SHA256 3d86beaa8faa655a9b179926277fd843749b881f6b31bfabd5099f9c60a599be
+MISC ChangeLog 3576 RMD160 726380bd0e72703067f36ba8627f0d29edac2ac8 SHA1 77b2624d72fc185839786101debf2588e6611973 SHA256 9d5f99bc42d504fe4883d065bcf86d02f4bb0c84bc47491b1da552c74f6e6ab4
 MISC metadata.xml 663 RMD160 fa865916cf612ed4d4510e2ac1a5aebd6568bad4 SHA1 4e58f56c8f6ebed1b013bc2c81509a7ebf569a9a SHA256 b3bf5af66a3c0b34c9f62155b3cf0207072cfae8695575dd194061e80873ec7e
diff --git a/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild b/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
index a6ae22b5085c..b827231faaf3 100644
--- a/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
+++ b/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild,v 1.4 2006/06/02 05:42:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild,v 1.5 2008/05/31 13:26:35 markusle Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -20,12 +20,12 @@ S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.patch || die "epatch failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch || die "epatch failed"
 }
 
 src_compile() {
-	econf --host=${CHOST} --prefix=${D}usr --libdir=${D}usr/$(get_libdir) \
+	econf --host=${CHOST} --prefix="${D}"usr --libdir="${D}"usr/$(get_libdir) \
 	    || die "econf failed"
 	make || die "make failed"
 	make shared fitscopy imcopy listhead
@@ -36,6 +36,7 @@ src_install () {
 	dodir /usr/include
 	dobin fitscopy imcopy listhead
 	dolib.so libcfitsio.so.*
+	dolib.a libcfitsio.a
 	dodoc changes.txt README Licence.txt
 
 	if use doc; then
@@ -43,6 +44,6 @@ src_install () {
 	fi
 	insinto /usr/include
 	doins fitsio.h fitsio2.h longnam.h drvrsmem.h
-	cd ${D}/usr/$(get_libdir)
+	cd "${D}"/usr/$(get_libdir)
 	    dosym libcfitsio.so.0 /usr/$(get_libdir)/libcfitsio.so
 }
diff --git a/sci-libs/cfitsio/cfitsio-3.006.ebuild b/sci-libs/cfitsio/cfitsio-3.006.ebuild
index 5e7d8b01b921..524211c345ca 100644
--- a/sci-libs/cfitsio/cfitsio-3.006.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.006.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.006.ebuild,v 1.4 2006/06/02 05:42:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.006.ebuild,v 1.5 2008/05/31 13:26:35 markusle Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -20,12 +20,12 @@ S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.patch || die "epatch failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch || die "epatch failed"
 }
 
 src_compile() {
-	econf --host=${CHOST} --prefix=${D}usr --libdir=${D}usr/$(get_libdir) || die "econf failed"
+	econf --host=${CHOST} --prefix="${D}"usr --libdir="${D}"usr/$(get_libdir) || die "econf failed"
 	make || die "make failed"
 	make shared fitscopy imcopy listhead
 }
@@ -33,6 +33,7 @@ src_compile() {
 src_install () {
 	dodir /usr/include
 	dolib.so libcfitsio.so.*
+	dolib.a libcfitsio.a
 	dobin fitscopy imcopy listhead
 	dodoc changes.txt README
 
@@ -42,7 +43,7 @@ src_install () {
 
 	insinto /usr/include
 	doins fitsio.h fitsio2.h longnam.h drvrsmem.h
-	cd ${D}/usr/$(get_libdir)
+	cd "${D}"/usr/$(get_libdir)
 	    dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so
 	    dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so.0
 }