diff options
| author |   Aric Belsito <lluixhi@gmail.com> | 2018-04-13 07:58:46 -0700 |
|---|---|---|
| committer | Aric Belsito <lluixhi@gmail.com> | 2018-04-13 07:58:46 -0700 |
| commit | 538b041aa8c1f23b877a53b6685f0295d98bff03 (patch) | |
| tree | 9989d768dba5628d7ea67028497acdc889fd578f /dev-python | |
| parent | net-misc/openssh: add missing files to FILESDIR (diff) | |
| download | libressl-538b041aa8c1f23b877a53b6685f0295d98bff03.tar.gz libressl-538b041aa8c1f23b877a53b6685f0295d98bff03.tar.bz2 libressl-538b041aa8c1f23b877a53b6685f0295d98bff03.zip | |
dev-python/m2crypto: sync with upstream
0.27.0-r1 includes patch
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/m2crypto/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.26.4.ebuild | 48 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.27.0.ebuild | 12 |
3 files changed, 10 insertions, 51 deletions
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest index a566973..bb56a61 100644 --- a/dev-python/m2crypto/Manifest +++ b/dev-python/m2crypto/Manifest @@ -1,2 +1 @@ -DIST M2Crypto-0.26.4.tar.gz 1116587 SHA256 5cae7acc0b34821f8c0ddf6665e482893fe1f198ad6379e61ffa9d8e65f5c199 SHA512 632b71850edd4f4e32d6d3aa83cb0e8068654c087498c88265f999180e0c58917aa6d29c5d1033f597397da98c3dc9acb9d21feddbb2f3da25a368f6a0af60f9 WHIRLPOOL 9388b016cf47f849379ef47a1819a9ee4fd647f8491a61e7381107032ba0e57f28bf6ebca868cf8cc6e4d6fb9341c77a01bc620b5133ea6e689aab72349a07d0 DIST M2Crypto-0.27.0.tar.gz 1119288 SHA256 82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2 WHIRLPOOL 678f19d7bcd0663b704761a78b8e2d39a1c62450f99d5b0aa513e8b8af717ef1935b274eef99d4e027e8e5992887806bd270fcba02fd3e650f086f8b87f5adc7 diff --git a/dev-python/m2crypto/m2crypto-0.26.4.ebuild b/dev-python/m2crypto/m2crypto-0.26.4.ebuild deleted file mode 100644 index d198975..0000000 --- a/dev-python/m2crypto/m2crypto-0.26.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -MY_PN="M2Crypto" - -DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit" -HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" - -IUSE="libressl" - -RDEPEND=" - !libressl? ( >=dev-libs/openssl-0.9.8:0= ) - libressl? ( dev-libs/libressl:0= ) - dev-python/typing[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.28:0 - dev-python/setuptools[${PYTHON_USEDEP}] -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -# Tests access network, and fail randomly. Bug #431458. -RESTRICT=test - -PATCHES=( - "${FILESDIR}"/0.26.4-libressl.patch -) - -python_compile() { - distutils-r1_python_compile --openssl="${EPREFIX}"/usr -} - -python_test() { - esetup.py test -} diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild index ff22f35..4d813e0 100644 --- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild +++ b/dev-python/m2crypto/m2crypto-0.27.0.ebuild @@ -16,12 +16,12 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="libressl" RDEPEND=" - !libressl? ( >=dev-libs/openssl-0.9.8:0= ) + !libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) dev-python/typing[${PYTHON_USEDEP}] " @@ -40,6 +40,14 @@ PATCHES=( ) python_compile() { + # setup.py looks at platform.machine() to determine swig options. + # For exotic ABIs, we need to give swig a hint. + # https://bugs.gentoo.org/617946 + # TODO: Fix cross-compiles + local -x SWIG_FEATURES= + case ${ABI} in + x32) SWIG_FEATURES="-D__ILP32__" ;; + esac distutils-r1_python_compile --openssl="${EPREFIX}"/usr } |