summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2015-07-23 06:36:36 +0000
committerTim Harder <radhermit@gentoo.org>2015-07-23 06:36:36 +0000
commitc675e4206ba564da33cc2a35054359892aeb3e01 (patch)
tree74b4726e210cf6f2d965374f369f99a145f228b4 /sys-apps
parentAdd setuptools dep. (diff)
downloadgentoo-2-c675e4206ba564da33cc2a35054359892aeb3e01.tar.gz
gentoo-2-c675e4206ba564da33cc2a35054359892aeb3e01.tar.bz2
gentoo-2-c675e4206ba564da33cc2a35054359892aeb3e01.zip
Simplify building and installing docs.
(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.ebuild27
2 files changed, 9 insertions, 23 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index c43290df088d..139209918206 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.192 2015/07/23 06:25:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.193 2015/07/23 06:36:36 radhermit Exp $
+
+ 23 Jul 2015; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
+ Simplify building and installing docs.
23 Jul 2015; Tim Harder <radhermit@gentoo.org> pkgcore-9999.ebuild:
Add setuptools dep.
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 3483ece0f079..181be79533ea 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.28 2015/07/23 06:25:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.29 2015/07/23 06:36:36 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -32,41 +32,24 @@ DEPEND="${RDEPEND}
pkg_setup() {
# disable snakeoil 2to3 caching...
unset PY2TO3_CACHEDIR
-
- mydistutilsargs=(
- build
- --disable-html-docs
- --disable-man-pages
- )
}
python_compile_all() {
- esetup.py $(use doc && echo 'build_docs')
-
if [[ ${PV} == *9999 ]]; then
esetup.py build_man
ln -s "${BUILD_DIR}/sphinx/man" man || die
fi
- # symlinks generated manpages into source root
- # dead symlinks are tolerated
- ln -s "${BUILD_DIR}/sphinx/html" html || die
+ if use doc; then
+ esetup.py build_html
+ ln -s "${BUILD_DIR}/sphinx/html" html || die
+ fi
}
python_test() {
esetup.py test
}
-src_install() {
- mydistutilsargs+=(
- install
- --disable-html-docs
- --disable-man-pages
- )
-
- distutils-r1_src_install
-}
-
python_install_all() {
local cmds=(
install_man