summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-05-20 19:32:47 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-05-20 19:32:47 +0000
commit0a10925aea073631c0bf0e82ab7d11d245846cd2 (patch)
tree5def585e4e17a350351a1b08f9046a1c07f51df4 /dev-python/pyopenssl
parentppc64 stable wrt #360221 (diff)
downloadgentoo-2-0a10925aea073631c0bf0e82ab7d11d245846cd2.tar.gz
gentoo-2-0a10925aea073631c0bf0e82ab7d11d245846cd2.tar.bz2
gentoo-2-0a10925aea073631c0bf0e82ab7d11d245846cd2.zip
Use Python 2 during generation of documentation (bug #368105).
(Portage version: 2.2.0_alpha34_p4/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pyopenssl')
-rw-r--r--dev-python/pyopenssl/ChangeLog6
-rw-r--r--dev-python/pyopenssl/pyopenssl-0.12.ebuild11
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog
index 9d5af2c2b8b2..9ab89c1b1924 100644
--- a/dev-python/pyopenssl/ChangeLog
+++ b/dev-python/pyopenssl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pyopenssl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.74 2011/05/04 16:54:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.75 2011/05/20 19:32:47 arfrever Exp $
+
+ 20 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ pyopenssl-0.12.ebuild:
+ Use Python 2 during generation of documentation (bug #368105).
04 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pyopenssl-0.12.ebuild:
diff --git a/dev-python/pyopenssl/pyopenssl-0.12.ebuild b/dev-python/pyopenssl/pyopenssl-0.12.ebuild
index 924bb2a94b4f..dc229dd070c1 100644
--- a/dev-python/pyopenssl/pyopenssl-0.12.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.12.ebuild,v 1.2 2011/05/04 16:54:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.12.ebuild,v 1.3 2011/05/20 19:32:47 arfrever Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -15,14 +15,17 @@ DESCRIPTION="Python interface to the OpenSSL library"
HOMEPAGE="http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl http://pypi.python.org/pypi/pyOpenSSL"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc"
RDEPEND=">=dev-libs/openssl-0.9.6g"
DEPEND="${RDEPEND}
- doc? ( >=dev-tex/latex2html-2002.2 )"
+ doc? (
+ =dev-lang/python-2*
+ >=dev-tex/latex2html-2002.2
+ )"
S="${WORKDIR}/${MY_P}"
@@ -46,6 +49,8 @@ src_prepare() {
-e "s/test_subject_name_hash/_&/" \
-i OpenSSL/test/test_crypto.py
sed -e "s/test_load_verify_directory/_&/" -i OpenSSL/test/test_ssl.py
+
+ sed -e "s/python/&2/" -i doc/Makefile
}
src_compile() {