Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-lang/php/ChangeLog10
-rw-r--r--dev-lang/php/files/20php4-envd2
-rw-r--r--dev-lang/php/files/20php5-envd2
-rw-r--r--dev-lang/php/files/70_mod_php.conf-apache118
-rw-r--r--dev-lang/php/files/70_mod_php.conf-apache21
-rw-r--r--dev-lang/php/files/70_mod_php5.conf-apache119
-rw-r--r--dev-lang/php/files/70_mod_php5.conf-apache21
-rw-r--r--dev-lang/php/files/70_mod_php5_concurr.conf-apache21
-rw-r--r--dev-lang/php/files/70_mod_php_concurr.conf-apache21
-rw-r--r--dev-lang/php/php-4.4.6.ebuild97
-rw-r--r--dev-lang/php/php-4.4.7.ebuild97
-rw-r--r--dev-lang/php/php-5.1.6-r11.ebuild97
-rw-r--r--dev-lang/php/php-5.2.1-r3.ebuild97
-rw-r--r--dev-lang/php/php-5.2.2-r1.ebuild97
14 files changed, 156 insertions, 384 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 7937f349e29b..aec7f50ff507 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.168 2007/05/10 14:56:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.169 2007/05/12 05:32:57 chtekk Exp $
+
+ 12 May 2007; Luca Longinotti <chtekk@gentoo.org>
+ files/70_mod_php.conf-apache2, files/70_mod_php5_concurr.conf-apache2,
+ -files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2,
+ files/20php4-envd, files/20php5-envd, -files/70_mod_php.conf-apache1,
+ files/70_mod_php_concurr.conf-apache2, php-4.4.6.ebuild, php-4.4.7.ebuild,
+ php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild, php-5.2.2-r1.ebuild:
+ Apache 1.X masking (fix ebuilds to not require apache-1*).
10 May 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.7.ebuild,
php-5.2.2-r1.ebuild:
diff --git a/dev-lang/php/files/20php4-envd b/dev-lang/php/files/20php4-envd
index b4eabf7b0278..ac444e9677aa 100644
--- a/dev-lang/php/files/20php4-envd
+++ b/dev-lang/php/files/20php4-envd
@@ -1,2 +1,2 @@
MANPATH="/usr/lib/php4/man/"
-CONFIG_PROTECT_MASK="/etc/php/cli-php4/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/apache1-php4/ext-active/ /etc/php/apache2-php4/ext-active/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php4/ext-active/ /etc/php/cgi-php4/ext-active/ /etc/php/apache2-php4/ext-active/"
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
index c69dfb26b09a..f6033ae517c7 100644
--- a/dev-lang/php/files/20php5-envd
+++ b/dev-lang/php/files/20php5-envd
@@ -1,2 +1,2 @@
MANPATH="/usr/lib/php5/man/"
-CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache1-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
diff --git a/dev-lang/php/files/70_mod_php.conf-apache1 b/dev-lang/php/files/70_mod_php.conf-apache1
deleted file mode 100644
index 6d352b03b303..000000000000
--- a/dev-lang/php/files/70_mod_php.conf-apache1
+++ /dev/null
@@ -1,18 +0,0 @@
-<IfDefine PHP4>
-
- # Load the module first
- <IfModule !mod_php4.c>
- LoadModule php4_module modules/libphp4.so
- </IfModule>
-
- # Set it to handle the files
- <IfModule mod_mime.c>
- AddType application/x-httpd-php .php
- AddType application/x-httpd-php .phtml
- AddType application/x-httpd-php .php3
- AddType application/x-httpd-php .php4
- AddType application/x-httpd-php-source .phps
- </IfModule>
-
- AddDirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php.conf-apache2 b/dev-lang/php/files/70_mod_php.conf-apache2
index d3ca2eaa00a0..abf8377a8b2d 100644
--- a/dev-lang/php/files/70_mod_php.conf-apache2
+++ b/dev-lang/php/files/70_mod_php.conf-apache2
@@ -1,5 +1,4 @@
<IfDefine PHP4>
-
# Load the module first
<IfModule !sapi_apache2.c>
LoadModule php4_module modules/libphp4.so
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache1 b/dev-lang/php/files/70_mod_php5.conf-apache1
deleted file mode 100644
index e7604dffb042..000000000000
--- a/dev-lang/php/files/70_mod_php5.conf-apache1
+++ /dev/null
@@ -1,19 +0,0 @@
-<IfDefine PHP5>
-
- # Load the module first
- <IfModule !mod_php5.c>
- LoadModule php5_module modules/libphp5.so
- </IfModule>
-
- # Set it to handle the files
- <IfModule mod_mime.c>
- AddType application/x-httpd-php .php
- AddType application/x-httpd-php .phtml
- AddType application/x-httpd-php .php3
- AddType application/x-httpd-php .php4
- AddType application/x-httpd-php .php5
- AddType application/x-httpd-php-source .phps
- </IfModule>
-
- AddDirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
index e7604dffb042..fec800035b00 100644
--- a/dev-lang/php/files/70_mod_php5.conf-apache2
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2
@@ -1,5 +1,4 @@
<IfDefine PHP5>
-
# Load the module first
<IfModule !mod_php5.c>
LoadModule php5_module modules/libphp5.so
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
index f95db6f1b60c..90a6de68a006 100644
--- a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
+++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
@@ -1,5 +1,4 @@
<IfDefine PHP5>
-
# Load the module first
<IfModule !mod_php5.c>
LoadModule php5_module modules/libphp5.so
diff --git a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php_concurr.conf-apache2
index 64f5b91eb47f..00a1853149c1 100644
--- a/dev-lang/php/files/70_mod_php_concurr.conf-apache2
+++ b/dev-lang/php/files/70_mod_php_concurr.conf-apache2
@@ -1,5 +1,4 @@
<IfDefine PHP4>
-
# Load the module first
<IfModule !sapi_apache2.c>
LoadModule php4_module modules/libphp4.so
diff --git a/dev-lang/php/php-4.4.6.ebuild b/dev-lang/php/php-4.4.6.ebuild
index 2efc4d45aaa3..267a45183f0d 100644
--- a/dev-lang/php/php-4.4.6.ebuild
+++ b/dev-lang/php/php-4.4.6.ebuild
@@ -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/dev-lang/php/php-4.4.6.ebuild,v 1.10 2007/05/04 12:02:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.6.ebuild,v 1.11 2007/05/12 05:32:57 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,7 +29,7 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php4_4-sapi apache-module
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
@@ -41,12 +41,12 @@ pkg_setup() {
# Make sure the user has specified at least one SAPI
einfo "Determining SAPI(s) to build"
- phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2
+ phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2
# Threaded Apache2 support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if ! useq threads ; then
+ if ! use threads ; then
APACHE2_SAFE_MPMS="itk peruser prefork"
else
APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
@@ -66,9 +66,9 @@ pkg_setup() {
fi
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
ewarn
ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
ewarn "versioned mod_php's into the same Apache instance. This is done with"
@@ -90,7 +90,7 @@ pkg_setup() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
ewarn
ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
ewarn "This is an experimental feature, so please rebuild PHP"
@@ -110,17 +110,16 @@ php_determine_sapis() {
# holds the list of sapis that we want to build
PHPSAPIS=
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
PHPSAPIS="${PHPSAPIS} cli"
fi
- if useq cgi ; then
+ if use cgi ; then
PHPSAPIS="${PHPSAPIS} cgi"
fi
- # note - we can only build one apache sapi for now
# note - apache SAPI comes after the simpler cli/cgi sapis
- if useq apache || useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
fi
@@ -135,9 +134,9 @@ src_unpack() {
cd "${S}"
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
else
@@ -148,7 +147,7 @@ src_unpack() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
epatch "${WORKDIR}/${FASTBUILD_PATCH}"
else
@@ -160,14 +159,14 @@ src_unpack() {
php4_4-sapi_src_unpack
# Fix Makefile.global:test to consider the CGI SAPI if present
- if useq cgi ; then
+ if use cgi ; then
sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
fi
}
src_compile() {
- if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+ if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
src_compile_fastbuild
else
src_compile_normal
@@ -179,7 +178,6 @@ src_compile_fastbuild() {
build_cli=0
build_cgi=0
- build_apache1=0
build_apache2=0
my_conf=""
@@ -191,9 +189,6 @@ src_compile_fastbuild() {
cgi)
build_cgi=1
;;
- apache1)
- build_apache1=1
- ;;
apache2)
build_apache2=1
;;
@@ -214,21 +209,17 @@ src_compile_fastbuild() {
my_conf="${my_conf} --disable-cgi"
fi
- if [[ ${build_apache1} = 1 ]] ; then
- my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
- fi
-
if [[ ${build_apache2} = 1 ]] ; then
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-experimental-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
fi
fi
@@ -267,7 +258,7 @@ src_compile_fastbuild() {
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
fi
- if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+ if [[ ${build_apache2} = 1 ]] ; then
einfo
einfo "Building apache${APACHE_VERSION} SAPI"
einfo
@@ -289,10 +280,10 @@ src_compile_normal() {
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
fi
fi
@@ -301,10 +292,10 @@ src_compile_normal() {
for x in ${PHPSAPIS} ; do
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-experimental-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
@@ -330,10 +321,6 @@ src_compile_normal() {
php4_4-sapi_src_compile
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
;;
- apache1)
- my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
- php4_4-sapi_src_compile
- ;;
apache2)
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
php4_4-sapi_src_compile
@@ -374,18 +361,10 @@ src_install() {
dobin php-cgi || die "Unable to install ${x} sapi"
php4_4-sapi_install_ini
;;
- apache1)
- einfo "Installing Apache${APACHE_VERSION} SAPI"
- make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- einfo "Installing Apache${APACHE_VERSION} config file for PHP4 (70_mod_php.conf)"
- insinto ${APACHE_MODULES_CONFDIR}
- newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf"
- php4_4-sapi_install_ini
- ;;
apache2)
einfo "Installing Apache${APACHE_VERSION} SAPI"
make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
einfo "Installing Apache${APACHE_VERSION} config file for PHP4-concurrent (70_mod_php_concurr.conf)"
insinto ${APACHE_MODULES_CONFDIR}
newins "${FILESDIR}/70_mod_php_concurr.conf-apache2" "70_mod_php_concurr.conf"
@@ -413,11 +392,9 @@ src_install() {
pkg_postinst() {
# Output some general info to the user
- if useq apache || useq apache2 ; then
- APACHE1_MOD_DEFINE="PHP4"
- APACHE1_MOD_CONF="70_mod_php"
+ if use apache2 ; then
APACHE2_MOD_DEFINE="PHP4"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
APACHE2_MOD_CONF="70_mod_php_concurr"
else
APACHE2_MOD_CONF="70_mod_php"
@@ -425,24 +402,8 @@ pkg_postinst() {
apache-module_pkg_postinst
fi
- # Update Apache1 to use mod_php
- if useq apache ; then
- "${ROOT}/usr/sbin/php-select" -t apache1 php4 > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 2 ]] ; then
- php-select apache1 php4
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn
- ewarn "Apache1 is configured to load a different version of PHP."
- ewarn "To make Apache1 use PHP v4, use php-select:"
- ewarn
- ewarn " php-select apache1 php4"
- ewarn
- fi
- fi
-
# Update Apache2 to use mod_php
- if useq apache2 ; then
+ if use apache2 ; then
"${ROOT}/usr/sbin/php-select" -t apache2 php4 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 2 ]] ; then
@@ -458,7 +419,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cli
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
"${ROOT}/usr/sbin/php-select" -t php php4 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
@@ -474,7 +435,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cgi
- if useq cgi ; then
+ if use cgi ; then
"${ROOT}/usr/sbin/php-select" -t php-cgi php4 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
diff --git a/dev-lang/php/php-4.4.7.ebuild b/dev-lang/php/php-4.4.7.ebuild
index a200bd85e983..a19bd19c047b 100644
--- a/dev-lang/php/php-4.4.7.ebuild
+++ b/dev-lang/php/php-4.4.7.ebuild
@@ -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/dev-lang/php/php-4.4.7.ebuild,v 1.7 2007/05/10 14:56:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.7.ebuild,v 1.8 2007/05/12 05:32:57 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,7 +29,7 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php4_4-sapi apache-module
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
@@ -41,12 +41,12 @@ pkg_setup() {
# Make sure the user has specified at least one SAPI
einfo "Determining SAPI(s) to build"
- phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2
+ phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2
# Threaded Apache2 support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if ! useq threads ; then
+ if ! use threads ; then
APACHE2_SAFE_MPMS="itk peruser prefork"
else
APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
@@ -66,9 +66,9 @@ pkg_setup() {
fi
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
ewarn
ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
ewarn "versioned mod_php's into the same Apache instance. This is done with"
@@ -90,7 +90,7 @@ pkg_setup() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
ewarn
ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
ewarn "This is an experimental feature, so please rebuild PHP"
@@ -110,17 +110,16 @@ php_determine_sapis() {
# holds the list of sapis that we want to build
PHPSAPIS=
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
PHPSAPIS="${PHPSAPIS} cli"
fi
- if useq cgi ; then
+ if use cgi ; then
PHPSAPIS="${PHPSAPIS} cgi"
fi
- # note - we can only build one apache sapi for now
# note - apache SAPI comes after the simpler cli/cgi sapis
- if useq apache || useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
fi
@@ -135,9 +134,9 @@ src_unpack() {
cd "${S}"
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
else
@@ -148,7 +147,7 @@ src_unpack() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
epatch "${WORKDIR}/${FASTBUILD_PATCH}"
else
@@ -160,14 +159,14 @@ src_unpack() {
php4_4-sapi_src_unpack
# Fix Makefile.global:test to consider the CGI SAPI if present
- if useq cgi ; then
+ if use cgi ; then
sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
fi
}
src_compile() {
- if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+ if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
src_compile_fastbuild
else
src_compile_normal
@@ -179,7 +178,6 @@ src_compile_fastbuild() {
build_cli=0
build_cgi=0
- build_apache1=0
build_apache2=0
my_conf=""
@@ -191,9 +189,6 @@ src_compile_fastbuild() {
cgi)
build_cgi=1
;;
- apache1)
- build_apache1=1
- ;;
apache2)
build_apache2=1
;;
@@ -214,21 +209,17 @@ src_compile_fastbuild() {
my_conf="${my_conf} --disable-cgi"
fi
- if [[ ${build_apache1} = 1 ]] ; then
- my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
- fi
-
if [[ ${build_apache2} = 1 ]] ; then
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-experimental-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
fi
fi
@@ -267,7 +258,7 @@ src_compile_fastbuild() {
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
fi
- if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+ if [[ ${build_apache2} = 1 ]] ; then
einfo
einfo "Building apache${APACHE_VERSION} SAPI"
einfo
@@ -289,10 +280,10 @@ src_compile_normal() {
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
fi
fi
@@ -301,10 +292,10 @@ src_compile_normal() {
for x in ${PHPSAPIS} ; do
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-experimental-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
@@ -330,10 +321,6 @@ src_compile_normal() {
php4_4-sapi_src_compile
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
;;
- apache1)
- my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
- php4_4-sapi_src_compile
- ;;
apache2)
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
php4_4-sapi_src_compile
@@ -374,18 +361,10 @@ src_install() {
dobin php-cgi || die "Unable to install ${x} sapi"
php4_4-sapi_install_ini
;;
- apache1)
- einfo "Installing Apache${APACHE_VERSION} SAPI"
- make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- einfo "Installing Apache${APACHE_VERSION} config file for PHP4 (70_mod_php.conf)"
- insinto ${APACHE_MODULES_CONFDIR}
- newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf"
- php4_4-sapi_install_ini
- ;;
apache2)
einfo "Installing Apache${APACHE_VERSION} SAPI"
make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
einfo "Installing Apache${APACHE_VERSION} config file for PHP4-concurrent (70_mod_php_concurr.conf)"
insinto ${APACHE_MODULES_CONFDIR}
newins "${FILESDIR}/70_mod_php_concurr.conf-apache2" "70_mod_php_concurr.conf"
@@ -413,11 +392,9 @@ src_install() {
pkg_postinst() {
# Output some general info to the user
- if useq apache || useq apache2 ; then
- APACHE1_MOD_DEFINE="PHP4"
- APACHE1_MOD_CONF="70_mod_php"
+ if use apache2 ; then
APACHE2_MOD_DEFINE="PHP4"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
APACHE2_MOD_CONF="70_mod_php_concurr"
else
APACHE2_MOD_CONF="70_mod_php"
@@ -425,24 +402,8 @@ pkg_postinst() {
apache-module_pkg_postinst
fi
- # Update Apache1 to use mod_php
- if useq apache ; then
- "${ROOT}/usr/sbin/php-select" -t apache1 php4 > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 2 ]] ; then
- php-select apache1 php4
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn
- ewarn "Apache1 is configured to load a different version of PHP."
- ewarn "To make Apache1 use PHP v4, use php-select:"
- ewarn
- ewarn " php-select apache1 php4"
- ewarn
- fi
- fi
-
# Update Apache2 to use mod_php
- if useq apache2 ; then
+ if use apache2 ; then
"${ROOT}/usr/sbin/php-select" -t apache2 php4 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 2 ]] ; then
@@ -458,7 +419,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cli
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
"${ROOT}/usr/sbin/php-select" -t php php4 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
@@ -474,7 +435,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cgi
- if useq cgi ; then
+ if use cgi ; then
"${ROOT}/usr/sbin/php-select" -t php-cgi php4 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
diff --git a/dev-lang/php/php-5.1.6-r11.ebuild b/dev-lang/php/php-5.1.6-r11.ebuild
index 991662486e96..7a51d1a24e25 100644
--- a/dev-lang/php/php-5.1.6-r11.ebuild
+++ b/dev-lang/php/php-5.1.6-r11.ebuild
@@ -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/dev-lang/php/php-5.1.6-r11.ebuild,v 1.10 2007/05/04 12:02:55 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.6-r11.ebuild,v 1.11 2007/05/12 05:32:57 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,7 +29,7 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php5_1-sapi apache-module
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
@@ -41,12 +41,12 @@ pkg_setup() {
# Make sure the user has specified at least one SAPI
einfo "Determining SAPI(s) to build"
- phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2
+ phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2
# Threaded Apache2 support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if ! useq threads ; then
+ if ! use threads ; then
APACHE2_SAFE_MPMS="itk peruser prefork"
else
APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
@@ -66,9 +66,9 @@ pkg_setup() {
fi
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
ewarn
ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
ewarn "versioned mod_php's into the same Apache instance. This is done with"
@@ -90,7 +90,7 @@ pkg_setup() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
ewarn
ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
ewarn "This is an experimental feature, so please rebuild PHP"
@@ -110,17 +110,16 @@ php_determine_sapis() {
# holds the list of sapis that we want to build
PHPSAPIS=
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
PHPSAPIS="${PHPSAPIS} cli"
fi
- if useq cgi ; then
+ if use cgi ; then
PHPSAPIS="${PHPSAPIS} cgi"
fi
- # note - we can only build one apache sapi for now
# note - apache SAPI comes after the simpler cli/cgi sapis
- if useq apache || useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
fi
@@ -135,9 +134,9 @@ src_unpack() {
cd "${S}"
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
else
@@ -148,7 +147,7 @@ src_unpack() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
epatch "${WORKDIR}/${FASTBUILD_PATCH}"
else
@@ -160,14 +159,14 @@ src_unpack() {
php5_1-sapi_src_unpack
# Fix Makefile.global:test to consider the CGI SAPI if present
- if useq cgi ; then
+ if use cgi ; then
sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
fi
}
src_compile() {
- if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+ if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
src_compile_fastbuild
else
src_compile_normal
@@ -179,7 +178,6 @@ src_compile_fastbuild() {
build_cli=0
build_cgi=0
- build_apache1=0
build_apache2=0
my_conf=""
@@ -191,9 +189,6 @@ src_compile_fastbuild() {
cgi)
build_cgi=1
;;
- apache1)
- build_apache1=1
- ;;
apache2)
build_apache2=1
;;
@@ -214,21 +209,17 @@ src_compile_fastbuild() {
my_conf="${my_conf} --disable-cgi"
fi
- if [[ ${build_apache1} = 1 ]] ; then
- my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
- fi
-
if [[ ${build_apache2} = 1 ]] ; then
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-maintainer-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
fi
fi
@@ -267,7 +258,7 @@ src_compile_fastbuild() {
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
fi
- if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+ if [[ ${build_apache2} = 1 ]] ; then
einfo
einfo "Building apache${APACHE_VERSION} SAPI"
einfo
@@ -289,10 +280,10 @@ src_compile_normal() {
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
fi
fi
@@ -301,10 +292,10 @@ src_compile_normal() {
for x in ${PHPSAPIS} ; do
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-maintainer-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
@@ -330,10 +321,6 @@ src_compile_normal() {
php5_1-sapi_src_compile
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
;;
- apache1)
- my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
- php5_1-sapi_src_compile
- ;;
apache2)
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
php5_1-sapi_src_compile
@@ -374,18 +361,10 @@ src_install() {
dobin php-cgi || die "Unable to install ${x} sapi"
php5_1-sapi_install_ini
;;
- apache1)
- einfo "Installing Apache${APACHE_VERSION} SAPI"
- make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
- insinto ${APACHE_MODULES_CONFDIR}
- newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
- php5_1-sapi_install_ini
- ;;
apache2)
einfo "Installing Apache${APACHE_VERSION} SAPI"
make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
insinto ${APACHE_MODULES_CONFDIR}
newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf"
@@ -413,11 +392,9 @@ src_install() {
pkg_postinst() {
# Output some general info to the user
- if useq apache || useq apache2 ; then
- APACHE1_MOD_DEFINE="PHP5"
- APACHE1_MOD_CONF="70_mod_php5"
+ if use apache2 ; then
APACHE2_MOD_DEFINE="PHP5"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
APACHE2_MOD_CONF="70_mod_php5_concurr"
else
APACHE2_MOD_CONF="70_mod_php5"
@@ -425,24 +402,8 @@ pkg_postinst() {
apache-module_pkg_postinst
fi
- # Update Apache1 to use mod_php
- if useq apache ; then
- "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 2 ]] ; then
- php-select apache1 php5
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn
- ewarn "Apache1 is configured to load a different version of PHP."
- ewarn "To make Apache1 use PHP v5, use php-select:"
- ewarn
- ewarn " php-select apache1 php5"
- ewarn
- fi
- fi
-
# Update Apache2 to use mod_php
- if useq apache2 ; then
+ if use apache2 ; then
"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 2 ]] ; then
@@ -458,7 +419,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cli
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
@@ -474,7 +435,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cgi
- if useq cgi ; then
+ if use cgi ; then
"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
diff --git a/dev-lang/php/php-5.2.1-r3.ebuild b/dev-lang/php/php-5.2.1-r3.ebuild
index 5083a4b43edd..4378ad04b5ef 100644
--- a/dev-lang/php/php-5.2.1-r3.ebuild
+++ b/dev-lang/php/php-5.2.1-r3.ebuild
@@ -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/dev-lang/php/php-5.2.1-r3.ebuild,v 1.10 2007/04/01 07:56:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.1-r3.ebuild,v 1.11 2007/05/12 05:32:57 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,7 +29,7 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php5_2-sapi apache-module
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
@@ -41,12 +41,12 @@ pkg_setup() {
# Make sure the user has specified at least one SAPI
einfo "Determining SAPI(s) to build"
- phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2
+ phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2
# Threaded Apache2 support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if ! useq threads ; then
+ if ! use threads ; then
APACHE2_SAFE_MPMS="itk peruser prefork"
else
APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
@@ -66,9 +66,9 @@ pkg_setup() {
fi
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
ewarn
ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
ewarn "versioned mod_php's into the same Apache instance. This is done with"
@@ -90,7 +90,7 @@ pkg_setup() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
ewarn
ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
ewarn "This is an experimental feature, so please rebuild PHP"
@@ -110,17 +110,16 @@ php_determine_sapis() {
# holds the list of sapis that we want to build
PHPSAPIS=
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
PHPSAPIS="${PHPSAPIS} cli"
fi
- if useq cgi ; then
+ if use cgi ; then
PHPSAPIS="${PHPSAPIS} cgi"
fi
- # note - we can only build one apache sapi for now
# note - apache SAPI comes after the simpler cli/cgi sapis
- if useq apache || useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
fi
@@ -135,9 +134,9 @@ src_unpack() {
cd "${S}"
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
else
@@ -148,7 +147,7 @@ src_unpack() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
epatch "${WORKDIR}/${FASTBUILD_PATCH}"
else
@@ -160,14 +159,14 @@ src_unpack() {
php5_2-sapi_src_unpack
# Fix Makefile.global:test to consider the CGI SAPI if present
- if useq cgi ; then
+ if use cgi ; then
sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
fi
}
src_compile() {
- if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+ if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
src_compile_fastbuild
else
src_compile_normal
@@ -179,7 +178,6 @@ src_compile_fastbuild() {
build_cli=0
build_cgi=0
- build_apache1=0
build_apache2=0
my_conf=""
@@ -191,9 +189,6 @@ src_compile_fastbuild() {
cgi)
build_cgi=1
;;
- apache1)
- build_apache1=1
- ;;
apache2)
build_apache2=1
;;
@@ -214,21 +209,17 @@ src_compile_fastbuild() {
my_conf="${my_conf} --disable-cgi"
fi
- if [[ ${build_apache1} = 1 ]] ; then
- my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
- fi
-
if [[ ${build_apache2} = 1 ]] ; then
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-maintainer-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
fi
fi
@@ -267,7 +258,7 @@ src_compile_fastbuild() {
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
fi
- if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+ if [[ ${build_apache2} = 1 ]] ; then
einfo
einfo "Building apache${APACHE_VERSION} SAPI"
einfo
@@ -289,10 +280,10 @@ src_compile_normal() {
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
fi
fi
@@ -301,10 +292,10 @@ src_compile_normal() {
for x in ${PHPSAPIS} ; do
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-maintainer-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
@@ -330,10 +321,6 @@ src_compile_normal() {
php5_2-sapi_src_compile
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
;;
- apache1)
- my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
- php5_2-sapi_src_compile
- ;;
apache2)
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
php5_2-sapi_src_compile
@@ -374,18 +361,10 @@ src_install() {
dobin php-cgi || die "Unable to install ${x} sapi"
php5_2-sapi_install_ini
;;
- apache1)
- einfo "Installing Apache${APACHE_VERSION} SAPI"
- make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
- insinto ${APACHE_MODULES_CONFDIR}
- newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
- php5_2-sapi_install_ini
- ;;
apache2)
einfo "Installing Apache${APACHE_VERSION} SAPI"
make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
insinto ${APACHE_MODULES_CONFDIR}
newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf"
@@ -413,11 +392,9 @@ src_install() {
pkg_postinst() {
# Output some general info to the user
- if useq apache || useq apache2 ; then
- APACHE1_MOD_DEFINE="PHP5"
- APACHE1_MOD_CONF="70_mod_php5"
+ if use apache2 ; then
APACHE2_MOD_DEFINE="PHP5"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
APACHE2_MOD_CONF="70_mod_php5_concurr"
else
APACHE2_MOD_CONF="70_mod_php5"
@@ -425,24 +402,8 @@ pkg_postinst() {
apache-module_pkg_postinst
fi
- # Update Apache1 to use mod_php
- if useq apache ; then
- "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 2 ]] ; then
- php-select apache1 php5
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn
- ewarn "Apache1 is configured to load a different version of PHP."
- ewarn "To make Apache1 use PHP v5, use php-select:"
- ewarn
- ewarn " php-select apache1 php5"
- ewarn
- fi
- fi
-
# Update Apache2 to use mod_php
- if useq apache2 ; then
+ if use apache2 ; then
"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 2 ]] ; then
@@ -458,7 +419,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cli
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
@@ -474,7 +435,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cgi
- if useq cgi ; then
+ if use cgi ; then
"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
diff --git a/dev-lang/php/php-5.2.2-r1.ebuild b/dev-lang/php/php-5.2.2-r1.ebuild
index 5203ddba0344..a1081758819a 100644
--- a/dev-lang/php/php-5.2.2-r1.ebuild
+++ b/dev-lang/php/php-5.2.2-r1.ebuild
@@ -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/dev-lang/php/php-5.2.2-r1.ebuild,v 1.7 2007/05/10 14:56:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.2-r1.ebuild,v 1.8 2007/05/12 05:32:57 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,7 +29,7 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php5_2-sapi apache-module
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
@@ -41,12 +41,12 @@ pkg_setup() {
# Make sure the user has specified at least one SAPI
einfo "Determining SAPI(s) to build"
- phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache apache2
+ phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2
# Threaded Apache2 support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if ! useq threads ; then
+ if ! use threads ; then
APACHE2_SAFE_MPMS="itk peruser prefork"
else
APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
@@ -66,9 +66,9 @@ pkg_setup() {
fi
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
ewarn
ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
ewarn "versioned mod_php's into the same Apache instance. This is done with"
@@ -90,7 +90,7 @@ pkg_setup() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
ewarn
ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
ewarn "This is an experimental feature, so please rebuild PHP"
@@ -110,17 +110,16 @@ php_determine_sapis() {
# holds the list of sapis that we want to build
PHPSAPIS=
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
PHPSAPIS="${PHPSAPIS} cli"
fi
- if useq cgi ; then
+ if use cgi ; then
PHPSAPIS="${PHPSAPIS} cgi"
fi
- # note - we can only build one apache sapi for now
# note - apache SAPI comes after the simpler cli/cgi sapis
- if useq apache || useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
fi
@@ -135,9 +134,9 @@ src_unpack() {
cd "${S}"
# Concurrent PHP Apache2 modules support
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
else
@@ -148,7 +147,7 @@ src_unpack() {
fi
# fastbuild support
- if useq fastbuild ; then
+ if use fastbuild ; then
if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
epatch "${WORKDIR}/${FASTBUILD_PATCH}"
else
@@ -160,14 +159,14 @@ src_unpack() {
php5_2-sapi_src_unpack
# Fix Makefile.global:test to consider the CGI SAPI if present
- if useq cgi ; then
+ if use cgi ; then
sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
fi
}
src_compile() {
- if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+ if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
src_compile_fastbuild
else
src_compile_normal
@@ -179,7 +178,6 @@ src_compile_fastbuild() {
build_cli=0
build_cgi=0
- build_apache1=0
build_apache2=0
my_conf=""
@@ -191,9 +189,6 @@ src_compile_fastbuild() {
cgi)
build_cgi=1
;;
- apache1)
- build_apache1=1
- ;;
apache2)
build_apache2=1
;;
@@ -214,21 +209,17 @@ src_compile_fastbuild() {
my_conf="${my_conf} --disable-cgi"
fi
- if [[ ${build_apache1} = 1 ]] ; then
- my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
- fi
-
if [[ ${build_apache2} = 1 ]] ; then
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-maintainer-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
fi
fi
@@ -267,7 +258,7 @@ src_compile_fastbuild() {
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
fi
- if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+ if [[ ${build_apache2} = 1 ]] ; then
einfo
einfo "Building apache${APACHE_VERSION} SAPI"
einfo
@@ -289,10 +280,10 @@ src_compile_normal() {
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Concurrent PHP Apache2 modules support
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
fi
fi
@@ -301,10 +292,10 @@ src_compile_normal() {
for x in ${PHPSAPIS} ; do
# Support the Apache2 extras, they must be set globally for all
# SAPIs to work correctly, especially for external PHP extensions
- if useq apache2 ; then
+ if use apache2 ; then
if [[ "${APACHE_VERSION}" != "0" ]] ; then
# Threaded Apache2 support
- if useq threads ; then
+ if use threads ; then
my_conf="${my_conf} --enable-maintainer-zts"
ewarn "Enabling ZTS for Apache2 MPM"
fi
@@ -330,10 +321,6 @@ src_compile_normal() {
php5_2-sapi_src_compile
cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
;;
- apache1)
- my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
- php5_2-sapi_src_compile
- ;;
apache2)
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
php5_2-sapi_src_compile
@@ -374,18 +361,10 @@ src_install() {
dobin php-cgi || die "Unable to install ${x} sapi"
php5_2-sapi_install_ini
;;
- apache1)
- einfo "Installing Apache${APACHE_VERSION} SAPI"
- make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
- insinto ${APACHE_MODULES_CONFDIR}
- newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
- php5_2-sapi_install_ini
- ;;
apache2)
einfo "Installing Apache${APACHE_VERSION} SAPI"
make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
insinto ${APACHE_MODULES_CONFDIR}
newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf"
@@ -413,11 +392,9 @@ src_install() {
pkg_postinst() {
# Output some general info to the user
- if useq apache || useq apache2 ; then
- APACHE1_MOD_DEFINE="PHP5"
- APACHE1_MOD_CONF="70_mod_php5"
+ if use apache2 ; then
APACHE2_MOD_DEFINE="PHP5"
- if useq concurrentmodphp ; then
+ if use concurrentmodphp ; then
APACHE2_MOD_CONF="70_mod_php5_concurr"
else
APACHE2_MOD_CONF="70_mod_php5"
@@ -425,24 +402,8 @@ pkg_postinst() {
apache-module_pkg_postinst
fi
- # Update Apache1 to use mod_php
- if useq apache ; then
- "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 2 ]] ; then
- php-select apache1 php5
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn
- ewarn "Apache1 is configured to load a different version of PHP."
- ewarn "To make Apache1 use PHP v5, use php-select:"
- ewarn
- ewarn " php-select apache1 php5"
- ewarn
- fi
- fi
-
# Update Apache2 to use mod_php
- if useq apache2 ; then
+ if use apache2 ; then
"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 2 ]] ; then
@@ -458,7 +419,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cli
- if useq cli || phpconfutils_usecheck cli ; then
+ if use cli || phpconfutils_usecheck cli ; then
"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then
@@ -474,7 +435,7 @@ pkg_postinst() {
fi
# Create the symlinks for php-cgi
- if useq cgi ; then
+ if use cgi ; then
"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
exitStatus=$?
if [[ ${exitStatus} == 5 ]] ; then