dev-python/cryptography: bump to 0.6.1, rm old

3 files changed, 16 insertions, 30 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 18f77de..ee009d0 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,6 +1,5 @@
-AUX asn1.patch 583 SHA256 14a90ece482d3a5cf428ed989d2f816d84345558b01b0df85dd9711cfda32db6 SHA512 0bc83be0ab56ec8abb59df86b1cb44137228854414fb0e3a48a19727e32e3c85b1a0c5134053a1ff12755323cc0ac7fd706a044dae91511f8280d4dd4e78445a WHIRLPOOL d5feee082478e5a80772252c35e138580abba816e084fce992ff9cbec308839d9214b57a4772f59fb225a89757c8055a1e293e3258601cdfce4731dd73c78fa7
 AUX cryptography-liressl.diff 3529 SHA256 454d49751319b9e724b35b9a82bdba9442065f99b0ab4a57a4e57da0bf9a78d1 SHA512 6f29895de938ba80d71a9921a50295174328ea38d6711b45d93875abb206cc606024a692780822d6fe27408a4e813fd2be930fa14a003583b1c2ea05f9e05b46 WHIRLPOOL 3ce6d92d07fa1538f044a9c8fcd8f9ca7ed97a03900b0f3e1c959c389702fbb1828c3207ad1fb35720745fc0ce04571fb607bdc962c105ecd40538bf82b35dfc
-DIST cryptography-0.5.2.tar.gz 319705 SHA256 39e00712ace199c0346f59a5e4526782841277167649ee5dc4ec8faeb786d288 SHA512 90d8fafcc5e51f8a6a9f4427f4a66de34d4537943603485170d90158d1bf745ee60e3582138ae1953fdb652f4c98678fd846077d603d96cf93c53fa8f66eda98 WHIRLPOOL 2eef91130560a45103c744ed60e65bbd2c2738f766603629ef7f1e469d5274317ae4323491348e4cdb75a6acc4f8dd762e7b2e53a7f2104ba72f606b565df030
-EBUILD cryptography-0.5.2.ebuild 1250 SHA256 72e21a6ba6dcfe8be82baa506d4809b9df09e2d5853da15c5ab96d9e87dea5c6 SHA512 cad9baeb48e45ce476de1b559d27bc0129c72f1f5a76761e155e89d39ab0f5c989f6a1117d90eb3c50c02c78e0a4915616f639ccb157a1341ffcce34db2823ec WHIRLPOOL 85f662dc0ffc596f5151d0ec1d22f2ca529190a00e3aff81eff10e9421a17025571934c02a42ccb9541bda2d6db92edb179bbaad6e7c2699d7e5caa77eddef5c
+DIST cryptography-0.6.1.tar.gz 236721 SHA256 024910130a01eda0ce969764d893d2e397168ebb94181ca1ea3e23e19912329e SHA512 b99338bbbeb70f37e0bfcc6ef33ddff5beb74f7876a30d34deb3a433ddd77f821e5cc5dde228f792362ae7a261d4ceb3b702fb1a8c30ce15a1e6e4de98ef1afa WHIRLPOOL a641342fe13f584ee657aa917172810117416cd426746af30499e43174041c8031598c223398dace1ad1385e3905a27c9f6e5ac5def88a8b87e2ed3bfd95b9ce
+EBUILD cryptography-0.6.1.ebuild 1434 SHA256 615eae659cc5fe99d6e50a2f8c172fa4ee3461668518712fe63dcc69f48f14d7 SHA512 cfaab52cd9c3bc9a4d13cc5b7d01785ea273c7b55807b48ecf2a5d0ec89355a7eebf44e4a07776db9939d607769c8b3b3b5c440a2695db9000edbbfb0383676d WHIRLPOOL cb8e4ff5b30a600bf8a304499880b20ea19d937aeb5eb3a64afe60aecef54c012a71068ac66e3cf2636625350270fd72a6397b61eadad923dfe7c2fd7561233a
 MISC ChangeLog 2919 SHA256 e4020a34225f2f691927eeff8e1df07de398fbda6671e0d2f9e5b2487c7d5161 SHA512 fb25091df950f46aede4c6bb42f841e12787941c23dfdc4c9f078edd4afaa6640368c029a7bc29c9c75bb3d756a233c03ad329bf4727994f6ecd6b17b2e1bac4 WHIRLPOOL 5f35096d5a472b36fd1608a11c60f55d940228cd774ca2b6bca8eb30e305cb363240c08f888f4de429c09c77a876700e332b9a5b99a266fa7788546bc48bd9fd
 MISC metadata.xml 235 SHA256 ed253d917bfdfb8c5311727f3d2e0da8e286e312082228f2fc2b363e54b9fc8a SHA512 a8cdfe62f3aa329708c4361281dc82d395a917c812dbf22f324bfb75c4f9df15a0759d397c28ee3189a0e2ceb48f6a537d7b11983b7cc9f3fa9dd154d04f147f WHIRLPOOL 4287962b1291e7d9e2e5ae11b7e38c0979793e945667c9e1c243d2fe9c8273b7251a0ef44647e8b4d70146104af59a1a88d473368c387dadb4f35981c3d6c700
diff --git a/dev-python/cryptography/cryptography-0.5.2.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
index 1b669d9..2ddd0c0 100644
--- a/dev-python/cryptography/cryptography-0.5.2.ebuild
+++ b/dev-python/cryptography/cryptography-0.6.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.2.ebuild,v 1.1 2014/07/11 00:04:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.6.1.ebuild,v 1.4 2014/11/16 06:33:36 floppym Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -13,27 +13,30 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND="dev-libs/openssl:0
+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/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
+"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		=dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		~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 )
+PATCHES=( "${FILESDIR}/cryptography-liressl.diff" )
 
-src_prepare() {
-	epatch "${FILESDIR}/cryptography-liressl.diff"
-}
+# Restricted until cffi fixes its compile on import issues
+RESTRICT="test"
 
 python_test() {
 	py.test -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/cryptography/files/asn1.patch b/dev-python/cryptography/files/asn1.patch
deleted file mode 100644
index 0b8f8de..0000000
--- a/dev-python/cryptography/files/asn1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/pyca/cryptography/commit/1e95bc636ffd66451b6097b0a7f55c6a004563b7
-diff --git a/cryptography/hazmat/bindings/openssl/asn1.py b/cryptography/hazmat/bindings/openssl/asn1.py
-index dfdf1bf..2edfd2d 100644
---- a/cryptography/hazmat/bindings/openssl/asn1.py
-+++ b/cryptography/hazmat/bindings/openssl/asn1.py
-@@ -141,6 +141,9 @@
- 
- /* These isn't a macro the arg is const on openssl 1.0.2+ */
- int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *);
-+
-+/* Not a macro, const on openssl 1.0 */
-+int ASN1_STRING_set_default_mask_asc(char *);
- """
- 
- CUSTOMIZATIONS = """
-