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

[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@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -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

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

[Ole Markus With (olemarkus)]

olemarkus    12/08/01 10:55:29

  Modified:             php-ext-source-r2.eclass
  Log:
  Typo. Bug 426288

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- php-ext-source-r2.eclass	22 Jun 2012 20:05:24 -0000	1.27
+++ php-ext-source-r2.eclass	1 Aug 2012 10:55:29 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.27 2012/06/22 20:05:24 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.28 2012/08/01 10:55:29 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -167,7 +167,7 @@
 	done
 }
 
-# @FUNCTION: php-ext-source-r1_src_install
+# @FUNCTION: php-ext-source-r2_src_install
 # @DESCRIPTION:
 # Takes care of standard install for PHP extensions (modules).
 

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

[Ole Markus With (olemarkus)]

olemarkus    12/06/22 20:05:24

  Modified:             php-ext-source-r2.eclass
  Log:
  Install ini files for embed SAPI too

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- php-ext-source-r2.eclass	2 Jun 2012 19:16:31 -0000	1.26
+++ php-ext-source-r2.eclass	22 Jun 2012 20:05:24 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.26 2012/06/02 19:16:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.27 2012/06/22 20:05:24 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -221,7 +221,7 @@
 php-ext-source-r2_buildinilist() {
 	# Work out the list of <ext>.ini files to edit/add to
 	if [[ -z "${PHPSAPILIST}" ]] ; then
-		PHPSAPILIST="apache2 cli cgi fpm"
+		PHPSAPILIST="apache2 cli cgi fpm embed"
 	fi
 
 	PHPINIFILELIST=""

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

[Ole Markus With (olemarkus)]

olemarkus    12/02/16 11:25:38

  Modified:             php-ext-source-r2.eclass
  Log:
  Add error message when copying source fails

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- php-ext-source-r2.eclass	19 Jan 2012 10:12:44 -0000	1.24
+++ php-ext-source-r2.eclass	16 Feb 2012 11:25:38 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.24 2012/01/19 10:12:44 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.25 2012/02/16 11:25:38 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -104,7 +104,7 @@
 	unpack ${A}
 	local slot orig_s="${PHP_EXT_S}"
 	for slot in $(php_get_slots); do
-		cp -r "${orig_s}" "${WORKDIR}/${slot}"
+		cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory"
 	done
 }
 

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

[Ole Markus With (olemarkus)]

olemarkus    12/01/15 17:18:48

  Modified:             php-ext-source-r2.eclass
  Log:
  Remove php5-2 from defauly USE_PHP

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php-ext-source-r2.eclass	13 Jan 2012 23:25:40 -0000	1.22
+++ php-ext-source-r2.eclass	15 Jan 2012 17:18:48 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.22 2012/01/13 23:25:40 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.23 2012/01/15 17:18:48 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -53,7 +53,7 @@
 # @ECLASS-VARIABLE: USE_PHP
 # @DESCRIPTION:
 # Lists the PHP slots compatibile the extension is compatibile with
-[[ -z "${USE_PHP}" ]] && USE_PHP="php5-3 php5-2"
+[[ -z "${USE_PHP}" ]] && USE_PHP="php5-3"
 
 # @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
 # @DESCRIPTION:

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

[Ole Markus With (olemarkus)]

olemarkus    12/01/13 05:38:42

  Modified:             php-ext-source-r2.eclass
  Log:
  Remove DEPEND string from php-ext-source-r2

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- php-ext-source-r2.eclass	12 Jan 2012 11:10:47 -0000	1.20
+++ php-ext-source-r2.eclass	13 Jan 2012 05:38:42 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.20 2012/01/12 11:10:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.21 2012/01/13 05:38:42 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -85,12 +85,12 @@
 	${PHPDEPEND}
 	${PHP_EXT_OPTIONAL_USE:+ )}"
 
-DEPEND="${DEPEND}
-	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
-	|| ( ${SELFDEPEND} )
-	${PHPDEPEND}
-	${PHP_EXT_OPTIONAL_USE:+ )}
-"
+#DEPEND="${DEPEND}
+#	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
+#	|| ( ${SELFDEPEND} )
+#	${PHPDEPEND}
+#	${PHP_EXT_OPTIONAL_USE:+ )}
+#"
 
 # @FUNCTION: php-ext-source-r2_src_unpack
 # @DESCRIPTION:

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

