revbump; re-add pypy support, update and tidy deps, patch (from upstream) to correct their own oversight in setup.py re use of enum34, ebuild cross checked and tested by Arfrever.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 52 insertions, 17 deletions

diff --git a/dev-python/cryptography/ChangeLog b/dev-python/cryptography/ChangeLog
index 0d4c053cf738..0385a15f3158 100644
--- a/dev-python/cryptography/ChangeLog
+++ b/dev-python/cryptography/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/cryptography
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.30 2015/01/13 03:21:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.31 2015/01/14 00:32:22 idella4 Exp $
+
+*cryptography-0.7 (14 Jan 2015)
+*cryptography-0.7.1-r1 (14 Jan 2015)
+
+  14 Jan 2015; Ian Delaney <idella4@gentoo.org> +cryptography-0.7.1-r1.ebuild,
+  +cryptography-0.7.ebuild, +files/0.7-setup.patch, -cryptography-0.7.1.ebuild:
+  revbump; re-add pypy support, update and tidy deps, patch (from upstream) to
+  correct their own oversight in setup.py re use of enum34, ebuild cross checked
+  and tested by Arfrever.
 
 *cryptography-0.7.1 (13 Jan 2015)
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 8fa98f636228..590513e8843a 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 0.7-setup.patch 510 SHA256 2a316a8e707bd1e2836476cf29ed14225d48ea62db69f3e117a417d41765ed8e SHA512 9708ce8bc6cae0f984bd5fe8ff6993e084bc1ae46ddc7d4f7fd7cce72d713496ffc97a66a922dfe5bfcb70a9e869041026ff0093bd47f398389e5b238825408a WHIRLPOOL 7c49c426c52c42c0687227b63dd25d318236a6cdcc1293dac37f3c9b67f039de843c7c1c23e326c67c1070fa11f8f36a39f7540d1ea607978c95193258a923d0
 DIST cryptography-0.5.4.tar.gz 320104 SHA256 5675999f3744cbc32a60cb0bba64de21405abced32ce19655212612262dd270d SHA512 bdfaed6271e21d8b5cef4e8d0cdb7fd4bfb5b607c0f14c7b33888301f9922035f337120c3252d2df16f1844129d4b18dd97abe566bccc18c829faa752af2b4a7 WHIRLPOOL 5522d40bef251b5005e17fa2f43c4f015a7422c2aa9a09cfed8f84365506a1c8d9a97d956d97a3130a46aa7a0d0e90258f9c365ffb196ad0df2be4f6548e3b10
 DIST cryptography-0.6.1.tar.gz 236721 SHA256 024910130a01eda0ce969764d893d2e397168ebb94181ca1ea3e23e19912329e SHA512 b99338bbbeb70f37e0bfcc6ef33ddff5beb74f7876a30d34deb3a433ddd77f821e5cc5dde228f792362ae7a261d4ceb3b702fb1a8c30ce15a1e6e4de98ef1afa WHIRLPOOL a641342fe13f584ee657aa917172810117416cd426746af30499e43174041c8031598c223398dace1ad1385e3905a27c9f6e5ac5def88a8b87e2ed3bfd95b9ce
 DIST cryptography-0.7.1.tar.gz 247309 SHA256 9ee59090b242ad0d6abcedebb9ab54358d5efd1a45706195f6e5928f7725bb76 SHA512 ae552fcb8005c98ded32b47edf61d4bf2b495c63b9ac744545d3d1ada7f6f64b1b23a5d9f396bf2a998fcc58370307c893f324806e0c825b9c63fe78698bdc4b WHIRLPOOL dfdb3ff90291c7f3dca3835532608b742c9768311b204bb4a41c62ed6d4ed48b812898a482d86ced10887daebe2b57b1451df51f297f9a19a7ce80a05446f938
 EBUILD cryptography-0.5.4.ebuild 1195 SHA256 a989b53034600cf37b037b01a528d1f2f9eb1e2bc2d94e4174ae02daf42127b8 SHA512 dfcabdd002a358ae388ee4003f8ea1a7e38054d0f9d4d4eec9ee641d26967671c2485416783a5277b79d46312e3c3ea3ccd25347a30e5caa36229c2aca969755 WHIRLPOOL 29f0a7de63b4f4140a7f72e721dc1b44c89c3c63b7949f4dd68f96847660ecbf1ae7e9febff86977208ee450698dafe592bf15274af54d166dca1ae6942f5bab
 EBUILD cryptography-0.6.1.ebuild 1379 SHA256 4973cad7919643f2110d8a5e561a39294b1ef30173daa05be7cb83c292c6da0c SHA512 11847de529b008b098cc71edebfca94a92313214907dc0773a144b484278eec9c4ed2533489aa127f125ad066bec1ef9196adc11fb065a16e241be60a2f3714d WHIRLPOOL 9db6b7aa14f49bb2e0d22d21ba36a2b905ed0dc1559462fe091292afa634fe9f27c0d7b63e9630b9b8503444afe09bf46292b0501cbdb3bfda1f7d05f16b69e4
