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

Package-Manager: portage-2.1.4_rc9

7 files changed, 38 insertions, 49 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/Manifest b/dev-python/pyrex/Manifest
index 59437a807eb5..5a36d9c912d2 100644
--- a/dev-python/pyrex/Manifest
+++ b/dev-python/pyrex/Manifest
@@ -1,17 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pyrex-0.9.6.3-setup_py.patch 525 RMD160 2945459ab9d81cf69f5c8b5d67d43cffda085406 SHA1 0c09bc27bb3f6e7eafdaa05d136fbf45c71153e4 SHA256 5711340e7ae1734672a39edba5f5f177ecbd191adbb7b2dd77c7617784fde516
-MD5 af901df9e7a2383b28cf1d3e3877aac5 files/pyrex-0.9.6.3-setup_py.patch 525
-RMD160 2945459ab9d81cf69f5c8b5d67d43cffda085406 files/pyrex-0.9.6.3-setup_py.patch 525
-SHA256 5711340e7ae1734672a39edba5f5f177ecbd191adbb7b2dd77c7617784fde516 files/pyrex-0.9.6.3-setup_py.patch 525
-AUX pyrex-0.9.6.3-setuptools-workaround.patch 571 RMD160 accadcd1b627c6f019721be14b8b1f0a329e2b07 SHA1 74ca12357fa443cba1be8860bdb6dfd8ca1d9c56 SHA256 7628c5f14d6c552f3eb8f682e6f2dcab31d68a88dfc5dd7740f09918d9ed68e3
-MD5 215cc66856c16724b00fb3bccd7cb234 files/pyrex-0.9.6.3-setuptools-workaround.patch 571
-RMD160 accadcd1b627c6f019721be14b8b1f0a329e2b07 files/pyrex-0.9.6.3-setuptools-workaround.patch 571
-SHA256 7628c5f14d6c552f3eb8f682e6f2dcab31d68a88dfc5dd7740f09918d9ed68e3 files/pyrex-0.9.6.3-setuptools-workaround.patch 571
+AUX pyrex-0.9.6.4-setuptools-workaround.patch 582 RMD160 275a89d1cf696ea81ba254a6604800cbd1a9af85 SHA1 669c7c543711b87beb9350dacfed16219de5b07b SHA256 b43be4504bf7dc06e4d231bbb3ecebf033240e96b5e304ea5f6f2dbc249a7e86
+MD5 388f8196a8d3205f16fce7d2a30b1068 files/pyrex-0.9.6.4-setuptools-workaround.patch 582
+RMD160 275a89d1cf696ea81ba254a6604800cbd1a9af85 files/pyrex-0.9.6.4-setuptools-workaround.patch 582
+SHA256 b43be4504bf7dc06e4d231bbb3ecebf033240e96b5e304ea5f6f2dbc249a7e86 files/pyrex-0.9.6.4-setuptools-workaround.patch 582
 DIST Pyrex-0.9.4.1.tar.gz 181507 RMD160 c6474bfdab3ed7df745b83aba89a47c6482d7d0a SHA1 cafd221d75bacd411d8f0ca8dabc450a58466ba5 SHA256 687c9169cfb716daa1414b1879a8cd4466be26c89e058d65c15d0dd30b61cfd3
 DIST Pyrex-0.9.5.1a.tar.gz 183135 RMD160 a8b1a358986a641fd604f5487750f5f1e2633aaa SHA1 ea8b6e5981ec2d05306a8fc42bb1c429bd3f5966 SHA256 7f34e865505bd467557220961b091fc54782114865e1c5b81e68395989ddbd53
-DIST Pyrex-0.9.6.3.tar.gz 222558 RMD160 555461710a0863da5ae38e1f52097cf1f145d6f4 SHA1 e93a9a80f9e796b89488503d74772cfc2a7f96e8 SHA256 e91e163d6f3f08de9c245a42d8572d08279dbdfe9b1f54cc1cf13a74bd61ba7d
+DIST Pyrex-0.9.6.4.tar.gz 221658 RMD160 4209739535744b65b8681e8974c5eac7894d3431 SHA1 233fb9b92b62015b9d0f24c9e1aea4acdcd6782d SHA256 48151c5f6f9ee92f9122bd1ced2c45c27578de83ad01c68e88860eaa904beda2
 EBUILD pyrex-0.9.4.1.ebuild 837 RMD160 627de134f3abcf89bb2f904c2ec1f472663710e0 SHA1 ee4b9f2faaadc9a103b7275dc29cee6e5bb71480 SHA256 514dd68da2d8ff24bbfd2f4d4f5b08fb2dd4e8f7665e0887d8ef88036247933a
 MD5 ef23e8df14f90c01714f7d24108b5b8a pyrex-0.9.4.1.ebuild 837
 RMD160 627de134f3abcf89bb2f904c2ec1f472663710e0 pyrex-0.9.4.1.ebuild 837