[Ole Markus With (olemarkus)]

olemarkus    12/01/12 11:10:47

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed a dependency issue where php would be pulled in for e.g ming even without php USE flag being set (bug 398649)

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- php-ext-source-r2.eclass	11 Jan 2012 18:30:36 -0000	1.19
+++ php-ext-source-r2.eclass	12 Jan 2012 11:10:47 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.19 2012/01/11 18:30:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.20 2012/01/12 11:10:47 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -86,7 +86,11 @@
 	${PHP_EXT_OPTIONAL_USE:+ )}"
 
 DEPEND="${DEPEND}
-${PHPDEPEND}"
+	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
+	|| ( ${SELFDEPEND} )
+	${PHPDEPEND}
+	${PHP_EXT_OPTIONAL_USE:+ )}
+"
 
 # @FUNCTION: php-ext-source-r2_src_unpack
 # @DESCRIPTION:

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

[Ole Markus With (olemarkus)]

olemarkus    12/01/11 18:30:36

  Modified:             php-ext-source-r2.eclass
  Log:
  Added php to DEPEND (bug 398553)

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- php-ext-source-r2.eclass	24 Nov 2011 00:04:39 -0000	1.18
+++ php-ext-source-r2.eclass	11 Jan 2012 18:30:36 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.18 2011/11/24 00:04:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.19 2012/01/11 18:30:36 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -85,6 +85,8 @@
 	${PHPDEPEND}
 	${PHP_EXT_OPTIONAL_USE:+ )}"
 
+DEPEND="${DEPEND}
+${PHPDEPEND}"
 
 # @FUNCTION: php-ext-source-r2_src_unpack
 # @DESCRIPTION:

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

[Mike Frysinger (vapier)]

vapier      11/11/24 00:04:39

  Modified:             php-ext-source-r2.eclass
  Log:
  delete duplicate PHP_EXT_NAME block (same thing appears a few lines below)

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- php-ext-source-r2.eclass	9 Sep 2011 14:39:39 -0000	1.17
+++ php-ext-source-r2.eclass	24 Nov 2011 00:04:39 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.17 2011/09/09 14:39:39 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.18 2011/11/24 00:04:39 vapier Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -20,13 +20,6 @@
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
 
-# @ECLASS-VARIABLE: PHP_EXT_NAME
-# @DESCRIPTION:
-# The extension name. This must be set, otherwise the eclass dies.
-# Only automagically set by php-ext-pecl-r1.eclass, so unless your ebuild
-# inherits that eclass, you must set this manually before inherit.
-[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-source-r2 eclass"
-
 DEPEND=">=sys-devel/m4-1.4.3
 		>=sys-devel/libtool-1.5.18"
 RDEPEND=""

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

[Ole Markus With (olemarkus)]

olemarkus    11/09/09 14:39:39

  Modified:             php-ext-source-r2.eclass
  Log:
  Add support for eapi 4

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- php-ext-source-r2.eclass	29 Aug 2011 01:28:10 -0000	1.16
+++ php-ext-source-r2.eclass	9 Sep 2011 14:39:39 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.16 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.17 2011/09/09 14:39:39 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@
 
 # Because of USE deps, we require at least EAPI 2
 case ${EAPI} in
-	2|3) ;;
+	2|3|4) ;;
 	*)
 		die "php-ext-source-r2 is not compatible with EAPI=${EAPI}"
 esac

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

[Ole Markus With (olemarkus)]

