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

["Peter Volkov (pva)" <pva@gentoo.org>]

pva         09/02/18 14:43:31

  Modified:             distutils.eclass
  Log:
  Made eclass EAPI=2 aware, bug #255989.

Revision  Changes    Path
1.55                 eclass/distutils.eclass

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

Index: distutils.eclass
===================================================================
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/10/28 21:29:28 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.55 2009/02/18 14:43:31 pva Exp $
 
 # @ECLASS: distutils.eclass
 # @MAINTAINER:
@@ -17,6 +17,15 @@
 
 inherit python multilib eutils
 
+case "${EAPI:-0}" in
+	0|1)
+		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
+		;;
+	*)
+		EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst 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}"
 
+	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
 }
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm