public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: depend.php.eclass
@ 2008-02-26 16:26 Raul Porcel (armin76)
  0 siblings, 0 replies; 5+ messages in thread
From: Raul Porcel (armin76) @ 2008-02-26 16:26 UTC (permalink / raw
  To: gentoo-commits

armin76     08/02/26 16:26:09

  Modified:             depend.php.eclass
  Log:
  import from php overlay

Revision  Changes    Path
1.25                 eclass/depend.php.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.php.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.php.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.php.eclass?r1=1.24&r2=1.25

Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- depend.php.eclass	11 Feb 2008 20:47:35 -0000	1.24
+++ depend.php.eclass	26 Feb 2008 16:26:08 -0000	1.25
@@ -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/depend.php.eclass,v 1.24 2008/02/11 20:47:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.25 2008/02/26 16:26:08 armin76 Exp $
 
 # Author: Stuart Herbert <stuart@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -171,21 +171,13 @@
 # need to know which PHP version is being used and where the PHP binaries/data
 # are installed.
 has_php() {
-	# If PHP_PKG is already set, then we have remembered our PHP settings
-	# from last time
-	if [[ -n ${PHP_PKG} ]] ; then
-		return
-	fi
-
-	if [[ -z ${PHP_VERSION} ]] ; then
-		# Detect which PHP version we have installed
-		if has_version '=dev-lang/php-5*' ; then
-			PHP_VERSION="5"
-		elif has_version '=dev-lang/php-4*' ; then
-			PHP_VERSION="4"
-		else
-			die "Unable to find an installed dev-lang/php package"
-		fi
+	# Detect which PHP version we have installed
+	if has_version '=dev-lang/php-5*' ; then
+		PHP_VERSION="5"
+	elif has_version '=dev-lang/php-4*' ; then
+		PHP_VERSION="4"
+	else
+		die "Unable to find an installed dev-lang/php package"
 	fi
 
 	# If we get here, then PHP_VERSION tells us which version of PHP we



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: depend.php.eclass
@ 2010-10-02 15:23 Ole Markus With (olemarkus)
  0 siblings, 0 replies; 5+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-10-02 15:23 UTC (permalink / raw
  To: gentoo-commits

olemarkus    10/10/02 15:23:57

  Modified:             depend.php.eclass
  Log:
  Added warning about using require_php_with_use reflection|pcre|spl

Revision  Changes    Path
1.27                 eclass/depend.php.eclass

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

Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- depend.php.eclass	13 Jul 2010 23:48:46 -0000	1.26
+++ depend.php.eclass	2 Oct 2010 15:23:57 -0000	1.27
@@ -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/depend.php.eclass,v 1.26 2010/07/13 23:48:46 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.27 2010/10/02 15:23:57 olemarkus Exp $
 
 # Author: Stuart Herbert <stuart@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -207,6 +207,15 @@
 	einfo "Checking for required PHP feature(s) ..."
 
 	for x in $@ ; do
+		case $x in
+			pcre|spl|reflection)
+				eqawarn "require_php_with_use MUST NOT check for the pcre, spl or reflection USE flag."
+				eqawarn "These USE flags are removed from >=dev-lang/php-5.3 and your ebuild will break"
+				eqawarn "if you check the USE flags against PHP 5.3 ebuilds."
+				eqawarn "Please use USE dependencies from EAPI 2 instead"
+				;;
+		esac
+
 		if ! built_with_use =${PHP_PKG} ${x} && ! phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
 			einfo "  Discovered missing USE flag: ${x}"
 			missing_use="${missing_use} ${x}"






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: depend.php.eclass
@ 2010-10-12 19:34 Ole Markus With (olemarkus)
  0 siblings, 0 replies; 5+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-10-12 19:34 UTC (permalink / raw
  To: gentoo-commits

olemarkus    10/10/12 19:34:49

  Modified:             depend.php.eclass
  Log:
  Also eqawarn if mhash is used with require_php_with_use

Revision  Changes    Path
1.28                 eclass/depend.php.eclass

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

Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- depend.php.eclass	2 Oct 2010 15:23:57 -0000	1.27
+++ depend.php.eclass	12 Oct 2010 19:34:49 -0000	1.28
@@ -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/depend.php.eclass,v 1.27 2010/10/02 15:23:57 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.28 2010/10/12 19:34:49 olemarkus Exp $
 
 # Author: Stuart Herbert <stuart@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -208,8 +208,8 @@
 
 	for x in $@ ; do
 		case $x in
-			pcre|spl|reflection)
-				eqawarn "require_php_with_use MUST NOT check for the pcre, spl or reflection USE flag."
+			pcre|spl|reflection|mhash)
+				eqawarn "require_php_with_use MUST NOT check for the pcre, spl, mhash or reflection USE flag."
 				eqawarn "These USE flags are removed from >=dev-lang/php-5.3 and your ebuild will break"
 				eqawarn "if you check the USE flags against PHP 5.3 ebuilds."
 				eqawarn "Please use USE dependencies from EAPI 2 instead"






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: depend.php.eclass
@ 2011-03-18 15:59 Ole Markus With (olemarkus)
  0 siblings, 0 replies; 5+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-03-18 15:59 UTC (permalink / raw
  To: gentoo-commits

olemarkus    11/03/18 15:59:25

  Modified:             depend.php.eclass
  Log:
  Changed deps to virtual/php to dev-lang/php

Revision  Changes    Path
1.29                 eclass/depend.php.eclass

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

Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- depend.php.eclass	12 Oct 2010 19:34:49 -0000	1.28
+++ depend.php.eclass	18 Mar 2011 15:59:25 -0000	1.29
@@ -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/depend.php.eclass,v 1.28 2010/10/12 19:34:49 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.29 2011/03/18 15:59:25 olemarkus Exp $
 
 # Author: Stuart Herbert <stuart@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -25,8 +25,8 @@
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
 # with cli SAPI.
 need_php5_cli() {
-	DEPEND="${DEPEND} =virtual/php-5*"
-	RDEPEND="${RDEPEND} =virtual/php-5*"
+	DEPEND="${DEPEND} =dev-lang/php-5*"
+	RDEPEND="${RDEPEND} =dev-lang/php-5*"
 	PHP_VERSION="5"
 }
 
@@ -76,8 +76,8 @@
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
 # (any version) with cli SAPI.
 need_php_cli() {
-	DEPEND="${DEPEND} virtual/php"
-	RDEPEND="${RDEPEND} virtual/php"
+	DEPEND="${DEPEND} dev-lang/php"
+	RDEPEND="${RDEPEND} dev-lang/php"
 }
 
 # @FUNCTION: need_php_httpd






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: depend.php.eclass
@ 2015-06-17 18:54 Brian Evans (grknight)
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans (grknight) @ 2015-06-17 18:54 UTC (permalink / raw
  To: gentoo-commits

grknight    15/06/17 18:54:44

  Modified:             depend.php.eclass
  Log:
  Deprecate unused functions in depend.php.eclass

Revision  Changes    Path
1.33                 eclass/depend.php.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.32&r2=1.33

Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- depend.php.eclass	2 Jun 2012 19:16:31 -0000	1.32
+++ depend.php.eclass	17 Jun 2015 18:54:44 -0000	1.33
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.32 2012/06/02 19:16:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.33 2015/06/17 18:54:44 grknight Exp $
 
 # @ECLASS: depend.php.eclass
 # @MAINTAINER:
@@ -24,6 +24,7 @@
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
 # with cli SAPI.
 need_php5_cli() {
+	eqawarn "(need_php5_cli) Deprecated function call.  Set to be removed on 2015-07-17"
 	DEPEND="${DEPEND} =dev-lang/php-5*"
 	RDEPEND="${RDEPEND} =dev-lang/php-5*"
 	PHP_VERSION="5"
@@ -34,6 +35,7 @@
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
 # with either cgi or apache2 SAPI.
 need_php5_httpd() {
+	eqawarn "(need_php5_httpd) Deprecated function call.  Set to be removed on 2015-07-17"
 	DEPEND="${DEPEND} =virtual/httpd-php-5*"
 	RDEPEND="${RDEPEND} =virtual/httpd-php-5*"
 	PHP_VERSION="5"
@@ -75,6 +77,7 @@
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
 # (any version) with cli SAPI.
 need_php_cli() {
+	eqawarn "(need_php_cli) Deprecated function call.  Set to be removed on 2015-07-17"
 	DEPEND="${DEPEND} dev-lang/php"
 	RDEPEND="${RDEPEND} dev-lang/php"
 }
@@ -104,6 +107,7 @@
 # determined by ${CATEGORY} - any PHP version or PHP5 for dev-php or
 # dev-php5, respectively.
 need_php_by_category() {
+	eqawarn "(need_php_by_category) Deprecated function call.  Set to be removed on 2015-07-17"
 	case "${CATEGORY}" in
 		dev-php) need_php ;;
 		*) die "Version of PHP required by packages in category ${CATEGORY} unknown"
@@ -145,6 +149,7 @@
 # and need_php[45]_httpd functions cannot guarantee these requirements.
 # See Bug 2272 for details.
 require_php_sapi_from() {
+	eqawarn "(require_php_sapi_from) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	local has_sapi="0"
@@ -248,6 +253,7 @@
 # any of specified USE flags. Returns if any of the listed USE flags are enabled.
 # Dies if all of the listed USE flags are disabled.
 require_php_with_any_use() {
+	eqawarn "(require_php_with_any_use) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	local missing_use=""
@@ -296,6 +302,7 @@
 # Check if our PHP was compiled with ZTS (Zend Thread Safety) enabled.
 # @RETURN: 0 if true, 1 otherwise
 has_zts() {
+	eqawarn "(has_zts) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	if built_with_use =${PHP_PKG} apache2 threads || phpconfutils_built_with_use =${PHP_PKG} apache2 threads ; then
@@ -310,6 +317,7 @@
 # Check if our PHP was built with debug support enabled.
 # @RETURN: 0 if true, 1 otherwise
 has_debug() {
+	eqawarn "(has_debug) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	if built_with_use =${PHP_PKG} debug || phpconfutils_built_with_use =${PHP_PKG} debug ; then
@@ -324,6 +332,7 @@
 # Check if our PHP was built with the concurrentmodphp support enabled.
 # @RETURN: 0 if true, 1 otherwise
 has_concurrentmodphp() {
+	eqawarn "(has_concurrentmodphp) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	if built_with_use =${PHP_PKG} apache2 concurrentmodphp || phpconfutils_built_with_use =${PHP_PKG} apache2 concurrentmodphp ; then
@@ -347,6 +356,7 @@
 # You should use require_php_with_use pdo instead now.
 # @RETURN: die if feature is missing
 require_pdo() {
+	eqawarn "(require_pdo) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	# Was PHP5 compiled with internal PDO support?
@@ -439,6 +449,7 @@
 # Require a PHP built with SQLite support
 # @RETURN: die if feature is missing
 require_sqlite() {
+	eqawarn "(require_sqlite) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	# Has our PHP been built with SQLite support?
@@ -461,6 +472,7 @@
 # Require a PHP built with GD support
 # @RETURN: die if feature is missing
 require_gd() {
+	eqawarn "(require_gd) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	# Do we have the internal GD support installed?
@@ -494,6 +506,7 @@
 # @DESCRIPTION:
 # Executes some checks needed when installing a binary PHP extension.
 php_binary_extension() {
+	eqawarn "(php_binary_extension) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	local PUSE_ENABLED=""





^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-06-17 18:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-26 16:26 [gentoo-commits] gentoo-x86 commit in eclass: depend.php.eclass Raul Porcel (armin76)
  -- strict thread matches above, loose matches on Subject: below --
2010-10-02 15:23 Ole Markus With (olemarkus)
2010-10-12 19:34 Ole Markus With (olemarkus)
2011-03-18 15:59 Ole Markus With (olemarkus)
2015-06-17 18:54 Brian Evans (grknight)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox