Merge from Prefix

(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)

3 files changed, 71 insertions, 3 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index 2b3a00fc4647..faa321c281b2 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pycrypto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.74 2009/10/02 01:08:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.75 2009/10/11 09:42:42 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pycrypto-2.0.1-r8.ebuild,
+  +files/pycrypto-2.0.1-caseimport.patch:
+  Merge from Prefix
 
   02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pycrypto-2.0.1-r8.ebuild:
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-caseimport.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-caseimport.patch
new file mode 100644
index 000000000000..ad4331ff05d2
--- /dev/null
+++ b/dev-python/pycrypto/files/pycrypto-2.0.1-caseimport.patch
@@ -0,0 +1,63 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1849383&group_id=20937&atid=320937
+
+--- pycrypto-2.0.1/Hash/MD5.py
++++ pycrypto-2.0.1/Hash/MD5.py
+@@ -13,11 +13,14 @@
+     digest_size = new().digest_size
+ 
+ except ImportError:
+-    from md5 import *
++    # cannot import 'md5' from within 'MD5.py',
++    # because on case insensitive filesystems it will find myself.
++    # thus need to do the actual 'import md5' from somewhere else.
++    from extmd5 import *
+ 
+-    import md5
+-    if hasattr(md5, 'digestsize'):
++    import extmd5
++    if hasattr(extmd5, 'digestsize'):
+         digest_size = digestsize
+         del digestsize
+-    del md5
++    del extmd5
+ 
+--- pycrypto-2.0.1/Hash/SHA.py
++++ pycrypto-2.0.1/Hash/SHA.py
+@@ -13,9 +13,12 @@
+     digest_size = new().digest_size
+ 
+ except ImportError:
+-    from sha import *
+-    import sha
+-    if hasattr(sha, 'digestsize'):
++    # cannot import 'sha' from within 'SHA.py',
++    # because on case insensitive filesystems it will find myself.
++    # thus need to do the actual 'import sha' from somewhere else.
++    from extsha import *
++    import extsha
++    if hasattr(extsha, 'digestsize'):
+         digest_size = digestsize
+         del digestsize
+-    del sha
++    del extsha
+--- pycrypto-2.0.1/Hash/extmd5/__init__.py
++++ pycrypto-2.0.1/Hash/extmd5/__init__.py
+@@ -0,0 +1,2 @@
++# see ../MD5.py for why this is done
++from md5 import *
+--- pycrypto-2.0.1/Hash/extsha/__init__.py
++++ pycrypto-2.0.1/Hash/extsha/__init__.py
+@@ -0,0 +1,2 @@
++# see ../SHA.py for why this is done
++from sha import *
+--- pycrypto-2.0.1/setup.py
++++ pycrypto-2.0.1/setup.py
+@@ -132,7 +132,7 @@
+       'url':"http://www.amk.ca/python/code/crypto",
+ 
+       'cmdclass' : {'build_ext':PCTBuildExt},
+-      'packages' : ["Crypto", "Crypto.Hash", "Crypto.Cipher", "Crypto.Util",
++      'packages' : ["Crypto", "Crypto.Hash", "Crypto.Hash.extmd5", "Crypto.Hash.extsha", "Crypto.Cipher", "Crypto.Util",
+                   "Crypto.Protocol", "Crypto.PublicKey"],
+       'package_dir' : { "Crypto":"." },
+       # One module is defined here, because build_ext won't be
diff --git a/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild b/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild
index ff2d60177c22..eab17d18c4c7 100644
--- a/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild,v 1.9 2009/10/02 01:08:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1-r8.ebuild,v 1.10 2009/10/11 09:42:42 grobian Exp $
 
 EAPI="2"
 NEED_PYTHON="2.5"
@@ -14,7 +14,7 @@ SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bindist gmp test"
 
 RDEPEND="gmp? ( dev-libs/gmp )"
@@ -34,6 +34,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-2.6_hashlib.patch
 	#ARC2 buffer overlow. Bug 258049
 	epatch "${FILESDIR}"/${P}-CVE-2009-0544.patch
+	epatch "${FILESDIR}"/${P}-caseimport.patch # for case insensitive filesystems
 }
 
 src_compile() {