@@ -20,14 +16,14 @@ EBUILD pyrex-0.9.5.1a.ebuild 852 RMD160 ce2c4d6800fd83d1e4817565c8ab162b49f5e609
 MD5 c7415ad25d107654f2856ee4c1c9312c pyrex-0.9.5.1a.ebuild 852
 RMD160 ce2c4d6800fd83d1e4817565c8ab162b49f5e609 pyrex-0.9.5.1a.ebuild 852
 SHA256 d6f227b5b19596c7b0b2294eef2f00bb3c2af891362bed65bd1c909493366c44 pyrex-0.9.5.1a.ebuild 852
-EBUILD pyrex-0.9.6.3.ebuild 984 RMD160 b4a5ae1a4559f43a9c01c60dd47f8ae07eb69db5 SHA1 19a1d540892b4edb30b8779dc95be12bc9c36ec4 SHA256 2e55195be1eb4feed63d4e57ef9ef369393bcf50df16d28269ac6d0bec6a0af2
-MD5 d8c3cfd99b7525266c6eea32e3f7d863 pyrex-0.9.6.3.ebuild 984
-RMD160 b4a5ae1a4559f43a9c01c60dd47f8ae07eb69db5 pyrex-0.9.6.3.ebuild 984
-SHA256 2e55195be1eb4feed63d4e57ef9ef369393bcf50df16d28269ac6d0bec6a0af2 pyrex-0.9.6.3.ebuild 984
-MISC ChangeLog 7061 RMD160 0cc41ccf32e96be975b1574a452ff12f1a131a14 SHA1 a5fc95363f70a8d03c9c668d8777d385e0bc0034 SHA256 0b5426ffb4f554c199cce75695f82fcda0414b2b33f87ff0e3ad77278ecc2ce1
-MD5 d65081e96c759e21b2b91694d40fd018 ChangeLog 7061
-RMD160 0cc41ccf32e96be975b1574a452ff12f1a131a14 ChangeLog 7061
-SHA256 0b5426ffb4f554c199cce75695f82fcda0414b2b33f87ff0e3ad77278ecc2ce1 ChangeLog 7061
+EBUILD pyrex-0.9.6.4.ebuild 942 RMD160 2bf19044ae728a758c5ba08ab1fb248600f4b41e SHA1 f9869289d486c9a2b499d7634ef8f4871bc452c7 SHA256 7d9815c2a79e0f54c5be5409168e868052997badb3dd24e238dcee19d8291812
+MD5 3d41f04d84bae1300473235a88df681a pyrex-0.9.6.4.ebuild 942
+RMD160 2bf19044ae728a758c5ba08ab1fb248600f4b41e pyrex-0.9.6.4.ebuild 942
+SHA256 7d9815c2a79e0f54c5be5409168e868052997badb3dd24e238dcee19d8291812 pyrex-0.9.6.4.ebuild 942
+MISC ChangeLog 7419 RMD160 c1f409ddff4796556337c134e664626421de82ed SHA1 4962b156b83aeaa2d4bf5696bb55be02449d3088 SHA256 f9192f9ac97f3a68ffbc97a2a4a6497dfd0836035980f39a73ccaac591211823
+MD5 c0685fcd95a0afbd68acca4c6a2a3465 ChangeLog 7419
+RMD160 c1f409ddff4796556337c134e664626421de82ed ChangeLog 7419
+SHA256 f9192f9ac97f3a68ffbc97a2a4a6497dfd0836035980f39a73ccaac591211823 ChangeLog 7419
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -38,13 +34,13 @@ SHA256 1645cb2b49b090a82a838862e6b27a3c9c6ece9f364ac1e7364ceda9b4f01afc files/di
 MD5 03ed2a6294de60da695ae019c81c8ea1 files/digest-pyrex-0.9.5.1a 244
 RMD160 e20488a57c96f66b59d0fa717d5d1170898095fe files/digest-pyrex-0.9.5.1a 244
 SHA256 23bd751803fa939fbe7101f7709369a46fccf9abbbd9270a1a527c0715eb7a87 files/digest-pyrex-0.9.5.1a 244
-MD5 014f91df1eea31bfeace3de082ce72f0 files/digest-pyrex-0.9.6.3 241
-RMD160 af365dfd65d68f6b4cfe83625ec42e659cae4acb files/digest-pyrex-0.9.6.3 241
-SHA256 c1dca82a5114c3dcc71c7eab2d8c2a6c7d1789d1fdb2602d627ba475c7f3ec65 files/digest-pyrex-0.9.6.3 241
+MD5 e73b3ddbe572206e3154a906c42aca56 files/digest-pyrex-0.9.6.4 241
+RMD160 110fa6a2eeea8d6b7df7c97a7b984a0decddd177 files/digest-pyrex-0.9.6.4 241
+SHA256 63c9268deb81f5405a99594a7d91100ceef04bf9ea95846d07fdfc8a4aa1bbbc files/digest-pyrex-0.9.6.4 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHLYjaQU4yORhF8iARAu9jAJ0dmgU1XES8l8Imv67IZZtNv8QxwACfWzn1
-VLFB5smK9E/l0lAkW6NfLFM=
-=bPCr
+iD8DBQFHX/4GQU4yORhF8iARAm+lAKCC6AyAhNp0Ta2uT5vmGlMA2iFVyQCfbChm
+eEn0Q8miiQ+xOD399Iq0Y8o=
+=C9h/
 -----END PGP SIGNATURE-----
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"
 }