[gentoo-commits] gentoo-x86 commit in eclass: distutils.eclass

["Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@gentoo.org>]

arfrever    09/09/09 19:26:00

  Modified:             distutils.eclass
  Log:
  Add support for DISTUTILS_DISABLE_PYTHON_DEPENDENCY variable. Improve handling of documentation in distutils_src_install().

Revision  Changes    Path
1.62                 eclass/distutils.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?r1=1.61&r2=1.62

Index: distutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- distutils.eclass	7 Sep 2009 02:34:10 -0000	1.61
+++ distutils.eclass	9 Sep 2009 19:26:00 -0000	1.62
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.61 2009/09/07 02:34:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.62 2009/09/09 19:26:00 arfrever Exp $
 
 # @ECLASS: distutils.eclass
 # @MAINTAINER:
@@ -24,8 +24,10 @@
 		;;
 esac
 
-DEPEND="virtual/python"
-RDEPEND="${DEPEND}"
+if [[ -z "${DISTUTILS_DISABLE_PYTHON_DEPENDENCY}" ]]; then
+	DEPEND="virtual/python"
+	RDEPEND="${DEPEND}"
+fi
 python="python"
 
 # @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES
@@ -159,15 +161,17 @@
 		${python} setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
 	fi
 
-	DDOCS="CHANGELOG KNOWN_BUGS MAINTAINERS PKG-INFO CONTRIBUTORS TODO NEWS"
-	DDOCS="${DDOCS} Change* MANIFEST* README* AUTHORS"
+	local default_docs
+	default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS MANIFEST* NEWS PKG-INFO README* TODO"
 
 	local doc
-	for doc in ${DDOCS}; do
-		[[ -s "$doc" ]] && dodoc $doc
+	for doc in ${default_docs}; do
+		[[ -s "${doc}" ]] && dodoc "${doc}"
 	done
 
-	[[ -n "${DOCS}" ]] && dodoc ${DOCS}
+	if [[ -n "${DOCS}" ]]; then
+		dodoc ${DOCS} || die "dodoc failed"
+	fi
 }
 
 # @FUNCTION: distutils_pkg_postrm