olemarkus    11/08/19 09:15:51

  Modified:             php-ext-source-r2.eclass
  Log:
  Pecl ebuilds now also install headers for the extensions

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- php-ext-source-r2.eclass	15 Aug 2011 12:48:27 -0000	1.13
+++ php-ext-source-r2.eclass	19 Aug 2011 09:15:51 -0000	1.14
@@ -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.13 2011/08/15 12:48:27 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.14 2011/08/19 09:15:51 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -146,10 +146,7 @@
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		# Set the correct config options
-		# We cannot use econf here, phpize/php-config deals with setting
-		# --prefix etc to whatever the php slot was configured to use
-		echo ./configure --with-php-config=${PHPCONFIG} ${my_conf}
-		./configure --with-php-config=${PHPCONFIG} ${my_conf}  || die "Unable to configure code to compile"
+		econf --with-php-config=${PHPCONFIG} ${my_conf}  || die "Unable to configure code to compile"
 	done
 }
 
@@ -190,6 +187,7 @@
 			[[ -s ${doc} ]] && dodoc ${doc}
 		done
 
+		INSTALL_ROOT="${D}" emake install-headers
 	done
 	php-ext-source-r2_createinifiles
 }

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

[Ole Markus With (olemarkus)]

olemarkus    11/08/15 12:48:28

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed a bug with ini files and multiple slots (bug 379127)

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-ext-source-r2.eclass	22 Jul 2011 12:13:27 -0000	1.12
+++ php-ext-source-r2.eclass	15 Aug 2011 12:48:27 -0000	1.13
@@ -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.12 2011/07/22 12:13:27 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.13 2011/08/15 12:48:27 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -247,19 +247,21 @@
 		# Build the list of <ext>.ini files to edit/add to
 		php-ext-source-r2_buildinilist ${slot}
 
-		PHPFULLINIFILELISTbak="${PHPFULLINIFILELIST}"
-		PHPFULLINIFILELIST="${PHPINIFILELIST}"
+
 		# Add the needed lines to the <ext>.ini files
+		local file
 		if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
-			php-ext-source-r2_addextension "${PHP_EXT_NAME}.so"
+			for file in ${PHPINIFILELIST}; do 
+				php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" "${file}"
+			done
 		fi
 		
-		PHPFULLINIFILELIST=${PHPFULLINIFILELISTbak}
 
 		# Symlink the <ext>.ini files from ext/ to ext-active/
+		local inifile
 		for inifile in ${PHPINIFILELIST} ; do
 			if [[ -n "${PHP_EXT_INIFILE}" ]]; then
-				cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${D}/${inifile}"
+				cat "${FILESDIR}/${PHP_EXT_INIFILE}" > "${inifile}"
 				einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}"
 			fi
 
@@ -272,7 +274,6 @@
 			dosym "/${inifile}" "/${inifile/ext/ext-active}"
 		done
 
-
 		# Add support for installing PHP files into a version dependant directory
 		PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}"
 	done
@@ -312,7 +313,7 @@
 		ext_file="${1}"
 	fi
 
-	php-ext-source-r2_addtoinifiles "${ext_type}" "${ext_file}" "Extension added"
+	php-ext-source-r2_addtoinifile "${ext_type}" "${ext_file}" "${2}" "Extension added"
 }
 
 # $1 - Setting name
@@ -320,16 +321,17 @@
 # $3 - File to add to
 # $4 - Sanitized text to output
 php-ext-source-r2_addtoinifile() {
-	if [[ ! -d $(dirname ${3}) ]] ; then
-		mkdir -p $(dirname ${3})
+	local inifile="${WORKDIR}/${3}"
+	if [[ ! -d $(dirname ${inifile}) ]] ; then
+		mkdir -p $(dirname ${inifile})
 	fi
 
 	# Are we adding the name of a section?
 	if [[ ${1:0:1} == "[" ]] ; then
-		echo "${1}" >> "${3}"
+		echo "${1}" >> "${inifile}"
 		my_added="${1}"
 	else
-		echo "${1}=${2}" >> "${3}"
+		echo "${1}=${2}" >> "${inifile}"
 		my_added="${1}=${2}"
 	fi
 
@@ -340,7 +342,7 @@
 	fi
 
 	insinto /$(dirname ${3})
-	doins "${3}"
+	doins "${inifile}"
 }
 
 # @FUNCTION: php-ext-source-r2_addtoinifiles

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

[Ole Markus With (olemarkus)]

