Bug #61910 fixed. No version bump.

5 files changed, 29 insertions, 14 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index d330eb6901b4..d14dc27cc8e6 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.179 2004/08/26 10:50:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.180 2004/09/12 21:41:15 robbat2 Exp $
+
+  12 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-5.0.0-r1.ebuild,
+  mod_php-5.0.0.ebuild, mod_php-5.0.1.ebuild:
+  Bug #61910 fixed. No version bump.
 
   26 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-5.0.1.ebuild:
   better warning message.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index ab80737c406a..cac59b3568d3 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,9 +1,12 @@
-MD5 1c5a0beb6a09c14f2a2661ed78eeba4d mod_php-5.0.0.ebuild 4008
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 309b2e76d5d4951508c3376817f1c416 mod_php-5.0.0.ebuild 3997
 MD5 b88dcf659c6b7a84f49710bf3a90c4cb mod_php-4.3.8.ebuild 5912
-MD5 4e71e32fe9d8f2eec8b24dc0ca72237d mod_php-5.0.0-r1.ebuild 4193
+MD5 ee2192bcf2a49ea2faf6dc79b9b03099 mod_php-5.0.0-r1.ebuild 4181
 MD5 9e19b7f691662389947b59c9a1156935 mod_php-4.3.9_rc1.ebuild 6027
-MD5 c9ed1b264452cc590d110e0d99e1a602 mod_php-5.0.1.ebuild 4258
-MD5 e61e138c448ee570ca9a4766aaff8592 ChangeLog 32673
+MD5 f6c0b2da02a8c55fc260ae228e9cf2f4 mod_php-5.0.1.ebuild 4246
+MD5 b201dbd19dfa3470d3d04cded0583f4c ChangeLog 32835
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
@@ -17,3 +20,11 @@ MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 42
 MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
 MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
 MD5 9591544f5ec3e6302f69a9d82676273c files/70_mod_php5.conf 1003
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+Comment: .//Manifest 1095025281
+
+iD8DBQFBRMKIPpIsIjIzwiwRAlX2AKDyk+Y26FChCTAbupaMPLx+afiS3ACfUf4Q
+FdYhcsuoa+wk/wGp3FfbypQ=
+=yAms
+-----END PGP SIGNATURE-----
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 b70efcd2c55f..6e0d2bf10dc2 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,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/mod_php/mod_php-5.0.0-r1.ebuild,v 1.3 2004/08/13 20:48:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0-r1.ebuild,v 1.4 2004/09/12 21:41:15 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -98,7 +98,7 @@ src_install() {
 	php5-sapi_src_install
 
 	einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
-	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib
+	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib
 
 	if [ -n "${USE_APACHE2}" ] ; then
 		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
@@ -108,7 +108,7 @@ src_install() {
 		einfo "Installing a Apache config for PHP (mod_php5.conf)"
 		insinto /etc/apache/conf/addon-modules
 		doins ${FILESDIR}/mod_php5.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
+		dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE}
 	fi
 }
 
diff --git a/dev-php/mod_php/mod_php-5.0.0.ebuild b/dev-php/mod_php/mod_php-5.0.0.ebuild
index 903813d67c77..630ffcaf0d8a 100644
--- a/dev-php/mod_php/mod_php-5.0.0.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.0.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/mod_php/mod_php-5.0.0.ebuild,v 1.3 2004/07/22 18:47:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0.ebuild,v 1.4 2004/09/12 21:41:15 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -95,7 +95,7 @@ src_install() {
 	php5-sapi_src_install
 
 	einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
-	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib
+	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib
 
 	if [ -n "${USE_APACHE2}" ] ; then
 		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
@@ -105,7 +105,7 @@ src_install() {
 		einfo "Installing a Apache config for PHP (mod_php5.conf)"
 		insinto /etc/apache/conf/addon-modules
 		doins ${FILESDIR}/mod_php5.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
+		dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE}
 	fi
 }
 
diff --git a/dev-php/mod_php/mod_php-5.0.1.ebuild b/dev-php/mod_php/mod_php-5.0.1.ebuild
index 248199be3d41..a935ccd2c71a 100644
--- a/dev-php/mod_php/mod_php-5.0.1.ebuild
+++ b/dev-php/mod_php/mod_php-5.0.1.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/mod_php/mod_php-5.0.1.ebuild,v 1.3 2004/08/26 10:50:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.1.ebuild,v 1.4 2004/09/12 21:41:15 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -98,7 +98,7 @@ src_install() {
 	php5-sapi_src_install
 
 	einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
-	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib
+	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib
 
 	if [ -n "${USE_APACHE2}" ] ; then
 		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
@@ -108,7 +108,7 @@ src_install() {
 		einfo "Installing a Apache config for PHP (mod_php5.conf)"
 		insinto /etc/apache/conf/addon-modules
 		doins ${FILESDIR}/mod_php5.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
+		dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE}
 	fi
 }