Correct DEPEND on PHP CLI binary. Do not build PHP CLI binary.

(Portage version: 2.0.51.22-r1)

4 files changed, 19 insertions, 19 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 6adc69357e6c..ad68942e1d0c 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.251 2005/07/12 09:11:21 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.252 2005/07/12 14:48:40 sebastian Exp $
+
+  12 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  mod_php-4.4.0.ebuild, mod_php-4.4.0-r1.ebuild:
+  Correct DEPEND on PHP CLI binary. Do not build PHP CLI binary.
 
   12 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
   mod_php-4.4.0.ebuild:
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index bb1786b4c50c..99bfcfd6b563 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b0615b8b7f2778ebe8e818ed81ecdb54 mod_php-4.4.0.ebuild 6076
+MD5 cf8fa9b4a037a44d92f6f3d35f978427 mod_php-4.4.0.ebuild 6158
 MD5 bc61d0a7ca0fa2b489073275c1cb9d28 mod_php-5.1.0_beta-r1.ebuild 2431
-MD5 075c5ccb4e2564be9002a4e394a0696a mod_php-4.4.0-r1.ebuild 6287
+MD5 94fa1cead05926e9b2816e6931311fd3 mod_php-4.4.0-r1.ebuild 6368
 MD5 2b6e8a15d7fd5d82d50db473856a5333 mod_php-4.3.11.ebuild 6203
 MD5 b91268f902ce021485b29c4fbc7d1e45 mod_php-5.0.4.ebuild 2408
 MD5 d05ddd325011d4af904f1e62237e4ea5 ChangeLog 43792
@@ -27,10 +24,3 @@ MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC04lVaGfFFLhbXWkRAscfAJ40OyokAIDDAIGBz2SY9GC9BUNG/gCeJpvV
-2avlgW7ajVAIYb2TU3h7WqQ=
-=oAoj
------END PGP SIGNATURE-----
diff --git a/dev-php/mod_php/mod_php-4.4.0-r1.ebuild b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
index b66aa46dbc64..743f0813765c 100644
--- a/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r1.ebuild,v 1.1 2005/07/12 07:26:34 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r1.ebuild,v 1.2 2005/07/12 14:48:40 sebastian Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -59,7 +59,7 @@ DEPEND="${DEPEND} ${DEPEND_EXTRA}"
 RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0"
 PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # generalize some apache{,2} vars (defined by apache-module.eclass)
@@ -112,9 +112,12 @@ src_compile() {
 		esac;
 	fi
 
-	#use apache2 \
+	#use apache2
 	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
 
+	# Do not build CLI SAPI module.
+	myconf="${myconf} --disable-cli --without-pear"
+
 	php-sapi_src_compile
 }
 
diff --git a/dev-php/mod_php/mod_php-4.4.0.ebuild b/dev-php/mod_php/mod_php-4.4.0.ebuild
index c538df85ba15..20a6ce81c2e9 100644
--- a/dev-php/mod_php/mod_php-4.4.0.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0.ebuild,v 1.4 2005/07/12 09:11:21 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0.ebuild,v 1.5 2005/07/12 14:48:40 sebastian Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -60,7 +60,7 @@ DEPEND="${DEPEND} ${DEPEND_EXTRA}"
 RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11"
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.4.0"
 PROVIDE="${PROVIDE} virtual/httpd-php"
 
 # Add a 'return 0' as we DON'T want the return code checked
@@ -98,9 +98,12 @@ src_compile() {
 		esac;
 	fi
 
-	#use apache2 \
+	# use apache2
 	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
 
+	# Do not build CLI SAPI module.
+	myconf="${myconf} --disable-cli --without-pear"
+
 	php-sapi_src_compile
 }