From 42ae557bfe0a7bcb0ac88b761ec97a43236cb7ba Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 2 May 2021 18:49:36 +0300 Subject: dev-python/m2crypto: remove libressl support Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada --- dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild | 8 +------- dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild | 8 +------- dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild | 5 ++--- dev-python/m2crypto/m2crypto-0.37.1.ebuild | 9 ++------- 4 files changed, 6 insertions(+), 24 deletions(-) (limited to 'dev-python/m2crypto') 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 a0205b4bf2d8..af9a680ac8ae 100644 --- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild +++ b/dev-python/m2crypto/m2crypto-0.37.1-r1.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,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 -- cgit v1.2.3-65-gdbad