Version bump

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 25 insertions, 65 deletions

diff --git a/sci-libs/ccfits/ChangeLog b/sci-libs/ccfits/ChangeLog
index 39efb663221d..c6a60c8607f3 100644
--- a/sci-libs/ccfits/ChangeLog
+++ b/sci-libs/ccfits/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/ccfits
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ChangeLog,v 1.2 2010/11/24 20:11:54 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ChangeLog,v 1.3 2012/01/13 04:46:20 bicatali Exp $
+
+*ccfits-2.4 (13 Jan 2012)
+
+  13 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> -ccfits-2.2.ebuild,
+  -ccfits-2.3.ebuild, +ccfits-2.4.ebuild:
+  Version bump
 
 *ccfits-2.3 (24 Nov 2010)
 
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index 2c0015bdf672..210bda302c85 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX ccfits-2.2-makefile.patch 783 RMD160 12d6b2caf7f61788f8aef02371079b5552517c38 SHA1 b964ed982f3b9480e0ef02b208207e0607677d02 SHA256 3afa7d988be293a493f7368a66824c3d0bb6a26d78f7dfdc0fc130b7830063c3
-DIST CCfits-2.2.tar.gz 1752775 RMD160 0d3a5a999da0dcef36535a7cbba476cd6253bb3b SHA1 87c243e95ccc4897a13523d115aa1bd80f962f3f SHA256 dd145d037ed020aa5d05458d569e127431b45d83a8445ee99a35f18633e3c2fb
-DIST CCfits-2.3.tar.gz 1735742 RMD160 fd060e67bc66200b393728021245e59ae9e87c56 SHA1 09be985ef43294a7516542af57e6c0c5f766c7bf SHA256 e3e9e770e61d0c575c9bc1e23c1e8d3d7d27801a22ea32d24e615e469d6a826b
-EBUILD ccfits-2.2.ebuild 923 RMD160 4ba78eab2b378a5f774d5bd434fdc684b2861f74 SHA1 37352168a667cf93c90b7af70c22f4fe3a6ebd4a SHA256 54ab4fbddcdb7634dfcc1d125c12d3f630af9f5c320555df4019c98b9e1f77eb
-EBUILD ccfits-2.3.ebuild 892 RMD160 2f28a14ee0cf9b95c03a75f2d3c4c24f2e33e8de SHA1 f72afb7f1efcb2e084d64e14bca69d5f8958fe6c SHA256 9399ddd431d6179c0ffd40187f86f807f3998210ae37b51a0ffde12221b682e7
-MISC ChangeLog 486 RMD160 0a832c28efbb3f46220be5ecd43ea58af0af8c79 SHA1 c08ca99a3ba4daa7b2c3f82dec8a1576b10843e6 SHA256 83cb29af757f198f685abafbcc6dfa3242e0e19b5b473b6b653f7bc7278d3ba7
+DIST CCfits-2.4.tar.gz 1792643 RMD160 5dc64feed35498886316e8fd5603cf4d558f3e84 SHA1 3de2a6379bc1024300befae95cfdf33645a7b64a SHA256 ba6c5012b260adf7633f92581279ea582e331343d8c973981aa7de07242bd7f8
+EBUILD ccfits-2.4.ebuild 846 RMD160 368b3bec8b7cfc91871c39ca06d7b6790e2f70d9 SHA1 99773e2293dbd0f94cd627bf9def1b43c4950e06 SHA256 8e7d7b56cd27d2e00ffa6ada693ff9bcf58bddd6f2fbd5d21889cf429a9ca6cd
+MISC ChangeLog 646 RMD160 4744c064225ff6faea4807efe8251ffa21efed5b SHA1 4e3c842688364c1a196566f79ada6e9a73cb54e8 SHA256 6a04ef0298449e896a26a77ed2f3ed34f1ebb08a5d501240a9a079b224894bd5
 MISC metadata.xml 510 RMD160 52d0d9a34c7d24f167732714452ac0c9b66e83f5 SHA1 a1c3de553185011b5e42920f17b4c292bb22d9c8 SHA256 fd8d6c9a0a7d8185fb85f8467e381a7cd7d8db08fdac3c21c70db1c1e66f4213
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkztcZMACgkQ1ycZbhPLE2C6OgCgh49t+GNDZVGLFW59VCJx9nYT
-njQAn2mN0B64t3B1H/peS+bbCsKEP1jF
-=/G7/
+iEYEARECAAYFAk8PtzUACgkQ1ycZbhPLE2DUPwCgkLfTttkzNEQOi3WFi74lTors
+2+sAn1s+Ji5bN/x89iT4Bi4ngIBgkOz/
+=9CYi
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccfits/ccfits-2.2.ebuild b/sci-libs/ccfits/ccfits-2.2.ebuild
deleted file mode 100644
index 8ec7af07377f..000000000000
--- a/sci-libs/ccfits/ccfits-2.2.ebuild
+++ /dev/null
@@ -1,43 +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/ccfits/ccfits-2.2.ebuild,v 1.1 2010/01/20 02:32:36 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MYPN=CCfits
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="C++ interface for cfitsio"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
-SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=sci-libs/cfitsio-3.080"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}"
-
-src_prepare() {
-	# avoid building cookbook by default and no rpath
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	AT_M4DIR=config/m4 eautoreconf
-}
-
-src_test() {
-	emake check || die
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGES
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins *.pdf || die
-		doins -r html || die
-	fi
-}
diff --git a/sci-libs/ccfits/ccfits-2.3.ebuild b/sci-libs/ccfits/ccfits-2.4.ebuild
index c08be2d06084..64e98b3137f1 100644
--- a/sci-libs/ccfits/ccfits-2.3.ebuild
+++ b/sci-libs/ccfits/ccfits-2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ccfits-2.3.ebuild,v 1.1 2010/11/24 20:11:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccfits/ccfits-2.4.ebuild,v 1.1 2012/01/13 04:46:20 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils autotools
 
 MYPN=CCfits
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"
 DEPEND="${RDEPEND}"
@@ -28,12 +28,11 @@ src_prepare() {
 	AT_M4DIR=config/m4 eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGES
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins *.pdf || die
-		doins -r html || die
-	fi
+	default
+	use doc && dodoc *.pdf && dohtml -r html/*
 }