Version bump

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 156 insertions, 34 deletions

diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog
index 3a60c1cfb6c8..dd246ad418e5 100644
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyfits
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.41 2013/09/05 18:46:59 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.42 2014/02/05 23:15:46 bicatali Exp $
+
+*pyfits-3.2 (05 Feb 2014)
+
+  05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pyfits-3.2-unbundle-cfitsio.patch, +pyfits-3.2.ebuild,
+  -pyfits-3.1.1-r1.ebuild:
+  Version bump
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> pyfits-3.1.1-r1.ebuild,
   pyfits-3.1.2.ebuild:
diff --git a/dev-python/pyfits/files/pyfits-3.2-unbundle-cfitsio.patch b/dev-python/pyfits/files/pyfits-3.2-unbundle-cfitsio.patch
new file mode 100644
index 000000000000..28d149824903
--- /dev/null
+++ b/dev-python/pyfits/files/pyfits-3.2-unbundle-cfitsio.patch
@@ -0,0 +1,97 @@
+--- pyfits-3.2.orig/setup.cfg	2014-02-05 14:11:01.244895447 -0800
++++ pyfits-3.2/setup.cfg	2014-02-05 14:28:44.175030178 -0800
+@@ -36,91 +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-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.1.1-r1.ebuild b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
deleted file mode 100644
index 2180fc52c2fd..000000000000
--- a/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.1-r1.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit distutils-r1 eutils
-
-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=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/astropy"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils[${PYTHON_USEDEP}]
-	dev-python/d2to1[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.8-debundle_zlib.patch )
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	nosetests || die
-}
diff --git a/dev-python/pyfits/pyfits-3.2.ebuild b/dev-python/pyfits/pyfits-3.2.ebuild
new file mode 100644
index 000000000000..a2562cf0dafc
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.2.ebuild
@@ -0,0 +1,50 @@
+# 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.ebuild,v 1.1 2014/02/05 23:15:46 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+inherit distutils-r1 eutils
+
+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"
+DEPEND="${RDEPEND}
+	dev-python/d2to1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stsci-distutils[${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}"/${P}-unbundle-cfitsio.patch )
+
+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
+}