diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-17 17:33:39 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-17 17:33:39 +0000 |
| commit | 30f06312477eac6d8fbbb8eeca849de8b8392918 (patch) | |
| tree | b18916800cbd24b2051b0b7fee75c3a15e23c489 | |
| parent | NMU: Migrate to distutils-r1. Thanks to floppym for review. Drop old version. (diff) | |
| download | historical-30f06312477eac6d8fbbb8eeca849de8b8392918.tar.gz historical-30f06312477eac6d8fbbb8eeca849de8b8392918.tar.bz2 historical-30f06312477eac6d8fbbb8eeca849de8b8392918.zip | |
Use einstalldocs.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 22 |
2 files changed, 6 insertions, 21 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 13e89b1d12bb..31c262abc1fc 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.972 2013/09/17 17:28:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.973 2013/09/17 17:33:39 mgorny Exp $ + + 17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Use einstalldocs. 17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Rename variables in _python_ln_rel to make it less confusing. diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 94833623d9e2..d51ce44ea69a 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -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/eclass/distutils-r1.eclass,v 1.79 2013/09/17 13:33:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.80 2013/09/17 17:33:39 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -510,25 +510,7 @@ distutils-r1_python_install() { distutils-r1_python_install_all() { debug-print-function ${FUNCNAME} "${@}" - if declare -p DOCS &>/dev/null; then - # an empty list == don't install anything - if [[ ${DOCS[@]} ]]; then - dodoc -r "${DOCS[@]}" - fi - else - local f - # same list as in PMS - for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \ - THANKS BUGS FAQ CREDITS CHANGELOG; do - if [[ -s ${f} ]]; then - dodoc "${f}" - fi - done - fi - - if declare -p HTML_DOCS &>/dev/null; then - dohtml -r "${HTML_DOCS[@]}" - fi + einstalldocs if declare -p EXAMPLES &>/dev/null; then local INSDESTTREE=/usr/share/doc/${PF}/examples |