Version bump

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

6 files changed, 16 insertions, 240 deletions

diff --git a/dev-python/astropy/ChangeLog b/dev-python/astropy/ChangeLog
index d35cfd8108be..342ff25661b5 100644
--- a/dev-python/astropy/ChangeLog
+++ b/dev-python/astropy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/astropy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/ChangeLog,v 1.14 2013/11/20 21:38:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/ChangeLog,v 1.15 2013/11/26 18:03:32 bicatali Exp $
+
+*astropy-0.3 (26 Nov 2013)
+
+  26 Nov 2013; Sébastien Fabbro <bicatali@gentoo.org> +astropy-0.3.ebuild,
+  -astropy-0.2.1.ebuild, -astropy-0.2.3.ebuild, -astropy-0.2.4.ebuild,
+  -files/astropy-0.1-debundle_zlib.patch, -files/astropy-0.1-expat.patch:
+  Version bump
 
 *astropy-0.2.5 (20 Nov 2013)
 
diff --git a/dev-python/astropy/astropy-0.2.3.ebuild b/dev-python/astropy/astropy-0.2.3.ebuild
deleted file mode 100644
index 576483bdf535..000000000000
--- a/dev-python/astropy/astropy-0.2.3.ebuild
+++ /dev/null
@@ -1,67 +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/astropy/astropy-0.2.3.ebuild,v 1.2 2013/07/12 22:17:51 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-libs/expat
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/sofa_c
-	sci-astronomy/wcslib
-	sci-libs/cfitsio
-	sys-libs/zlib
-	!dev-python/pyfits
-	!dev-python/pywcs
-	!dev-python/vo"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( dev-python/matplotlib
-		   dev-python/sphinx
-		   media-gfx/graphviz )
-	test? (	dev-libs/libxml2
-			dev-python/h5py[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}] )"
-python_prepare_all() {
-	has_version '>=sci-libs/cfitsio-3.350' && sed -i \
-		-e 's/->quantize_dither/->quantize_method/g' \
-		astropy/io/fits/src/compressionmodule.c
-}
-
-python_configure_all() {
-	mydistutilsargs=( build --enable-legacy --use-system-libraries )
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && dohtml -r doc/_build/html
-}
diff --git a/dev-python/astropy/astropy-0.2.4.ebuild b/dev-python/astropy/astropy-0.2.4.ebuild
deleted file mode 100644
index cf851a4c6b67..000000000000
--- a/dev-python/astropy/astropy-0.2.4.ebuild
+++ /dev/null
@@ -1,69 +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/astropy/astropy-0.2.4.ebuild,v 1.1 2013/08/06 21:19:33 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Core functionality for performing astrophysics with Python"
-HOMEPAGE="http://astropy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-libs/expat
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/sofa_c
-	sci-astronomy/wcslib
-	sci-libs/cfitsio
-	sys-libs/zlib
-	!dev-python/pyfits
-	!dev-python/pywcs
-	!dev-python/vo"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( dev-python/matplotlib
-		   dev-python/sphinx
-		   media-gfx/graphviz )
-	test? (	dev-libs/libxml2
-			dev-python/h5py[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}] )"
-python_prepare_all() {
-	has_version '>=sci-libs/cfitsio-3.350' && sed -i \
-		-e 's/->quantize_dither/->quantize_method/g' \
-		astropy/io/fits/src/compressionmodule.c
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( build --enable-legacy --use-system-libraries )
-}
-
-python_compile_all() {
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${BUILD_DIR}"/lib \
-			emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dohtml -r doc/_build/html
-}
diff --git a/dev-python/astropy/astropy-0.2.1.ebuild b/dev-python/astropy/astropy-0.3.ebuild
index f3dc458f6249..8dea593d4a30 100644
--- a/dev-python/astropy/astropy-0.2.1.ebuild
+++ b/dev-python/astropy/astropy-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/astropy-0.2.1.ebuild,v 1.3 2013/05/22 06:23:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/astropy-0.3.ebuild,v 1.1 2013/11/26 18:03:32 bicatali Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ IUSE="doc test"
 RDEPEND="
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-astronomy/sofa_c
+	sci-astronomy/erfa
 	sci-astronomy/wcslib
 	sci-libs/cfitsio
 	sys-libs/zlib
