work the pyfits depedency, removed old

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

5 files changed, 13 insertions, 95 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/Manifest b/dev-python/pyds9/Manifest
index 1e3e23653753..6267b3ca6725 100644
--- a/dev-python/pyds9/Manifest
+++ b/dev-python/pyds9/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pyds9-1.5.tar.gz 2001781 SHA256 8f68a3b5a20a94d674553f2d9724d9c53a1ca1611a66dfb5665054c2091dd76d SHA512 cb3f7e8093d30746d8dce9619a7b4878542d85a327667a8a01b7f32775348116f97e9cb04fddc91366683251d94a045c96636c62a58f54cf25e458b5752bdb7f WHIRLPOOL 4ff41938fb9e3690cf65e287240eca319d35db7e2c33695377da6472d5493c9f743017ecabf7b045494b2a6a8faaa229bd45934d9f19548d303c42ce883bbbd8
-DIST pyds9-1.6.tar.gz 2016740 SHA256 649cb52b9dfa8492f7409733d143562dd0396f6e50d5bdabe9e944ff10956bd7 SHA512 d074a7ff2aace3b8d7eb6c3b720850013f77164b697e227771350c6be641ef54d0990b9a934dd7c18c860fec88066e30171afaa8c53e4c328e8d0a33fd1fc22f WHIRLPOOL 3266b5a48d89ca5d585fb5e1d55c05df256e32685aff44b733e6d43d6f95692db4ac9204d2c3b0d300ca309df26a1a1a47fea0e5a867888adb86da0499eb49ad
 DIST pyds9-1.7.tar.gz 879882 SHA256 026a86827fa93f074e2a90b9d831ba79253f312fa331f6a6a508cfa91fa81aac SHA512 8622cf40db65228553abc2f3dea346d9c948706a2681217a9383589d4df0143c42ef859dff12689f699b0fb40806945232c336539f37eb2c78754f9779043bcb WHIRLPOOL abc2d11817519e844f61319b0ba30276a9bb48b6a3beb5e6b7c097717cc86aeeb1960f58d62a21a9ce5d4bc37c05b8cee181abc1cc12e2821a5e878d64f1f175
-EBUILD pyds9-1.5.ebuild 1006 SHA256 49b7d384e2bb122477077db88f0562bb8e6474e043c36badfc201e846296f38a SHA512 106479c8c6a5767cb73506999faeaf23f87a4b5d2c7d939ec2c2cef10f05e568586bafddc04cef15775b068491142253abd6e9f24f1974cea0f5c937f345475e WHIRLPOOL ad46fd67c5ffa359e1ff6c15b687e27417f4e7f3e428ebbf2edbd42b3640eca3fd43431f38d9f840a8947601af8a07f578b151e0f368d70426c90cf2ecb26789
-EBUILD pyds9-1.6.ebuild 1016 SHA256 5b824236a6c722ed55178053d8e90fe3211e24fffb78bb1b99099285765efea8 SHA512 367905f49c268added247e45562a2a3e48d549ce04083b9edcf4a65a751e84281143fdab094076eae9398a785230fd54e3f57582d7f35e927f08998d8ba64243 WHIRLPOOL 6af8307921673d578c2259077d9940b97bfc525b03865d2e440ffe5f65ffe055221f49fe7cbb73eb2b4ccfd61015d5570abe19e4588d81c49151354497276e0b
-EBUILD pyds9-1.7.ebuild 1020 SHA256 d214bd4d327136e771653e5b38edd17f223fa34161593ef709bbe4149b1c2134 SHA512 66818b86fd0da59b147843f3109a92b5a27df8dc3e2b887ffbee40177406c154f061c71ab084a6735af48c05c4a9348f34c0caa77939efd9681238d331d5b9a1 WHIRLPOOL 7154f1d388dc713435a7cdb7fd5926e2667927166d96f325a8d28719a01127ff0588cc29c6e88eaf2b1717d059bacbdeed033e140fb8fb705a8e7e384a72739a
-MISC ChangeLog 1451 SHA256 5f03185bf9d148bccf2804d46c99aa73c67631be660778162392127f82f94347 SHA512 46deae96c4e6edcde896f3377a2723fd1f254810b5f9e714c4e9f423fb6bff1fafd9fa5931a0d0530bdd8025e31a0a9a1e198b4b70cff2a519809c93a6275b5f WHIRLPOOL 6e9ad189e16c9fcf5f810eb1208ecced2491e3a5dfc9885a4f91d751de698a68202b5b2ad1a7a59c97636e13a2f1fdb54f09626b65b0a1a0b763398c3d6a2d36
+EBUILD pyds9-1.7.ebuild 1070 SHA256 3d84461be5361308b1bb523ec8e12c7d55303d45ea307bf2566793640d7c4f5f SHA512 ab045d77a76f85f28793cca316e6381f853033e45792607a4c4e59b59d8fe097d4189f2885f6754f57f8d1f2c8cce9eea63abf875cba23002d0da7d6118a16b6 WHIRLPOOL 9ad37e3c10dfc8bd025e64fcd95870f50ebadcc64c68bb06b804c8d43f2f07352fc031ca88e32714d34d686656ba88dda401bf6782266b75d24f0412817e794d
+MISC ChangeLog 1606 SHA256 159624c871dcde740f57362e5af47907e9e3c4de40b5b5a03772a9ea6e51b4e6 SHA512 5167a275a6ad509b7f360cddd2bcc253c41107b71eef902aa98cabb8b8255946ac828c52a038a62a8e6b70484df9d6c10af4afc94b5f67143a5be24bc82922cd WHIRLPOOL 7ac1e12d23f076db7a9fcda3af7850c1e5143724309d48acfcc282fbddeae1c399d3be983579390f424e97f5490a00bd0869db740cab3190144e0fb3cddcd62c
 MISC metadata.xml 495 SHA256 a4baad46e408ee682f69fcbd8bf813db3313678b829a6a3dc9ce9a3d474a1f57 SHA512 01176b40a99b1fe082a92c88bf1ae1385440e40a50a9cdc7e3af619ddb47511316bc1a72e60ab93026a539c3a3a038e8fbbd1c8c633b946970b4578678e14434 WHIRLPOOL cd57e9dd006cf17f0fbed1d71b78b774c275f7f576b4a25ae9a80eea75aa67cbe4f3f6d3d830b6cab75c507afa7e837d64200e4c214b706969fba7192ed982bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLZqwYACgkQ1ycZbhPLE2DROACeOjpzSeO/XjX3khq6mGI79nwu
-QHMAn3paHAvFVJokyMreuBfbCWKd9RfV
-=dfJn
+iEYEAREIAAYFAlLyy/sACgkQ1ycZbhPLE2CVCwCfWFs7wD21Jzt+ABo2jYIkfAnh
+pUsAn0kqAAQForH/s7s5xc0uxZQj+i7s
+=yPFF
 -----END PGP SIGNATURE-----
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)