Switched to distutils-r1

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

5 files changed, 49 insertions, 93 deletions

diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog
index 6248f2420cef..41d319d4136a 100644
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2013/01/30 04:01:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.39 2013/04/22 21:50:31 bicatali Exp $
+
+*pyfits-3.1.1-r1 (22 Apr 2013)
+
+  22 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +pyfits-3.1.1-r1.ebuild,
+  -pyfits-3.0.8.ebuild, -pyfits-3.1.ebuild, metadata.xml:
+  Switched to distutils-r1
 
 *pyfits-3.1.1 (30 Jan 2013)
 
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
index b47d563f34f6..f413ce9b6b03 100644
--- a/dev-python/pyfits/metadata.xml
+++ b/dev-python/pyfits/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<herd>python</herd>
-	<longdescription lang="en">PyFITS provides an interface to FITS formatted files under the
-    Python scripting language and PyRAF, the Python-based interface to
-    IRAF.</longdescription>
-	<upstream>
-		<remote-id type="pypi">pyfits</remote-id>
-	</upstream>
+<herd>sci-astronomy</herd>
+<herd>python</herd>
+<longdescription lang="en">
+  PyFITS provides an interface to FITS formatted files under the
+  Python scripting language and PyRAF, the Python-based interface to
+  IRAF.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">pyfits</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyfits/pyfits-3.0.8.ebuild b/dev-python/pyfits/pyfits-3.0.8.ebuild
deleted file mode 100644
index 4e1829b84cc3..000000000000
--- a/dev-python/pyfits/pyfits-3.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.0.8.ebuild,v 1.4 2012/08/08 19:11:00 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.7-pypy-*"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils eutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/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
-	dev-python/setuptools
-	!dev-python/astropy"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils
-	dev-python/d2to1"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debundle_zlib.patch
-	distutils_src_prepare
-}
-
-src_test() {
-	testing() {
-		nosetests -w "$(ls -d build-${PYTHON_ABI}/lib*)"
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/pyfits/pyfits-3.1.1-r1.ebuild b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..5599a2f72ad1
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# 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.1 2013/04/22 21:50:31 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,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.1.ebuild b/dev-python/pyfits/pyfits-3.1.ebuild
deleted file mode 100644
index c2763e4c2165..000000000000
--- a/dev-python/pyfits/pyfits-3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.ebuild,v 1.2 2012/10/12 09:35:57 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.7-pypy-* 3.3"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils eutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/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
-	dev-python/setuptools
-	!dev-python/astropy"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils
-	dev-python/d2to1"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.8-debundle_zlib.patch
-	distutils_src_prepare
-}
-
-src_test() {
-	testing() {
-		nosetests -w "$(ls -d build-${PYTHON_ABI}/lib*)"
-	}
-	python_execute_function testing
-}