summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-08-18 10:33:24 +0000
committerMichał Górny <mgorny@gentoo.org>2013-08-18 10:33:24 +0000
commita07ed1999889a46d86c45903f1dad9ff68b84202 (patch)
treedb6943056aecd71b5e0d0ef4d3b6b1e22004aa3c /dev-python
parentAdhere to coding conventions (diff)
downloadgentoo-2-a07ed1999889a46d86c45903f1dad9ff68b84202.tar.gz
gentoo-2-a07ed1999889a46d86c45903f1dad9ff68b84202.tar.bz2
gentoo-2-a07ed1999889a46d86c45903f1dad9ff68b84202.zip
Improve the distutils-r1 ebuild. Install docs into /usr/share/doc/${PF}.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/networkx/ChangeLog5
-rw-r--r--dev-python/networkx/networkx-1.7-r2.ebuild25
2 files changed, 14 insertions, 16 deletions
diff --git a/dev-python/networkx/ChangeLog b/dev-python/networkx/ChangeLog
index 26ca3466d9cd..3e775791f7e8 100644
--- a/dev-python/networkx/ChangeLog
+++ b/dev-python/networkx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/networkx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.17 2013/04/26 09:50:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.18 2013/08/18 10:33:24 mgorny Exp $
+
+ 18 Aug 2013; Michał Górny <mgorny@gentoo.org> networkx-1.7-r2.ebuild:
+ Improve the distutils-r1 ebuild. Install docs into /usr/share/doc/${PF}.
*networkx-1.7-r2 (26 Apr 2013)
diff --git a/dev-python/networkx/networkx-1.7-r2.ebuild b/dev-python/networkx/networkx-1.7-r2.ebuild
index 3194c6c38709..57f5e652725f 100644
--- a/dev-python/networkx/networkx-1.7-r2.ebuild
+++ b/dev-python/networkx/networkx-1.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.1 2013/04/26 09:50:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.2 2013/08/18 10:33:24 mgorny Exp $
EAPI=5
@@ -36,28 +36,23 @@ RDEPEND="
virtual/pyparsing[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
- )"
+ )"
python_compile_all() {
if use doc; then
- elog "Building docs"
- # PYTHONPATH is necessary to use networkx to be installed.
- cd "${S}"/doc || die
sed \
-e "s:^\t\./:\t${PYTHON} :g" \
- -i Makefile || die
- pwd
- PYTHONPATH="${S}:${PYTHONPATH}" make html \
- || die "doc compilation failed"
+ -i doc/Makefile || die
+ emake -C doc html
fi
}
python_install_all() {
- distutils-r1_python_install_all
+ # Oh my.
+ rm -r "${ED}"usr/share/doc/${P} || die
- rm -f "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE}.txt || die
- if ! use examples; then
- rm -r "${ED}"usr/share/doc/${P}/examples || die
- fi
- use doc && dohtml -r doc/build/html/*
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
}