Version bump

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 177 insertions, 5 deletions

diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog
index 4703236bc0f4..afb63a69ad28 100644
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyfits
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.46 2014/03/03 20:27:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.47 2014/03/10 17:54:49 bicatali Exp $
+
+*pyfits-3.2.1 (10 Mar 2014)
+
+  10 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pyfits-3.2.1-unbundle-cfitsio.patch, +pyfits-3.2.1.ebuild:
+  Version bump
 
   03 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> pyfits-3.2.ebuild:
   renaming of binary for all python implementations
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index c59bdf410d77..bb7b86dc0a07 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX pyfits-3.2-unbundle-cfitsio.patch 2663 SHA256 ea5e95e50efca6a736bacddd631f104725e44ccf3dba98d9f192cb4af40ed302 SHA512 88497e25186b18c7a6389b16988323f93b66906568f404b0e626f17d317eb757567cf7516b083e62faf4cc7375e562bc6791733ef894e236885dc45b607d08e6 WHIRLPOOL 1476f015e607e6d3da75b56ea6e1e5fbd0786bdedec9514cc9d6e0520bd840da1653f8760b35fff1a545886fe1957e1ecd55c4238f0f0a1c604f6bba00f729ba
+AUX pyfits-3.2.1-unbundle-cfitsio.patch 2676 SHA256 eca480bee2d736d79ca98992386d499d2d9ee980b998cbd516d2565c673834d4 SHA512 bea17130b7cb3f593ba8e24a699f4a2d58990ee4aace00117beb68498a56c662f90031a8843cb9b388e3dd757bf1efaf2596ba3a69bcc958e0a344e53d3c0675 WHIRLPOOL dcd0ca12b3df48a365b0d4471ef265bdee85b19a1bd0b69d05992144080ea7717cb74c9424656966337114156011220553488cd1788d08252ad94cff4e2ca09c
 DIST pyfits-2.4.0.tar.gz 284236 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22 SHA512 cdbcf8b4e178cde8723eb9386a52e59c9d66462479491d0b0ae1d436c91cc476748c00e837477acf9a46791cd4a7517ff649434c33c225ba8a396148e4485fa1 WHIRLPOOL 2c22a63bd180ad68bf3001d539c403147eecc01dc5537f9c1b0be582c79dd87297f91f33809dec6c9f5906396d409af5b4495ef0b68fe6cc03d816a51a286e50
+DIST pyfits-3.2.1.tar.gz 1626583 SHA256 31cf6f3c5e53888027e9daa273e61cb3be0886b417567787f181378259f8be79 SHA512 3124fcd059010375529d3e3bb14d793bd23473895ba2aa157a1b4e713f2923e1fc5be3bc8f7ef2276771dfe7473970f3d2ab432578595758d864310d29b37e0e WHIRLPOOL 472155ffa416e772adc8d3808c8021b4f11eecf26f3275ea398ddc924cedf2fd25114409d50a870dad778a7fe1357686fac32a3199977c1635b4df0c40644881
 DIST pyfits-3.2.tar.gz 1606650 SHA256 1e049191f64f396e67603c507b63e7c0fc442eafddddc35a6e10244ad16dae42 SHA512 0942dd327608c22e828d227a1126f360df19456ba26914afa57a1a847a4dfec90954224f48e782dc458cda6d7a045beed0d9c0b750ebcebe4a56dc3b54f86494 WHIRLPOOL e07d476d9ba193cc94d51a5dd59231ea7368c80b7f2462f1154c55f4d426bf2e7ea1f8b174457747a25e0f983ccfae96a0c8c009a181dab4eb3b12d33e21bb46
 EBUILD pyfits-2.4.0.ebuild 1106 SHA256 4ee21cdaefb7b2674bee45dd9b07b1c210a0e557ffd23c157caa6047567792ae SHA512 e022e62be54fc7f29101cd0018bb4cdd96ad8a7fecc694aad3ba3ec6c7a14f0ec7af67bfe1a23474cdb326a23d4224370b1e35b84a1e322582a9b8541d58a5c7 WHIRLPOOL 83e0b33e3d20df842b616e8da14e86cca2fe574c5533e2ca6b2a9173603ba543cbd8eaaf14dadb9fd841587ddd53b1f3fadc3438e9d740354a3b086a35281e6a
