Add support for USE=bindist and some sh love.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 82 insertions, 18 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index 37645ddcefba..3e1f1c19653f 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pycrypto
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.19 2005/11/19 10:56:44 chriswhite Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.20 2006/01/06 23:08:29 vapier Exp $
+
+  06 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/pycrypto-2.0.1-bindist.patch, pycrypto-2.0-r1.ebuild,
+  pycrypto-2.0.1.ebuild:
+  Add support for USE=bindist and some sh love.
 
   19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
   Added japanese metadata.xml translation thanks to Yoshino-san.
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 62eab5349879..6cb43f51ec98 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a9f05fb111ad9ec8781460e75530756 ChangeLog 2483
+MD5 1f5791be578afe49ab0b64b3685b3912 ChangeLog 2666
 MD5 88124038f9bc0fb6771c9d12f9bcbac9 files/digest-pycrypto-1.9_alpha4 66
 MD5 b59c388eacd676d40313043ecea7841e files/digest-pycrypto-1.9_alpha6 66
 MD5 d204e299027be7fac9649389cf925a46 files/digest-pycrypto-2.0 64
 MD5 d204e299027be7fac9649389cf925a46 files/digest-pycrypto-2.0-r1 64
 MD5 b9e6cee737dea02a879ca7f8927b769a files/digest-pycrypto-2.0.1 66
+MD5 5cba92387bdac6204da53f0c3862ef3e files/pycrypto-2.0.1-bindist.patch 1557
 MD5 5b03cb0967f5fb96991f2463fa415797 metadata.xml 1774
 MD5 44877b6ed99242a7cab50a1941a19351 pycrypto-1.9_alpha4.ebuild 710
 MD5 3172f23539eb54a31ad3a7d8321d4557 pycrypto-1.9_alpha6.ebuild 622
-MD5 f9385559bb015b37c9e2ff2863e25eee pycrypto-2.0-r1.ebuild 594
-MD5 8de27bc518f75ebaba8b048aec87f02b pycrypto-2.0.1.ebuild 593
+MD5 d4fb605909249a6d153becb95ab0d3da pycrypto-2.0-r1.ebuild 599
+MD5 d9f822668d225711e529c75f075dac63 pycrypto-2.0.1.ebuild 750
 MD5 1ff484937e9f3be035fe383ea160e8ad pycrypto-2.0.ebuild 573
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDfwT/FdQwWVoAgN4RAuSQAKDC6qHGQXxvw6JT8X5lL0blZ0qDKgCg4Xmf
-tljIN0FnCWLdgfmWZ4UdlaI=
-=pS0i
+iD8DBQFDvvi02+ySkm8kpY0RAkVdAKCvaBa1xUI4uzlmhTwDRFyd4UMoAQCgqhFO
+UgfK6G9ao5bXR4HNd1mInFs=
+=iycB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/files/pycrypto-2.0.1-bindist.patch b/dev-python/pycrypto/files/pycrypto-2.0.1-bindist.patch
new file mode 100644
index 000000000000..be1d93260bdd
--- /dev/null
+++ b/dev-python/pycrypto/files/pycrypto-2.0.1-bindist.patch
@@ -0,0 +1,45 @@
+--- pycrypto/setup.py
++++ pycrypto/setup.py
+@@ -94,13 +94,6 @@
+             Extension("Crypto.Cipher.DES3",
+                       include_dirs=['src/'],
+                       sources=["src/DES3.c"]),
+-            Extension("Crypto.Cipher.IDEA",
+-                      include_dirs=['src/'],
+-                      sources=["src/IDEA.c"],
+-                      libraries=HTONS_LIBS),
+-            Extension("Crypto.Cipher.RC5",
+-                      include_dirs=['src/'],
+-                      sources=["src/RC5.c"]),
+ 
+             # Stream ciphers
+             Extension("Crypto.Cipher.ARC4",
+@@ -111,6 +104,17 @@
+                       sources=["src/XOR.c"]),
+             ]
+ 
++        if not os.environ.has_key("BINDIST") or os.environ["BINDIST"]!="1":
++            self.extensions += [
++                Extension("Crypto.Cipher.IDEA",
++                          include_dirs=['src/'],
++                          sources=["src/IDEA.c"],
++                          libraries=HTONS_LIBS),
++                Extension("Crypto.Cipher.RC5",
++                          include_dirs=['src/'],
++                          sources=["src/RC5.c"]),
++                ]
++
+         # Detect which modules should be compiled
+         self.detect_modules()
+         build_ext.build_extensions(self)
+--- pycrypto/Cipher/__init__.py
++++ pycrypto/Cipher/__init__.py
+@@ -24,7 +24,7 @@
+ """
+ 
+ __all__ = ['AES', 'ARC2', 'ARC4',
+-           'Blowfish', 'CAST', 'DES', 'DES3', 'IDEA', 'RC5',
++           'Blowfish', 'CAST', 'DES', 'DES3',
+            'XOR'
+            ]
+ 
diff --git a/dev-python/pycrypto/pycrypto-2.0-r1.ebuild b/dev-python/pycrypto/pycrypto-2.0-r1.ebuild
index 4239b4da3935..7ea564b49c06 100644
--- a/dev-python/pycrypto/pycrypto-2.0-r1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0-r1.ebuild,v 1.7 2005/09/02 15:48:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0-r1.ebuild,v 1.8 2006/01/06 23:08:29 vapier Exp $
 
 inherit distutils
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
 SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm hppa ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc sh ~sparc x86"
 LICENSE="freedist"
 DEPEND="dev-libs/gmp
 	virtual/python"
diff --git a/dev-python/pycrypto/pycrypto-2.0.1.ebuild b/dev-python/pycrypto/pycrypto-2.0.1.ebuild
index 85676f1cba3a..35144bf83935 100644
--- a/dev-python/pycrypto/pycrypto-2.0.1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.0.1.ebuild
@@ -1,15 +1,28 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.ebuild,v 1.4 2005/08/27 20:04:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1.ebuild,v 1.5 2006/01/06 23:08:29 vapier Exp $
 
-inherit distutils
+inherit eutils distutils
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
 SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+
 LICENSE="freedist"
-DEPEND="virtual/python"
 SLOT="0"
-IUSE=""
-DOCS="ACKS ChangeLog LICENSE MANIFEST PKG-INFO README TODO Doc/pycrypt.tex"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86"
+IUSE="bindist"
+
+DEPEND="virtual/python"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use bindist && epatch "${FILESDIR}"/${P}-bindist.patch
+}
+
+src_test() {
+	python ./test.py || die "test failed"
+}
+
+DOCS="ACKS ChangeLog PKG-INFO README TODO Doc/pycrypt.tex"