| 1 |
arfrever 09/09/09 19:26:00 |
| 2 |
|
| 3 |
Modified: distutils.eclass |
| 4 |
Log: |
| 5 |
Add support for DISTUTILS_DISABLE_PYTHON_DEPENDENCY variable. Improve handling of documentation in distutils_src_install(). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.62 eclass/distutils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?rev=1.62&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?rev=1.62&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?r1=1.61&r2=1.62 |
| 13 |
|
| 14 |
Index: distutils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v |
| 17 |
retrieving revision 1.61 |
| 18 |
retrieving revision 1.62 |
| 19 |
diff -u -r1.61 -r1.62 |
| 20 |
--- distutils.eclass 7 Sep 2009 02:34:10 -0000 1.61 |
| 21 |
+++ distutils.eclass 9 Sep 2009 19:26:00 -0000 1.62 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.61 2009/09/07 02:34:10 arfrever Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.62 2009/09/09 19:26:00 arfrever Exp $ |
| 27 |
|
| 28 |
# @ECLASS: distutils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -24,8 +24,10 @@ |
| 31 |
;; |
| 32 |
esac |
| 33 |
|
| 34 |
-DEPEND="virtual/python" |
| 35 |
-RDEPEND="${DEPEND}" |
| 36 |
+if [[ -z "${DISTUTILS_DISABLE_PYTHON_DEPENDENCY}" ]]; then |
| 37 |
+ DEPEND="virtual/python" |
| 38 |
+ RDEPEND="${DEPEND}" |
| 39 |
+fi |
| 40 |
python="python" |
| 41 |
|
| 42 |
# @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES |
| 43 |
@@ -159,15 +161,17 @@ |
| 44 |
${python} setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed" |
| 45 |
fi |
| 46 |
|
| 47 |
- DDOCS="CHANGELOG KNOWN_BUGS MAINTAINERS PKG-INFO CONTRIBUTORS TODO NEWS" |
| 48 |
- DDOCS="${DDOCS} Change* MANIFEST* README* AUTHORS" |
| 49 |
+ local default_docs |
| 50 |
+ default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS MANIFEST* NEWS PKG-INFO README* TODO" |
| 51 |
|
| 52 |
local doc |
| 53 |
- for doc in ${DDOCS}; do |
| 54 |
- [[ -s "$doc" ]] && dodoc $doc |
| 55 |
+ for doc in ${default_docs}; do |
| 56 |
+ [[ -s "${doc}" ]] && dodoc "${doc}" |
| 57 |
done |
| 58 |
|
| 59 |
- [[ -n "${DOCS}" ]] && dodoc ${DOCS} |
| 60 |
+ if [[ -n "${DOCS}" ]]; then |
| 61 |
+ dodoc ${DOCS} || die "dodoc failed" |
| 62 |
+ fi |
| 63 |
} |
| 64 |
|
| 65 |
# @FUNCTION: distutils_pkg_postrm |
Archives