From 484ac3d510a71d0c47a2841d06dd79cb5a34b202 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 9 Jan 2020 13:03:32 -0500 Subject: dev-python/cryptography: add cffi to RDEPEND cryptography installs egg-info/requires.txt containing cffi. This means packages using pkg_resources to import cryptography will fail if cffi is not installed at runtime. Closes: https://bugs.gentoo.org/696224 Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24 Signed-off-by: Mike Gilbert --- .../cryptography/cryptography-2.6.1-r1.ebuild | 70 ++++++++++++++++++++++ dev-python/cryptography/cryptography-2.6.1.ebuild | 70 ---------------------- dev-python/cryptography/cryptography-2.8-r1.ebuild | 67 +++++++++++++++++++++ dev-python/cryptography/cryptography-2.8.ebuild | 67 --------------------- 4 files changed, 137 insertions(+), 137 deletions(-) create mode 100644 dev-python/cryptography/cryptography-2.6.1-r1.ebuild delete mode 100644 dev-python/cryptography/cryptography-2.6.1.ebuild create mode 100644 dev-python/cryptography/cryptography-2.8-r1.ebuild delete mode 100644 dev-python/cryptography/cryptography-2.8.ebuild (limited to 'dev-python') diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild new file mode 100644 index 000000000000..d0c85a6a8fd1 --- /dev/null +++ b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +DESCRIPTION="Library providing cryptographic recipes and primitives" +HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="libressl idna test" +RESTRICT="!test? ( test )" + +# the openssl 1.0.2l-r1 needs to be updated again :( +# It'd theb be able to go into the || section again +#=dev-libs/openssl-1.0.2l-r1:0 +# the following is the original section, disallowing bindist entirely +#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) +RDEPEND=" + !libressl? ( + dev-libs/openssl:0= ( + || ( + dev-libs/openssl:0[-bindist(-)] + >=dev-libs/openssl-1.0.2o-r6:0 + ) + ) + ) + libressl? ( dev-libs/libressl:0= ) + idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) + >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.4.1[${PYTHON_USEDEP}] + virtual/python-enum34[${PYTHON_USEDEP}] + virtual/python-ipaddress[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*') + $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') + " +DEPEND="${RDEPEND} + >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] + test? ( + ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] + !~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] + )" + +DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) + +PATCHES=( + "${FILESDIR}"/${P}-libressl.patch +) + +python_configure_all() { + append-cflags $(test-flags-CC -pthread) +} + +python_test() { + py.test -v -v -x || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1.ebuild deleted file mode 100644 index 5eb0f608b495..000000000000 --- a/dev-python/cryptography/cryptography-2.6.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="libressl idna test" -RESTRICT="!test? ( test )" - -# the openssl 1.0.2l-r1 needs to be updated again :( -# It'd theb be able to go into the || section again -#=dev-libs/openssl-1.0.2l-r1:0 -# the following is the original section, disallowing bindist entirely -#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) -RDEPEND=" - !libressl? ( - dev-libs/openssl:0= ( - || ( - dev-libs/openssl:0[-bindist(-)] - >=dev-libs/openssl-1.0.2o-r6:0 - ) - ) - ) - libressl? ( dev-libs/libressl:0= ) - idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) - >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.4.1[${PYTHON_USEDEP}] - virtual/python-enum34[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*') - $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') - test? ( - ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] - !~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] - )" - -DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) - -PATCHES=( - "${FILESDIR}"/${P}-libressl.patch -) - -python_configure_all() { - append-cflags $(test-flags-CC -pthread) -} - -python_test() { - py.test -v -v -x || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/cryptography/cryptography-2.8-r1.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild new file mode 100644 index 000000000000..a3a34f92d7fc --- /dev/null +++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +VEC_P=cryptography_vectors-${PV} +DESCRIPTION="Library providing cryptographic recipes and primitives" +HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )" + +LICENSE="|| ( Apache-2.0 BSD )" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="libressl idna test" +RESTRICT="!test? ( test )" + +# the openssl 1.0.2l-r1 needs to be updated again :( +# It'd theb be able to go into the || section again +#=dev-libs/openssl-1.0.2l-r1:0 +# the following is the original section, disallowing bindist entirely +#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) +RDEPEND=" + !libressl? ( + dev-libs/openssl:0= ( + || ( + dev-libs/openssl:0[-bindist(-)] + >=dev-libs/openssl-1.0.2o-r6:0 + ) + ) + ) + libressl? ( dev-libs/libressl:0= ) + idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.4.1[${PYTHON_USEDEP}] + virtual/python-enum34[${PYTHON_USEDEP}] + virtual/python-ipaddress[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*') + $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') + " +DEPEND="${RDEPEND} + >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] + test? ( + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] + !~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) + +python_configure_all() { + append-cflags $(test-flags-CC -pthread) +} + +python_test() { + local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P} + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/cryptography/cryptography-2.8.ebuild b/dev-python/cryptography/cryptography-2.8.ebuild deleted file mode 100644 index edd5696da250..000000000000 --- a/dev-python/cryptography/cryptography-2.8.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic - -VEC_P=cryptography_vectors-${PV} -DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="libressl idna test" -RESTRICT="!test? ( test )" - -# the openssl 1.0.2l-r1 needs to be updated again :( -# It'd theb be able to go into the || section again -#=dev-libs/openssl-1.0.2l-r1:0 -# the following is the original section, disallowing bindist entirely -#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) -RDEPEND=" - !libressl? ( - dev-libs/openssl:0= ( - || ( - dev-libs/openssl:0[-bindist(-)] - >=dev-libs/openssl-1.0.2o-r6:0 - ) - ) - ) - libressl? ( dev-libs/libressl:0= ) - idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.4.1[${PYTHON_USEDEP}] - virtual/python-enum34[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*') - $(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*') - test? ( - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] - !~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) - -python_configure_all() { - append-cflags $(test-flags-CC -pthread) -} - -python_test() { - local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P} - pytest -vv || die "Tests fail with ${EPYTHON}" -} -- cgit v1.2.3-65-gdbad