From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LZneA-0002dY-AH for garchives@archives.gentoo.org; Wed, 18 Feb 2009 14:43:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60D9AE0453; Wed, 18 Feb 2009 14:43:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 40AE8E0453 for ; Wed, 18 Feb 2009 14:43:32 +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 DA591B5A60 for ; Wed, 18 Feb 2009 14:43:31 +0000 (UTC) Received: from pva by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LZne7-0005MF-Aq for gentoo-commits@lists.gentoo.org; Wed, 18 Feb 2009 14:43:31 +0000 From: "Peter Volkov (pva)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pva@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: pva X-VCS-Committer-Name: Peter Volkov Content-Type: text/plain; charset=utf8 Message-Id: Sender: Peter Volkov Date: Wed, 18 Feb 2009 14:43:31 +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: 21ff4919-a76e-4e29-a616-228398cb7d52 X-Archives-Hash: db81a1264eb980e4cdf1bf427e2122d3 pva 09/02/18 14:43:31 Modified: distutils.eclass Log: Made eclass EAPI=3D2 aware, bug #255989. Revision Changes Path 1.55 eclass/distutils.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.e= class?rev=3D1.55&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.e= class?rev=3D1.55&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.e= class?r1=3D1.54&r2=3D1.55 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.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- distutils.eclass 28 Oct 2008 21:29:28 -0000 1.54 +++ distutils.eclass 18 Feb 2009 14:43:31 -0000 1.55 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.54 2008/1= 0/28 21:29:28 hawking Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.55 2009/0= 2/18 14:43:31 pva Exp $ =20 # @ECLASS: distutils.eclass # @MAINTAINER: @@ -17,6 +17,15 @@ =20 inherit python multilib eutils =20 +case "${EAPI:-0}" in + 0|1) + EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_p= ostrm + ;; + *) + EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_po= stinst pkg_postrm + ;; +esac + # @ECLASS-VARIABLE: PYTHON_SLOT_VERSION # @DESCRIPTION: # This helps make it possible to add extensions to python slots. @@ -43,6 +52,13 @@ unpack ${A} cd "${S}" =20 + has ${EAPI:-0} 0 1 && distutils_src_prepare +} + +# @FUNCTION: distutils_src_prepare +# @DESCRIPTION: +# The distutils src_prepare function, this function is exported +distutils_src_prepare() { # remove ez_setup stuff to prevent packages # from installing setuptools on their own rm -rf ez_setup* @@ -159,4 +175,3 @@ python_tkinter_exists } =20 -EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_pos= trm