work the pyfits depedency, removed old

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

4 files changed, 8 insertions, 86 deletions

diff --git a/dev-python/pyds9/ChangeLog b/dev-python/pyds9/ChangeLog
index c094fbda0389..a7918bb022c7 100644
--- a/dev-python/pyds9/ChangeLog
+++ b/dev-python/pyds9/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyds9
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/ChangeLog,v 1.10 2014/01/17 22:13:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/ChangeLog,v 1.11 2014/02/05 23:40:42 bicatali Exp $
+
+  05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> -pyds9-1.5.ebuild,
+  -pyds9-1.6.ebuild, pyds9-1.7.ebuild:
+  work the pyfits depedency, removed old
 
 *pyds9-1.7 (17 Jan 2014)
 
diff --git a/dev-python/pyds9/pyds9-1.5.ebuild b/dev-python/pyds9/pyds9-1.5.ebuild
deleted file mode 100644
index 0f86a3785e20..000000000000
--- a/dev-python/pyds9/pyds9-1.5.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/pyds9/pyds9-1.5.ebuild,v 1.1 2012/08/21 11:55:00 xarthisius Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
-
-inherit distutils multilib
-
-DESCRIPTION="Python interface to XPA to communicate with DS9"
-HOMEPAGE="http://hea-www.harvard.edu/saord/ds9/pyds9/"
-SRC_URI="http://hea-www.harvard.edu/saord/download/ds9/python/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="x11-libs/xpa"
-RDEPEND="${DEPEND}
-	dev-python/numpy
-	dev-python/pyfits"
-
-DOCS="changelog README"
-
-src_prepare() {
-	rm -rf xpa-*
-	sed -i \
-		-e "/py_modules/s|\],|\])|" \
-		-e '/data_files/,$ d' \
-		setup.py || die
-	sed -i \
-		-e "s|./xpa-2.1.12|${EROOT}/usr/$(get_libdir)|" \
-		xpa.py || die
-	sed -i \
-		-e "s|sys.path|${EROOT}/usr/bin|" \
-		ds9.py || die
-	distutils_src_prepare
-}
diff --git a/dev-python/pyds9/pyds9-1.6.ebuild b/dev-python/pyds9/pyds9-1.6.ebuild
deleted file mode 100644
index 5f3efc8d5998..000000000000
--- a/dev-python/pyds9/pyds9-1.6.ebuild
+++ /dev/null
@@ -1,41 +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/pyds9/pyds9-1.6.ebuild,v 1.2 2013/04/24 21:20:51 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit distutils-r1 multilib
-
-XPAPV=2.1.14
-
-DESCRIPTION="Python interface to XPA to communicate with DS9"
-HOMEPAGE="http://hea-www.harvard.edu/RD/ds9/pyds9/"
-SRC_URI="http://hea-www.harvard.edu/RD/download/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=x11-libs/xpa-${XPAPV}"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/pyfits[${PYTHON_USEDEP}]"
-
-DOCS=(changelog README)
-
-src_prepare() {
-	rm -r xpa-${XPAPV} || die
-	sed -i \
-		-e "/py_modules/s|\],|\])|" \
-		-e '/data_files/,$ d' \
-		setup.py || die
-	sed -i \
-		-e "s|./xpa-${XPAPV}|${EROOT}/usr/$(get_libdir)|" \
-		xpa.py || die
-	sed -i \
-		-e "s|sys.path|${EROOT}/usr/bin|" \
-		ds9.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyds9/pyds9-1.7.ebuild b/dev-python/pyds9/pyds9-1.7.ebuild
index 8b86ac16ea2a..053336b3dd62 100644
--- a/dev-python/pyds9/pyds9-1.7.ebuild
+++ b/dev-python/pyds9/pyds9-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.7.ebuild,v 1.1 2014/01/17 22:13:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.7.ebuild,v 1.2 2014/02/05 23:40:42 bicatali Exp $
 
 EAPI=5
 
@@ -21,7 +21,8 @@ IUSE=""
 DEPEND=">=x11-libs/xpa-${XPAPV}"
 RDEPEND="${DEPEND}
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/pyfits[${PYTHON_USEDEP}]"
+	|| ( dev-python/astropy[${PYTHON_USEDEP}]
+		 dev-python/pyfits[${PYTHON_USEDEP}] )"
 
 DOCS=(changelog README)