[gentoo-commits] repo/gentoo:project/libressl commit in: dev-python/cryptography/, dev-python/cryptography/files/

[gentoo-commits] repo/gentoo:project/libressl commit in: dev-python/cryptography/, dev-python/cryptography/files/

[Julian Ospald]

commit:     3abbcebf6501d108e43f43943a1da9e9405a824b
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 12:42:46 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 12:42:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3abbcebf

Revert "dev-python/cryptography: fix compilation with libressl"

This reverts commit c881ebf5f48f952529be5334240e0695aa025a9d.

 dev-python/cryptography/cryptography-0.9.3.ebuild            |  1 -
 .../cryptography/files/cryptography-libressl-2.2.2.patch     | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/dev-python/cryptography/cryptography-0.9.3.ebuild b/dev-python/cryptography/cryptography-0.9.3.ebuild
index 40fc27c..6083bbc 100644
--- a/dev-python/cryptography/cryptography-0.9.3.ebuild
+++ b/dev-python/cryptography/cryptography-0.9.3.ebuild
@@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
 	)"
 
 DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-PATCHES=( "${FILESDIR}/cryptography-libressl-2.2.2.patch" )
 
 python_test() {
 	py.test -v || die "Tests fail with ${EPYTHON}"

diff --git a/dev-python/cryptography/files/cryptography-libressl-2.2.2.patch b/dev-python/cryptography/files/cryptography-libressl-2.2.2.patch
deleted file mode 100644
index c01a5fb..0000000
--- a/dev-python/cryptography/files/cryptography-libressl-2.2.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurw cryptography-0.9.3/src/cryptography/hazmat/bindings/openssl/ec.py cryptography-0.9.3.new/src/cryptography/hazmat/bindings/openssl/ec.py
---- cryptography-0.9.3/src/cryptography/hazmat/bindings/openssl/ec.py	2015-07-09 07:41:12.000000000 -0700
-+++ cryptography-0.9.3.new/src/cryptography/hazmat/bindings/openssl/ec.py	2015-08-08 12:15:42.739955819 -0700
-@@ -390,7 +390,7 @@
- #endif
- 
- #if defined(OPENSSL_NO_EC) || OPENSSL_VERSION_NUMBER < 0x1000200f || \
--    defined(LIBRESSL_VERSION_NUMBER)
-+    defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L
- static const long Cryptography_HAS_EC_1_0_2 = 0;
- const char *(*EC_curve_nid2nist)(int) = NULL;
- #else