[gentoo-commits] repo/gentoo:master commit in: dev-python/nose/

["Justin Lecher" <jlec@gentoo.org>]

commit:     c18afa2024c7cc62324c4031033431f0d480c0b2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 08:29:01 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 11:34:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18afa20

dev-python/nose: Build docs with python2

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=571006

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/nose/nose-1.3.7.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7.ebuild
index 7e9d805..150fb01 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,6 +21,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -61,7 +63,10 @@ python_compile() {
 }
 
 python_compile_all() {
-	use doc && emake -C doc html
+	if use doc; then
+		python_export python2_7 EPYTHON
+		emake -C doc html
+	fi
 }
 
 python_test() {
@@ -77,6 +82,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	if use doc; then
-		dohtml -r -A txt doc/.build/html/.
+		docinto html
+		dodoc -r -A txt doc/.build/html/.
 	fi
 }