From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-855644-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 0D2951388C3
for <garchives@archives.gentoo.org>; Wed, 6 Jan 2016 15:07:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5774BE07C5;
Wed, 6 Jan 2016 15:07:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id F0B6AE06FE
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jan 2016 15:07:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D784834098F
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jan 2016 15:07:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 19151D01
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jan 2016 15:07:46 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1452092827.1b9d991226d088eeb0275d42f5467450ae23dab1.jlec@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/nose/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/nose/nose-1.3.7.ebuild
X-VCS-Directories: dev-python/nose/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: 1b9d991226d088eeb0275d42f5467450ae23dab1
X-VCS-Branch: master
Date: Wed, 6 Jan 2016 15:07:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: bba100f2-198f-4119-96a5-c6b099493303
X-Archives-Hash: bb5dd86853319df849a9f294bb946339
commit: 1b9d991226d088eeb0275d42f5467450ae23dab1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 14:33:11 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 15:07:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9d9912
dev-python/nose: Include enhancement suggested by mgorny
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/nose/nose-1.3.7.ebuild | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7.ebuild
index 2353f02..a059793 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7.ebuild
@@ -21,7 +21,10 @@ 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 )"
+REQUIRED_USE="
+ doc? (
+ || ( $(python_gen_useflags 'python2*') )
+ )"
RDEPEND="
dev-python/coverage[${PYTHON_USEDEP}]
@@ -30,6 +33,10 @@ DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
python_prepare_all() {
# Tests need to be converted, and they don't respect BUILD_DIR.
use test && DISTUTILS_IN_SOURCE_BUILD=1
@@ -64,7 +71,7 @@ python_compile() {
python_compile_all() {
if use doc; then
- python_export python2_7 EPYTHON
+ python_setup 'python2*'
emake -C doc html
fi
}
@@ -79,10 +86,7 @@ python_install() {
python_install_all() {
use examples && local EXAMPLES=( examples/. )
+ use doc && HTML_DOCS=( doc/.build/html/. )
distutils-r1_python_install_all
- if use doc; then
- docinto html
- dodoc -r -A txt doc/.build/html/.
- fi
}