Version bump. Fix setuptools issues, thanks to Rene 'Necoro' Neumann, bug 195992

(Portage version: 2.1.3.16)

6 files changed, 51 insertions, 6 deletions

diff --git a/dev-python/pyrex/ChangeLog b/dev-python/pyrex/ChangeLog
index 50c0c348968b..8fd844a9e9fd 100644
--- a/dev-python/pyrex/ChangeLog
+++ b/dev-python/pyrex/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pyrex
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.58 2007/10/08 21:08:21 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.59 2007/11/04 08:54:50 hawking Exp $
+
+*pyrex-0.9.6.3 (04 Nov 2007)
+
+  04 Nov 2007; Ali Polatel <hawking@gentoo.org>
+  +files/pyrex-0.9.6.3-setup_py.patch,
+  +files/pyrex-0.9.6.3-setuptools-workaround.patch, -pyrex-0.9.6.ebuild,
+  +pyrex-0.9.6.3.ebuild:
+  Version bump. Fix setuptools issues, thanks to Rene 'Necoro' Neumann, bug
+  195992
 
 *pyrex-0.9.6 (08 Oct 2007)
 
diff --git a/dev-python/pyrex/files/digest-pyrex-0.9.6 b/dev-python/pyrex/files/digest-pyrex-0.9.6
deleted file mode 100644
index 3b553a0eb60b..000000000000
--- a/dev-python/pyrex/files/digest-pyrex-0.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e79be6e30a5abe35f6cded60ae8b23f1 Pyrex-0.9.6.tar.gz 221611
-RMD160 09b60c6b167d315e32b5b0bfa33a98faac5b7861 Pyrex-0.9.6.tar.gz 221611
-SHA256 be53be53e71072a9503d87c853aec2495f6a0f8bea00276b9116c6a1c4ce15c4 Pyrex-0.9.6.tar.gz 221611
diff --git a/dev-python/pyrex/files/digest-pyrex-0.9.6.3 b/dev-python/pyrex/files/digest-pyrex-0.9.6.3
new file mode 100644
index 000000000000..31bed38625c0
--- /dev/null
+++ b/dev-python/pyrex/files/digest-pyrex-0.9.6.3
@@ -0,0 +1,3 @@
+MD5 6fbd5a21d4f6f1b96b6b9c7e13b46d6f Pyrex-0.9.6.3.tar.gz 222558
+RMD160 555461710a0863da5ae38e1f52097cf1f145d6f4 Pyrex-0.9.6.3.tar.gz 222558
+SHA256 e91e163d6f3f08de9c245a42d8572d08279dbdfe9b1f54cc1cf13a74bd61ba7d Pyrex-0.9.6.3.tar.gz 222558
diff --git a/dev-python/pyrex/files/pyrex-0.9.6.3-setup_py.patch b/dev-python/pyrex/files/pyrex-0.9.6.3-setup_py.patch
new file mode 100644
index 000000000000..cca6c7df7a78
--- /dev/null
+++ b/dev-python/pyrex/files/pyrex-0.9.6.3-setup_py.patch
@@ -0,0 +1,16 @@
+--- setup.py.orig	2007-10-12 01:32:44.000000000 +0300
++++ setup.py	2007-11-04 10:29:28.000000000 +0200
+@@ -2,11 +2,12 @@
+ #   Pyrex setup file
+ #
+ 
++import distutils
+ from distutils.core import setup
+ from distutils.sysconfig import get_python_lib
+ import os, sys
+ #from Pyrex.Compiler.Version import version
+-execfile(distutils.util.convert_path('Pyrex/Compiler/Version.py')
++execfile(distutils.util.convert_path('Pyrex/Compiler/Version.py'))
+ 
+ compiler_dir = os.path.join(get_python_lib(prefix=''), 'Pyrex', 'Compiler')
+ 
diff --git a/dev-python/pyrex/files/pyrex-0.9.6.3-setuptools-workaround.patch b/dev-python/pyrex/files/pyrex-0.9.6.3-setuptools-workaround.patch
new file mode 100644
index 000000000000..0e9cd4ea7412
--- /dev/null
+++ b/dev-python/pyrex/files/pyrex-0.9.6.3-setuptools-workaround.patch
@@ -0,0 +1,14 @@
+--- Pyrex/Distutils/build_ext.py	2007-10-15 02:07:42.000000000 +0300
++++ Pyrex/Distutils/build_ext.py	2007-11-04 10:34:15.000000000 +0200
+@@ -81,6 +81,11 @@
+             ext.sources = self.pyrex_sources(ext.sources, ext)
+             self.build_extension(ext)
+ 
++    # Workaround, as setuptools wants swig_sources with only two arguments
++    # see Gentoo bugs #195354 and #195466
++    def swig_sources(self, sources, extension=None):
++        _build_ext.build_ext.swig_sources(self, sources, extension)
++
+     def pyrex_sources(self, sources, extension):
+ 
+         """
diff --git a/dev-python/pyrex/pyrex-0.9.6.ebuild b/dev-python/pyrex/pyrex-0.9.6.3.ebuild
index 541149d763fc..26fe62d328e1 100644
--- a/dev-python/pyrex/pyrex-0.9.6.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.6.ebuild,v 1.1 2007/10/08 21:08:21 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.6.3.ebuild,v 1.1 2007/11/04 08:54:50 hawking Exp $
 
 NEED_PYTHON=2.3
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="Pyrex-${PV}"
 DESCRIPTION="A language for writing Python extension modules"
@@ -20,6 +20,12 @@ S="${WORKDIR}/${MY_P}"
 
 PYTHON_MODNAME="Pyrex"
 
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}/${P}-setup_py.patch"
+	epatch "${FILESDIR}/${P}-setuptools-workaround.patch"
+}
+
 src_install() {
 	DOCS="CHANGES.txt ToDo.txt USAGE.txt"
 	distutils_src_install