Version bump.

Package-Manager: portage-14774-svn/cvs/Linux x86_64

4 files changed, 109 insertions, 2 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index faa321c281b2..0a3cbe785cc3 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2009/10/11 09:42:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.76 2009/11/02 23:32:07 arfrever Exp $
+
+*pycrypto-2.1.0_beta1 (03 Nov 2009)
+
+  03 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +pycrypto-2.1.0_beta1.ebuild, +files/pycrypto-2.1.0-gmp.patch:
+  Version bump.
 
   11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pycrypto-2.0.1-r8.ebuild,
   +files/pycrypto-2.0.1-caseimport.patch:
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 55effcc21b8e..a14afe85a03a 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -7,10 +7,13 @@ AUX pycrypto-2.0.1-sancho-package-rename.patch 2688 RMD160 6a827488245c262780190
 AUX pycrypto-2.0.1-sha256-2.patch 2689 RMD160 a1bee09ec9595cd9631ef8b3a6f323258374ea9b SHA1 2abda23ed2584db3307235749a5d1286610ced40 SHA256 0c270f90abb0d4ae32e7fe3b4b6d100596ef9ab14b43ace75cac4334bea149eb
 AUX pycrypto-2.0.1-sha256.patch 912 RMD160 9a2557cdaf4f9922b3ace23d7eced46f5785f0de SHA1 eafcd5a6e25c4f4d8411612a9f18f8e90e1aca18 SHA256 3fef960453dc28b2d17623c85338d49bc74f9a5e73bd31bceb77880b30c4779f
 AUX pycrypto-2.0.1-uint32.patch 1078 RMD160 40f20f4d3a89b8927eaee415418e1d9f2b2be33b SHA1 0214ba9f2a592e6ce78cf6dd8e5d72f9dd44ac0d SHA256 b8cb928cbf1713eff06c6899cb773c9a02f28e85de02e7d6f45ed1be413b47dd
+AUX pycrypto-2.1.0-gmp.patch 1049 RMD160 8fbf66f203cf6de229c540bce538698b0406536d SHA1 0dc2ee17b96f5673dc57607b6036b649eaaf3297 SHA256 70d9ff679f2bbb377eee0ee19643f07e2b6ebc0dd8c763fc22976a43afcc5ebf
 DIST pycrypto-2.0.1.tar.gz 154292 RMD160 5ce938a24f77f414e42680c17ef9b6dc8de94a2e SHA1 c77cdefdfb06e4749690013a9a9e1600ab14e26f SHA256 b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea
+DIST pycrypto-2.1.0b1.tar.gz 265344 RMD160 3312d4c667986b51d0936f2223b0cf31f300ef77 SHA1 099aa87f99b13577bf6f49b226c3e3e23c61bcdf SHA256 7be4be8262ed8443700eed71e498e9b8d8a5ac17f3a00abc112c81753ffec9ba
 EBUILD pycrypto-2.0.1-r5.ebuild 1501 RMD160 23fcf75215bacac43de0e254d216768a14aca7aa SHA1 882cfa951483f6c304984c75f541ef8488906fda SHA256 e1cfce80ae28225522ba830ed9062123a71fe8279f31ce9096d994f34a55d3b8
 EBUILD pycrypto-2.0.1-r6.ebuild 1532 RMD160 b96b870eceb138401f61bba45ef8021366da2e1c SHA1 d63f0abf22a9d3f59332e73a33fa3e1b03e7e5dc SHA256 d9fe3eac30683401eae64384b52653926c57c57945ad12ca59aba516e8fc5187
 EBUILD pycrypto-2.0.1-r7.ebuild 1628 RMD160 003756f506596bedd5cc76142b84e26c38221e34 SHA1 52692ec4cd6e0c8b50fd48ee50e40ce31ae4eac7 SHA256 4e9a1a631ef9e9c8c7f4e5ebcc0ad0e6ec443abcc2ac8b468dc71d4ccd037863
 EBUILD pycrypto-2.0.1-r8.ebuild 2052 RMD160 84bd582455c182c9f4fb642496d74d3e511fa0ea SHA1 6c301fe518051562c44d37f0fb8785d613514f30 SHA256 b36ab869b484ee46ec95acf02b21a7bf7d6ed0ae96cd77a43011d554880a07e1
