summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-07-20 14:26:12 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-07-20 14:26:12 +0000
commit5c8a9ce9feaedc27512988ea7f5e2f074f8a0124 (patch)
treef6477fb4b7c4e94d01effe39f7741880c3fa7e9c /dev-lang/php
parentapply patch to fix #139320 (diff)
downloadhistorical-5c8a9ce9feaedc27512988ea7f5e2f074f8a0124.tar.gz
historical-5c8a9ce9feaedc27512988ea7f5e2f074f8a0124.tar.bz2
historical-5c8a9ce9feaedc27512988ea7f5e2f074f8a0124.zip
Fix bug #141098.
Package-Manager: portage-2.1.1_pre2-r8
Diffstat (limited to 'dev-lang/php')
-rw-r--r--dev-lang/php/ChangeLog7
-rw-r--r--dev-lang/php/Manifest64
-rw-r--r--dev-lang/php/php-4.3.11-r5.ebuild6
-rw-r--r--dev-lang/php/php-4.4.2-r2.ebuild6
-rw-r--r--dev-lang/php/php-4.4.2-r6.ebuild6
-rw-r--r--dev-lang/php/php-4.4.2.ebuild6
-rw-r--r--dev-lang/php/php-5.0.5-r5.ebuild6
-rw-r--r--dev-lang/php/php-5.1.4-r4.ebuild6
-rw-r--r--dev-lang/php/php-5.1.4.ebuild6
9 files changed, 59 insertions, 54 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index c66d97355b36..d1272b9a1dc1 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.109 2006/07/18 23:08:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.110 2006/07/20 14:26:12 chtekk Exp $
+
+ 20 Jul 2006; Luca Longinotti <chtekk@gentoo.org> php-4.3.11-r5.ebuild,
+ php-4.4.2.ebuild, php-4.4.2-r2.ebuild, php-4.4.2-r6.ebuild,
+ php-5.0.5-r5.ebuild, php-5.1.4.ebuild, php-5.1.4-r4.ebuild:
+ Fix bug #141098.
18 Jul 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.2-r6.ebuild,
php-5.1.4-r4.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4c9cfdcff7c9..369d693231c0 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -49,38 +49,38 @@ DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed2185
DIST php-patchset-5.1.4-r1.tar.bz2 7330 RMD160 ed33ee236286539a0614709d944ac636b84bca45 SHA1 acf60f1f750cb8c2a42d0b5478cf295c2c5a37ea SHA256 5a780b331343fa1fb6c3c4a76bf87e24e586ca2f41c5cd3824291f1b0037e961
DIST php-patchset-5.1.4-r5.tar.bz2 21025 RMD160 ebe867eff66440c1714ac2cb87c11ee17f15d8ea SHA1 c0d23e0437878a54c8c06790cfe71de940ca2fa8 SHA256 8d682d0b26dcbd5ee420bc2c2e1483a68a34ede6eecf7ae83f1ea9ca36a6c57f
DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA1 040bf3344d68fff3eb1829a2a02586499de5c2ee SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19
-EBUILD php-4.3.11-r5.ebuild 14932 RMD160 3e16bd4b3dddb7604c580c732c5404501dfa386d SHA1 b379fb23c05bd696cea5b4c0f0bd062bc510e092 SHA256 13f0d92a69d193a7b818f017f08b2afaa13562188ad699bd372f456b57f7ea00
-MD5 c58e7cbb6eeebb0ba7490051f415adcf php-4.3.11-r5.ebuild 14932
-RMD160 3e16bd4b3dddb7604c580c732c5404501dfa386d php-4.3.11-r5.ebuild 14932
-SHA256 13f0d92a69d193a7b818f017f08b2afaa13562188ad699bd372f456b57f7ea00 php-4.3.11-r5.ebuild 14932
-EBUILD php-4.4.2-r2.ebuild 14573 RMD160 e446613c7105b01f561ae21f3aa8976541e7c34d SHA1 36ef0a3de0a67f2d5d7403d8a189ef543cfa42f8 SHA256 9e5f1a0b2488e632aa6215d7fa9fcf609e058c13b50ffd5490d0838eb520b95f
-MD5 dca718cf80b3f6983ce283c9ccadf597 php-4.4.2-r2.ebuild 14573
-RMD160 e446613c7105b01f561ae21f3aa8976541e7c34d php-4.4.2-r2.ebuild 14573
-SHA256 9e5f1a0b2488e632aa6215d7fa9fcf609e058c13b50ffd5490d0838eb520b95f php-4.4.2-r2.ebuild 14573
-EBUILD php-4.4.2-r6.ebuild 14578 RMD160 21a6d11ae06b3e009b319ba1a4e6914df566115e SHA1 d0b97e84a5cbe5a0fa610e02f5d1452a1ccf9560 SHA256 f20b6f17e194981b7adaf5df102b975a969090d627474c79e2005af92ea21400
-MD5 bef6dcee827008c325b71688fd19e737 php-4.4.2-r6.ebuild 14578
-RMD160 21a6d11ae06b3e009b319ba1a4e6914df566115e php-4.4.2-r6.ebuild 14578
-SHA256 f20b6f17e194981b7adaf5df102b975a969090d627474c79e2005af92ea21400 php-4.4.2-r6.ebuild 14578
-EBUILD php-4.4.2.ebuild 14557 RMD160 656544e23793a24bf5e1c0e34ae0f24f3dba4943 SHA1 d9a0e2bea5ef0d64b1afca77d37a3dfe1daba18c SHA256 4c28ffa8191833bce49ce34326ada3a7f546ff8cbb22d1eaf34126ff4edadacc
-MD5 3df04e0d18d67b67873ecfa96bf98c23 php-4.4.2.ebuild 14557
-RMD160 656544e23793a24bf5e1c0e34ae0f24f3dba4943 php-4.4.2.ebuild 14557
-SHA256 4c28ffa8191833bce49ce34326ada3a7f546ff8cbb22d1eaf34126ff4edadacc php-4.4.2.ebuild 14557
-EBUILD php-5.0.5-r5.ebuild 10457 RMD160 1de8d8592ff54acb7f7dda7fe0787313269b7a8e SHA1 0aa0a4020aebb385416121c8a1f76648fdb399ee SHA256 bfd45e6bcc1953f14417708964f6c4658e025723242119d4d97d1fd25267b12a
-MD5 24659d9e0a293e8c5d9f348a7b5e9bcf php-5.0.5-r5.ebuild 10457
-RMD160 1de8d8592ff54acb7f7dda7fe0787313269b7a8e php-5.0.5-r5.ebuild 10457
-SHA256 bfd45e6bcc1953f14417708964f6c4658e025723242119d4d97d1fd25267b12a php-5.0.5-r5.ebuild 10457
-EBUILD php-5.1.4-r4.ebuild 14586 RMD160 17569b8988a57411cb3d584d34946b3e6b7b1d31 SHA1 58dc31f71a804eae1c7f14f4c8539d0b4d86c2bf SHA256 f6ed97c981813fdd913a97683ac2b7b2afbc26e2b9e285a27cf9ba6b2f6f31b5
-MD5 75c92e02490afa22ea783c7d3ee882d0 php-5.1.4-r4.ebuild 14586
-RMD160 17569b8988a57411cb3d584d34946b3e6b7b1d31 php-5.1.4-r4.ebuild 14586
-SHA256 f6ed97c981813fdd913a97683ac2b7b2afbc26e2b9e285a27cf9ba6b2f6f31b5 php-5.1.4-r4.ebuild 14586
-EBUILD php-5.1.4.ebuild 14575 RMD160 5dbfcc9c82324f918d1ba4ccee423a22d447b8ef SHA1 efe7877584e1cf9dc958f6a474ebf7c5a31fead0 SHA256 774134b6262e999a01ed4067a21d3b315c0efa03d3838d9440dfc19c76def26b
-MD5 57fe11eb4ede6ef93cd0cdc385f50717 php-5.1.4.ebuild 14575
-RMD160 5dbfcc9c82324f918d1ba4ccee423a22d447b8ef php-5.1.4.ebuild 14575
-SHA256 774134b6262e999a01ed4067a21d3b315c0efa03d3838d9440dfc19c76def26b php-5.1.4.ebuild 14575
-MISC ChangeLog 23771 RMD160 44f7df95ac339f5f0faab4444adf208a47b24074 SHA1 b7f6b04973a03ba642226a97f994ba3e09845f3a SHA256 0851a3335a5262e7ec8eadcbb737b33dc6f4de4bd96e978c93a82b39f8ef9055
-MD5 e5986533b5b54e46e1b9d533161996b8 ChangeLog 23771
-RMD160 44f7df95ac339f5f0faab4444adf208a47b24074 ChangeLog 23771
-SHA256 0851a3335a5262e7ec8eadcbb737b33dc6f4de4bd96e978c93a82b39f8ef9055 ChangeLog 23771
+EBUILD php-4.3.11-r5.ebuild 14932 RMD160 496b57fd984931f17edb7c00521988fd0b04c893 SHA1 1097ac9cdfd25179203032ed482574bf6021b773 SHA256 a48ab17f67dfbb3c4a598a02ef059a5320c15063fa2863c16f23e1ac936176c0
+MD5 73dadb37690226c70f1f1be9eec1e3b5 php-4.3.11-r5.ebuild 14932
+RMD160 496b57fd984931f17edb7c00521988fd0b04c893 php-4.3.11-r5.ebuild 14932
+SHA256 a48ab17f67dfbb3c4a598a02ef059a5320c15063fa2863c16f23e1ac936176c0 php-4.3.11-r5.ebuild 14932
+EBUILD php-4.4.2-r2.ebuild 14573 RMD160 9fba3af8064bfc567fd641c3383499fc4b3328d1 SHA1 b59a86ba67779241dc49077c84534ba258e547af SHA256 6d5ba804c850448e66079c13fc45168b419819dcc620fe99c34d164f4037c092
+MD5 bafa97edfede697af5ef0e441312c71d php-4.4.2-r2.ebuild 14573
+RMD160 9fba3af8064bfc567fd641c3383499fc4b3328d1 php-4.4.2-r2.ebuild 14573
+SHA256 6d5ba804c850448e66079c13fc45168b419819dcc620fe99c34d164f4037c092 php-4.4.2-r2.ebuild 14573
+EBUILD php-4.4.2-r6.ebuild 14578 RMD160 0018314f6751436f229bbf4836b571c6636cafb0 SHA1 a4bdec600d796f10ceb125a6d059d0052cfcc69e SHA256 b8277da1970c50f64cfae8b275226a8da91f5e231db29e7cd14248d0fd052a59
+MD5 e3b0d3844cb90af09f4c66f974e385f2 php-4.4.2-r6.ebuild 14578
+RMD160 0018314f6751436f229bbf4836b571c6636cafb0 php-4.4.2-r6.ebuild 14578
+SHA256 b8277da1970c50f64cfae8b275226a8da91f5e231db29e7cd14248d0fd052a59 php-4.4.2-r6.ebuild 14578
+EBUILD php-4.4.2.ebuild 14557 RMD160 503ac43956034c09048fb503c0ec8e8183b9b83a SHA1 3a9a0aa4b4f0955e2cabe15ef2793a0a6a1b5f32 SHA256 3ea41d08f3ec23aa107a34f11f8294ce6b73e995758e9e1f88858a1d5bbc215c
+MD5 18a50db5046960540ea7c86bcbb8408a php-4.4.2.ebuild 14557
+RMD160 503ac43956034c09048fb503c0ec8e8183b9b83a php-4.4.2.ebuild 14557
+SHA256 3ea41d08f3ec23aa107a34f11f8294ce6b73e995758e9e1f88858a1d5bbc215c php-4.4.2.ebuild 14557
+EBUILD php-5.0.5-r5.ebuild 10457 RMD160 d862476c6c06944317cc3f417005f93a652c8996 SHA1 1d0b97da8e1cdeefacffd9e68dec94a94eb040db SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb
+MD5 a78424ab5677e3d6ec0588295fd480b7 php-5.0.5-r5.ebuild 10457
+RMD160 d862476c6c06944317cc3f417005f93a652c8996 php-5.0.5-r5.ebuild 10457
+SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb php-5.0.5-r5.ebuild 10457
+EBUILD php-5.1.4-r4.ebuild 14586 RMD160 a2992b15a945bfa50034378ac772b6436f4a886d SHA1 3e1ce69179b636e496ee9ca578a2b277e1a06a11 SHA256 afa2947cb38a87fb86f418e25876cf41ea6f1e288d409bb7b6d753d9f705ed54
+MD5 e5ec270cd96e413a838281ed1cd8bc7a php-5.1.4-r4.ebuild 14586
+RMD160 a2992b15a945bfa50034378ac772b6436f4a886d php-5.1.4-r4.ebuild 14586
+SHA256 afa2947cb38a87fb86f418e25876cf41ea6f1e288d409bb7b6d753d9f705ed54 php-5.1.4-r4.ebuild 14586
+EBUILD php-5.1.4.ebuild 14575 RMD160 798bb61e46536dbb1429df96a5ab596457b01543 SHA1 690b5a8e83f1a6a81644596f5a0e89b974498f22 SHA256 5055ab37f0e18f503f49e012bd01a02d1e8dd824cfed9aa76d27c44988b21123
+MD5 36747f311302de82fcacf093713361bb php-5.1.4.ebuild 14575
+RMD160 798bb61e46536dbb1429df96a5ab596457b01543 php-5.1.4.ebuild 14575
+SHA256 5055ab37f0e18f503f49e012bd01a02d1e8dd824cfed9aa76d27c44988b21123 php-5.1.4.ebuild 14575
+MISC ChangeLog 23988 RMD160 6311badcf6683b12d7c6fc92bf8becc140c3ebf8 SHA1 81880e76738a507a5d56cd671d70a25dc6b14f30 SHA256 0f30546005f06a5ad4094facec2fdefab0ca3f0e67993e2596da3db791e2a1b4
+MD5 58a2d15b12a5fda47856422a896be09a ChangeLog 23988
+RMD160 6311badcf6683b12d7c6fc92bf8becc140c3ebf8 ChangeLog 23988
+SHA256 0f30546005f06a5ad4094facec2fdefab0ca3f0e67993e2596da3db791e2a1b4 ChangeLog 23988
MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
diff --git a/dev-lang/php/php-4.3.11-r5.ebuild b/dev-lang/php/php-4.3.11-r5.ebuild
index 99722b3df0a7..59f5b395d610 100644
--- a/dev-lang/php/php-4.3.11-r5.ebuild
+++ b/dev-lang/php/php-4.3.11-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r5.ebuild,v 1.12 2006/07/14 16:04:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r5.ebuild,v 1.13 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,13 +29,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php4_4-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
# Fixed PCRE library for security issues, bug #102373
SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
diff --git a/dev-lang/php/php-4.4.2-r2.ebuild b/dev-lang/php/php-4.4.2-r2.ebuild
index 73b0c8f97613..21945fbf3de4 100644
--- a/dev-lang/php/php-4.4.2-r2.ebuild
+++ b/dev-lang/php/php-4.4.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2-r2.ebuild,v 1.11 2006/07/14 16:04:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2-r2.ebuild,v 1.12 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,13 +29,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php4_4-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
pkg_setup() {
PHPCONFUTILS_AUTO_USE=""
diff --git a/dev-lang/php/php-4.4.2-r6.ebuild b/dev-lang/php/php-4.4.2-r6.ebuild
index 7129a9fd14bf..858576984e3f 100644
--- a/dev-lang/php/php-4.4.2-r6.ebuild
+++ b/dev-lang/php/php-4.4.2-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2-r6.ebuild,v 1.7 2006/07/18 23:08:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2-r6.ebuild,v 1.8 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,13 +29,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php4_4-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
pkg_setup() {
PHPCONFUTILS_AUTO_USE=""
diff --git a/dev-lang/php/php-4.4.2.ebuild b/dev-lang/php/php-4.4.2.ebuild
index 7e853768ec1c..f2fb6a70265f 100644
--- a/dev-lang/php/php-4.4.2.ebuild
+++ b/dev-lang/php/php-4.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2.ebuild,v 1.12 2006/07/14 16:04:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2.ebuild,v 1.13 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,13 +29,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php4_4-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
pkg_setup() {
PHPCONFUTILS_AUTO_USE=""
diff --git a/dev-lang/php/php-5.0.5-r5.ebuild b/dev-lang/php/php-5.0.5-r5.ebuild
index a39a68f5289a..d0f2fd3a07da 100644
--- a/dev-lang/php/php-5.0.5-r5.ebuild
+++ b/dev-lang/php/php-5.0.5-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r5.ebuild,v 1.15 2006/07/14 16:04:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r5.ebuild,v 1.16 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -28,13 +28,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php5_0-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
pkg_setup() {
PHPCONFUTILS_AUTO_USE=""
diff --git a/dev-lang/php/php-5.1.4-r4.ebuild b/dev-lang/php/php-5.1.4-r4.ebuild
index 4c90952343b1..b0bcbbae38d0 100644
--- a/dev-lang/php/php-5.1.4-r4.ebuild
+++ b/dev-lang/php/php-5.1.4-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4-r4.ebuild,v 1.7 2006/07/18 23:08:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4-r4.ebuild,v 1.8 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,13 +29,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php5_1-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
pkg_setup() {
PHPCONFUTILS_AUTO_USE=""
diff --git a/dev-lang/php/php-5.1.4.ebuild b/dev-lang/php/php-5.1.4.ebuild
index 665ad7817116..64ca6f722488 100644
--- a/dev-lang/php/php-5.1.4.ebuild
+++ b/dev-lang/php/php-5.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4.ebuild,v 1.12 2006/07/14 16:04:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4.ebuild,v 1.13 2006/07/20 14:26:12 chtekk Exp $
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,13 +29,13 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modul
inherit php5_1-sapi apache-module
-want_apache
-
DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
DEPEND="app-admin/php-toolkit"
RDEPEND="${DEPEND}"
+want_apache
+
pkg_setup() {
PHPCONFUTILS_AUTO_USE=""