Version bump. All changes from upstream are in the modified tar ball

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

3 files changed, 25 insertions, 20 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index c1a29d8bda1f..4f032b03ee36 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cfitsio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.50 2011/06/28 10:43:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.51 2011/08/03 21:03:26 bicatali Exp $
+
+*cfitsio-3.280 (03 Aug 2011)
+
+  03 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -cfitsio-3.250-r1.ebuild, +cfitsio-3.280.ebuild:
+  Version bump. All changes from upstream are in the modified tar ball
 
   28 Jun 2011; Fabian Groffen <grobian@gentoo.org> cfitsio-3.270.ebuild:
   Fix linking against zlib (don't force zlib from host system) in Prefix
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index e2a4fc4bc838..ce73ac6e2eb5 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 AUX cfitsio-3.140-autotools.patch 8213 RMD160 b886aa73d3bc7b4f6f0ea824d8e4705be6870e6a SHA1 bc1c9257befbeec7b283a2b6b8d7e3b0cd5e463e SHA256 46eba8ba973eb0873992ea942d196815d375951c9154af65eb217abddd4c617f
 AUX cfitsio-3.140-missing-include.patch 384 RMD160 364b1eb604f925916a3fca9d470bda8930b623dd SHA1 18a022de6f2964ab1bf4796f677fb73a287f059f SHA256 3758a4c2b926889b42c14e6ad01857c4ab7ab5bf07010b8d5c043c284d1740eb
-DIST cfitsio-3.250.tar.gz 2829274 RMD160 b615010ce80b09e8260381ce7206a646cba68430 SHA1 960afb35aa178dada01123e944af80db920aefed SHA256 2fb8b7b3071fe7f0a24456f1d62aa27c3ac75cd34a4e94fedbadd739b0d4fc06
 DIST cfitsio-3.270.tar.gz 3139349 RMD160 b506c699845e5cd4eaabb41745490499f234e70f SHA1 bbfcfc24010089957118712c3fa6cc9c36606c04 SHA256 e870650f8ce74ca5f5deb61810f8ab2fc5dec8559dbf72c72d0e06cc24239557
+DIST cfitsio-3.280.tar.gz 3100872 RMD160 1a55bd66e8e26bf8ba4431731ae45fdc65c3c49f SHA1 5cd970d0abeaf4d97bfe5ca11f8340e5f41ca996 SHA256 de405947e94c06163e31d9b86b8ae3455afefce981bd0f592cc5e0921f51ea9f
 DIST cfitsio3140.tar.gz 2903379 RMD160 df80966f6b0ae7a435828bdfe4ef33ae708aecf5 SHA1 54c10c83e1edc9901229169b3aba337677e468a7 SHA256 d45e253d513d8df331a0294d243460773c57f9045878c8b79efbc7427c873d96
 EBUILD cfitsio-3.140.ebuild 1466 RMD160 9e4105541fce82519486847c10dc2334c799ab86 SHA1 a39fa6ad85bab2f4b50081ed65d1138dbf1da2ac SHA256 ebadb23dca7e5c8c892b84d743137b1778091b0fb4e8f4efef68b93d887e043a
-EBUILD cfitsio-3.250-r1.ebuild 1372 RMD160 679115ccda4d65292e90b6aba88d39a88677983e SHA1 3520b2e9463dea6b2c3f9e05ac2188102bec4290 SHA256 69ecae44de0511bcfa493616a87573df5e135ad7c19b532dc803b1079d2b019c
 EBUILD cfitsio-3.270.ebuild 1512 RMD160 56d123316fd102e5c697406c75cafcad633bb035 SHA1 582aaabf162f9c6d46882875c3d705f5cbdd9b82 SHA256 1b33c869f60a3d1bdcaae3704fe1782e335527291b9ced67dda2a52cab2918fa
-MISC ChangeLog 9889 RMD160 1d88aaaef1170a1fc76bf71d47f865782833daed SHA1 4295aa037288e8781ce303486b285403e8eda86b SHA256 2dc989369f81e2ac1d265e239672ce6cd698c96bb45ec6a2c9c992f1a879a457
+EBUILD cfitsio-3.280.ebuild 1413 RMD160 11bb157efa80b4f70d986ed7802582855b27134b SHA1 0146ca680faf573c3fcf401aff4c35f31c641ea7 SHA256 7b32678111e67fb785aef68f869f56726564bb1378413e764002c1c9eeb4f25f
+MISC ChangeLog 10098 RMD160 8d3254f1eb70f5bd4a53c3e6c47f68d7e2f5ec60 SHA1 aedf5f17782d89275e14d00d3b29af6108c21eaa SHA256 9b6944998e11aaea1ff2f8425991b9b470867e8758c4eaaaf78af9cdd1e2d129
 MISC metadata.xml 677 RMD160 3a527306bc0d3ee04c9aa7a89ae9669300449f25 SHA1 332827a79018490259a4fda69a9b508862612941 SHA256 20ff9f82126be9cb9b5a8c21e1bf2556e8ae91e32442b59f26f938ccc1f42b91
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (SunOS)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4JsGEACgkQX3X2B8XHTok9sACgnnXbfYvgX76X7AIIgcEQ97QO
-NdYAnj6opZB7ICS/U1DU3DSBN8r6zzDQ
-=2pPh
+iEYEARECAAYFAk45uDkACgkQ1ycZbhPLE2DQmwCeMiJuD1ohbDdBs2A6PiHxhoiw
+PogAn0tpFC53TXHUsMRG62iV4RQNwqjf
+=1xKR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cfitsio/cfitsio-3.250-r1.ebuild b/sci-libs/cfitsio/cfitsio-3.280.ebuild
index 9fe7e2a0059a..3f2a1c9008b0 100644
--- a/sci-libs/cfitsio/cfitsio-3.250-r1.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.280.ebuild
@@ -1,21 +1,22 @@
 # 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.250-r1.ebuild,v 1.3 2011/05/03 09:38:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.280.ebuild,v 1.1 2011/08/03 21:03:26 bicatali Exp $
 
-EAPI=3
+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="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~bicatali/${P}.tar.gz"
 
-LICENSE="BSD GPL-2"
+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"
 
-DEPEND="fortran? ( dev-lang/cfortran )"
-RDEPEND=""
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	fortran? ( dev-lang/cfortran )"
 
 src_prepare() {
 	# avoid internal cfortran
@@ -30,6 +31,7 @@ src_configure() {
 	myeconfargs=(
 		$(use_enable threads)
 		$(use_enable fortran)
+		"--with-zlib=${EPREFIX}/usr"
 	)
 	autotools-utils_src_configure
 }
@@ -38,11 +40,8 @@ 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 cfitsio.doc
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins quick.ps cfitsio.ps fpackguide.pdf
-		use fortran && doins fitsio.ps
-	fi
+	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
 }