Roll out 5.0.0-r1 to ~x86 ONLY. Other interested arches need to keyword the required dependancies first. Create virtual/httpd-php.

4 files changed, 26 insertions, 11 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 087e4b8bedb2..bb78f6eaa206 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.174 2004/08/12 10:50:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.175 2004/08/12 11:07:48 robbat2 Exp $
+
+  12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-5.0.0-r1.ebuild:
+  Roll out 5.0.0-r1 to ~x86 ONLY. Other interested arches need to keyword the
+  required dependancies first. Create virtual/httpd-php.
 
 *mod_php-4.3.9_rc1 (12 Aug 2004)
 
diff --git a/dev-php/mod_php/mod_php-5.0.0-r1.ebuild b/dev-php/mod_php/mod_php-5.0.0-r1.ebuild
index c973ab0cc853..514984252fdd 100644
--- a/dev-php/mod_php/mod_php-5.0.0-r1.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0-r1.ebuild,v 1.1 2004/08/08 23:56:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0-r1.ebuild,v 1.2 2004/08/12 11:07:48 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
-KEYWORDS="-x86 -ppc -sparc -alpha -hppa -ia64 -amd64 -s390"
-PROVIDE="virtual/php-${PV}"
+KEYWORDS="~x86"
+PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
 
 detectapache() {
 	local domsg=
@@ -40,7 +40,7 @@ detectapache() {
 
 detectapache
 
-SLOT="5${APACHEVER}"
+SLOT="${APACHEVER}"
 [ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2=''
 
 PHPSAPI="apache${APACHEVER}"
@@ -54,7 +54,9 @@ inherit php5-sapi eutils
 
 DESCRIPTION="Apache module for PHP 5"
 
-DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
+# provides all base PHP extras (eg PEAR, extension building stuff)
+DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.0-r1
+			  >=net-www/apache-1.3.26-r2
 			  apache2? ( >=net-www/apache-2.0.43-r1 )"
 DEPEND="${DEPEND} ${DEPEND_EXTRA}"
 RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
@@ -111,6 +113,7 @@ src_install() {
 
 apache2msg() {
 	einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS"
+	ewarn "This is a change from before!"
 }
 
 pkg_postinst() {
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 5b669593e359..d0e545256ca4 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.33 2004/08/12 10:51:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.34 2004/08/12 11:08:09 robbat2 Exp $
+
+  12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> php-cgi-5.0.0-r1.ebuild:
+  Roll out 5.0.0-r1 to ~x86 ONLY. Other interested arches need to keyword the
+  required dependancies first. Create virtual/httpd-php.
 
 *php-cgi-4.3.9_rc1 (12 Aug 2004)
 
diff --git a/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild b/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
index 72bcfbc8533f..a1a8959404e1 100644
--- a/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
+++ b/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild,v 1.2 2004/08/09 09:49:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.0-r1.ebuild,v 1.3 2004/08/12 11:08:09 robbat2 Exp $
 
 PHPSAPI="cgi"
 MY_P="php-${PV}"
@@ -9,10 +9,14 @@ inherit php5-sapi eutils
 
 DESCRIPTION="PHP CGI"
 SLOT="0"
-KEYWORDS="-x86 -sparc -alpha -hppa -ppc"
+KEYWORDS="~x86"
 
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-5.0.0"
+# provides all base PHP extras (eg PEAR, extension building stuff)
+DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.0-r1"
+DEPEND="${DEPEND} ${DEPEND_PHP}"
+RDEPEND="${RDEPEND} ${DEPEND_PHP}"
+
+PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
 
 src_compile() {
 	# CLI needed to build stuff