@@ -41,24 +41,24 @@ DEPEND="${RDEPEND}
 			sci-libs/scipy[${PYTHON_USEDEP}] )"
 
 python_compile() {
-	distutils-r1_python_compile build \
-		--enable-legacy --use-system-libraries
+	distutils-r1_python_compile --use-system-libraries
 }
 
 python_compile_all() {
 	if use doc; then
+		python_export_best
 		VARTEXFONTS="${T}"/fonts \
 			MPLCONFIGDIR="${BUILD_DIR}" \
 			PYTHONPATH="${BUILD_DIR}"/lib \
-			emake -C docs html
+			esetup.py build_sphinx
 	fi
 }
 
 python_test() {
-	distutils-r1_python_compile build \
-		--enable-legacy --use-system-libraries test
+	esetup.py test
 }
 
 python_install_all() {
-	use doc && dohtml -r doc/_build/html
+	distutils-r1_python_install_all
+	use doc && dohtml -r docs/_build/html
 }
diff --git a/dev-python/astropy/files/astropy-0.1-debundle_zlib.patch b/dev-python/astropy/files/astropy-0.1-debundle_zlib.patch
deleted file mode 100644
index 3702f2a1fda3..000000000000
--- a/dev-python/astropy/files/astropy-0.1-debundle_zlib.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Debundle zlib
-
-https://bugs.gentoo.org/show_bug.cgi?id=422657
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/astropy/io/fits/setup_package.py
-+++ b/astropy/io/fits/setup_package.py
-@@ -20,6 +20,7 @@
-             [os.path.relpath(x) for x in
-              glob(os.path.join(os.path.dirname(__file__), 'src/*.c'))],
-             include_dirs=[setup_helpers.get_numpy_include_path()],
-+            libraries=['z'],
-             extra_compile_args=extra_compile_args)
-     ]
- 
---- a/astropy/io/fits/src/compress.c
-+++ b/astropy/io/fits/src/compress.c
-@@ -106,7 +106,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "zlib.h"  
-+#include <zlib.h>
- 
- int _astropy_uncompress2mem_from_mem(
-              char *inmemptr,     
-@@ -182,7 +182,7 @@
-         d_stream.next_out = uncompr;
-         d_stream.avail_out = uncomprLen;
- 
--        err = _astropy_inflate(&d_stream, Z_NO_FLUSH);
-+        err = inflate(&d_stream, Z_NO_FLUSH);
- 
-         if (err != Z_OK && err != Z_STREAM_END)
-         {
-@@ -217,7 +217,7 @@
-     *filesize = d_stream.total_out;
- 
-     /* End the decompression */
--    err = _astropy_inflateEnd(&d_stream);
-+    err = inflateEnd(&d_stream);
- 
-     /* free temporary output data buffer */
-     free(uncompr);
-@@ -285,7 +285,7 @@
-         c_stream.next_out = compr;
-         c_stream.avail_out = comprLen;
- 
--        err = _astropy_deflate(&c_stream, Z_FINISH);
-+        err = deflate(&c_stream, Z_FINISH);
- 
-         if (err != Z_OK && err != Z_STREAM_END)
-         {
-@@ -320,7 +320,7 @@
-     *filesize = c_stream.total_out;
- 
-     /* End the compression */
--    err = _astropy_deflateEnd(&c_stream);
-+    err = deflateEnd(&c_stream);
- 
-     /* free temporary output data buffer */
-     free(compr);
diff --git a/dev-python/astropy/files/astropy-0.1-expat.patch b/dev-python/astropy/files/astropy-0.1-expat.patch
deleted file mode 100644
index 5bc1b294cfe2..000000000000
--- a/dev-python/astropy/files/astropy-0.1-expat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- astropy/utils/xml/setup_package.py.orig	2012-06-18 07:48:04.000000000 +0200
-+++ astropy/utils/xml/setup_package.py	2012-06-19 12:43:29.685002916 +0200
-@@ -4,7 +4,6 @@
- 
- 
- def get_extensions(build_type='release'):
--    EXPAT_DIR = 'cextern/expat/lib'
-     XML_DIR = 'astropy/utils/xml/src'
- 
-     defines = [("HAVE_EXPAT_CONFIG_H", 1)]
-@@ -21,18 +20,14 @@
-         # place of ours.
-         extra_link_args = [
-             '-Wl,--version-script={0}'.format(
--                join(XML_DIR, 'iterparse.map'))
--            ]
-+                join(XML_DIR, 'iterparse.map')),
-+            '-lexpat']
-     else:
-         extra_link_args = []
- 
-     return [Extension(
-         "astropy.utils.xml._iterparser",
--        [join(XML_DIR, "iterparse.c"),
--         join(EXPAT_DIR, "xmlparse.c"),
--         join(EXPAT_DIR, "xmlrole.c"),
--         join(EXPAT_DIR, "xmltok.c"),
--         join(EXPAT_DIR, "xmltok_impl.c")],
-+        [join(XML_DIR, "iterparse.c")],
-         define_macros=defines,
--        include_dirs=[XML_DIR, EXPAT_DIR],
-+        include_dirs=[XML_DIR],
-         extra_link_args=extra_link_args)]