Version bump wrt #422839 by Ian Delaney <johneed@hotmail.com> Debundle zlib, execute tests properly, drop old versions

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

7 files changed, 101 insertions, 203 deletions

diff --git a/dev-python/flask-pymongo/Manifest b/dev-python/flask-pymongo/Manifest
index a98693a50c8d..60c374802d1e 100644
--- a/dev-python/flask-pymongo/Manifest
+++ b/dev-python/flask-pymongo/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST Flask-PyMongo-0.1.2.tar.gz 19622 RMD160 c79bb560fadceba5af21349fcd64fa30ca413e7f SHA1 911e4708bd433d2f7ec1d2a19a0543609d65ba29 SHA256 6457c0f4669cb0fb48d0eb716f90ef95215ac22cb1c4848ed7b3f8d136246e0e
-EBUILD flask-pymongo-0.1.2.ebuild 1258 RMD160 efb5b6d8ca15465c1899c8db201e2d3faae5860e SHA1 2cd89ecb914f39691ae815dfe44260c4bc5a7ace SHA256 b73406bbdd852da2e9e0c6f0fc68de7a6c8e9ddea9aba314e4b19715003cd982
+EBUILD flask-pymongo-0.1.2.ebuild 1260 RMD160 59c175258da7403bcf5f82d5c4eb9f1ad83cc8f7 SHA1 f70daff55594f14f4a4478b30fc6b7880c8533b6 SHA256 283c19f2f74c43b7c06ddc321afac7c2454ab7807a8aaf999adbbfe3625e1b69
 MISC ChangeLog 553 RMD160 e7211d7caffd025450a6cf26d8dffee3767ae54d SHA1 4887fc008aa2e21333175c283817ce802463cce0 SHA256 aba3984fc239a41a71bb0e78fbf8043be5d08ff9bfed12d98601848f8da38ac6
 MISC metadata.xml 330 RMD160 da84a150449175662282fbce445f86284c3f5d5e SHA1 b4f8e63b2decb00a4fe23ee97508391a479c706f SHA256 e68f5c0580514a636e3df09046ebee8e9acc984bf781b489a859d3b59d74685b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAk/jFW4ACgkQKiQSS7ZY+hMXTAEA5cUsefYefak3h9fPjQw1POVf
-hYyuPLP05OtupwBJPNsBAM1QKrJEIZbdJqiCcAxC0CaP5hEOVWgq14IOcVGPp+fe
-=Ilpg
------END PGP SIGNATURE-----
diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog
index c8435ec54ea7..a2791ca9268d 100644
--- a/dev-python/pyfits/ChangeLog
+++ b/dev-python/pyfits/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pyfits
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.31 2012/04/16 09:20:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.32 2012/06/21 15:52:40 xarthisius Exp $
+
+*pyfits-3.0.8 (21 Jun 2012)
+
+  21 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/pyfits-3.0.8-debundle_zlib.patch, +pyfits-3.0.8.ebuild,
+  -files/pyfits-3.0.4-tests_python3.patch, -pyfits-3.0.6.ebuild,
+  -pyfits-3.0.7.ebuild:
+  Version bump wrt #422839 by Ian Delaney <johneed@hotmail.com> Debundle zlib,
+  execute tests properly, drop old versions
 
 *pyfits-3.0.7 (16 Apr 2012)
 
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index f2e315931cee..e636e93db9e0 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pyfits-3.0.4-tests_python3.patch 4264 RMD160 83e10cf47c43892393d26f88342e0b5a3d2214d0 SHA1 db5ab1f254d026f0d547feef1dd31c17639ba379 SHA256 22a1f12a2a2da82e778daaea9ca5fa9fab7e46f0aa2baaa311fb91daff897107
+AUX pyfits-3.0.8-debundle_zlib.patch 1554 RMD160 d6306322f7b08ac55a13c6310a1f6bc83ab1bf68 SHA1 1047da0f796e552d749f38fc927b97185042086c SHA256 751bccc866f4a4f0b781aacf8318b60aad4c6ba18ff729e7390b5fa04d9dc735
 DIST pyfits-2.4.0.tar.gz 284236 RMD160 3256f2111db7c994f1deb7d6ec37cb6a2a003fb0 SHA1 5a0c9c7fd058fc44a22f1c00682461ecf4ebc3c1 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22