olemarkus    11/07/22 12:13:27

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed a few bugs and added support for supplying custom ini files

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-ext-source-r2.eclass	22 Jul 2011 09:19:15 -0000	1.11
+++ php-ext-source-r2.eclass	22 Jul 2011 12:13:27 -0000	1.12
@@ -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.11 2011/07/22 09:19:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.12 2011/07/22 12:13:27 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -225,12 +225,14 @@
 		PHPSAPILIST="apache2 cli cgi fpm"
 	fi
 
+	PHPINIFILELIST=""
 	local x
 	for x in ${PHPSAPILIST} ; do
 		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
 			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
 		fi
 	done
+	PHPFULLINIFILELIST="${PHPFULLINIFILELIST} ${PHPINIFILELIST}"
 }
 
 # @FUNCTION: php-ext-source-r2_createinifiles
@@ -245,22 +247,36 @@
 		# Build the list of <ext>.ini files to edit/add to
 		php-ext-source-r2_buildinilist ${slot}
 
+		PHPFULLINIFILELISTbak="${PHPFULLINIFILELIST}"
+		PHPFULLINIFILELIST="${PHPINIFILELIST}"
 		# Add the needed lines to the <ext>.ini files
 		if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
 			php-ext-source-r2_addextension "${PHP_EXT_NAME}.so"
 		fi
+		
+		PHPFULLINIFILELIST=${PHPFULLINIFILELISTbak}
 
 		# Symlink the <ext>.ini files from ext/ to ext-active/
 		for inifile in ${PHPINIFILELIST} ; do
+			if [[ -n "${PHP_EXT_INIFILE}" ]]; then
+				cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${D}/${inifile}"
+				einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}"
+			fi
+
+
+
+
 			inidir="${inifile/${PHP_EXT_NAME}.ini/}"
 			inidir="${inidir/ext/ext-active}"
 			dodir "/${inidir}"
 			dosym "/${inifile}" "/${inifile/ext/ext-active}"
 		done
 
+
 		# Add support for installing PHP files into a version dependant directory
 		PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}"
 	done
+	
 }
 
 php-ext-source-r2_addextension() {
@@ -348,7 +364,7 @@
 # @CODE
 php-ext-source-r2_addtoinifiles() {
 	local x
-	for x in ${PHPINIFILELIST} ; do
+	for x in ${PHPFULLINIFILELIST} ; do
 		php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}"
 	done
 }

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

[Ole Markus With (olemarkus)]

olemarkus    11/07/22 09:19:15

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed a bug causing bogus ini files to be installed

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-ext-source-r2.eclass	29 Jun 2011 07:04:43 -0000	1.10
+++ php-ext-source-r2.eclass	22 Jul 2011 09:19:15 -0000	1.11
@@ -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.10 2011/06/29 07:04:43 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.11 2011/07/22 09:19:15 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -225,7 +225,6 @@
 		PHPSAPILIST="apache2 cli cgi fpm"
 	fi
 
-	PHPINIFILELIST=""
 	local x
 	for x in ${PHPSAPILIST} ; do
 		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then

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

[Ole Markus With (olemarkus)]

olemarkus    11/06/29 07:04:43

  Modified:             php-ext-source-r2.eclass
  Log:
  Removed 5.4 and 5.5 from default USE_PHP

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- php-ext-source-r2.eclass	22 May 2011 07:18:44 -0000	1.9
+++ php-ext-source-r2.eclass	29 Jun 2011 07:04:43 -0000	1.10
@@ -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.9 2011/05/22 07:18:44 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.10 2011/06/29 07:04:43 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -60,7 +60,7 @@
 # @ECLASS-VARIABLE: USE_PHP
 # @DESCRIPTION:
 # Lists the PHP slots compatibile the extension is compatibile with
-[[ -z "${USE_PHP}" ]] && USE_PHP="php5-5 php5-4 php5-3 php5-2"
+[[ -z "${USE_PHP}" ]] && USE_PHP="php5-3 php5-2"
 
 # @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
 # @DESCRIPTION:

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

[Ole Markus With (olemarkus)]

