Version bump.

Package-Manager: portage-14609-svn/cvs/Linux x86_64

5 files changed, 13 insertions, 100 deletions

diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog
index f46e756f56d7..de70d77cb3e1 100644
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyfits
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.12 2009/10/15 13:32:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.13 2009/10/15 23:38:13 arfrever Exp $
+
+*pyfits-2.2.2 (15 Oct 2009)
+
+  15 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pyfits-1.3.ebuild, -files/pyfits-1.3-test-table.patch,
+  -pyfits-2.2.ebuild, +pyfits-2.2.2.ebuild:
+  Version bump.
 
   15 Oct 2009; Markus Meier <maekke@gentoo.org> pyfits-2.1.1.ebuild:
   amd64/x86 stable, bug #288111
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index d85bae8d7972..501734d45377 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -1,21 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX pyfits-1.3-test-table.patch 2364 RMD160 bbbeb2d9c7aa27e3e385f2a50b6d3b0c6d1602df SHA1 607fddc5245dd000199bbb9195e589018f25a41b SHA256 801064aaf18f12aabb2fda8f984c135aa92866a5647c986c9a70b6e2cbfc615e
-DIST pyfits-1.3.tar.gz 3425265 RMD160 f8f8779b9a9ebe41f3baeebf48791c2bb584ceaf SHA1 280f29e2ae4b7ded3cb44fc545e8c7217266fbc4 SHA256 a6b01c9d75e7955765019581700bd6ac344457b327522facedaf4cff9e86093c
 DIST pyfits-2.1.1.tar.gz 578750 RMD160 d925bd16d7151a7bde11559219b56b3ee127015a SHA1 baf9d07e1a898992c4a4a5083c88de577ef2a543 SHA256 b5fbcd77f616dd3765f4cce8d60f06e1ccc4bd55b09ec1897fc17873b236c6a9
 DIST pyfits-2.2.1.tar.gz 2909558 RMD160 ea28c5f5c2454aa7946726464b31d5639c527073 SHA1 bf83c081dc9546a4c2949254f384369bdc712d30 SHA256 e1ce3c896eea2a4d198d2001c21bfd2d8ebd9982e98387a2c75cf09d01454046
-DIST pyfits-2.2.tar.gz 2909950 RMD160 ad812cc253d61bac36fbd732501557376e8dd1cf SHA1 1dba12b569930b6df2b27ecb1163a916776cc066 SHA256 77551fdee9b18e4e0392f2790507870a7e25484f3bb2dc4b52e89d800ab31585
-EBUILD pyfits-1.3.ebuild 1006 RMD160 cf6b9ad4923e4cf2f75680ef0f3c357dfc23a13c SHA1 c25a328ad9a13c04685769d6e2f8546a8765411e SHA256 0bdd2d884670b5e000c8cb162d4e73dcaae932b316b350e0f0e0d5f6f727d653
+DIST pyfits-2.2.2.tar.gz 2909559 RMD160 4e822282287c97e797b0c305b9fa05b6d0afef9f SHA1 966bf909e9776c54dfe3fba216f54fd7c13bff69 SHA256 fd53300a0d4ac48a357055ed40a22a4756566bf948d9f37ecb6c591993f14116
 EBUILD pyfits-2.1.1.ebuild 881 RMD160 192438ef928ca88f9e5209d8b709a47560317033 SHA1 a0226938e7837ce1d3ef22d7afff811e27b3ebf5 SHA256 b4ef865e03dc4fecb93ca457dccd13a8eb1277692b48d02ea7248177598bf689
 EBUILD pyfits-2.2.1.ebuild 892 RMD160 650435849e53435b3a5f6f6bee7b5d12cfda567e SHA1 1b714897065a2f1bf4916cab92cf39f46bc7d0d8 SHA256 da83dcd69b393b5b95c8b777cd0f8b70f91022353442f12bbd9fa392a7816ef0
-EBUILD pyfits-2.2.ebuild 883 RMD160 e704d3dd2a9c44874deb0aa7cd65bce866e8b078 SHA1 d8f8be63eda91d46352dddd32e910e43bcd44fb4 SHA256 4c88f17e692df498d1dcf8ac27d1476d3a918e6a736cd599cf65f5929384dcce
-MISC ChangeLog 1675 RMD160 bec00e7549bfbfd2ceb75961f3db0f863c279ac9 SHA1 963651dd8fdd209da697922aad0761615e08493e SHA256 23fb76ed51a680f4e67f0340409270311f0db5f9a32bf9f31362f3dcf8516a76
+EBUILD pyfits-2.2.2.ebuild 892 RMD160 f095b0eebdd90c4c6203dc9a1561ee0ab798ef5e SHA1 9665e1c61274d3208cf584f2b523b303d1903a5e SHA256 6dd81dbbe3ff0d0145eff53e9dd4e1494591109f3325e1218911ffd8a5922fd0
+MISC ChangeLog 1898 RMD160 20af896cbd1f4b25a374954f2dcedf57ba32e403 SHA1 8db558a6c87b4a534c0d8466cd7d0e4b28117085 SHA256 89c5f6330a1b61db2c911532f061b39b282ac3fc15ebdde5d35507e9bf588c25
 MISC metadata.xml 418 RMD160 9a7191d88e1220dec5db4cfcf09e0f7f48951deb SHA1 09a7993d074a69c35542a09a4c905aafb8854e1f SHA256 49f10a05ab0d8af4d0cc7eeb8c239d901d67c5741cece547f7602152c8ea722e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrXJK0ACgkQkKaRLQcq0GKN+gCfbPvYzIQ6QTZwtYpX/tReaej9