+EBUILD pyfits-3.2.1.ebuild 1693 SHA256 1c6f19e4371cb03f1db68f78ea7651acca639dfb0da532b7e9358977ebddc9d0 SHA512 04838f81e7083873f07731d9908c04e13aa99b3f231233b4b3fe4ec8ac756899988eeedb99a03913feb32ca09bc8ee3ce74d1459431f21616ce7c2fca9e9267e WHIRLPOOL 8a88522376b2ae512822fc868d9b6cc744a67981a4c0c33bc182c700f5a1f7a18ca9728ab1eb27934d63507b309fe6fdc7c18ce56b9d946f53d2afbd1971b24f
 EBUILD pyfits-3.2.ebuild 1681 SHA256 7b9255721d8668319dc47fe8040772a12ce440fc6e3dd97752e01448d3067266 SHA512 945bfdd13e70bbe41cbdc303931bd938e28f8e9c7ac78d323fd64cb587bf76680c0a8557f32729ea7971d2932fb9c69286f956b8a08d0e288383d81ff3896a26 WHIRLPOOL df2631470155cb35aca09b729ac75855c47131811a8c4b2cebcb32eb73477f0763ae3e3ce3fdfb1aa4ea982ed4a97906d891567adcc2c0e51d6d9936727c23be
-MISC ChangeLog 6663 SHA256 2e3d746c30ad44108556c36523bba53bcac1375abdfc1601006633d7cfc18119 SHA512 33cdea66133cbddbe3b08b987c1ad2f9b8f505e4fc5f9811ab5fd9fc66c4c9c2c708ccadf5fb40b35fd4d38ca6ffeb971471d335952cf7a603909c3e8392603f WHIRLPOOL 4abffe0757672c3c0264c64a5922884a618cdfd6fbf03f712cdfe97b34465d61b733c2da909ef281a3f44285a1d1cd8d5bdd6077db64cf5e769a3434096eaf0a
+MISC ChangeLog 6831 SHA256 c391a50d3abedc1c041b519e01d112fb105805b7e2c8468d1efae2f5af638aca SHA512 01875b70fb3f4c03c96dd5b2d6ed384a4b1820456b655ffc62b1bebf9b7fc8fedf93bfc786a90b88d18577d36a995ad679cd12a2c762a60187e5d71a631d05e5 WHIRLPOOL e0f9cd22062ed7511c35ac4eab9c862359f251125aa2ef7e973a48e6ec333f3bde00972e0b93b27877915c2abbd86116e0332ad589168528794a6f16d502f778
 MISC metadata.xml 442 SHA256 850ab3e12e4663642d3d25837785bf8cb4bfa1e007d1c0a00a586e43946b4c80 SHA512 40d9f3f2f49cb36e7905c62a5d4201baeefcc0db1098531de6cd9e005392b1ab73fa01d2d0fd390c13a89408c59a62e59a576685171970d906b7a470a5462176 WHIRLPOOL 13a968a5e2f1f67f064fb86cb98170304b75ba81833873a97ffc0330fa205ba8ce416698d9a3e38955521ab4edd86a9698147da9ad550612674b3d822bde5dfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMU5bsACgkQ1ycZbhPLE2BsZQCgiQtC2SSpeZz2gKZzurv8PjRp