olemarkus    11/05/22 07:18:44

  Modified:             php-ext-source-r2.eclass
  Log:
  Added 5.4 and 5.5 to PHP_USE

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-ext-source-r2.eclass	10 Jan 2011 11:25:21 -0000	1.8
+++ php-ext-source-r2.eclass	22 May 2011 07:18:44 -0000	1.9
@@ -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.8 2011/01/10 11:25:21 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.9 2011/05/22 07:18:44 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -60,7 +60,7 @@
 # @ECLASS-VARIABLE: USE_PHP
 # @DESCRIPTION:
 # Lists the PHP slots compatibile the extension is compatibile with
-[[ -z "${USE_PHP}" ]] && USE_PHP="php5-2 php5-3"
+[[ -z "${USE_PHP}" ]] && USE_PHP="php5-5 php5-4 php5-3 php5-2"
 
 # @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
 # @DESCRIPTION:

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

[Ole Markus With (olemarkus)]

olemarkus    11/01/10 11:25:21

  Modified:             php-ext-source-r2.eclass
  Log:
  Added a PHP_EXT_S to aid packages with bundled extensions

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-ext-source-r2.eclass	9 Jan 2011 00:05:10 -0000	1.7
+++ php-ext-source-r2.eclass	10 Jan 2011 11:25:21 -0000	1.8
@@ -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.7 2011/01/09 00:05:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.8 2011/01/10 11:25:21 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -68,6 +68,13 @@
 # Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind
 # USE=php.
 
+# @ECLASS-VARIABLE: PHP_EXT_S
+# @DESCRIPTION:
+# The relative location of the temporary build directory for the PHP extension within
+# the source package. This is useful for packages that bundle the PHP extension.
+# Defaults to ${S}
+[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}"
+
 #Make sure at least one target is installed. Abuses USE dependencies.
 for target in ${USE_PHP}; do
 	IUSE="${IUSE} php_targets_${target}"
@@ -97,14 +104,14 @@
 # Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
 php-ext-source-r2_src_unpack() {
 	unpack ${A}
-	local slot orig_s="$S"
+	local slot orig_s="${PHP_EXT_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"
+	local slot orig_s="${PHP_EXT_S}"
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		php-ext-source-r2_phpize
@@ -141,6 +148,7 @@
 		# Set the correct config options
 		# We cannot use econf here, phpize/php-config deals with setting
 		# --prefix etc to whatever the php slot was configured to use
+		echo ./configure --with-php-config=${PHPCONFIG} ${my_conf}
 		./configure --with-php-config=${PHPCONFIG} ${my_conf}  || die "Unable to configure code to compile"
 	done
 }
@@ -207,8 +215,8 @@
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
 	PHP_CURRENTSLOT=${1:3}
 
-	S="${WORKDIR}/${1}"
-	cd "${S}"
+	PHP_EXT_S="${WORKDIR}/${1}"
+	cd "${PHP_EXT_S}"
 }
 
 php-ext-source-r2_buildinilist() {

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

[Robin H. Johnson (robbat2)]

robbat2     11/01/09 00:05:10

  Modified:             php-ext-source-r2.eclass
  Log:
  Implement PHP_EXT_OPTIONAL_USE as a way to make the PHP dependency optional for bug #351098: Supports prevents packages USE=-php bringing in PHP when they do not need it.

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -p -w -b -B -u -u -r1.6 -r1.7
--- php-ext-source-r2.eclass	27 Dec 2010 22:19:51 -0000	1.6
+++ php-ext-source-r2.eclass	9 Jan 2011 00:05:10 -0000	1.7
@@ -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.6 2010/12/27 22:19:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.7 2011/01/09 00:05:10 robbat2 Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -62,6 +62,12 @@ esac
 # Lists the PHP slots compatibile the extension is compatibile with
 [[ -z "${USE_PHP}" ]] && USE_PHP="php5-2 php5-3"
 
+# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
+# @DESCRIPTION:
+# If set, this is the USE flag that the PHP dependencies are behind
+# Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind
+# USE=php.
+
 #Make sure at least one target is installed. Abuses USE dependencies.
 for target in ${USE_PHP}; do
 	IUSE="${IUSE} php_targets_${target}"
@@ -74,8 +80,10 @@ for target in ${USE_PHP}; do
 done
 
 RDEPEND="${RDEPEND}
+	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
 	|| ( ${SELFDEPEND} )
-	${PHPDEPEND}"
+	${PHPDEPEND}
+	${PHP_EXT_OPTIONAL_USE:+ )}"
 
 
 # @FUNCTION: php-ext-source-r2_src_unpack

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

