summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2015-08-07 19:13:22 +0000
committerTim Harder <radhermit@gentoo.org>2015-08-07 19:13:22 +0000
commit0ea513122f229ad5297d8506a67034bdfbb68c15 (patch)
tree81357c039367df25af3cc47081bee5fead034a44 /sys-apps
parentupdated user message on configuration (diff)
downloadgentoo-2-0ea513122f229ad5297d8506a67034bdfbb68c15.tar.gz
gentoo-2-0ea513122f229ad5297d8506a67034bdfbb68c15.tar.bz2
gentoo-2-0ea513122f229ad5297d8506a67034bdfbb68c15.zip
Conditionalize sphinx build dep.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/pkgcore/ChangeLog5
-rw-r--r--sys-apps/pkgcore/pkgcore-9999.ebuild9
2 files changed, 11 insertions, 3 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index bfc2ff65f63d..feedd0983eea 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/pkgcore
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.194 2015/08/03 06:07:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.195 2015/08/07 19:13:22 radhermit Exp $
+
+ 07 Aug 2015; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
+ Conditionalize sphinx build dep.
03 Aug 2015; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
Update docs build command.
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 43d1a698e0b4..d9bcb177d8d8 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.30 2015/08/03 06:07:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.31 2015/08/07 19:13:22 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -21,11 +21,16 @@ LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
IUSE="doc test"
+if [[ ${PV} == *9999 ]] ; then
+ SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
+else
+ SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+fi
RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
+ ${SPHINX}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
"