Clean up old pyzmq versions.

(Portage version: 2.1.10.4/cvs/Linux x86_64)

6 files changed, 7 insertions, 400 deletions

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index 726f971d9c6f..1a9cc3222ae7 100644
--- a/dev-python/pyzmq/ChangeLog
+++ b/dev-python/pyzmq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyzmq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.11 2011/08/30 07:02:25 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.12 2011/08/30 07:49:55 djc Exp $
+
+  30 Aug 2011; Dirkjan Ochtman <djc@gentoo.org> -pyzmq-2.0.10.1.ebuild,
+  -files/pyzmq-2.0.10.1-python-2.7.patch,
+  -files/pyzmq-2.0.10.1-python-3.1.patch,
+  -files/pyzmq-2.0.10.1-python-3.2.patch, -pyzmq-2.1.4.ebuild:
+  Clean up old versions.
 
 *pyzmq-2.1.9 (30 Aug 2011)
 
diff --git a/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-2.7.patch b/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-2.7.patch
deleted file mode 100644
index 0e67d2742a5a..000000000000
--- a/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-2.7.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-https://github.com/zeromq/pyzmq/commit/cf38679a8c7c34fcc22c3225767cf6faf2192ffd
-https://github.com/zeromq/pyzmq/commit/deab5827ef218cfccead6af1ba910e0622993e23
-
---- zmq/tests/__init__.py
-+++ zmq/tests/__init__.py
-@@ -28,10 +28,13 @@
- import zmq
- 
- try:
--    from nose import SkipTest
-+    from unittest import SkipTest
- except ImportError:
--    class SkipTest(Exception):
--        pass
-+    try:
-+        from nose import SkipTest
-+    except ImportError:
-+        class SkipTest(Exception):
-+            pass
- 
- #-----------------------------------------------------------------------------
- # Utilities
---- zmq/tests/test_message.py
-+++ zmq/tests/test_message.py
-@@ -38,8 +38,19 @@
- # Tests
- #-----------------------------------------------------------------------------
- 
-+# some useful constants:
-+
- x = 'x'.encode()
- 
-+try:
-+    view = memoryview
-+except NameError:
-+    view = buffer
-+
-+rc0 = grc(x)
-+v = view(x)
-+view_rc = grc(x) - rc0
-+
- class TestMessage(BaseZMQTestCase):
- 
-     def test_above_30(self):
-@@ -93,10 +104,6 @@
- 
-     def test_lifecycle1(self):
-         """Run through a ref counting cycle with a copy."""
--        try:
--            view = memoryview
--        except NameError:
--            view = type(None)
-         for i in range(5, 16):  # 32, 64,..., 65536
-             s = (2**i)*x
-             rc = 2
-@@ -108,10 +115,8 @@
-             rc += 1
-             self.assertEquals(grc(s), rc)
-             b = m2.buffer
--            extra = int(isinstance(b,view))
--            # memoryview incs by 2
--            # buffer by 1
--            rc += 1+extra
-+
-+            rc += view_rc
-             self.assertEquals(grc(s), rc)
- 
-             self.assertEquals(s, str(m).encode())
-@@ -122,7 +127,7 @@
-             del m2
-             rc -= 1
-             self.assertEquals(grc(s), rc)
--            rc -= 1+extra
-+            rc -= view_rc
-             del b
-             self.assertEquals(grc(s), rc)
-             del m
-@@ -133,10 +138,6 @@
- 
-     def test_lifecycle2(self):
-         """Run through a different ref counting cycle with a copy."""
--        try:
--            view = memoryview
--        except NameError:
--            view = type(None)
-         for i in range(5, 16):  # 32, 64,..., 65536
-             s = (2**i)*x
-             rc = 2
-@@ -148,8 +149,7 @@
-             rc += 1
-             self.assertEquals(grc(s), rc)
-             b = m.buffer
--            extra = int(isinstance(b,view))
--            rc += 1+extra
-+            rc += view_rc
-             self.assertEquals(grc(s), rc)
-             self.assertEquals(s, str(m).encode())
-             self.assertEquals(s, str(m2).encode())
-@@ -161,7 +161,7 @@
-             self.assertEquals(grc(s), rc)
-             del m
-             # m.buffer is kept until m is del'd
--            rc -= 1+extra
-+            rc -= view_rc
-             rc -= 1
-             self.assertEquals(grc(s), rc)
-             del m2
-@@ -203,10 +203,6 @@
-     
-     def test_buffer_in(self):
-         """test using a buffer as input"""
--        try:
--            view = memoryview
--        except NameError:
--            view = buffer
-         if unicode is str:
-             ins = "§§¶•ªº˜µ¬˚…∆˙åß∂©œ∑´†≈ç√".encode('utf8')
-         else:
-@@ -220,10 +216,6 @@
-         
-     def test_buffer_out(self):
-         """receiving buffered output"""
--        try:
--            view = memoryview
--        except NameError:
--            view = buffer
-         if unicode is str:
-             ins = "§§¶•ªº˜µ¬˚…∆˙åß∂©œ∑´†≈ç√".encode('utf8')
-         else:
-@@ -269,8 +261,12 @@
-             shape = shapes[:i]
-             A = numpy.random.random(shape)
-             m = zmq.Message(A)
--            self.assertEquals(A.data, m.buffer)
--            B = numpy.frombuffer(m.buffer,dtype=A.dtype).reshape(A.shape)
-+            if view.__name__ == 'buffer':
-+                self.assertEquals(A.data, m.buffer)
-+                B = numpy.frombuffer(m.buffer,dtype=A.dtype).reshape(A.shape)
-+            else:
-+                self.assertEquals(memoryview(A), m.buffer)
-+                B = numpy.array(m.buffer,dtype=A.dtype).reshape(A.shape)
-             self.assertEquals((A==B).all(), True)
-     
-     def test_memoryview(self):
diff --git a/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-3.1.patch b/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-3.1.patch
deleted file mode 100644
index 3d56ab43e9e0..000000000000
--- a/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-3.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zmq/tests/test_message.py
-+++ zmq/tests/test_message.py
-@@ -256,7 +256,7 @@
-             import numpy
-         except ImportError:
-             raise SkipTest("NumPy unavailable")
--        shapes = map(numpy.random.randint, [2]*5,[16]*5)
-+        shapes = list(map(numpy.random.randint, [2]*5,[16]*5))
-         for i in range(1,len(shapes)+1):
-             shape = shapes[:i]
-             A = numpy.random.random(shape)
diff --git a/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-3.2.patch b/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-3.2.patch
deleted file mode 100644
index a89a1371d883..000000000000
--- a/dev-python/pyzmq/files/pyzmq-2.0.10.1-python-3.2.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-https://github.com/zeromq/pyzmq/commit/c963d9a5aeb26d60026bf3472e98a6337f12330f
-https://github.com/zeromq/pyzmq/commit/7acb75644de0b94fbc4b5fff103395b0a7871d17
-
---- setup.py
-+++ setup.py
-@@ -197,18 +197,17 @@
-     return os.path.abspath(pjoin('zmq', subdir, name+'.c'))
- 
- czmq = pxd('core', 'czmq')
--allocate = pxd('utils', 'allocate')
- buffers = pxd('utils', 'buffers')
- 
- submodules = dict(
-     core = {'constants': [czmq],
-             'error':[czmq],
--            'poll':[czmq, allocate], 
-+            'poll':[czmq], 
-             'stopwatch':[czmq],
-             'context':[pxd('core', 'socket'), czmq],
-             'message':[czmq, buffers],
-             'socket':[pxd('core', 'context'), pxd('core', 'message'), 
--                      czmq, allocate, buffers],
-+                      czmq, buffers],
-             'device':[czmq],
-             'version':[czmq],
-     },
---- zmq/core/czmq.pxd
-+++ zmq/core/czmq.pxd
-@@ -27,6 +27,9 @@
- # Import the C header files
- #-----------------------------------------------------------------------------
- 
-+cdef extern from "allocate.h":
-+    object allocate(size_t n, void **pp)
-+
- cdef extern from "errno.h" nogil:
-     enum: ZMQ_EINVAL "EINVAL"
-     enum: ZMQ_EAGAIN "EAGAIN"
---- zmq/core/poll.pyx
-+++ zmq/core/poll.pyx
-@@ -23,9 +23,8 @@
- # Imports
- #-----------------------------------------------------------------------------
- 
--from czmq cimport zmq_poll, zmq_pollitem_t
-+from czmq cimport zmq_poll, zmq_pollitem_t, allocate
- from socket cimport Socket
--from allocate cimport allocate
- 
- import sys
- from zmq.core.error import ZMQError
---- zmq/core/socket.pyx
-+++ zmq/core/socket.pyx
-@@ -32,7 +32,6 @@
- from cpython cimport PyBytes_AsString, PyBytes_Size
- from cpython cimport Py_DECREF, Py_INCREF
- 
--from allocate cimport allocate
- from buffers cimport asbuffer_r, frombuffer_r, viewfromobject_r
- 
- from czmq cimport *
---- zmq/utils/allocate.h
-+++ zmq/utils/allocate.h
-@@ -0,0 +1,39 @@
-+/*
-+A utility to allocate a C array.
-+
-+This is excerpted from mpi4py's "atimport.h" and is licensed under the BSD license.
-+*/
-+
-+#include "Python.h"
-+
-+static PyObject * allocate(Py_ssize_t n, void **pp){
-+  PyObject *ob;
-+  if (n > PY_SSIZE_T_MAX)
-+    return PyErr_NoMemory();
-+  else if (n < 0) {
-+    PyErr_SetString(PyExc_RuntimeError,
-+                    "memory allocation with negative size");
-+    return NULL;
-+  }
-+#if PY_VERSION_HEX >= 0x02060000
-+  ob = PyByteArray_FromStringAndSize(NULL, (n==0) ? 1 : n);
-+  if (ob && n==0 && (PyByteArray_Resize(ob, 0) < 0)) {
-+    Py_DECREF(ob);
-+    return NULL;
-+  }
-+  if (ob && pp)
-+    *pp = (void *)PyByteArray_AS_STRING(ob);
-+#else
-+  {
-+    void *p = PyMem_Malloc(n);
-+    if (!p)
-+      return PyErr_NoMemory();
-+    ob = PyCObject_FromVoidPtr(p, PyMem_Free);
-+    if (!ob)
-+      PyMem_Free(p);
-+    else if (pp)
-+      *pp = p;
-+  }
-+#endif
-+  return ob;
-+}
-\ No newline at end of file
---- zmq/utils/allocate.pxd
-+++ zmq/utils/allocate.pxd
-@@ -1,40 +0,0 @@
--"""A utility to allocate a C array.
--
--This was copied from mpi4py and is licensed under the BSD license.
--"""
--
--from libc.stdlib cimport free, malloc
--
--#-----------------------------------------------------------------------------
--# Python includes.
--#-----------------------------------------------------------------------------
--
--cdef extern from "Python.h":
--    object PyCObject_FromVoidPtr(void *, void (*)(void*))
--
--#-----------------------------------------------------------------------------
--# Main functions.
--#-----------------------------------------------------------------------------
--
--cdef inline void *memnew(size_t n):
--    """malloc a new memory chunk of a given size."""
--    if n == 0: n = 1
--    return malloc(n)
--
--cdef inline void memdel(void *p):
--    """free a chunk of memory allocated with memnew."""
--    if p != NULL: free(p)
--
--cdef inline object allocate(size_t n, void **pp):
--    """A wrapper that allocates a C array, but with Python ref-counting."""
--    cdef object cob
--    cdef void *p = memnew(n)
--    if p == NULL:
--        raise MemoryError()
--    try:
--        cob = PyCObject_FromVoidPtr(p, memdel)
--    except:
--        memdel(p)
--        raise
--    pp[0] = p
--    return cob
diff --git a/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild b/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild
deleted file mode 100644
index cbf9d6caa1f6..000000000000
--- a/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.0.10.1.ebuild,v 1.7 2011/03/16 08:31:01 djc Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 *-jython"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="net-libs/zeromq"
-# dev-python/cython required only as long as pyzmq-2.0.10.1-python-3.2.patch is applied.
-DEPEND="${RDEPEND}
-	dev-python/cython"
-
-DOCS="README.rst"
-PYTHON_MODNAME="zmq"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-python-2.7.patch"
-	epatch "${FILESDIR}/${P}-python-3.1.patch"
-	epatch "${FILESDIR}/${P}-python-3.2.patch"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" nosetests -sv $(ls -d build-${PYTHON_ABI}/lib.*)
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/build/html/* || die "Installation of documentation failed"
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pyzmq/pyzmq-2.1.4.ebuild b/dev-python/pyzmq/pyzmq-2.1.4.ebuild
deleted file mode 100644
index 77e45e802d72..000000000000
--- a/dev-python/pyzmq/pyzmq-2.1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.1.4.ebuild,v 1.1 2011/05/02 12:27:09 djc Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 *-jython"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="PyZMQ is a lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=net-libs/zeromq-2.1"
-DEPEND="${RDEPEND}"
-
-DOCS="README.rst"
-PYTHON_MODNAME="zmq"
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" nosetests -sv $(ls -d build-${PYTHON_ABI}/lib.*)
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r docs/build/html/* || die "Installation of documentation failed"
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}