aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-03-07 17:12:43 -0500
committerAnthony G. Basile <blueness@gentoo.org>2016-03-07 17:12:43 -0500
commit24de68305ed1588a4e0d36933a22321ccfece661 (patch)
treecf2ea5ee7963422daeffad537935de0964794792 /dev-python
parentdev-lang/php: remove ancient php 5.3 (diff)
downloadlibressl-24de68305ed1588a4e0d36933a22321ccfece661.tar.gz
libressl-24de68305ed1588a4e0d36933a22321ccfece661.tar.bz2
libressl-24de68305ed1588a4e0d36933a22321ccfece661.zip
dev-python/crytography: moved to tree
Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/cryptography/ChangeLog239
-rw-r--r--dev-python/cryptography/Manifest2
-rw-r--r--dev-python/cryptography/cryptography-0.6.1.ebuild44
-rw-r--r--dev-python/cryptography/cryptography-0.9.3.ebuild44
-rw-r--r--dev-python/cryptography/files/cryptography-libressl-2.2.2.patch12
-rw-r--r--dev-python/cryptography/files/cryptography-liressl.diff76
-rw-r--r--dev-python/cryptography/metadata.xml12
7 files changed, 0 insertions, 429 deletions
diff --git a/dev-python/cryptography/ChangeLog b/dev-python/cryptography/ChangeLog
deleted file mode 100644
index fbe6013..0000000
--- a/dev-python/cryptography/ChangeLog
+++ /dev/null
@@ -1,239 +0,0 @@
-# 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.55 2015/08/02 09:24:45 pacho Exp $
-
- 02 Aug 2015; Pacho Ramos <pacho@gentoo.org> cryptography-0.6.1.ebuild:
- sparc stable wrt bug #530294
-
-*cryptography-0.9.3 (16 Jul 2015)
-
- 16 Jul 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.9.3.ebuild:
- Bump
-
- 11 Jul 2015; Tobias Klausmann <klausman@gentoo.org>
- cryptography-0.6.1.ebuild:
- Stable on alpha, bug 530294
-
- 10 Jul 2015; Mike Gilbert <floppym@gentoo.org> -cryptography-0.9.1.ebuild,
- -cryptography-0.9.ebuild, cryptography-0.9.2.ebuild:
- Fix conditional dep on dev-python/ipaddress.
-
-*cryptography-0.9.2 (08 Jul 2015)
-
- 08 Jul 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.9.2.ebuild:
- Bump
-
- 21 Jun 2015; Markus Meier <maekke@gentoo.org> cryptography-0.9.1.ebuild:
- add ~arm, bug #549518
-
- 07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
- Add github to remote-id in metadata.xml
-
-*cryptography-0.9.1 (07 Jun 2015)
-
- 07 Jun 2015; Justin Lecher <jlec@gentoo.org> +cryptography-0.9.1.ebuild:
- Version Bump
-
- 28 May 2015; Justin Lecher <jlec@gentoo.org> cryptography-0.8.2.ebuild,
- cryptography-0.9.ebuild:
- Fix dependencies, thanks Arfrever
-
- 17 May 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.9.ebuild:
- Mark ~hppa (bug #549518).
-
- 17 May 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.9.ebuild:
- Mark ~ppc64 (bug #549518).
-
- 16 May 2015; Anthony G. Basile <blueness@gentoo.org>
- cryptography-0.5.4.ebuild, cryptography-0.6.1.ebuild,
- cryptography-0.7.1-r1.ebuild, cryptography-0.7.2.ebuild,
- cryptography-0.8.1.ebuild, cryptography-0.8.2.ebuild, cryptography-0.8.ebuild,
- cryptography-0.9.ebuild:
- Keyword ~ppc. Bug #533430.
-
-*cryptography-0.9 (15 May 2015)
-
- 15 May 2015; Justin Lecher <jlec@gentoo.org> +cryptography-0.9.ebuild:
- Version Bump
-
- 23 Apr 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.7.1-r1.ebuild,
- cryptography-0.7.2.ebuild, cryptography-0.8.ebuild,
- cryptography-0.8.1.ebuild, cryptography-0.8.2.ebuild:
- Marked ~ppc64 (bug #533430).
-
-*cryptography-0.8.2 (13 Apr 2015)
-
- 13 Apr 2015; Justin Lecher <jlec@gentoo.org> +cryptography-0.8.2.ebuild,
- metadata.xml:
- Version Bump
-
- 08 Apr 2015; Michał Górny <mgorny@gentoo.org> cryptography-0.5.4.ebuild:
- Drop old Python implementations
-
- 04 Apr 2015; Mike Frysinger <vapier@gentoo.org> cryptography-0.6.1.ebuild,
- cryptography-0.7.1-r1.ebuild, cryptography-0.7.2.ebuild,
- cryptography-0.8.1.ebuild, cryptography-0.8.ebuild:
- Add arm64/ia64/m68k/s390/sh love.
-
- 01 Apr 2015; Tobias Klausmann <klausman@gentoo.org>
- cryptography-0.8.1.ebuild:
- Keyworded on alpha, bug 503094
-
-*cryptography-0.8.1 (24 Mar 2015)
-
- 24 Mar 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.8.1.ebuild:
- Bump
-
-*cryptography-0.8 (11 Mar 2015)
-
- 11 Mar 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.8.ebuild:
- Bump
-
- 15 Feb 2015; Pacho Ramos <pacho@gentoo.org> cryptography-0.6.1.ebuild:
- amd64/ppc/ppc64/x86 stable, bug #530294
-
-*cryptography-0.7.2 (26 Jan 2015)
-
- 26 Jan 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.7.2.ebuild:
- Bump
-
- 16 Jan 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.7.1-r1.ebuild:
- Marked ~hppa (bug #533430).
-
-*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)
-
- 13 Jan 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.7.1.ebuild:
- Bump, drop minor arches due to enum34 keywords missing, drop pypy because
- keywords missing, drop py34 target because setup.py too confused about life
-
- 24 Dec 2014; Markus Meier <maekke@gentoo.org> cryptography-0.6.1.ebuild:
- arm stable, bug #530294
-
- 09 Dec 2014; Jeroen Roovers <jer@gentoo.org> cryptography-0.6.1.ebuild:
- Stable for HPPA (bug #530294).
-
- 16 Nov 2014; Mike Gilbert <floppym@gentoo.org> cryptography-0.5.4.ebuild,
- cryptography-0.6.1.ebuild:
- Fix dependency on dev-python/cffi.
-
- 26 Oct 2014; Fabian Groffen <grobian@gentoo.org> cryptography-0.6.1.ebuild:
- Added Prefix keywords, bug #503094
-
- 18 Oct 2014; Tim Harder <radhermit@gentoo.org> cryptography-0.6.1.ebuild:
- Setuptools is now a runtime dep.
-
-*cryptography-0.6.1 (18 Oct 2014)
-
- 18 Oct 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.6.1.ebuild:
- Version bump, restrict tests until cffi fixes its compile on import issues,
- and drop python3_2 support.
-
- 07 Oct 2014; Tim Harder <radhermit@gentoo.org> -cryptography-0.4-r1.ebuild,
- -cryptography-0.4-r2.ebuild, -cryptography-0.5.1.ebuild,
- -cryptography-0.5.2.ebuild, -cryptography-0.5.3.ebuild, -files/asn1.patch:
- Remove old.
-
-*cryptography-0.5.4 (24 Aug 2014)
-
- 24 Aug 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.5.4.ebuild:
- Version bump.
-
- 13 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
- cryptography-0.4-r1.ebuild, cryptography-0.4-r2.ebuild,
- cryptography-0.5.1.ebuild, cryptography-0.5.2.ebuild,
- cryptography-0.5.3.ebuild:
- Keyword ~ppc and ~ppc64, bug #503094
-
-*cryptography-0.5.3 (08 Aug 2014)
-
- 08 Aug 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.5.3.ebuild:
- Version bump.
-
-*cryptography-0.5.2 (11 Jul 2014)
-
- 11 Jul 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.5.2.ebuild:
- Version bump.
-
-*cryptography-0.5.1 (08 Jul 2014)
-
- 08 Jul 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.5.1.ebuild:
- Version bump.
-
- 03 Jul 2014; Tobias Klausmann <klausman@gentoo.org>
- cryptography-0.4-r1.ebuild, cryptography-0.4-r2.ebuild:
- Ensure usage of new-enough pytest version (see bug 514442)
-
-*cryptography-0.4-r2 (23 Jun 2014)
-
- 23 Jun 2014; Ian Delaney <idella4@gentoo.org> +cryptography-0.4-r2.ebuild,
- +files/asn1.patch, cryptography-0.4-r1.ebuild:
- revbump; patch required to fix a test failing in pyopenssl, fixes Bug #514418
-
- 08 Jun 2014; Akinori Hattori <hattya@gentoo.org> cryptography-0.4-r1.ebuild:
- keyword ~ia64 wrt bug #503094
-
- 10 May 2014; Ian Delaney <idella4@gentoo.org> cryptography-0.4-r1.ebuild:
- add new dep, drop py2.6 upport
-
-*cryptography-0.4-r1 (08 May 2014)
-
- 08 May 2014; Michał Górny <mgorny@gentoo.org> +cryptography-0.4-r1.ebuild,
- -cryptography-0.2.1.ebuild, -cryptography-0.2.2.ebuild,
- -cryptography-0.3.ebuild, -cryptography-0.4.ebuild:
- Add a slot operator on dev-python/cffi dep (bug #506552), and make it
- conditional to CPython implementations (PyPy has built-in cffi). Drop old.
-
-*cryptography-0.4 (07 May 2014)
-
- 07 May 2014; Patrick Lauer <patrick@gentoo.org> +cryptography-0.4.ebuild:
- Bump
-
- 03 Apr 2014; Tim Harder <radhermit@gentoo.org> cryptography-0.2.2.ebuild,
- cryptography-0.3.ebuild:
- Sync ~arm keywords.
-
-*cryptography-0.3 (03 Apr 2014)
-
- 03 Apr 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.3.ebuild:
- Version bump, add python3_4 support.
-
- 31 Mar 2014; Michał Górny <mgorny@gentoo.org> cryptography-0.2.1.ebuild,
- cryptography-0.2.2.ebuild:
- Add support for the new PyPy slotting.
-
- 22 Mar 2014; Markos Chandras <hwoarang@gentoo.org> cryptography-0.2.2.ebuild:
- Add ~mips. Bug #503094
-
- 22 Mar 2014; Markus Meier <maekke@gentoo.org> cryptography-0.2.1.ebuild:
- add ~arm, bug #503094
-
-*cryptography-0.2.2 (15 Mar 2014)
-
- 15 Mar 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.2.2.ebuild:
- Version bump.
-
- 04 Mar 2014; Naohiro Aota <naota@gentoo.org> cryptography-0.2.1.ebuild:
- Add ~x86-fbsd wrt bug #503094
-
- 03 Mar 2014; Jeroen Roovers <jer@gentoo.org> cryptography-0.2.1.ebuild:
- Marked ~hppa (bug #503094).
-
- 01 Mar 2014; Tim Harder <radhermit@gentoo.org> cryptography-0.2.1.ebuild:
- Add pypy2_0 support.
-
- 01 Mar 2014; Tim Harder <radhermit@gentoo.org> cryptography-0.2.1.ebuild:
- Fix deps.
-
-*cryptography-0.2.1 (01 Mar 2014)
-
- 01 Mar 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.2.1.ebuild,
- +metadata.xml:
- Initial import.
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
deleted file mode 100644
index 1fc4f77..0000000
--- a/dev-python/cryptography/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cryptography-0.6.1.tar.gz 236721 SHA256 024910130a01eda0ce969764d893d2e397168ebb94181ca1ea3e23e19912329e SHA512 b99338bbbeb70f37e0bfcc6ef33ddff5beb74f7876a30d34deb3a433ddd77f821e5cc5dde228f792362ae7a261d4ceb3b702fb1a8c30ce15a1e6e4de98ef1afa WHIRLPOOL a641342fe13f584ee657aa917172810117416cd426746af30499e43174041c8031598c223398dace1ad1385e3905a27c9f6e5ac5def88a8b87e2ed3bfd95b9ce
-DIST cryptography-0.9.3.tar.gz 303075 SHA256 aed022f738dd9adb840d92960b0464ea1fbb222ba118938858eb93fe25151c2d SHA512 828dd6d3af940c91f77b9bcefb34ca9cc3ac05606d707889ff35bf708c3536414db46f8db7d7dcbffe2ad1f82834bc9edab1b28b05fee3f2a5f9f5a56abd697c WHIRLPOOL 33eb42741cf2426ffe16d50d0f555fee65637d812f9510016ceb708f9c591f38de2d65e4b4118f744ff9b73596727160501ec5d077bfe0935d088586909b979d
diff --git a/dev-python/cryptography/cryptography-0.6.1.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
deleted file mode 100644
index 3f4523d..0000000
--- a/dev-python/cryptography/cryptography-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-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"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="libressl test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl:= )
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
-"
-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 )
-PATCHES=( "${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/cryptography-0.9.3.ebuild b/dev-python/cryptography/cryptography-0.9.3.ebuild
deleted file mode 100644
index 40fc27c..0000000
--- a/dev-python/cryptography/cryptography-0.9.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-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 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- dev-libs/openssl:0
- $(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)
- dev-python/idna[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
- dev-python/iso8601[${PYTHON_USEDEP}]
- dev-python/pretend[${PYTHON_USEDEP}]
- >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
- )"
-
-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
diff --git a/dev-python/cryptography/files/cryptography-liressl.diff b/dev-python/cryptography/files/cryptography-liressl.diff
deleted file mode 100644
index 1f122ec..0000000
--- a/dev-python/cryptography/files/cryptography-liressl.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur cryptography-0.5.2/cryptography/hazmat/bindings/openssl/engine.py cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/engine.py
---- cryptography-0.5.2/cryptography/hazmat/bindings/openssl/engine.py 2014-07-10 02:54:35.000000000 +0200
-+++ cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/engine.py 2014-07-22 23:06:43.076997776 +0200
-@@ -58,7 +58,6 @@
- int ENGINE_finish(ENGINE *);
- void ENGINE_load_openssl(void);
- void ENGINE_load_dynamic(void);
--void ENGINE_load_cryptodev(void);
- void ENGINE_load_builtin_engines(void);
- void ENGINE_cleanup(void);
- ENGINE *ENGINE_get_default_RSA(void);
-diff -Naur cryptography-0.5.2/cryptography/hazmat/bindings/openssl/rand.py cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/rand.py
---- cryptography-0.5.2/cryptography/hazmat/bindings/openssl/rand.py 2014-07-10 02:54:35.000000000 +0200
-+++ cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/rand.py 2014-07-22 23:02:10.251408565 +0200
-@@ -25,9 +25,6 @@
- void RAND_seed(const void *, int);
- void RAND_add(const void *, int, double);
- int RAND_status(void);
--int RAND_egd(const char *);
--int RAND_egd_bytes(const char *, int);
--int RAND_query_egd_bytes(const char *, unsigned char *, int);
- const char *RAND_file_name(char *, size_t);
- int RAND_load_file(const char *, long);
- int RAND_write_file(const char *);
-diff -Naur cryptography-0.5.2/cryptography/hazmat/bindings/openssl/ssl.py cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/ssl.py
---- cryptography-0.5.2/cryptography/hazmat/bindings/openssl/ssl.py 2014-07-10 02:54:35.000000000 +0200
-+++ cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/ssl.py 2014-07-22 23:05:18.648053283 +0200
-@@ -157,7 +157,6 @@
-
- typedef ... SSL_CIPHER;
- typedef ... Cryptography_STACK_OF_SSL_CIPHER;
--typedef ... COMP_METHOD;
- """
-
- FUNCTIONS = """
-@@ -197,10 +196,6 @@
- const char *SSL_get_cipher_list(const SSL *, int);
- Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
-
--const COMP_METHOD *SSL_get_current_compression(SSL *);
--const COMP_METHOD *SSL_get_current_expansion(SSL *);
--const char *SSL_COMP_get_name(const COMP_METHOD *);
--
- /* context */
- void SSL_CTX_free(SSL_CTX *);
- long SSL_CTX_set_timeout(SSL_CTX *, long);
-@@ -520,7 +515,7 @@
- #endif
-
- /* ALPN was added in OpenSSL 1.0.2. */
--#if OPENSSL_VERSION_NUMBER < 0x10002001L
-+#if OPENSSL_VERSION_NUMBER < 0x10002001L || OPENSSL_VERSION_NUMBER >= 0x20000000L
- int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
- const unsigned char*,
- unsigned) = NULL;
-diff -Naur cryptography-0.5.2/cryptography/hazmat/bindings/openssl/x509_vfy.py cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/x509_vfy.py
---- cryptography-0.5.2/cryptography/hazmat/bindings/openssl/x509_vfy.py 2014-07-10 02:54:35.000000000 +0200
-+++ cryptography-0.5.2-1/cryptography/hazmat/bindings/openssl/x509_vfy.py 2014-07-22 23:01:18.596054346 +0200
-@@ -207,7 +207,7 @@
- #endif
-
- /* OpenSSL 1.0.2+ verification error codes */
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#ifdef X509_V_ERR_EMAIL_MISMATCH
- static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1;
- #else
- static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
-@@ -223,7 +223,7 @@
- #endif
-
- /* OpenSSL 1.0.2+ verification parameters */
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#ifdef X509_V_FLAG_PARTIAL_CHAIN
- static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
- #else
- static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
deleted file mode 100644
index 2dfa57b..0000000
--- a/dev-python/cryptography/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">cryptography</remote-id>
- <remote-id type="github">pyca/cryptography</remote-id>
- </upstream>
-</pkgmetadata>