* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
@ 2015-06-17 20:11 Brian Evans (grknight)
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans (grknight) @ 2015-06-17 20:11 UTC (permalink / raw
To: gentoo-commits
grknight 15/06/17 20:11:28
Modified: ChangeLog depend.php.eclass
Log:
Add require_php_cli to the list of deprecated functions to be removed from depend.php.eclass
Revision Changes Path
1.1673 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1673&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1673&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1672&r2=1.1673
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1672
retrieving revision 1.1673
diff -u -r1.1672 -r1.1673
--- ChangeLog 17 Jun 2015 19:23:34 -0000 1.1672
+++ ChangeLog 17 Jun 2015 20:11:28 -0000 1.1673
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1672 2015/06/17 19:23:34 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1673 2015/06/17 20:11:28 grknight Exp $
+
+ 17 Jun 2015; <grknight@gentoo.org> depend.php.eclass:
+ Add require_php_cli to the list of deprecated functions to be removed
17 Jun 2015; <grknight@gentoo.org> php-common-r1.eclass,
php-ext-base-r1.eclass, php-ezc.eclass:
1.34 eclass/depend.php.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.33&r2=1.34
Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- depend.php.eclass 17 Jun 2015 18:54:44 -0000 1.33
+++ depend.php.eclass 17 Jun 2015 20:11:28 -0000 1.34
@@ -1,6 +1,6 @@
# 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.33 2015/06/17 18:54:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.34 2015/06/17 20:11:28 grknight Exp $
# @ECLASS: depend.php.eclass
# @MAINTAINER:
@@ -380,6 +380,7 @@
# depending on the CLI SAPI.
# @RETURN: die if feature is missing
require_php_cli() {
+ eqawarn "(require_php_cli) Deprecated function call. Set to be removed on 2015-07-17"
# If PHP_PKG is set, then we have remembered our PHP settings
# from last time
if [[ -n ${PHP_PKG} ]] ; then
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
@ 2015-06-18 14:22 Brian Evans (grknight)
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans (grknight) @ 2015-06-18 14:22 UTC (permalink / raw
To: gentoo-commits
grknight 15/06/18 14:22:59
Modified: ChangeLog depend.php.eclass
Log:
Remove phpconfutils calls in preparation for its deprecation
Revision Changes Path
1.1674 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1674&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1674&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1673&r2=1.1674
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1673
retrieving revision 1.1674
diff -u -r1.1673 -r1.1674
--- ChangeLog 17 Jun 2015 20:11:28 -0000 1.1673
+++ ChangeLog 18 Jun 2015 14:22:59 -0000 1.1674
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1673 2015/06/17 20:11:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1674 2015/06/18 14:22:59 grknight Exp $
+
+ 18 Jun 2015; <grknight@gentoo.org> depend.php.eclass:
+ Remove phpconfutils calls in preparation for its deprecation
17 Jun 2015; <grknight@gentoo.org> depend.php.eclass:
Add require_php_cli to the list of deprecated functions to be removed
1.35 eclass/depend.php.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.34&r2=1.35
Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- depend.php.eclass 17 Jun 2015 20:11:28 -0000 1.34
+++ depend.php.eclass 18 Jun 2015 14:22:59 -0000 1.35
@@ -1,6 +1,6 @@
# 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.34 2015/06/17 20:11:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.35 2015/06/18 14:22:59 grknight Exp $
# @ECLASS: depend.php.eclass
# @MAINTAINER:
@@ -15,7 +15,7 @@
# for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install
# documentation for PHP packages to php-specific location.
-inherit eutils multilib phpconfutils
+inherit eutils multilib
# PHP5-only depend functions
@@ -158,7 +158,7 @@
einfo "Checking for compatible SAPI(s)"
for x in $@ ; do
- if built_with_use =${PHP_PKG} ${x} || phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
+ if built_with_use =${PHP_PKG} ${x} ; then
einfo " Discovered compatible SAPI ${x}"
has_sapi="1"
fi
@@ -219,7 +219,7 @@
;;
esac
- if ! built_with_use =${PHP_PKG} ${x} && ! phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
+ if ! built_with_use =${PHP_PKG} ${x} ; then
einfo " Discovered missing USE flag: ${x}"
missing_use="${missing_use} ${x}"
fi
@@ -262,7 +262,7 @@
einfo "Checking for required PHP feature(s) ..."
for x in $@ ; do
- if built_with_use =${PHP_PKG} ${x} || phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
+ if built_with_use =${PHP_PKG} ${x} ; then
einfo " USE flag ${x} is enabled, ok ..."
return
else
@@ -305,7 +305,7 @@
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
+ if built_with_use =${PHP_PKG} apache2 threads ; then
return 0
fi
@@ -320,7 +320,7 @@
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
+ if built_with_use =${PHP_PKG} debug ; then
return 0
fi
@@ -335,7 +335,7 @@
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
+ if built_with_use =${PHP_PKG} apache2 concurrentmodphp ; then
return 0
fi
@@ -360,7 +360,7 @@
has_php
# Was PHP5 compiled with internal PDO support?
- if built_with_use =${PHP_PKG} pdo || phpconfutils_built_with_use =${PHP_PKG} pdo ; then
+ if built_with_use =${PHP_PKG} pdo ; then
return
else
eerror
@@ -392,7 +392,7 @@
if has_version '=dev-lang/php-5*' ; then
PHP_PACKAGE_FOUND="1"
pkg="$(best_version '=dev-lang/php-5*')"
- if built_with_use =${pkg} cli || phpconfutils_built_with_use =${pkg} cli ; then
+ if built_with_use =${pkg} cli ; then
PHP_VERSION="5"
fi
fi
@@ -427,7 +427,7 @@
if has_version '=dev-lang/php-5*' ; then
PHP_PACKAGE_FOUND="1"
pkg="$(best_version '=dev-lang/php-5*')"
- if built_with_use =${pkg} cgi || phpconfutils_built_with_use =${pkg} cgi ; then
+ if built_with_use =${pkg} cgi ; then
PHP_VERSION="5"
fi
fi
@@ -454,7 +454,7 @@
has_php
# Has our PHP been built with SQLite support?
- if built_with_use =${PHP_PKG} sqlite || phpconfutils_built_with_use =${PHP_PKG} sqlite ; then
+ if built_with_use =${PHP_PKG} sqlite ; then
return
fi
@@ -477,12 +477,12 @@
has_php
# Do we have the internal GD support installed?
- if built_with_use =${PHP_PKG} gd || phpconfutils_built_with_use =${PHP_PKG} gd ; then
+ if built_with_use =${PHP_PKG} gd ; then
return
fi
# Ok, maybe GD was built using the external library support?
- if built_with_use =${PHP_PKG} gd-external || phpconfutils_built_with_use =${PHP_PKG} gd-external ; then
+ if built_with_use =${PHP_PKG} gd-external ; then
return
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
@ 2015-06-24 13:36 Brian Evans (grknight)
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans (grknight) @ 2015-06-24 13:36 UTC (permalink / raw
To: gentoo-commits
grknight 15/06/24 13:36:03
Modified: ChangeLog depend.php.eclass
Log:
depend.php.eclass is deprecated and is set to be removed 30 days after bug 552836 is resolved
Revision Changes Path
1.1682 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1682&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1682&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1681&r2=1.1682
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1681
retrieving revision 1.1682
diff -u -r1.1681 -r1.1682
--- ChangeLog 24 Jun 2015 13:22:02 -0000 1.1681
+++ ChangeLog 24 Jun 2015 13:36:03 -0000 1.1682
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1681 2015/06/24 13:22:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1682 2015/06/24 13:36:03 grknight Exp $
+
+ 24 Jun 2015; <grknight@gentoo.org> depend.php.eclass:
+ depend.php.eclass is deprecated and is set to be removed 30 days after bug
+ 552836 is resolved
24 Jun 2015; <grknight@gentoo.org> php-lib-r1.eclass:
Remove depend.php and dodoc-php in favor of just dodoc
1.36 eclass/depend.php.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.35&r2=1.36
Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- depend.php.eclass 18 Jun 2015 14:22:59 -0000 1.35
+++ depend.php.eclass 24 Jun 2015 13:36:03 -0000 1.36
@@ -1,7 +1,8 @@
# 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.35 2015/06/18 14:22:59 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.36 2015/06/24 13:36:03 grknight Exp $
+# @DEAD
# @ECLASS: depend.php.eclass
# @MAINTAINER:
# Gentoo PHP team <php-bugs@gentoo.org>
@@ -14,6 +15,7 @@
# This eclass provides functions that allow ebuilds to depend on php5 and check
# for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install
# documentation for PHP packages to php-specific location.
+# This eclass is deprecated and is set to be removed 30 days after bug 552836 is resolved
inherit eutils multilib
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
@ 2015-07-17 18:29 Brian Evans (grknight)
0 siblings, 0 replies; 4+ messages in thread
From: Brian Evans (grknight) @ 2015-07-17 18:29 UTC (permalink / raw
To: gentoo-commits
grknight 15/07/17 18:29:39
Modified: ChangeLog depend.php.eclass
Log:
Remove deprecated functions from depend.php.eclass as announced 30 days ago
Revision Changes Path
1.1718 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1718&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1718&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1717&r2=1.1718
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1717
retrieving revision 1.1718
diff -u -r1.1717 -r1.1718
--- ChangeLog 17 Jul 2015 18:02:35 -0000 1.1717
+++ ChangeLog 17 Jul 2015 18:29:39 -0000 1.1718
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1717 2015/07/17 18:02:35 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1718 2015/07/17 18:29:39 grknight Exp $
+
+ 17 Jul 2015; Brian Evans <grknight@gentoo.org> depend.php.eclass:
+ Remove deprecated functions from depend.php.eclass as announced 30 days ago
17 Jul 2015; Brian Evans <grknight@gentoo.org> -php-common-r1.eclass,
-php-ext-base-r1.eclass, -php-ezc.eclass:
1.37 eclass/depend.php.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.36&r2=1.37
Index: depend.php.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- depend.php.eclass 24 Jun 2015 13:36:03 -0000 1.36
+++ depend.php.eclass 17 Jul 2015 18:29:39 -0000 1.37
@@ -1,6 +1,6 @@
# 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.36 2015/06/24 13:36:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.37 2015/07/17 18:29:39 grknight Exp $
# @DEAD
# @ECLASS: depend.php.eclass
@@ -21,28 +21,6 @@
# PHP5-only depend functions
-# @FUNCTION: need_php5_cli
-# @DESCRIPTION:
-# 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"
-}
-
-# @FUNCTION: need_php5_httpd
-# @DESCRIPTION:
-# 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"
-}
-
# @FUNCTION: need_php5
# @DESCRIPTION:
# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
@@ -74,16 +52,6 @@
# general PHP depend functions
-# @FUNCTION: need_php_cli
-# @DESCRIPTION:
-# 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"
-}
-
# @FUNCTION: need_php_httpd
# @DESCRIPTION:
# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
@@ -103,20 +71,6 @@
PHP_SHARED_CAT="php"
}
-# @FUNCTION: need_php_by_category
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild to depend on PHP version
-# 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"
- esac
-}
-
-
# @FUNCTION: has_php
# @DESCRIPTION:
# Call this function from your pkg_setup, src_compile, src_install etc. if you
@@ -135,50 +89,6 @@
uses_php${PHP_VERSION}
}
-# @FUNCTION: require_php_sapi_from
-# @USAGE: <list of SAPIs>
-# @DESCRIPTION:
-# Call this function from pkg_setup if your package only works with
-# specific SAPI(s) and specify a list of PHP SAPI USE flags that are
-# required (one or more from cli, cgi, apache2) as arguments.
-# Returns if any of the listed SAPIs have been installed, dies if none
-# of them is available.
-#
-# Unfortunately, if you want to be really sure that the required SAPI is
-# provided by PHP, you will have to use this function or similar ones (like
-# require_php_cli or require_php_cgi) in pkg_setup until we are able to
-# depend on USE flags being enabled. The above described need_php[45]_cli
-# 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"
- local x
-
- einfo "Checking for compatible SAPI(s)"
-
- for x in $@ ; do
- if built_with_use =${PHP_PKG} ${x} ; then
- einfo " Discovered compatible SAPI ${x}"
- has_sapi="1"
- fi
- done
-
- if [[ "${has_sapi}" == "1" ]] ; then
- return
- fi
-
- eerror
- eerror "${PHP_PKG} needs to be re-installed with one of the following"
- eerror "USE flags enabled:"
- eerror
- eerror " $@"
- eerror
- die "No compatible PHP SAPIs found"
-}
-
# @FUNCTION: require_php_with_use
# @USAGE: <list of USE flags>
# @DESCRIPTION:
@@ -248,101 +158,6 @@
fi
}
-# @FUNCTION: require_php_with_any_use
-# @USAGE: <list of USE flags>
-# @DESCRIPTION:
-# Call this function from pkg_setup if your package requires PHP compiled with
-# 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=""
- local x
-
- einfo "Checking for required PHP feature(s) ..."
-
- for x in $@ ; do
- if built_with_use =${PHP_PKG} ${x} ; then
- einfo " USE flag ${x} is enabled, ok ..."
- return
- else
- missing_use="${missing_use} ${x}"
- fi
- done
-
- if [[ -z "${missing_use}" ]] ; then
- if [[ -z "${PHPCHECKNODIE}" ]] ; then
- return
- else
- return 0
- fi
- fi
-
- if [[ -z "${PHPCHECKNODIE}" ]] ; then
- eerror
- eerror "${PHP_PKG} needs to be re-installed with any of the following"
- eerror "USE flags enabled:"
- eerror
- eerror " $@"
- eerror
- die "Missing PHP USE flags found"
- else
- return 1
- fi
-}
-
-# ========================================================================
-# has_*() functions
-#
-# These functions return 0 if the condition is satisfied, 1 otherwise
-# ========================================================================
-
-# @FUNCTION: has_zts
-# @DESCRIPTION:
-# 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 ; then
- return 0
- fi
-
- return 1
-}
-
-# @FUNCTION: has_debug
-# @DESCRIPTION:
-# 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 ; then
- return 0
- fi
-
- return 1
-}
-
-# @FUNCTION: has_concurrentmodphp
-# @DESCRIPTION:
-# 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 ; then
- return 0
- fi
-
- return 1
-}
# ========================================================================
# require_*() functions
@@ -350,68 +165,6 @@
# These functions die() if PHP was built without the required features
# ========================================================================
-# @FUNCTION: require_pdo
-# @DESCRIPTION:
-# Require a PHP built with PDO support (PHP5 only).
-# This function is now redundant and DEPRECATED since
-# pdo-external use flag and pecl-pdo-* ebuilds were removed.
-# 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?
- if built_with_use =${PHP_PKG} pdo ; then
- return
- else
- eerror
- eerror "No PDO extension for PHP found."
- eerror "Please note that PDO only exists for PHP 5."
- eerror "Please install a PDO extension for PHP 5."
- eerror "You must install >=dev-lang/php-5.1 with USE=\"pdo\"."
- eerror
- die "No PDO extension for PHP 5 found"
- fi
-}
-
-# @FUNCTION: require_php_cli
-# @DESCRIPTION:
-# Determines which installed PHP version has the CLI SAPI enabled.
-# Useful for PEAR stuff, or anything which needs to run PHP script
-# depending on the CLI SAPI.
-# @RETURN: die if feature is missing
-require_php_cli() {
- eqawarn "(require_php_cli) Deprecated function call. Set to be removed on 2015-07-17"
- # If PHP_PKG is set, then we have remembered our PHP settings
- # from last time
- if [[ -n ${PHP_PKG} ]] ; then
- return
- fi
-
- local PHP_PACKAGE_FOUND=""
-
- if has_version '=dev-lang/php-5*' ; then
- PHP_PACKAGE_FOUND="1"
- pkg="$(best_version '=dev-lang/php-5*')"
- if built_with_use =${pkg} cli ; then
- PHP_VERSION="5"
- fi
- fi
-
- if [[ -z ${PHP_PACKAGE_FOUND} ]] ; then
- die "Unable to find an installed dev-lang/php package"
- fi
-
- if [[ -z ${PHP_VERSION} ]] ; then
- die "No PHP CLI installed. Re-emerge dev-lang/php with USE=cli."
- fi
-
- # If we get here, then PHP_VERSION tells us which version of PHP we
- # want to use
- uses_php${PHP_VERSION}
-}
-
# @FUNCTION: require_php_cgi
# @DESCRIPTION:
# Determines which installed PHP version has the CGI SAPI enabled.
@@ -447,103 +200,12 @@
uses_php${PHP_VERSION}
}
-# @FUNCTION: require_sqlite
-# @DESCRIPTION:
-# 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?
- if built_with_use =${PHP_PKG} sqlite ; then
- return
- fi
-
- # If we get here, then we don't have any SQLite support for PHP installed
- eerror
- eerror "No SQLite extension for PHP found."
- eerror "Please install an SQLite extension for PHP,"
- eerror "this is done best by simply adding the"
- eerror "'sqlite' USE flag when emerging dev-lang/php."
- eerror
- die "No SQLite extension for PHP found"
-}
-
-# @FUNCTION: require_gd
-# @DESCRIPTION:
-# 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?
- if built_with_use =${PHP_PKG} gd ; then
- return
- fi
-
- # Ok, maybe GD was built using the external library support?
- if built_with_use =${PHP_PKG} gd-external ; then
- return
- fi
-
- # If we get here, then we have no GD support
- eerror
- eerror "No GD support for PHP found."
- eerror "Please install the GD support for PHP,"
- eerror "you must install dev-lang/php with either"
- eerror "the 'gd' or the 'gd-external' USE flags"
- eerror "turned on."
- eerror
- die "No GD support found for PHP"
-}
-
# ========================================================================
# Misc functions
#
# These functions provide miscellaneous checks and functionality.
# ========================================================================
-# @FUNCTION: php_binary_extension
-# @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=""
-
- # Binary extensions do not support the change of PHP
- # API version, so they can't be installed when USE flags
- # are enabled which change the PHP API version, they also
- # don't provide correctly versioned symbols for our use
-
- if has_debug ; then
- eerror
- eerror "You cannot install binary PHP extensions"
- eerror "when the 'debug' USE flag is enabled!"
- eerror "Please reemerge dev-lang/php with the"
- eerror "'debug' USE flag turned off."
- eerror
- PUSE_ENABLED="1"
- fi
-
- if has_concurrentmodphp ; then
- eerror
- eerror "You cannot install binary PHP extensions when"
- eerror "the 'concurrentmodphp' USE flag is enabled!"
- eerror "Please reemerge dev-lang/php with the"
- eerror "'concurrentmodphp' USE flag turned off."
- eerror
- PUSE_ENABLED="1"
- fi
-
- if [[ -n ${PUSE_ENABLED} ]] ; then
- die "'debug' and/or 'concurrentmodphp' USE flags turned on!"
- fi
-}
-
# @FUNCTION: dodoc-php
# @USAGE: <list of docs>
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-17 18:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-24 13:36 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass Brian Evans (grknight)
-- strict thread matches above, loose matches on Subject: below --
2015-07-17 18:29 Brian Evans (grknight)
2015-06-18 14:22 Brian Evans (grknight)
2015-06-17 20:11 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