-Bl8AnjEzBxdv77h4XPeFekaVnOMEksCI
-=mtTu
------END PGP SIGNATURE-----
diff --git a/dev-python/pyfits/files/pyfits-1.3-test-table.patch b/dev-python/pyfits/files/pyfits-1.3-test-table.patch
deleted file mode 100644
index bb76ea840237..000000000000
--- a/dev-python/pyfits/files/pyfits-1.3-test-table.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- pyfits-1.3/test/testPyfitsTable.py.orig	2007-12-18 19:10:29.000000000 +0000
-+++ pyfits-1.3/test/testPyfitsTable.py	2008-05-22 17:11:12.000000000 +0100
-@@ -128,7 +128,7 @@
-         # the table HDU's data is a subclass of a record array, so we can access
-         # one row like this:
- 
--        self.assertEqual(str(tbhdu.data[1]),"('def', 12.0, 4, 2, (4.0+4.0j), array([ True], dtype=bool), 102, array([False,  True,  True,  True,  True, False, False, False, False,\n        True, False], dtype=bool))")
-+        self.assertEqual(str(tbhdu.data[1]),"('def', 12.0, 4, 2, (4+4j), array([ True], dtype=bool), 102, array([False,  True,  True,  True,  True, False, False, False, False,\n        True, False], dtype=bool))")
- 
-         # and a column like this:
-         self.assertEqual(str(tbhdu.data.field('abc')),"['abc' 'def' 'xx']")
-@@ -306,11 +306,25 @@
-                                 formats='int16,a20,float32,a10',\
-                                 names='order,name,mag,Sp')
-         hdu=pyfits.new_table(bright,nrows=2,tbtype='TableHDU')
--        s="[(1, 'Serius', -1.45, 'A1V') (2, 'Canopys', -0.73000002, 'F0Ib')]"
--        self.assertEqual(str(hdu.data[:]),s)
-+        self.assertEqual(hdu.data.field(0).all(),
-+                         num.array([1,2],dtype=num.int16).all())
-+        self.assertEqual(hdu.data[0][1],'Serius')
-+        self.assertEqual(hdu.data[1][1],'Canopys')
-+        self.assertEqual(hdu.data.field(2).all(),
-+                         num.array([-1.45,-0.73],dtype=num.float32).all())
-+        self.assertEqual(hdu.data[0][3],'A1V')
-+        self.assertEqual(hdu.data[1][3],'F0Ib')
-         hdu.writeto('toto.fits', clobber=True)
-         hdul = pyfits.open('toto.fits')
--        self.assertEqual(str(hdul[1].data[:]),s)
-+        self.assertEqual(hdul[1].data.field(0).all(),
-+                         num.array([1,2],dtype=num.int16).all())
-+        self.assertEqual(hdul[1].data[0][1],'Serius')
-+        self.assertEqual(hdul[1].data[1][1],'Canopys')
-+        self.assertEqual(hdul[1].data.field(2).all(),
-+                         num.array([-1.45,-0.73],dtype=num.float32).all())
-+        self.assertEqual(hdul[1].data[0][3],'A1V')
-+        self.assertEqual(hdul[1].data[1][3],'F0Ib')
-+
-         os.remove('toto.fits')
-         hdu=pyfits.new_table(bright,nrows=2)
-         tmp=pyfits.rec.array([(1,'Serius',-1.45,'A1V'),\
diff --git a/dev-python/pyfits/pyfits-1.3.ebuild b/dev-python/pyfits/pyfits-1.3.ebuild
deleted file mode 100644
index ce59eca80d3d..000000000000
--- a/dev-python/pyfits/pyfits-1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-1.3.ebuild,v 1.3 2008/05/23 21:04:18 maekke Exp $
-
-NEED_PYTHON=2.3
-inherit distutils eutils
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-SRC_URI="http://www.stsci.edu/resources/software_hardware/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-
-RDEPEND="dev-python/numpy"
-DEPEND="test? ( dev-python/numpy )"
-
-IUSE="doc test"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="AURA"
-
-src_unpack() {
-	unpack ${A}
-	# fix test in binary table (should be fixed in >1.3)
-	epatch "${FILESDIR}"/${P}-test-table.patch
-}
-
-src_test() {
-	cd "${S}"/test
-	for t in test*.py; do
-		PYTHONPATH="${S}"/build/lib ${python} ${t} || die "test ${t} failed"
-	done
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins docs/Users_Manual.pdf || die
-	fi
-}
diff --git a/dev-python/pyfits/pyfits-2.2.ebuild b/dev-python/pyfits/pyfits-2.2.2.ebuild
index 55ef3bc42c89..3d1609ddba9d 100644
--- a/dev-python/pyfits/pyfits-2.2.ebuild
+++ b/dev-python/pyfits/pyfits-2.2.2.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.2.ebuild,v 1.1 2009/09/30 19:42:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.2.2.ebuild,v 1.1 2009/10/15 23:38:13 arfrever Exp $
 
 EAPI="2"
-
-NEED_PYTHON="2.3"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
@@ -28,7 +26,7 @@ src_test() {
 	testing() {
 		local test
 		for test in test*.py; do
-			PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib*)" "$(PYTHON)" "${test}" || die "test ${test} failed"
+			PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib*)" "$(PYTHON)" "${test}" || die "test ${test} failed with Python ${PYTHON_ABI}"
 		done
 	}
 	python_execute_function testing