From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- dev-python/m2crypto/Manifest | 4 +- dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild | 22 +++++++--- dev-python/m2crypto/m2crypto-0.35.2.ebuild | 63 +++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 dev-python/m2crypto/m2crypto-0.35.2.ebuild (limited to 'dev-python/m2crypto') diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest index 4b9672a5904f..e1954386ccb7 100644 --- a/dev-python/m2crypto/Manifest +++ b/dev-python/m2crypto/Manifest @@ -1,5 +1,7 @@ AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f140cd3b26ad771e9c6819315388dc5ef6be26fb730018c1869bcc8d68c54a1e0c54b3ffa422c981597c7a3518a174c9a SHA512 bc13bda02e42937e1793c46dbcbdd0ba887d49360899cbecfc53f5580bbdb070cf76d6f986e146aac0cf6733edadec855cb64b1e25ec74212f82f90a425bfb7b AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598 -EBUILD m2crypto-0.31.0-r2.ebuild 1352 BLAKE2B 93fed1fd0a2d67a10cc54957f82d4e0029e25ac7349d56114e310d6b52b1035aeb8d592fce51fbd78910499039bd8a6d35fb2d7c1cb6f2799f3794761df8604b SHA512 ef87960d482e8491135f5a871731e5e8af838d862016e6be3683954ca0956f144f937517529a206dfa5c116c8c0e4dc1168372e5739e5be9130381b5e993a5f7 +DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36 +EBUILD m2crypto-0.31.0-r2.ebuild 1515 BLAKE2B 3cc2223d5714513962c326cd45bed685cac3f03e104ab47c287bcdffd726a11b528c91e7147f4d2156effdc4098e11d89464fb64aea397b452b6586b84f2abcf SHA512 8d0e4a5ec4b7f9302eae28c97622ea00f85f16290cc4b78a03682d476d13d0e73184bcdc0fa14e42249ff68f0b1decfb16454d7b2d1645792d19d84c7843dcc1 +EBUILD m2crypto-0.35.2.ebuild 1412 BLAKE2B 5c717244dc0242bfbd49297b7f82282010f469c8c37f65902a506e1edb0cf21eec9c5143278746ca7ab859f60a08c838e9aba1efbb9351d5e0bc892f8cf75525 SHA512 81fe16ace64b91bb73cbc3e1c07a3d887d69610dbfc3aaf6d2186261cdef61195334d8e8f6322bca2f1eb68c74e174f082254c608b03edb6e0a304adba5fe9f7 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6 diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild index 17cac8b10d3a..c88a6032975d 100644 --- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild +++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5..7}) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs MY_PN="M2Crypto" @@ -41,14 +41,26 @@ PATCHES=( "${FILESDIR}/${PN}-crossdev-${PV}.patch" ) +swig_define() { + local x + for x; do + if tc-cpp-is-true "defined(${x})"; then + SWIG_FEATURES+=" -D${x}" + fi + done +} + 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 local -x SWIG_FEATURES= - case ${ABI} in - x32) SWIG_FEATURES="-D__ILP32__" ;; - esac + + # https://bugs.gentoo.org/617946 + swig_define __ILP32__ + + # https://bugs.gentoo.org/674112 + swig_define __ARM_PCS_VFP + distutils-r1_python_compile --openssl="${ESYSROOT}"/usr } diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild new file mode 100644 index 000000000000..86b019473876 --- /dev/null +++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 2018-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5..7}) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 toolchain-funcs + +MY_PN="M2Crypto" +DESCRIPTION="A Python crypto and SSL toolkit" +HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/" +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 ~x86-macos" +IUSE="libressl" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + virtual/python-typing[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-lang/swig-2.0.9 + dev-python/setuptools[${PYTHON_USEDEP}] +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-libressl-0.31.0.patch" +) + +swig_define() { + local x + for x; do + if tc-cpp-is-true "defined(${x})"; then + SWIG_FEATURES+=" -D${x}" + fi + done +} + +python_compile() { + # setup.py looks at platform.machine() to determine swig options. + # For exotic ABIs, we need to give swig a hint. + local -x SWIG_FEATURES= + + # https://bugs.gentoo.org/617946 + swig_define __ILP32__ + + # https://bugs.gentoo.org/674112 + swig_define __ARM_PCS_VFP + + distutils-r1_python_compile --openssl="${ESYSROOT}"/usr +} + +python_test() { + esetup.py test +} -- cgit v1.2.3