[Jeremy Olexa (darkside)]

darkside    10/12/27 22:19:51

  Modified:             php-ext-source-r2.eclass
  Log:
  whitespace and typo fix

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-ext-source-r2.eclass	3 Nov 2010 22:47:19 -0000	1.5
+++ php-ext-source-r2.eclass	27 Dec 2010 22:19:51 -0000	1.6
@@ -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.5 2010/11/03 22:47:19 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.6 2010/12/27 22:19:51 darkside Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -69,11 +69,11 @@
 	SELFDEPEND="${SELFDEPEND} =${CATEGORY}/${PF}[php_targets_${target}]"
 	slot=${target/php}
 	slot=${slot/-/.}
-	PHPDEPEND="${PHPDEPEND} 
+	PHPDEPEND="${PHPDEPEND}
 	php_targets_${target}? ( dev-lang/php:${slot} )"
 done
-	
-RDEPEND="${RDEPEND} 
+
+RDEPEND="${RDEPEND}
 	|| ( ${SELFDEPEND} )
 	${PHPDEPEND}"
 
@@ -85,7 +85,7 @@
 # @VARIABLE: PHP_EXT_SKIP_PHPIZE
 # @DESCRIPTION:
 # phpize will be run by default for all ebuilds that use
-# php-ext-source-r1_src_unpack
+# php-ext-source-r2_src_unpack
 # Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
 php-ext-source-r2_src_unpack() {
 	unpack ${A}
@@ -116,7 +116,7 @@
 		# files (bug 220519)
 		rm aclocal.m4
 		eautoreconf
-	fi	
+	fi
 }
 
 # @FUNCTION: php-ext-source-r2_src_configure
@@ -145,7 +145,7 @@
 	addpredict /usr/share/snmp/mibs/.index
 	# shm extension createss a semaphore file #173574
 	addpredict /session_mm_cli0.sem