-DIST pyfits-3.0.6.tar.gz 666264 RMD160 e40fe0313d00be0698497e010c636256b8ef2196 SHA1 5e5cfcd86923e79f3884d5c5b95c5a43e27da736 SHA256 2bf912d0d4dcad75bac4b8c207b420e6415c1f400941dd44282fa91d33e5a482
-DIST pyfits-3.0.7.tar.gz 677588 RMD160 c0cae95cbd143c85f0bb62835a6927ef70d9eb36 SHA1 ae7285a4b5d9167ab77860a487ee13e084f8dd35 SHA256 831687e556091bbb005f1358729046c984cb896f1e11fb01df7469ace377cdce
+DIST pyfits-3.0.8.tar.gz 683390 RMD160 cf0ab16cb727b34472b5d96e57c418282b6a44c3 SHA1 579c106c4ced2938435696ca0b383be431844c6f SHA256 cd5aa6911b1f56daf634f9d29ca6942cc54bd8924b1d9a5ed0fef570ed34c5ec
 EBUILD pyfits-2.4.0.ebuild 948 RMD160 7edc2517373bcf7e8e72fe83a7d45e09cd81bc79 SHA1 f4714468158734407b79fc7c29c179c550f70a02 SHA256 046d432ee4df9f86d20b9f20c93318b97487841f0c09fe7fa876ff8ccfc29bbd
-EBUILD pyfits-3.0.6.ebuild 1204 RMD160 723856edf371e97188a565f2cc3dd20b6735caf8 SHA1 cbebd407ed7d452e3ba1b7dcbe793e3793ab90e6 SHA256 4f3ddd9848fec67f9345a8cabc3b09ad111eab39597dd3cfa4326a33bed76f2f
-EBUILD pyfits-3.0.7.ebuild 1204 RMD160 71ba94316d4bdb7c2906615d6709e5e3290c6999 SHA1 8f23e38be31523c6cefbbbc76bb1952b57494ee9 SHA256 597f7649089856bd1e371f9447f115777f630117b31da4c0b8cd247271b2f404
-MISC ChangeLog 4339 RMD160 2728fbb7ab2a918f5e36d3a204ac19c3ee5681e3 SHA1 465da599650f0552c2a4cbb0594473876ca5d48b SHA256 3518cfe7646cbfa46fba0debf398fffc15a542460fa3c1a8beb142a232536337
+EBUILD pyfits-3.0.8.ebuild 978 RMD160 7b9c08b4e7976658c3e2bafe3b7a77a3e5a91742 SHA1 fed8b6444b821062c62b905286fb39746661f141 SHA256 6716a24f20d95129ee7a6c1b4d9d8b8283cf1edace92bc4ae6d8424239cfcc9b
+MISC ChangeLog 4700 RMD160 16966bba43c24df24f6132b7caedf40e2c28c68d SHA1 62b835038e37c292ed160df42962333467af4493 SHA256 c89a2f56b9d143aa3a237d3b0daf7e25e9f6ea49cf27382a22f673d31f9dff90
 MISC metadata.xml 447 RMD160 228a15287c41532a07c0233aa26af5e02ef4dc3f SHA1 335d39f9a219784110ed93cd9d0eea872cb356ab SHA256 60b3efa9bebe6a20b6bc28b6789a1d3cdd0367dcdcf55c941b2170da91f1f4a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPi+R2AAoJEF0huFKJUZL5fNoP/ikyXY0cKVdsJORu/mfSHJzq
