From 6a4730aba38e7408643db48488be0ddd511de004 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 22 May 2012 15:12:21 -0400 Subject: [PATCH] m2crypto: upgrade to latest stable version Upgraded dev-python/m2crypto to version 0.21.1 on amd64, arm, x86. Needed for openssl-1.0 upgrade. BUG=None TEST=`emerge m2crypto` works TEST=`emerge-amd64-generic crda` works (its build code calls m2crypto) Change-Id: I821f4bb8fb905227df79076052b82a339a34c539 Reviewed-on: https://gerrit.chromium.org/gerrit/23259 Reviewed-by: Elly Jones Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../dev-python/m2crypto/Manifest | 2 +- .../m2crypto/m2crypto-0.20.2.ebuild | 55 ----------------- .../m2crypto/m2crypto-0.21.1.ebuild | 59 +++++++++++++++++++ .../md5-cache/dev-python/m2crypto-0.20.2 | 13 ---- .../md5-cache/dev-python/m2crypto-0.21.1 | 13 ++++ 5 files changed, 73 insertions(+), 69 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.20.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.21.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.20.2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.21.1 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/Manifest index b500aa8039..73e5da7d0b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/Manifest @@ -1 +1 @@ -DIST M2Crypto-0.20.2.tar.gz 412987 RMD160 7376195fd586e7834d41229a4798f8810b86eed2 SHA1 6e85d7035971c353db74a497fca0ec2eaea4dea0 SHA256 fc66b96ad2a14de1a502358286d3490677eda30385645fca995fffff22b73e6e +DIST M2Crypto-0.21.1.tar.gz 413563 RMD160 313dcab450846a0363e7192a10364bdfd5dfae85 SHA1 3c7135b952092e4f2eee7a94c5153319cccba94e SHA256 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a diff --git a/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.20.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.20.2.ebuild deleted file mode 100644 index daa9559c8b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.20.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v 1.12 2010/02/14 18:00:53 arfrever Exp $ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils multilib portability - -MY_PN="M2Crypto" - -DESCRIPTION="A python wrapper for the OpenSSL crypto library" -HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc" - -RDEPEND=">=dev-libs/openssl-0.9.8" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.25 - doc? ( dev-python/epydoc ) - dev-python/setuptools" -RESTRICT_PYTHON_ABIS="3.*" - -PYTHON_MODNAME="${MY_PN}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -DOCS="CHANGES" - -src_test() { - testing() { - PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test - } - python_execute_function testing -} - -src_install() { - [[ -z ${ED} ]] && local ED=${D} - distutils_src_install - - if use doc; then - cd "${S}/demo" - treecopy . "${ED}/usr/share/doc/${PF}/example" - - einfo "Generating API documentation..." - cd "${S}/doc" - PYTHONPATH="${ED}$(python_get_sitedir -f)" epydoc --html --output=api --name=M2Crypto M2Crypto - fi - dohtml -r * -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.21.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.21.1.ebuild new file mode 100644 index 0000000000..87b1dd9883 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/m2crypto/m2crypto-0.21.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1.ebuild,v 1.12 2012/05/13 20:46:48 aballier Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" +DISTUTILS_SRC_TEST="setup.py" + +inherit distutils + +MY_PN="M2Crypto" + +DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit" +HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="doc examples" + +RDEPEND=">=dev-libs/openssl-0.9.8" +DEPEND="${RDEPEND} + >=dev-lang/swig-1.3.28 + dev-python/setuptools + doc? ( dev-python/epydoc )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +DOCS="CHANGES" +PYTHON_MODNAME="${MY_PN}" + +src_compile() { + distutils_src_compile + + if use doc; then + einfo "Generation of documentation" + pushd doc > /dev/null + PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib.*)" epydoc --html --output=api --name=M2Crypto M2Crypto || die "Generation of documentation failed" + popd > /dev/null + fi +} + +src_install() { + distutils_src_install + + if use doc; then + dohtml -r doc/* || die "Installation of documentation failed" + fi + + if use examples; then + pushd demo > /dev/null + insinto /usr/share/doc/${PF}/examples + doins -r * || die "Installation of examples failed" + popd > /dev/null + fi +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.20.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.20.2 deleted file mode 100644 index 743ab9b481..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.20.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=>=dev-libs/openssl-0.9.8 >=dev-lang/swig-1.3.25 doc? ( dev-python/epydoc ) dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2* -DESCRIPTION=A python wrapper for the OpenSSL crypto library -EAPI=2 -HOMEPAGE=http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto -IUSE=doc -KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos -LICENSE=BSD -RDEPEND=>=dev-libs/openssl-0.9.8 >=app-admin/eselect-python-20091230 =dev-lang/python-2* -SLOT=0 -SRC_URI=http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.20.2.tar.gz -_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=a7a4a8de727473df5d40e9162149c682 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.21.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.21.1 new file mode 100644 index 0000000000..f62ce56318 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/m2crypto-0.21.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst postrm prepare test +DEPEND=>=dev-libs/openssl-0.9.8 >=dev-lang/swig-1.3.28 dev-python/setuptools doc? ( dev-python/epydoc ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* +DESCRIPTION=M2Crypto: A Python crypto and SSL toolkit +EAPI=3 +HOMEPAGE=http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto +IUSE=doc examples +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos +LICENSE=BSD +RDEPEND=>=dev-libs/openssl-0.9.8 >=app-admin/eselect-python-20091230 =dev-lang/python-2* +SLOT=0 +SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.21.1.tar.gz +_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 +_md5_=510fa4db78b76fbca399ab1eff762bf8