-n6AAoKft1XW4Q0i/OdReYjV1QegPUQBn
-=b+cp
+iEYEAREIAAYFAlMd/G0ACgkQ1ycZbhPLE2BqqQCdEIRqTwII5dfdxknHBfpFBPIl
+QpYAni/c7AMhNAnNOmhG1/TSHSOoHG0z
+=JpIT
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch b/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
new file mode 100644
index 000000000000..a5d7e6217486
--- /dev/null
+++ b/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
@@ -0,0 +1,98 @@
+--- setup.cfg.orig	2014-03-10 10:50:38.200531959 -0700
++++ setup.cfg	2014-03-10 10:52:19.288232002 -0700
+@@ -36,92 +36,12 @@
+ 
+ [extension=pyfits.compression]
+ sources = 
+-	cextern/cfitsio/adler32.c
+-	cextern/cfitsio/buffers.c
+-	cextern/cfitsio/cfileio.c
+-	cextern/cfitsio/checksum.c
+-	cextern/cfitsio/crc32.c
+-	cextern/cfitsio/deflate.c
+-	cextern/cfitsio/drvrfile.c
+-	cextern/cfitsio/drvrgsiftp.c
+-	cextern/cfitsio/drvrmem.c
+-	cextern/cfitsio/drvrnet.c
+-	cextern/cfitsio/drvrsmem.c
+-	cextern/cfitsio/editcol.c
+-	cextern/cfitsio/edithdu.c
+-	cextern/cfitsio/eval_f.c
+-	cextern/cfitsio/eval_l.c
+-	cextern/cfitsio/eval_y.c
+-	cextern/cfitsio/fitscore.c
+-	cextern/cfitsio/fits_hcompress.c
+-	cextern/cfitsio/fits_hdecompress.c
+-	cextern/cfitsio/getcolb.c
+-	cextern/cfitsio/getcol.c
+-	cextern/cfitsio/getcold.c
+-	cextern/cfitsio/getcole.c
+-	cextern/cfitsio/getcoli.c
+-	cextern/cfitsio/getcolj.c
+-	cextern/cfitsio/getcolk.c
+-	cextern/cfitsio/getcoll.c
+-	cextern/cfitsio/getcolsb.c
+-	cextern/cfitsio/getcols.c
+-	cextern/cfitsio/getcolui.c
+-	cextern/cfitsio/getcoluj.c
+-	cextern/cfitsio/getcoluk.c
+-	cextern/cfitsio/getkey.c
+-	cextern/cfitsio/group.c
+-	cextern/cfitsio/grparser.c
+-	cextern/cfitsio/histo.c
+-	cextern/cfitsio/imcompress.c
+-	cextern/cfitsio/infback.c
+-	cextern/cfitsio/inffast.c
+-	cextern/cfitsio/inflate.c
+-	cextern/cfitsio/inftrees.c
+-	cextern/cfitsio/iraffits.c
+-	cextern/cfitsio/modkey.c
+-	cextern/cfitsio/pliocomp.c
+-	cextern/cfitsio/putcolb.c
+-	cextern/cfitsio/putcol.c
+-	cextern/cfitsio/putcold.c
+-	cextern/cfitsio/putcole.c
+-	cextern/cfitsio/putcoli.c
+-	cextern/cfitsio/putcolj.c
+-	cextern/cfitsio/putcolk.c
+-	cextern/cfitsio/putcoll.c
+-	cextern/cfitsio/putcolsb.c
+-	cextern/cfitsio/putcols.c
+-	cextern/cfitsio/putcolu.c
+-	cextern/cfitsio/putcolui.c
+-	cextern/cfitsio/putcoluj.c
+-	cextern/cfitsio/putcoluk.c
+-	cextern/cfitsio/putkey.c
+-	cextern/cfitsio/quantize.c
+-	cextern/cfitsio/region.c
+-	cextern/cfitsio/ricecomp.c
+-	cextern/cfitsio/scalnull.c
+-	cextern/cfitsio/swapproc.c
+-	cextern/cfitsio/trees.c
+-	cextern/cfitsio/uncompr.c
+-	cextern/cfitsio/wcssub.c
+-	cextern/cfitsio/wcsutil.c
+-	cextern/cfitsio/zcompress.c
+-	cextern/cfitsio/zuncompress.c
+-	cextern/cfitsio/zutil.c
+ 	src/compressionmodule.c
+ include_dirs = 
+ 	numpy
+-	cextern/cfitsio
+-extra_compile_args = 
+-	-Wno-declaration-after-statement
+-	-Wno-unused-variable
+-	-Wno-parentheses
+-	-Wno-uninitialized
+-	-Wno-format
+-	-Wno-strict-prototypes
+-	-Wno-unused
+-	-Wno-comments
+-	-Wno-switch
+-optional = True
++libraries =
++	cfitsio
++optional = False
+ fail_message = 
+ 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ 	Failed to build PyFITS tile compression support.  PyFITS will still
diff --git a/dev-python/pyfits/pyfits-3.2.1.ebuild b/dev-python/pyfits/pyfits-3.2.1.ebuild
new file mode 100644
index 000000000000..12a1cad27585
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.2.1.ebuild,v 1.1 2014/03/10 17:54:49 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	!<dev-python/astropy-0.3
+	sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
+	doc? (
+			dev-python/matplotlib
+			dev-python/numpydoc
+			dev-python/sphinxcontrib-programoutput
+			dev-python/stsci-sphinxext
+		 )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
+
+python_prepare_all() {
+	sed -i \
+		-e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+		"${S}"/setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	nosetests || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html )
+	distutils-r1_python_install_all
+	dodoc FAQ.txt CHANGES.txt
+	rename_binary() {
+		local binary
+		for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*
+		do
+			mv ${binary}{,-${PN}} || die "failed renaming"
+		done
+	}
+	python_foreach_impl rename_binary
+}