-Gf0gER3H0CzI8wsJKMhQ7cQZruWvmfbZS9dvAcdmwWNa6wd2ZqUBVnjH43ahNHXT
-mDi9hq7qfYdvBrCGNohjabpsmEjETQ5u0h5wVwH/lzgeVdA6bXiLoRABrtwa4U3N
-H4Ssb+dtQOnflP7PEUdx6H/8XPY1C+LKnwsJ2QFVlK1s2NXMkLT+j2BnT3kEla3K
-Gu0XmuAfDQxM9MkxVsnCm26ceNTjUqIsKT/wDt6KfMMuG+DO6iQhkfDyw5mNuhLc
-5Ve2MVtw3oar+kWhot6ST7WgyRXabZmBml/F8n1ivE0BuIgO+xDD11wwnC59B0WZ
-MirUntxNwxPFMgvVYdkaf4hY9i3yM90KjKJPCAb2UZiB/w51uiVCc1KNSZoqb6iJ
-+ScQK/Q2mEjpRvJq7LI7b+fHQOmJBsfR1t4irQlPyIsw3tHFZlmg/ZrGv4JJpi8e
-ZLTAczEcmScgEdKBOYFAE2s7x/tJonq5Af6WC9YqowKTD8jUIcc2rLnNsYbTb2G/
-aMsoZL6cE41xYKtoCHvCR06MYDI3n2NHtFPMtWeLxfwI88WVLEeJzmqd1ELl89Dd
-inZqI4/15LvrSVAEhXS6uVV1P/zAmZvcPbxoE7KEOUOeqmaPUovTOPUOQeEIcsN+
-sMwVY2Vs3HKrncgRbH2+
-=mjwU
+iQIcBAEBCAAGBQJP40NSAAoJEF0huFKJUZL5tqEP/0mzmUW6GycH/rOFpW/4KYpR
+lQDSG6ee6oB/zyRsRUdGypm976WMLudcFmxESjipAabqlaNy3fVwp0xDqrZmLRqN
+DPwvUSchbexmLbaKwprpYCMZPnDbCITwJk5tlKEoMONzOWwF/SgUkBMxTyjX1xD7
+C0m93MXA9qBOKL9FjMxbRZvdJtYuFEnZr2UstG3/OrNA3q2NZaW/DnGiP8dUIQJ3
+vtC9OMqy51LVJHtjjeV0KRSpCBTq9pGbo/BkHjXkG9HbunBMNa28qex1aSo1HwLE
+60zvFccdHti+GSdhcD2RawhoLviU1O2f+bir4KWXNOSQELLt5EyKp34nHmBXMtbL
+eU2dVfYvi6AL0r7gbgdEWTJY8NhIzTwfqVBClwPRiaCqztX6SuXvFnNobTrUIzxQ
+7w8pwzMKkkVAHakDJ07lIS+EmNU3NEVI/qj5X0fNIY3Lgsr+sAF2kOspvKRqwD+l
+XZ3a+I9A1qel5BaTn221GeeZ9zQP7wMd3C28TGZw7uEv7kc8zabTdOANczN1dvfc
+2uomVlYK0gOHGxE8RXbuzuztbRyWEGUFEaFzcKT3UEf2mDOgUO0sH2LVwkJiGZgA
+ZM4imNZo19uaqYgojN2h8NUEhJUZreY6zLxDd2Tp+2EkjdgMRX6LHRr/Ayq7Xkxx
+uX3JklPdyFZWxbAKpRo+
+=61lu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyfits/files/pyfits-3.0.4-tests_python3.patch b/dev-python/pyfits/files/pyfits-3.0.4-tests_python3.patch
deleted file mode 100644
index 0138d5798f9a..000000000000
--- a/dev-python/pyfits/files/pyfits-3.0.4-tests_python3.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- lib/pyfits/tests/test_division.py
-+++ lib/pyfits/tests/test_division.py
-@@ -1,7 +1,10 @@
- from __future__ import division # confidence high
- from __future__ import with_statement
- 
--from cStringIO import StringIO
-+try:
-+   from cStringIO import StringIO
-+except:
-+   from io import StringIO
- 
- import numpy as np
- 
---- lib/pyfits/tests/test_structured.py
-+++ lib/pyfits/tests/test_structured.py
-@@ -65,8 +65,8 @@
-     st['f1'] = [1, 3, 5]
-     st['f2'] = ['hello', 'world', 'byebye']
-     st['f3'] = np.random.random(st['f3'].shape)
--    print st.dtype.descr
--    print st
-+    print(st.dtype.descr)
-+    print(st)
- 
-     return st
- 
-@@ -75,26 +75,26 @@
-     def test_structured(self):
-         fname = self.data('stddata.fits')
- 
--        print 'Reading from ', fname
-+        print('Reading from ', fname)
-         data1, h1 = pyfits.getdata(fname, ext=1, header=True)
-         data2, h2 = pyfits.getdata(fname, ext=2, header=True)
- 
-         st = get_test_data()
- 
-         outfile = self.temp('test.fits')
--        print 'Writing to file data1:', outfile
-+        print('Writing to file data1:', outfile)
-         pyfits.writeto(outfile, data1, clobber=True)
--        print 'Appending to file: data2', outfile
-+        print('Appending to file: data2', outfile)
-         pyfits.append(outfile, data2)
- 
--        print 'Appending to file: st', outfile
-+        print('Appending to file: st', outfile)
-         pyfits.append(outfile, st)
--        print st.dtype.descr
--        print st
-+        print(st.dtype.descr)
-+        print(st)
-         assert st.dtype.isnative
-         assert np.all(st['f1'] == [1,3,5])
- 
--        print 'Reading data back'
-+        print('Reading data back')
-         data1check, h1check = pyfits.getdata(outfile, ext=1, header=True)
-         data2check, h2check = pyfits.getdata(outfile, ext=2, header=True)
-         stcheck, sthcheck = pyfits.getdata(outfile, ext=3, header=True)
-@@ -103,12 +103,12 @@
-             raise ValueError('Fail')
-         if not compare_arrays(data2, data2check, verbose=True):
-             raise ValueError('Fail')
--        print st, stcheck
-+        print(st, stcheck)
-         if not compare_arrays(st, stcheck, verbose=True):
-             raise ValueError('Fail')
- 
-         # try reading with view
--        print 'Reading with ndarray view'
-+        print('Reading with ndarray view')
-         dataviewcheck, hviewcheck = pyfits.getdata(outfile, ext=2, header=True,
-                                                    view=np.ndarray)
-         if not compare_arrays(data2, dataviewcheck, verbose=True):
---- lib/pyfits/tests/test_table.py
-+++ lib/pyfits/tests/test_table.py
-@@ -51,7 +51,7 @@
-     nfieldsa = len(a.dtype.names)
-     nfieldsb = len(b.dtype.names)
-     if nfieldsa != nfieldsb:
--        print "number of fields don't match"
-+        print("number of fields don't match")
-         return False
-     for i in range(nfieldsa):
-         fielda = a.field(i)
-@@ -63,21 +63,21 @@
-         if (type(fielda) != type(fieldb) and not
-             (issubclass(type(fielda), type(fieldb)) or
-              issubclass(type(fieldb), type(fielda)))):
--            print "type(fielda): ",type(fielda)," fielda: ",fielda
--            print "type(fieldb): ",type(fieldb)," fieldb: ",fieldb
--            print 'field %d type differs' % i
-+            print("type(fielda): ",type(fielda)," fielda: ",fielda)
-+            print("type(fieldb): ",type(fieldb)," fieldb: ",fieldb)
-+            print('field %d type differs' % i)
-             return False
-         if isinstance(fielda[0], np.floating):
-             if not comparefloats(fielda, fieldb):
--                print "fielda: ",fielda
--                print "fieldb: ",fieldb
--                print 'field %d differs' % i
-+                print("fielda: ",fielda)
-+                print("fieldb: ",fieldb)
-+                print('field %d differs' % i)
-                 return False
-         else:
-             if np.any(fielda != fieldb):
--                print "fielda: ",fielda
--                print "fieldb: ",fieldb
--                print 'field %d differs' % i
-+                print("fielda: ",fielda)
-+                print("fieldb: ",fieldb)
-+                print('field %d differs' % i)
-                 return False
-     return True
- 
diff --git a/dev-python/pyfits/files/pyfits-3.0.8-debundle_zlib.patch b/dev-python/pyfits/files/pyfits-3.0.8-debundle_zlib.patch
new file mode 100644
index 000000000000..d1754e614bf2
--- /dev/null
+++ b/dev-python/pyfits/files/pyfits-3.0.8-debundle_zlib.patch
@@ -0,0 +1,64 @@
+Debundle zlib
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -43,10 +43,7 @@
+ 	src/compressionmodule.c
+ 	src/quantize.c
+ 	src/ricecomp.c
+-	src/zlib.c
+-	src/inffast.c
+-	src/inftrees.c
+-	src/trees.c
++libraries = z
+ include_dirs = numpy
+ extra_compile_args = 
+ 	-Wno-unused-function
+--- a/src/compress.c
++++ b/src/compress.c
+@@ -106,7 +106,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "zlib.h"  
++#include <zlib.h>
+ 
+ int _pyfits_uncompress2mem_from_mem(
+              char *inmemptr,     
+@@ -182,7 +182,7 @@
+         d_stream.next_out = uncompr;
+         d_stream.avail_out = uncomprLen;
+ 
+-        err = _pyfits_inflate(&d_stream, Z_NO_FLUSH);
++        err = inflate(&d_stream, Z_NO_FLUSH);
+ 
+         if (err != Z_OK && err != Z_STREAM_END)
+         {
+@@ -217,7 +217,7 @@
+     *filesize = d_stream.total_out;
+ 
+     /* End the decompression */
+-    err = _pyfits_inflateEnd(&d_stream);
++    err = inflateEnd(&d_stream);
+ 
+     /* free temporary output data buffer */
+     free(uncompr);
+@@ -285,7 +285,7 @@
+         c_stream.next_out = compr;
+         c_stream.avail_out = comprLen;
+ 
+-        err = _pyfits_deflate(&c_stream, Z_FINISH);
++        err = deflate(&c_stream, Z_FINISH);
+ 
+         if (err != Z_OK && err != Z_STREAM_END)
+         {
+@@ -320,7 +320,7 @@
+     *filesize = c_stream.total_out;
+ 
+     /* End the compression */
+-    err = _pyfits_deflateEnd(&c_stream);
++    err = deflateEnd(&c_stream);
+ 
+     /* free temporary output data buffer */
+     free(compr);
diff --git a/dev-python/pyfits/pyfits-3.0.7.ebuild b/dev-python/pyfits/pyfits-3.0.7.ebuild
deleted file mode 100644
index dc1715aa2f38..000000000000
--- a/dev-python/pyfits/pyfits-3.0.7.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.7.ebuild,v 1.1 2012/04/16 09:20:30 xarthisius Exp $
-
-EAPI=4
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.7-pypy-*"
-
-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"
-IUSE="test"
-
-RDEPEND="dev-python/numpy
-	dev-python/setuptools"
-DEPEND="${RDEPEND}
-	dev-python/stsci-distutils
-	dev-python/d2to1
-	test? ( dev-python/nose )"
-
-src_prepare() {
-	sed -e 's/Exception, e/Exception as e/g' \
-		-i lib/pyfits/{hdu/base.py,_release.py,tests/test_core.py} || die
-	epatch "${FILESDIR}"/${PN}-3.0.4-tests_python3.patch
-	distutils_src_prepare
-}
-
-src_test() {
-	testing() {
-		local t
-		for t in lib/${PN}/tests/test_*.py; do
-			PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)"  "$(PYTHON)" "${t}" || die "${t} failed with Python ${PYTHON_ABI}"
-		done
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/pyfits/pyfits-3.0.6.ebuild b/dev-python/pyfits/pyfits-3.0.8.ebuild
index bff3a79745b6..ff4cb0d7ec49 100644
--- a/dev-python/pyfits/pyfits-3.0.6.ebuild
+++ b/dev-python/pyfits/pyfits-3.0.8.ebuild
@@ -1,10 +1,13 @@
 # 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.6.ebuild,v 1.1 2012/03/07 18:55:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.0.8.ebuild,v 1.1 2012/06/21 15:52:40 xarthisius Exp $
 
 EAPI=4
+
+PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.5 2.7-pypy-*"
+DISTUTILS_SRC_TEST=nosetests
 
 inherit distutils eutils
 
@@ -15,28 +18,22 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="test"
+IUSE=""
 
 RDEPEND="dev-python/numpy
 	dev-python/setuptools"
 DEPEND="${RDEPEND}
 	dev-python/stsci-distutils
-	dev-python/d2to1
-	test? ( dev-python/nose )"
+	dev-python/d2to1"
 
 src_prepare() {
-	sed -e 's/Exception, e/Exception as e/g' \
-		-i lib/pyfits/{hdu/base.py,_release.py,tests/test_core.py} || die
-	epatch "${FILESDIR}"/${PN}-3.0.4-tests_python3.patch
+	epatch "${FILESDIR}"/${P}-debundle_zlib.patch
 	distutils_src_prepare
 }
 
 src_test() {
 	testing() {
-		local t
-		for t in lib/${PN}/tests/test_*.py; do
-			PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)"  "$(PYTHON)" "${t}" || die "${t} failed with Python ${PYTHON_ABI}"
-		done
+		nosetests -w "$(ls -d build-${PYTHON_ABI}/lib*)"
 	}
 	python_execute_function testing
 }