Removed old, worked the pyfits dependency

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

4 files changed, 15 insertions, 59 deletions

diff --git a/dev-python/pywcs/ChangeLog b/dev-python/pywcs/ChangeLog
index caec983ed8a7..83c7ea099f32 100644
--- a/dev-python/pywcs/ChangeLog
+++ b/dev-python/pywcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pywcs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/ChangeLog,v 1.9 2013/04/24 22:42:52 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/ChangeLog,v 1.10 2014/02/05 23:49:00 bicatali Exp $
+
+  05 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> -pywcs-1.11.ebuild,
+  pywcs-1.11-r1.ebuild:
+  Removed old, worked the pyfits dependency
 
 *pywcs-1.11-r1 (24 Apr 2013)
 
diff --git a/dev-python/pywcs/Manifest b/dev-python/pywcs/Manifest
index 6878c62c96c6..1dd21d801391 100644
--- a/dev-python/pywcs/Manifest
+++ b/dev-python/pywcs/Manifest
@@ -3,14 +3,13 @@ Hash: SHA256
 
 AUX pywcs-1.11-wcslib.patch 4246 SHA256 0094071a2521a28d8e2ccdd672ea50647b60ef35202f88f45ccf0eb6a1ca720a SHA512 ab0652e6a47569c45f056cf556db66d86ceaf668c0ea78a91cd7b339b7f5d2e2c581a776b406f642d7adf380139b33f575526b26c6fdf328393f590a85705909 WHIRLPOOL 9eeddb8e03a8be9574628d3b4a3ece98bbf61e9902cc383b602d0d838d397340550f107375283bc657603503714d2bef406b341c3f383047da6dd0084b50e9b5
 DIST pywcs-1.11-4.8.2.tar.gz 2187116 SHA256 61b2d9abf90f4dce2071dfeed1628b487aa32e27b0c01e9983410557db96ac34 SHA512 595cdb910005ef8348eb84d1e0e3db7e5c925d8f44c8f84d8158729d2a9352811a1e1bee49049a91a033503bc9cc8b39c60b1acd526b2fccdd1a8764ec8a7c1e WHIRLPOOL d0c3cd2a428ab1d25594024f3db4f5b586cd1d3d82074828260942e74742602b8c4010cdcb4f73d32d20e71133dae9c7cb5af49e53aab880d404a9ebaf22cb08
