[gentoo-commits] gentoo-x86 commit in eclass: php-ext-source-r2.eclass

[Ole Markus With (olemarkus)]

olemarkus    10/11/02 21:46:05

  Modified:             php-ext-source-r2.eclass
  Log:
  Added an src_prepare that fits better with EAPI=2

Revision  Changes    Path
1.4                  eclass/php-ext-source-r2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?r1=1.3&r2=1.4

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-ext-source-r2.eclass	2 Nov 2010 17:09:56 -0000	1.3
+++ php-ext-source-r2.eclass	2 Nov 2010 21:46:05 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.3 2010/11/02 17:09:56 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.4 2010/11/02 21:46:05 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@g.o>
 # Author: Stuart Herbert <stuart@g.o>
@@ -18,7 +18,7 @@
 
 inherit flag-o-matic autotools depend.php
 
-EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
 
 # @ECLASS-VARIABLE: PHP_EXT_NAME
 # @DESCRIPTION:
@@ -92,10 +92,14 @@
 	local slot orig_s="$S"
 	for slot in $(php_get_slots); do
 		cp -r "${orig_s}" "${WORKDIR}/${slot}"
+	done
+}
+
+php-ext-source-r2_src_prepare() {
+	local slot orig_s="$S"
+	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
-		if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
-			php-ext-source-r2_phpize
-		fi
+		php-ext-source-r2_phpize
 	done
 }
 
@@ -103,14 +107,16 @@
 # @DESCRIPTION:
 # Runs phpize and autotools in addition to the standard src_unpack
 php-ext-source-r2_phpize() {
-	# Create configure out of config.m4
-	# I wish I could run this to solve #329071, but I cannot
-	#autotools_run_tool ${PHPIZE} 
-	${PHPIZE}
-	# force run of libtoolize and regeneration of related autotools
-	# files (bug 220519)
-	rm aclocal.m4
-	eautoreconf
+	if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
+		# Create configure out of config.m4
+		# I wish I could run this to solve #329071, but I cannot
+		#autotools_run_tool ${PHPIZE} 
+		${PHPIZE}
+		# force run of libtoolize and regeneration of related autotools
+		# files (bug 220519)
+		rm aclocal.m4
+		eautoreconf
+	fi	
 }
 
 # @FUNCTION: php-ext-source-r2_src_configure