-	local slot	
+	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		emake || die "Unable to make code"
@@ -223,7 +223,7 @@
 # Builds ini files for every enabled slot and SAPI
 php-ext-source-r2_createinifiles() {
 	local slot
-	for slot in $(php_get_slots); do 
+	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		# Pull in the PHP settings
 

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

[Ole Markus With (olemarkus)]

olemarkus    10/11/03 22:47:19

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed issues with zend_extension as well as removed dep on depend.php

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-ext-source-r2.eclass	2 Nov 2010 21:46:05 -0000	1.4
+++ php-ext-source-r2.eclass	3 Nov 2010 22:47:19 -0000	1.5
@@ -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.4 2010/11/02 21:46:05 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.5 2010/11/03 22:47:19 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -16,7 +16,7 @@
 # This eclass provides a unified interface for compiling and installing standalone
 # PHP extensions (modules).
 
-inherit flag-o-matic autotools depend.php
+inherit flag-o-matic autotools
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
 
@@ -197,6 +197,7 @@
 	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
 	PHPPREFIX="/usr/${libdir}/${slot}"
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
+	PHP_CURRENTSLOT=${1:3}
 
 	S="${WORKDIR}/${1}"
 	cd "${S}"
@@ -251,15 +252,15 @@
 	if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then
 		# We need the full path for ZendEngine extensions
 		# and we need to check for debugging enabled!
-		if has_zts ; then
-			if has_debug ; then
+		if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then
+			if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then
 				ext_type="zend_extension_debug_ts"
 			else
 				ext_type="zend_extension_ts"
 			fi
 			ext_file="${EXT_DIR}/${1}"
 		else
-			if has_debug ; then
+			if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then
 				ext_type="zend_extension_debug"
 			else
 				ext_type="zend_extension"

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

[Ole Markus With (olemarkus)]

olemarkus    10/11/02 17:09:56

  Modified:             php-ext-source-r2.eclass
  Log:
  Cleanup of eclass. Also added depend.php back in as it is still required for some parts

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-ext-source-r2.eclass	6 Oct 2010 19:58:45 -0000	1.2
+++ php-ext-source-r2.eclass	2 Nov 2010 17:09:56 -0000	1.3
@@ -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.2 2010/10/06 19:58:45 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.3 2010/11/02 17:09:56 olemarkus Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -16,7 +16,7 @@
 # This eclass provides a unified interface for compiling and installing standalone
 # PHP extensions (modules).
 
-inherit flag-o-matic autotools
+inherit flag-o-matic autotools depend.php
 
 EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install
 
@@ -60,22 +60,22 @@
 # @ECLASS-VARIABLE: USE_PHP
 # @DESCRIPTION:
 # Lists the PHP slots compatibile the extension is compatibile with
-[[ -z "$USE_PHP" ]] && USE_PHP="php5-2 php5-3"
+[[ -z "${USE_PHP}" ]] && USE_PHP="php5-2 php5-3"
 
 #Make sure at least one target is installed. Abuses USE dependencies.
-for target in $USE_PHP; do
-	IUSE="${IUSE} php_targets_$target"
+for target in ${USE_PHP}; do
+	IUSE="${IUSE} php_targets_${target}"
 	target=${target/+}
-	SELFDEPEND="$SELFDEPEND =$CATEGORY/$PF[php_targets_$target]"
+	SELFDEPEND="${SELFDEPEND} =${CATEGORY}/${PF}[php_targets_${target}]"
 	slot=${target/php}
 	slot=${slot/-/.}
-	PHPDEPEND="$PHPDEPEND 
-	php_targets_$target? ( dev-lang/php:${slot} )"
+	PHPDEPEND="${PHPDEPEND} 
+	php_targets_${target}? ( dev-lang/php:${slot} )"
 done
 	
 RDEPEND="${RDEPEND} 
-	|| ( $SELFDEPEND )
-	$PHPDEPEND"
+	|| ( ${SELFDEPEND} )
+	${PHPDEPEND}"
 
 
 # @FUNCTION: php-ext-source-r2_src_unpack
@@ -91,8 +91,8 @@
 	unpack ${A}
 	local slot orig_s="$S"
 	for slot in $(php_get_slots); do
-		cp -r "$orig_s" "${WORKDIR}/$slot"
-		php_init_slot_env $slot
+		cp -r "${orig_s}" "${WORKDIR}/${slot}"
+		php_init_slot_env ${slot}
 		if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
 			php-ext-source-r2_phpize
 		fi
@@ -123,7 +123,7 @@
 php-ext-source-r2_src_configure() {
 	local slot
 	for slot in $(php_get_slots); do
-		php_init_slot_env $slot
+		php_init_slot_env ${slot}
 		# Set the correct config options
 		# We cannot use econf here, phpize/php-config deals with setting
 		# --prefix etc to whatever the php slot was configured to use
@@ -141,7 +141,7 @@
 	addpredict /session_mm_cli0.sem
 	local slot	
 	for slot in $(php_get_slots); do
-		php_init_slot_env $slot
+		php_init_slot_env ${slot}
 		emake || die "Unable to make code"
 
 	done
@@ -157,12 +157,13 @@
 php-ext-source-r2_src_install() {
 	local slot
 	for slot in $(php_get_slots); do
-		php_init_slot_env $slot
+		php_init_slot_env ${slot}
 
 		# Let's put the default module away
 		insinto "${EXT_DIR}"
 		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
 
+		local doc
 		for doc in ${DOCS} ; do
 			[[ -s ${doc} ]] && dodoc ${doc}
 		done
@@ -173,10 +174,9 @@
 
 
 php_get_slots() {
-	local s
-	local slot
-	for slot in $USE_PHP; do
-		use php_targets_$slot && s+=" ${slot/-/.}"
+	local s slot
+	for slot in ${USE_PHP}; do
+		use php_targets_${slot} && s+=" ${slot/-/.}"
 	done
 	echo $s
 }
@@ -184,16 +184,16 @@
 php_init_slot_env() {
 	libdir=$(get_libdir)
 
-	PHPIZE="/usr/${libdir}/$1/bin/phpize"
-	PHPCONFIG="/usr/${libdir}/$1/bin/php-config"
-	PHPCLI="/usr/${libdir}/$1/bin/php"
-	PHPCGI="/usr/${libdir}/$1/bin/php-cgi"
+	PHPIZE="/usr/${libdir}/${1}/bin/phpize"
+	PHPCONFIG="/usr/${libdir}/${1}/bin/php-config"
+	PHPCLI="/usr/${libdir}/${1}/bin/php"
+	PHPCGI="/usr/${libdir}/${1}/bin/php-cgi"
 	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
-	PHPPREFIX="/usr/${libdir}/$slot"
+	PHPPREFIX="/usr/${libdir}/${slot}"
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
 
-	S="${WORKDIR}/$1"
-	cd $S
+	S="${WORKDIR}/${1}"
+	cd "${S}"
 }
 
 php-ext-source-r2_buildinilist() {
@@ -203,7 +203,7 @@
 	fi
 
 	PHPINIFILELIST=""
-
+	local x
 	for x in ${PHPSAPILIST} ; do
 		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
 			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
@@ -217,11 +217,11 @@
 php-ext-source-r2_createinifiles() {
 	local slot
 	for slot in $(php_get_slots); do 
-		php_init_slot_env $slot		
+		php_init_slot_env ${slot}
 		# Pull in the PHP settings
 
 		# Build the list of <ext>.ini files to edit/add to
-		php-ext-source-r2_buildinilist $slot
+		php-ext-source-r2_buildinilist ${slot}
 
 		# Add the needed lines to the <ext>.ini files
 		if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
@@ -251,14 +251,14 @@
 			else
 				ext_type="zend_extension_ts"
 			fi
-			ext_file="${EXT_DIR}/$1"
+			ext_file="${EXT_DIR}/${1}"
 		else
 			if has_debug ; then
 				ext_type="zend_extension_debug"
 			else
 				ext_type="zend_extension"
 			fi
-			ext_file="${EXT_DIR}/$1"
+			ext_file="${EXT_DIR}/${1}"
 		fi
 
 		# php-5.3 unifies zend_extension loading and just requires the
@@ -271,7 +271,7 @@
 	else
 		# We don't need the full path for normal extensions!
 		ext_type="extension"
-		ext_file="$1"
+		ext_file="${1}"
 	fi
 
 	php-ext-source-r2_addtoinifiles "${ext_type}" "${ext_file}" "Extension added"
@@ -282,27 +282,27 @@
 # $3 - File to add to
 # $4 - Sanitized text to output
 php-ext-source-r2_addtoinifile() {
-	if [[ ! -d $(dirname $3) ]] ; then
-		mkdir -p $(dirname $3)
+	if [[ ! -d $(dirname ${3}) ]] ; then
+		mkdir -p $(dirname ${3})
 	fi
 
 	# Are we adding the name of a section?
 	if [[ ${1:0:1} == "[" ]] ; then
-		echo "$1" >> "$3"
-		my_added="$1"
+		echo "${1}" >> "${3}"
+		my_added="${1}"
 	else
-		echo "$1=$2" >> "$3"
-		my_added="$1=$2"
+		echo "${1}=${2}" >> "${3}"
+		my_added="${1}=${2}"
 	fi
 
-	if [[ -z "$4" ]] ; then
-		einfo "Added '$my_added' to /$3"
+	if [[ -z "${4}" ]] ; then
+		einfo "Added '${my_added}' to /${3}"
 	else
-		einfo "$4 to /$3"
+		einfo "${4} to /${3}"
 	fi
 
-	insinto /$(dirname $3)
-	doins "$3"
+	insinto /$(dirname ${3})
+	doins "${3}"
 }
 
 # @FUNCTION: php-ext-source-r2_addtoinifiles
@@ -325,7 +325,8 @@
 # php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on"
 # @CODE
 php-ext-source-r2_addtoinifiles() {
+	local x
 	for x in ${PHPINIFILELIST} ; do
-		php-ext-source-r2_addtoinifile "$1" "$2" "$x" "$3"
+		php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}"
 	done
 }