-EBUILD pywcs-1.11-r1.ebuild 959 SHA256 5eeef890e5d4aac3ab76a742516999045753dc7b15c9fa504ca9edbaf8d0bb68 SHA512 9dee5378a1b6989533dc8b03822f508c9ed7c64af9c9b930a865ec779dfd1637bba1e310d63ca0c0c7b46fd704de3f4d149806531c94168dc33fe8853b6cbb62 WHIRLPOOL 141c38b65b3945e8e624ee3c35cea27a40a6776bc8d1cf48572b8209bffa74bfe6c464f6fe6623c628c8dfa6db9773bddb5b09266acb5b23fbf7649bc894300e
-EBUILD pywcs-1.11.ebuild 1169 SHA256 dfe4a118652b77285fcc5f46d0a5f807fed89413a453b94bccbd448250c94f10 SHA512 62c2a6e5573d72210fabe510d909054fa5c12e295865c08e320a6dbfd5acf7533b3f5c3826ed1093ff8b88ef48eafd1478e722f3f9654279f3dbeeea5951c764 WHIRLPOOL a46511a61409aa2ec5098150e76b049b0c5b9c7b5bb8c43f339eb7a44a30aa0b03db759639239030b40386758a994946908a716696f0d374bf66bafe9c74ac4c
-MISC ChangeLog 2535 SHA256 ca5d2326d9399bb119b9edf2a0657e7cd21e5cdc1b168aae799a147b0ba416ca SHA512 7b7c7a0717ee7994eaad582c68f1202057f372f7c5892b06b5b46fa845ea94cca48a6ea857ef9159395e7debc0aa0b63eb34cf958912d7fabe0f6161b0dab6f9 WHIRLPOOL 7b07630be676284014f60ad35757ec4cdfeaf7bab81d9bdea5da4e9548f7615cf9b50fac4fde98944cf5c79c558b5a44a46a7a99ee5b216d18b5429d96304257
+EBUILD pywcs-1.11-r1.ebuild 964 SHA256 747fff6b2908503af0e7f0d6b73ecc0ec9512e03a0a1086c94cd4d1191cd422a SHA512 e7b1def913d6984b7dd3d51884613ac999d315bf47dfb3b66bf598ae1b7d94879a23c810066d845859f6fb0569c4c5344cb553c71a74d45be8faf103026ece65 WHIRLPOOL f6cc6c241059ef4fdad16d5a38a8afc87f02e49b1327b682e635cee5f8255652c74e932a85d3a7b6c0d1444d557030946517f359b52c6f18278267642bae0142
+MISC ChangeLog 2680 SHA256 6c034d7d26c212003675d52993826f6274b0e29ce40f53892c2ec8dc5731001a SHA512 cf99e2215c8eeef8189b9e7a68fcd46fa380b038ab1f40743550c7db62a97f007eeb5395d5ae5c1d336082c100181542053a7001a31e280e91fa0fae1c2b3160 WHIRLPOOL 21f47cd09e276a21abc7db2b917f756408fd573422d1c09b28d08746a0f7a84c257731e7240aa95e608269cdf4bacfd3d75816e413094e6e283c0636ad2ca08a
 MISC metadata.xml 384 SHA256 84cfdb26708fbfad4b807b2527dc4599d0e3b3e118ce07b85ee5638d8c5b6bc3 SHA512 076bdd39f540c32fcdd2e044707da79e62234781bd7b97db00553f6e5884c4f85b201037bf044e37cb58b8eb3244b9893f51f49c9c7319eb8559a092ac970ca6 WHIRLPOOL b2b8951825b905c44e078ef1060fef2c3674525761b318528d93e32660fd7abedd6cd755a5ccbe7a5fe6e8ddc8ad88ef5d25682e16939847b64adb15726662ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlF4X+4ACgkQ1ycZbhPLE2DO+ACfVbNdxlbEq6EmN0RK/NEeUm24
-aeIAn25jL15xN8W7ntiM98TRDKH/WIVG
-=9qOc
+iEYEAREIAAYFAlLyze4ACgkQ1ycZbhPLE2BznQCfci6bwlFmE1z61uwoFM3MJ6DD
+cTIAn1sJYKX194oTR8UcmKDmrZCB19Nc
+=zoeB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pywcs/pywcs-1.11-r1.ebuild b/dev-python/pywcs/pywcs-1.11-r1.ebuild
index 19c1a642ab09..43d133c43b53 100644
--- a/dev-python/pywcs/pywcs-1.11-r1.ebuild
+++ b/dev-python/pywcs/pywcs-1.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11-r1.ebuild,v 1.1 2013/04/24 22:42:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11-r1.ebuild,v 1.2 2014/02/05 23:49:00 bicatali Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ DEPEND="
 RDEPEND="
 	>=sci-astronomy/wcslib-${WCS_V}
 	virtual/pyfits
-	!dev-python/astropy"
+	!<dev-python/astropy-0.3"
 
 # missing data to run tests
 RESTRICT=test
diff --git a/dev-python/pywcs/pywcs-1.11.ebuild b/dev-python/pywcs/pywcs-1.11.ebuild
deleted file mode 100644
index afd721b373c7..000000000000
--- a/dev-python/pywcs/pywcs-1.11.ebuild
+++ /dev/null
@@ -1,47 +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/pywcs/pywcs-1.11.ebuild,v 1.6 2013/04/23 16:00:52 bicatali Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-* *-jython 3.3"
-
-inherit distutils eutils
-
-WCS_V=4.8.2
-MYP=${P}-${WCS_V}
-
-DESCRIPTION="Python routines for handling the FITS World Coordinate System"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib"
-SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=sci-astronomy/wcslib-${WCS_V}"
-DEPEND="${CDEPEND}
-	  virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-python/pyfits
-	!dev-python/astropy"
-
-S=${WORKDIR}/${MYP}
-
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-wcslib.patch
-	distutils_src_prepare
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
-			"$(PYTHON)" lib/${PN}/tests/test.py
-	}
-	python_execute_function testing
-}
-
-#FIX: compiles twice (once during build, another time during install)
-# seems to be in the defsetup.py hack script