Version bump

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 18 insertions, 56 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/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/*
 }