diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /dev-python/m2crypto | |
parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) |
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-python/m2crypto')
-rw-r--r-- | dev-python/m2crypto/Manifest | 9 | ||||
-rw-r--r-- | dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch | 222 | ||||
-rw-r--r-- | dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild | 8 | ||||
-rw-r--r-- | dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild | 8 | ||||
-rw-r--r-- | dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild | 7 | ||||
-rw-r--r-- | dev-python/m2crypto/m2crypto-0.37.1.ebuild | 9 |
6 files changed, 11 insertions, 252 deletions
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest index 0d054027bdab..e3f915252629 100644 --- a/dev-python/m2crypto/Manifest +++ b/dev-python/m2crypto/Manifest @@ -1,10 +1,9 @@ AUX m2crypto-0.37.1-openssl-fixes.patch 3074 BLAKE2B 3daa583d4f7e04840a9c2f15fc583dcf8e4ee996aee93d9c180ccc4920f36cd2f90e2f2591732597b0108f3944cb3b22d0eb202c8dfd500fccb8e805aa74666d SHA512 fd73a98592026b39341200fc378042b71272dad4c43c63e4da3aafabae4f5a8aadeb41738ca99cca87ebeecb5455abadfe96d0c6640702b14f138f8122dc57ee -AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1 DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e -EBUILD m2crypto-0.35.2-r1.ebuild 1412 BLAKE2B 3ebc7eacf9a3c1856baa7b6840eaf8350c9a8282fc07469b6bfd85425d3cd50c4112d178d22ad793992d860bd8712b276e2ae4700fdc4bb90f9dc573ec623d2a SHA512 1b77d2436aad5efea0e2b8afe7b501f86347dba601e32fdc2b09e88a64a378ce59737b5fdf4893f3a1494d85fa5ad05066454910129e9f7d5f65e3116409c008 -EBUILD m2crypto-0.36.0-r1.ebuild 1543 BLAKE2B eaa6cfa13143cdc26b0bd42d01742a5b51213419c5de03bcd2d9cef04ec01c5d77da6325ae8452b6ccb0682ad2520f98b75eb60c0e53fe6f5b3bbd05605b7865 SHA512 464263a00453564f4a729b3e3d403b555ca6d19835d7727d775fedcd2179b0f7ff781cccd1ae5e61af5c9930117c854232c34990735f510334dd1859a349f37d -EBUILD m2crypto-0.37.1-r1.ebuild 1518 BLAKE2B 6a5f677520198c38d4f461c1c88852264c33890e458367378d535e503773e629aa06ed867f1ae67efdfee4cda1a0d542f214a9c6d4845b32bf4089a9c743c9bc SHA512 b40fe56c621a730baf3186cb3e5bb3ad69e401e5caa8d7ef721e1a2c33a95170e6c4db71acdde610b69003fed3d9caacb24e6094f3d548c6867c808a7cfa5546 -EBUILD m2crypto-0.37.1.ebuild 1524 BLAKE2B 054203de4f7b81f9083440bd2e02bcae9fb713d1c1d498f69728b2a0ca1a53d94898d5a08673ac78785d78242311d5ac384d38819852fed0aaf1b60599a6706e SHA512 ccdcee7b053971725b71392cc854c984f524b0db06263c4ff0a6e21b77e3dc8106ee9cb3fa0fe3b623eae8f4c233b9d7328f8df96b86eaa0642f33242de16eeb +EBUILD m2crypto-0.35.2-r1.ebuild 1289 BLAKE2B 376878f2a67c9e9ef6b2ec628fed337f521567e107c63bad62bd2e751b46c0bb9ad74dfe41abcba137beadfe9d4a34d72582b4a1460bb0112eb78c3099893931 SHA512 852ed45c0773ef735dd11efaea31e90e4cbde198cf2159dab524a055f404b6714eb302f90d9a300016a1884fe807084d9169e95ecee77253ab5da89f64c76c42 +EBUILD m2crypto-0.36.0-r1.ebuild 1420 BLAKE2B fb4ca5fa9c710aa7605003eca2bf1b96e3c423b7521ebb43bbb16ac78fd9f27ae411a6ae0b06942bb099a659847f4ebdd0f71c755dbd913d8df6d7bc27d3850e SHA512 1858b478147e291e86246a1d23e6147d8e9e2a8b615d1e242cf2c23dbfd434482ba771eb13e851a9644e1908574d2f8e2d5cbbe9df2f3bc6348585432efdad1c +EBUILD m2crypto-0.37.1-r1.ebuild 1457 BLAKE2B 9581aafee67b42758fb9b09e7b0db9df9719c33a2728ef5d07841ce2da4299ab7e07a6872455124b76a75778c22dbf7da6a22ebdf3f09181bd738dc4b61b8434 SHA512 1ece80dd6c509de35abfa97a3f499cea202e234d5e6e6b323b25e5ada7b0b7300b4ac5086f9cb3dfbaf643f1b66a6bed2c74fd534975cdf3e2ca023621c9f2c6 +EBUILD m2crypto-0.37.1.ebuild 1408 BLAKE2B 7dea42ac2fe95c5a740cd723bc2b6f583b58908102e3b748a808dc612ed8f11ebaeaec0cdabe3b0d24febbebf9f029754637366547dccd16777dd84914c46fab SHA512 a6f0fb112a0d5c476393125087830f29ee37a500e3a35d146aae02cb359b0521db4412c8931755bbd286f876ac0e6fe3dbfe4c89fc2c30c4d73ea1bfcd5a5b84 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6 diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch deleted file mode 100644 index 10ed142b33e4..000000000000 --- a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch +++ /dev/null @@ -1,222 +0,0 @@ -From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <stefan.strogin@gmail.com> -Date: Wed, 9 Jan 2019 10:15:08 +0200 -Subject: [PATCH] Fix compilation with LibreSSL - ---- - SWIG/_bio.i | 8 +++++--- - SWIG/_evp.i | 2 +- - SWIG/_lib.i | 2 +- - SWIG/_lib11_compat.i | 5 ++++- - SWIG/_m2crypto_wrap.c | 11 ++++++++--- - SWIG/_ssl.i | 4 ++-- - SWIG/_threads.i | 10 +++++----- - 7 files changed, 26 insertions(+), 16 deletions(-) - -diff --git a/SWIG/_bio.i b/SWIG/_bio.i -index e85a275..8eada82 100644 ---- a/SWIG/_bio.i -+++ b/SWIG/_bio.i -@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) { - } - - /* Macros for things not defined before 1.1.0 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - static BIO_METHOD * - BIO_meth_new( int type, const char *name ) - { -@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth ) - #define BIO_set_shutdown(b, x) (b)->shutdown = x - #define BIO_get_shutdown(b) (b)->shutdown - #define BIO_set_init(b, x) b->init = x --#define BIO_get_init(b) (b)->init - #define BIO_set_data(b, x) b->ptr = x - #define BIO_clear_flags(b, x) b->flags &= ~(x) - #define BIO_get_data(b) b->ptr - #endif -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#define BIO_get_init(b) (b)->init -+#endif - - /* implment custom BIO_s_pyfd */ - -@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) { - } - - void pyfd_init(void) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - methods_fdp = BIO_meth_new( - BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK, - "python file descriptor"); -diff --git a/SWIG/_evp.i b/SWIG/_evp.i -index d04e806..6fa9b38 100644 ---- a/SWIG/_evp.i -+++ b/SWIG/_evp.i -@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved. - #include <openssl/rsa.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - HMAC_CTX *HMAC_CTX_new(void) { - HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); -diff --git a/SWIG/_lib.i b/SWIG/_lib.i -index c84b800..807d5f6 100644 ---- a/SWIG/_lib.i -+++ b/SWIG/_lib.i -@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) { - %inline %{ - - void lib_init() { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - SSLeay_add_all_algorithms(); - ERR_load_ERR_strings(); - #endif -diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i -index 1ec42dd..4234004 100644 ---- a/SWIG/_lib11_compat.i -+++ b/SWIG/_lib11_compat.i -@@ -8,7 +8,7 @@ - */ - - %{ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #include <string.h> - #include <openssl/engine.h> -@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line) - return ret; - } - -+#endif -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) -+ - #include <openssl/bn.h> - - #ifndef BN_F_BN_GENCB_NEW -diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c -index 0f07702..f168822 100644 ---- a/SWIG/_m2crypto_wrap.c -+++ b/SWIG/_m2crypto_wrap.c -@@ -3838,7 +3838,7 @@ void threading_cleanup(void) { - #include <ceval.h> - - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - #include <string.h> - #include <openssl/engine.h> -@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line) - return ret; - } - -+#endif -+#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) -+ - #include <openssl/bn.h> - - #ifndef BN_F_BN_GENCB_NEW -@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) { - } - - /* Macros for things not defined before 1.1.0 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - static BIO_METHOD * - BIO_meth_new( int type, const char *name ) - { -@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth ) - #define BIO_set_shutdown(b, x) (b)->shutdown = x - #define BIO_get_shutdown(b) (b)->shutdown - #define BIO_set_init(b, x) b->init = x --#define BIO_get_init(b) (b)->init - #define BIO_set_data(b, x) b->ptr = x - #define BIO_clear_flags(b, x) b->flags &= ~(x) - #define BIO_get_data(b) b->ptr - #endif -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#define BIO_get_init(b) (b)->init -+#endif - - /* implment custom BIO_s_pyfd */ - -diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i -index 7257656..40b0582 100644 ---- a/SWIG/_ssl.i -+++ b/SWIG/_ssl.i -@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t; - #endif - %} - --#if OPENSSL_VERSION_NUMBER >= 0x10100005L -+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - %include <openssl/safestack.h> - #endif - -@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) { - } - - const SSL_METHOD *tlsv1_method(void) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - PyErr_WarnEx(PyExc_DeprecationWarning, - "Function TLSv1_method has been deprecated.", 1); - #endif -diff --git a/SWIG/_threads.i b/SWIG/_threads.i -index 69adb9f..fd2285a 100644 ---- a/SWIG/_threads.i -+++ b/SWIG/_threads.i -@@ -5,7 +5,7 @@ - #include <pythread.h> - #include <openssl/crypto.h> - --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS) - static PyThread_type_lock lock_cs[CRYPTO_num_locks()]; - static long lock_count[CRYPTO_num_locks()]; -@@ -13,7 +13,7 @@ static int thread_mode = 0; - #endif - - void threading_locking_callback(int mode, int type, const char *file, int line) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - if (mode & CRYPTO_LOCK) { - PyThread_acquire_lock(lock_cs[type], WAIT_LOCK); - lock_count[type]++; -@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line) - } - - unsigned long threading_id_callback(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - return (unsigned long)PyThread_get_thread_ident(); - #else - return (unsigned long)0; -@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) { - - %inline %{ - void threading_init(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - int i; - if (!thread_mode) { - for (i=0; i<CRYPTO_num_locks(); i++) { -@@ -50,7 +50,7 @@ void threading_init(void) { - } - - void threading_cleanup(void) { --#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - int i; - if (thread_mode) { - CRYPTO_set_locking_callback(NULL); --- -2.20.1 - diff --git a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild index a96e594465a2..20ad917a37b9 100644 --- a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild +++ b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild @@ -16,11 +16,9 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="libressl" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= $(python_gen_cond_dep ' dev-python/typing[${PYTHON_USEDEP}] ' -2) @@ -33,10 +31,6 @@ BDEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( - "${FILESDIR}/${PN}-libressl-0.31.0.patch" -) - swig_define() { local x for x; do diff --git a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild index 7bdd305b75f6..221b4223b392 100644 --- a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild +++ b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild @@ -16,11 +16,9 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="libressl" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= $(python_gen_cond_dep ' dev-python/typing[${PYTHON_USEDEP}] ' -2) @@ -33,10 +31,6 @@ BDEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( - "${FILESDIR}/${PN}-libressl-0.31.0.patch" -) - swig_define() { local x for x; do diff --git a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild index b536accf6bbd..af9a680ac8ae 100644 --- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild +++ b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild @@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="libressl test" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="test" RESTRICT="!test? ( test )" BDEPEND=" @@ -25,8 +25,7 @@ BDEPEND=" test? ( dev-python/parameterized[${PYTHON_USEDEP}] ) " RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND}" diff --git a/dev-python/m2crypto/m2crypto-0.37.1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1.ebuild index 33b0214c3a13..e4bd5539a6b2 100644 --- a/dev-python/m2crypto/m2crypto-0.37.1.ebuild +++ b/dev-python/m2crypto/m2crypto-0.37.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="libressl test" +IUSE="test" RESTRICT="!test? ( test )" BDEPEND=" @@ -25,15 +25,10 @@ BDEPEND=" test? ( dev-python/parameterized[${PYTHON_USEDEP}] ) " RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-libressl-0.31.0.patch" -) - swig_define() { local x for x; do |