Version bump. Fixed setuptools patch, thanks to Klaus Zimmermann #195992. Drop old.

(Portage version: 2.1.4_rc9)

6 files changed, 18 insertions, 25 deletions

diff --git a/dev-python/pyrex/ChangeLog b/dev-python/pyrex/ChangeLog
index 8fd844a9e9fd..77fa41902f97 100644
--- a/dev-python/pyrex/ChangeLog
+++ b/dev-python/pyrex/ChangeLog
@@ -1,6 +1,16 @@
 # 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.59 2007/11/04 08:54:50 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.60 2007/12/12 15:27:53 hawking Exp $
+
+*pyrex-0.9.6.4 (12 Dec 2007)
+
+  12 Dec 2007; Ali Polatel <hawking@gentoo.org>
+  -files/pyrex-0.9.6.3-setup_py.patch,
+  -files/pyrex-0.9.6.3-setuptools-workaround.patch,
+  +files/pyrex-0.9.6.4-setuptools-workaround.patch, -pyrex-0.9.6.3.ebuild,
+  +pyrex-0.9.6.4.ebuild:
+  Version bump. Fixed setuptools patch, thanks to Klaus Zimmermann #195992.
+  Drop old.
 
 *pyrex-0.9.6.3 (04 Nov 2007)
 
diff --git a/dev-python/pyrex/files/digest-pyrex-0.9.6.3 b/dev-python/pyrex/files/digest-pyrex-0.9.6.3
deleted file mode 100644
index 31bed38625c0..000000000000
--- a/dev-python/pyrex/files/digest-pyrex-0.9.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-pyrex-0.9.6.4 b/dev-python/pyrex/files/digest-pyrex-0.9.6.4
new file mode 100644
index 000000000000..b503eab1e300
--- /dev/null
+++ b/dev-python/pyrex/files/digest-pyrex-0.9.6.4
@@ -0,0 +1,3 @@
+MD5 52bb6ec8848d9aa412c8bfd0fe9f33ea Pyrex-0.9.6.4.tar.gz 221658
+RMD160 4209739535744b65b8681e8974c5eac7894d3431 Pyrex-0.9.6.4.tar.gz 221658
+SHA256 48151c5f6f9ee92f9122bd1ced2c45c27578de83ad01c68e88860eaa904beda2 Pyrex-0.9.6.4.tar.gz 221658
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
deleted file mode 100644
index cca6c7df7a78..000000000000
--- a/dev-python/pyrex/files/pyrex-0.9.6.3-setup_py.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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.4-setuptools-workaround.patch
index 0e9cd4ea7412..443d2facceb2 100644
--- a/dev-python/pyrex/files/pyrex-0.9.6.3-setuptools-workaround.patch
+++ b/dev-python/pyrex/files/pyrex-0.9.6.4-setuptools-workaround.patch
@@ -1,5 +1,5 @@
---- 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
+--- Pyrex/Distutils/build_ext.py.old	2007-10-16 00:43:41.035218320 +0200
++++ Pyrex/Distutils/build_ext.py	2007-10-16 00:49:33.564437777 +0200
 @@ -81,6 +81,11 @@
              ext.sources = self.pyrex_sources(ext.sources, ext)
              self.build_extension(ext)
@@ -7,7 +7,7 @@
 +    # 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)
++        return _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.3.ebuild b/dev-python/pyrex/pyrex-0.9.6.4.ebuild
index 26fe62d328e1..8d35eceb6ba7 100644
--- a/dev-python/pyrex/pyrex-0.9.6.3.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.6.4.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2007/11/04 08:54:50 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.6.4.ebuild,v 1.1 2007/12/12 15:27:53 hawking Exp $
 
 NEED_PYTHON=2.3
 
@@ -22,7 +22,6 @@ PYTHON_MODNAME="Pyrex"
 
 src_unpack() {
 	distutils_src_unpack
-	epatch "${FILESDIR}/${P}-setup_py.patch"
 	epatch "${FILESDIR}/${P}-setuptools-workaround.patch"
 }