From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MlSnq-00018X-Kt for garchives@archives.gentoo.org; Wed, 09 Sep 2009 19:26:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42405E0A10; Wed, 9 Sep 2009 19:26:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 24ED0E0A10 for ; Wed, 9 Sep 2009 19:26:02 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C899C67146 for ; Wed, 9 Sep 2009 19:26:01 +0000 (UTC) Received: from arfrever by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MlSno-0002z6-TS for gentoo-commits@lists.gentoo.org; Wed, 09 Sep 2009 19:26:00 +0000 From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, arfrever@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: distutils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: distutils.eclass X-VCS-Directories: eclass X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis Content-Type: text/plain; charset=utf8 Message-Id: Sender: Arfrever Frehtes Taifersar Arahesis Date: Wed, 09 Sep 2009 19:26:00 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1ed2ef2e-e009-46c5-bbe6-787ebcdea0b7 X-Archives-Hash: b4aec162932a5a2f2bfdf874e9ccd715 arfrever 09/09/09 19:26:00 Modified: distutils.eclass Log: Add support for DISTUTILS_DISABLE_PYTHON_DEPENDENCY variable. Improve h= andling 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.e= class?rev=3D1.62&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.e= class?rev=3D1.62&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.e= class?r1=3D1.61&r2=3D1.62 Index: distutils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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/0= 9/07 02:34:10 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.62 2009/0= 9/09 19:26:00 arfrever Exp $ =20 # @ECLASS: distutils.eclass # @MAINTAINER: @@ -24,8 +24,10 @@ ;; esac =20 -DEPEND=3D"virtual/python" -RDEPEND=3D"${DEPEND}" +if [[ -z "${DISTUTILS_DISABLE_PYTHON_DEPENDENCY}" ]]; then + DEPEND=3D"virtual/python" + RDEPEND=3D"${DEPEND}" +fi python=3D"python" =20 # @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES @@ -159,15 +161,17 @@ ${python} setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root=3D"= ${D}" --no-compile "$@" || die "Installation failed" fi =20 - DDOCS=3D"CHANGELOG KNOWN_BUGS MAINTAINERS PKG-INFO CONTRIBUTORS TODO NE= WS" - DDOCS=3D"${DDOCS} Change* MANIFEST* README* AUTHORS" + local default_docs + default_docs=3D"AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINT= AINERS MANIFEST* NEWS PKG-INFO README* TODO" =20 local doc - for doc in ${DDOCS}; do - [[ -s "$doc" ]] && dodoc $doc + for doc in ${default_docs}; do + [[ -s "${doc}" ]] && dodoc "${doc}" done =20 - [[ -n "${DOCS}" ]] && dodoc ${DOCS} + if [[ -n "${DOCS}" ]]; then + dodoc ${DOCS} || die "dodoc failed" + fi } =20 # @FUNCTION: distutils_pkg_postrm