mod_php-5.1.0_beta updated to use latest eclass; see bug #96479

(Portage version: 2.0.51.19)

3 files changed, 36 insertions, 41 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 8c70028fa54a..364c8cfb76cc 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # 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.240 2005/06/15 04:09:15 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.241 2005/06/19 08:58:56 stuart Exp $
+
+*mod_php-5.1.0_beta (19 Jun 2005)
+
+  19 Jun 2005; Stuart Herbert <stuart@gentoo.org> mod_php-5.1.0_beta.ebuild:
+  Modified to use php5-sapi-r3 eclass; see bug #96479
 
   15 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
   mod_php-4.4.0_rc1.ebuild:
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 2afc038c64d8..da1693eb0fbd 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,48 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ce0c1ad88f1fac304d4c323878a78660 ChangeLog 42038
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 93f24cd45f23a55e8f9c85b4c7cfa4d8 mod_php-4.3.9_rc1.ebuild 6066
+MD5 b91268f902ce021485b29c4fbc7d1e45 mod_php-5.0.4.ebuild 2408
 MD5 490f9e2ff2635eae30c20d16861e6f6d mod_php-4.3.9.ebuild 6068
-MD5 001341d164c4e4431c2bd07227c2e328 mod_php-4.3.11-r1.ebuild 6422
-MD5 bc040469da2e609a96b7bfd3181f7090 mod_php-4.4.0_rc1.ebuild 6328
+MD5 bf3e266fc7fbc08f3b079effce2c7086 mod_php-4.3.10.ebuild 6128
 MD5 acc16e417db750b0a6f65eb6120469ff mod_php-4.3.10-r1.ebuild 6346
-MD5 de26e4f44bfecb1636b35257ba6f3f46 mod_php-4.3.11.ebuild 6205
-MD5 b91268f902ce021485b29c4fbc7d1e45 mod_php-5.0.4.ebuild 2408
+MD5 bc040469da2e609a96b7bfd3181f7090 mod_php-4.4.0_rc1.ebuild 6328
 MD5 e4b18e01eaf5163e6236425277b965b3 mod_php-4.3.8.ebuild 5963
-MD5 ae4194e1f5a0793f371bb09b230b5181 mod_php-5.1.0_beta.ebuild 2425
-MD5 93f24cd45f23a55e8f9c85b4c7cfa4d8 mod_php-4.3.9_rc1.ebuild 6066
+MD5 96b2c9ec32dc015699797ca0127e1fdb mod_php-5.1.0_beta.ebuild 2425
+MD5 de26e4f44bfecb1636b35257ba6f3f46 mod_php-4.3.11.ebuild 6205
+MD5 001341d164c4e4431c2bd07227c2e328 mod_php-4.3.11-r1.ebuild 6422
 MD5 8a5a40024d86195720f12c9b65ae19c6 mod_php-4.3.11-r2.ebuild 6422
-MD5 e07cd22f539deea79ec9d1c24bcf129e ChangeLog 41871
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 bf3e266fc7fbc08f3b079effce2c7086 mod_php-4.3.10.ebuild 6128
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284
-MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284
+MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
+MD5 c489374c3a857fe00e500c1d49ad1ee4 files/digest-mod_php-5.1.0_beta 65
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
 MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282
-MD5 457955f18cb41f31bab803aac779573c files/digest-mod_php-5.0.4 140
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 61651790550bc156f10ae2a3edafebe2 files/digest-mod_php-4.4.0_rc1 208
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
 MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10-r1 284
+MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
+MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r1 284
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r2 284
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
+MD5 457955f18cb41f31bab803aac779573c files/digest-mod_php-5.0.4 140
 MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
-MD5 c489374c3a857fe00e500c1d49ad1ee4 files/digest-mod_php-5.1.0_beta 65
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 61651790550bc156f10ae2a3edafebe2 files/digest-mod_php-4.4.0_rc1 208
-MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
 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)
-
-iD8DBQFCr6oKaGfFFLhbXWkRAkSMAKCa6Ay0sWQ+9XLCK2AidLCVKkEFRACbBYQc
-pNJw9qfM8Q4a7qUP2+9W2vs=
-=+5eR
------END PGP SIGNATURE-----
+MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
diff --git a/dev-php/mod_php/mod_php-5.1.0_beta.ebuild b/dev-php/mod_php/mod_php-5.1.0_beta.ebuild
index fcddaad0498c..d06543aecbaf 100644
--- a/dev-php/mod_php/mod_php-5.1.0_beta.ebuild
+++ b/dev-php/mod_php/mod_php-5.1.0_beta.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-5.1.0_beta.ebuild,v 1.1 2005/06/11 13:15:14 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.1.0_beta.ebuild,v 1.2 2005/06/19 08:58:56 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -26,7 +26,7 @@ PHP_PACKAGE=1
 
 # BIG FAT WARNING!
 # the php eclass requires the PHPSAPI setting!
-inherit eutils php5-sapi-r2 apache-module
+inherit eutils php5-sapi-r3 apache-module
 
 need_apache
 
@@ -42,11 +42,11 @@ pkg_setup() {
 	fi
 
 	apache-module_pkg_setup
-	php5-sapi-r2_pkg_setup
+	php5-sapi-r3_pkg_setup
 }
 
 src_unpack() {
-	php5-sapi-r2_src_unpack
+	php5-sapi-r3_src_unpack
 
 	# if we're not using threads, we need to force them to be switched
 	# off by patching php's configure script
@@ -78,12 +78,12 @@ src_compile() {
 
 	my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
 
-	php5-sapi-r2_src_compile
+	php5-sapi-r3_src_compile
 }
 
 src_install() {
 	PHP_INSTALLTARGETS="install"
-	php5-sapi-r2_src_install
+	php5-sapi-r3_src_install
 
 	if [ -n "${USE_APACHE2}" ] ; then
 		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"