-MISC ChangeLog 10054 RMD160 9149d006f67648e6edb910f6cbeeffd5467c6d1e SHA1 9d3cb0be1bfc45deaee02ae9a63efe3d741b255c SHA256 861f767ebf35671e1408c7aca36541e45508aed86312ae74bf00e83d9d4b3ede
+EBUILD pycrypto-2.1.0_beta1.ebuild 2123 RMD160 4b83aaaaeb4ac30acddb64464613f493befac2ee SHA1 5db8d7cbedec6331cc1d29abe7629ae1d203aee8 SHA256 d8f71a049a9c4ef6d0c17d5a17ff7ef65f6e38e6d63167b88209783b3b6c33f6
+MISC ChangeLog 10247 RMD160 ca91406067c091b0a0ead664fbc751a3297568b5 SHA1 9563f5745d416b1600d0b714465a65c00dac8b4d SHA256 e1381e93d00740d3f1de53b14173f4acebdd30b4984c1749739ba33ee140fe3a
 MISC metadata.xml 1774 RMD160 b0aeda4d69c1dc4ec798f05f617a2d0ddf8c29ab SHA1 00da4a85672688868003fecd52b3a9497a3c433c SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2
diff --git a/dev-python/pycrypto/files/pycrypto-2.1.0-gmp.patch b/dev-python/pycrypto/files/pycrypto-2.1.0-gmp.patch
new file mode 100644
index 000000000000..1aafd8022d56
--- /dev/null
+++ b/dev-python/pycrypto/files/pycrypto-2.1.0-gmp.patch
@@ -0,0 +1,20 @@
+--- setup.py
++++ setup.py
+@@ -151,11 +151,12 @@
+         if self.compiler.compiler_type == 'msvc':
+             self.compiler.include_dirs.insert(0, "src/inc-msvc/")
+ 
+-        # Detect libgmp and don't build _fastmath if it is missing.
+-        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
+-        if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
+-            print >>sys.stderr, "warning: GMP library not found; Not building Crypto.PublicKey._fastmath."
+-            self.__remove_extensions(["Crypto.PublicKey._fastmath"])
++        if os.environ.get("USE_GMP", "1") == "1":
++            # Detect libgmp and don't build _fastmath if it is missing.
++            lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
++            if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
++                print >>sys.stderr, "error: GMP library not found."
++                sys.exit(1)
+ 
+     def __remove_extensions(self, names):
+         """Remove the specified extension from the list of extensions to build"""
diff --git a/dev-python/pycrypto/pycrypto-2.1.0_beta1.ebuild b/dev-python/pycrypto/pycrypto-2.1.0_beta1.ebuild
new file mode 100644
index 000000000000..9d9c09dc9bcb
--- /dev/null
+++ b/dev-python/pycrypto/pycrypto-2.1.0_beta1.ebuild
@@ -0,0 +1,78 @@
+# 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.1.0_beta1.ebuild,v 1.1 2009/11/02 23:32:07 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils flag-o-matic
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="Python Cryptography Toolkit"
+HOMEPAGE="http://www.dlitz.net/software/pycrypto/"
+SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp"
+
+RDEPEND="gmp? ( dev-libs/gmp )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils dev-python/epydoc )"
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS="ACKS ChangeLog README TODO"
+
+pkg_setup() {
+	# Some tests fail with some limit of inlining of functions.
+	append-flags -fno-inline-functions
+}
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${PN}-2.1.0-gmp.patch"
+}
+
+src_configure() {
+	use gmp \
+		&& export USE_GMP="1" \
+		|| export USE_GMP="0"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		rst2html.py Doc/pycrypt.rst > Doc/index.html
+
+		# Build documentation only once.
+		documentation_built="0"
+		generate_documentation() {
+			[[ "${documentation_built}" == "1" ]] && return
+			PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die "Generation of documentation failed"
+			documentation_built="1"
+		}
+		python_execute_function -q generate_documentation
+		unset documentation_built
+	fi
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml Doc/index.html || die "dohtml failed"
+		dohtml Doc/apidoc/* || die "dohtml failed"
+	fi
+}