Version bump. Added examples flag

(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64)

3 files changed, 22 insertions, 62 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index 780c5cd10fa9..9176650756e3 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cfitsio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.53 2012/04/03 16:54:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.54 2012/07/07 22:26:55 bicatali Exp $
+
+*cfitsio-3.300 (07 Jul 2012)
+
+  07 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +cfitsio-3.300.ebuild,
+  -cfitsio-3.270.ebuild, -cfitsio-3.280.ebuild:
+  Version bump. Added examples flag
 
 *cfitsio-3.290 (03 Apr 2012)
 
diff --git a/sci-libs/cfitsio/cfitsio-3.270.ebuild b/sci-libs/cfitsio/cfitsio-3.270.ebuild
deleted file mode 100644
index a5e8ce31edbc..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.270.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.270.ebuild,v 1.4 2011/06/28 10:43:39 grobian Exp $
-
-EAPI=3
-inherit autotools-utils
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="http://dev.gentoo.org/~bicatali/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc fortran static-libs threads"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h .
-	fi
-	autotools-utils_src_prepare
-	# fix stupdity in zlib check macro
-	sed -i -e '/^ZLIB_HOME=\/usr\/local/d' configure || die
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable threads)
-		$(use_enable fortran)
-		"--with-zlib=${EPREFIX}/usr"
-	)
-	autotools-utils_src_configure
-}
-
-src_install () {
-	insinto /usr/share/doc/${PF}/examples
-	doins cookbook.c testprog.c speed.c smem.c
-	use fortran && doins cookbook.f testf77.f && dodoc fitsio.doc
-	dodoc changes.txt README README.repack cfitsio.doc
-	use doc && dodoc quick.pdf cfitsio.pdf fpackguide.pdf
-	use doc && use fortran && doins fitsio.pdf
-	autotools-utils_src_install
-}
diff --git a/sci-libs/cfitsio/cfitsio-3.280.ebuild b/sci-libs/cfitsio/cfitsio-3.300.ebuild
index 3f2a1c9008b0..baafa6b4c0f1 100644
--- a/sci-libs/cfitsio/cfitsio-3.280.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.300.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2011 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/cfitsio/cfitsio-3.280.ebuild,v 1.1 2011/08/03 21:03:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.300.ebuild,v 1.1 2012/07/07 22:26:55 bicatali Exp $
 
 EAPI=4
 inherit autotools-utils
 
 DESCRIPTION="C and Fortran library for manipulating FITS files"
 HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="http://dev.gentoo.org/~bicatali/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc fortran static-libs threads"
+IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
@@ -29,19 +29,22 @@ src_prepare() {
 
 src_configure() {
 	myeconfargs=(
-		$(use_enable threads)
 		$(use_enable fortran)
-		"--with-zlib=${EPREFIX}/usr"
+		$(use_enable threads)
+		$(use_enable tools)
 	)
 	autotools-utils_src_configure
 }
 
 src_install () {
-	insinto /usr/share/doc/${PF}/examples
-	doins cookbook.c testprog.c speed.c smem.c
-	use fortran && doins cookbook.f testf77.f && dodoc fitsio.doc
-	dodoc changes.txt README.repack cfitsio.doc
-	use doc && dodoc quick.pdf cfitsio.pdf fpackguide.pdf
-	use doc && use fortran && doins fitsio.pdf
 	autotools-utils_src_install
+	dodoc changes.txt README* cfitsio.doc Changes.rst
+	use fortran && dodoc fitsio.doc
+	use doc && dodoc quick.pdf cfitsio.pdf fpackguide.pdf
+	use doc && use fortran && dodoc fitsio.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins cookbook.c testprog.c speed.c smem.c
+		use fortran && doins cookbook.f testf77.f
+	fi
 }