-EBUILD cryptography-0.7.1.ebuild 1601 SHA256 591d11f98f199330bf14b64169a8713335daf65df3cb7507eced41377071876a SHA512 062dd76059e81b3930207e1a7813a935a846e13a6d4e1b9b622ebf1af81211ead91c5051bc893d961881ceb5e2e26ad6357da1720ebb74b1cf0868904f594902 WHIRLPOOL 4bfdf645d95d227729ec64002e1b6def49a3df1da70437b178ac8cfbed0b8ec36f8edc08ee5ba507d6e05c2c0f0a70e263dfce706ab4b10b9a3371ca9056ebcd
-MISC ChangeLog 4712 SHA256 85e61105fd038755c8df74b2b858622bb11dcb38c82e5dfc2883abee5d7ef6fd SHA512 6a7c00a31ef47eea957ae20a87b66e47e7660bfd854967bf29f3a9fbe4d82357be7e4f99dd6f63803650ce39a5bb17766cd8c06039604bc63f1d9ef86ffb7d5d WHIRLPOOL ab9ee46f4f21df97275b6e6d30ca172deacec2a14c5256a854d15ef105a24e33376a986ad6613bd7fce9744cec17aeddf031ad520c683f432758e66c039e6497
+EBUILD cryptography-0.7.1-r1.ebuild 1423 SHA256 ac39efc0afc75882f091d8019cce4cf2062f59aeb0726016a9ba55ff10f695af SHA512 6d7919ad9513c549822a73ba48340e05cfccc7d9e386117be025f1458ccbbf8b491a406a4ed9587a54e1884a18480d4c9fd6245b7d06ce75cf1e3897c330b759 WHIRLPOOL a4e2cd6b7917b1dcd7dd9584375e86d10292974021b3a4841259d325b85a06a30db7096005768fc8583d2cec916633e081a2adaedd7fb7a9dbc576854b0048b2
+MISC ChangeLog 5128 SHA256 95db4c61e0eca6ad6197cc93cf34c2137d22cdfd2a2aafc40112c9c94684c5f3 SHA512 a98b72a5e6abf909c25471c7fcbc190e21e11bc369278dcf59efb84232f3088554037b0f03e3b4d7f1371266258754df0a5b30fd0f8b991b6d39e2832292c3fb WHIRLPOOL ea768b95bc66c1a812a25305eb91b2ee0c5bc2e5293cc9cb4b73270a41e95587210903b846daae9d6a54a19ad04a7331e263e1606316091ccb0943fc2201e41c
 MISC metadata.xml 235 SHA256 ed253d917bfdfb8c5311727f3d2e0da8e286e312082228f2fc2b363e54b9fc8a SHA512 a8cdfe62f3aa329708c4361281dc82d395a917c812dbf22f324bfb75c4f9df15a0759d397c28ee3189a0e2ceb48f6a537d7b11983b7cc9f3fa9dd154d04f147f WHIRLPOOL 4287962b1291e7d9e2e5ae11b7e38c0979793e945667c9e1c243d2fe9c8273b7251a0ef44647e8b4d70146104af59a1a88d473368c387dadb4f35981c3d6c700
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlS1uSYACgkQso7CE7gHKw0X6ACfbRpHI5sA70ouh1iO787npesb
+hlsAoMSgn8c8bVsJgnNgU929cLK8xlet
+=yYfA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/cryptography/cryptography-0.7.1.ebuild b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
index 661c4e00f188..051ca1e8e1ae 100644
--- a/dev-python/cryptography/cryptography-0.7.1.ebuild
+++ b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.7.1.ebuild,v 1.1 2015/01/13 03:21:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.7.1-r1.ebuild,v 1.1 2015/01/14 00:32:22 idella4 Exp $
 
 EAPI=5
-
-# drop pypy so that keywording on not-x86 doesn't get in the way
-# temporarily drop py3.4 until someone stabs setup.py into submission
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -14,7 +11,7 @@ DESCRIPTION="Library providing cryptographic recipes and primitives"
 HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
@@ -23,24 +20,20 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-libs/openssl:0
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3} )
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-"
+	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
 DEPEND="${RDEPEND}
 	test? (
 		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
 		dev-python/iso8601[${PYTHON_USEDEP}]
 		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	)
-"
+	)"
 
 DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
 
-# Restricted until cffi fixes its compile on import issues
-RESTRICT="test"
+PATCHES=( "${FILESDIR}"/0.7-setup.patch )
 
 python_test() {
 	py.test -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/cryptography/files/0.7-setup.patch b/dev-python/cryptography/files/0.7-setup.patch
new file mode 100644
index 000000000000..db5cc0239c70
--- /dev/null
+++ b/dev-python/cryptography/files/0.7-setup.patch
@@ -0,0 +1,22 @@
+https://github.com/pyca/cryptography/commit/5bea5ca0233be05e09d8c62fdeae86187e73a48e
+diff --git a/setup.py b/setup.py
+index ead5ec4..32a87ba 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,12 +36,14 @@
+ 
+ requirements = [
+     CFFI_DEPENDENCY,
+-    "enum34",
+     "pyasn1",
+     SIX_DEPENDENCY,
+     SETUPTOOLS_DEPENDENCY
+ ]
+ 
++if sys.version_info < (3, 4):
++    requirements.append("enum34")
++
+ # If you add a new dep here you probably need to add it in the tox.ini as well
+ test_requirements = [
+     "pytest",
+