Improve my java-config again.

6 files changed, 17 insertions, 11 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index f3452dda62f4..bfbcf3b4eeb8 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.78 2003/05/31 22:32:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.79 2003/06/02 20:12:03 robbat2 Exp $
 
 *mod_php-4.3.2 (31 May 2003)
 
-  26 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild,
+  31 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild,
   files/digest-mod_php-4.3.2:
   Version bump.
   BerkDB is disabled due to DB4 issues and changes in PHP 4.3.2 presently.
@@ -81,6 +81,9 @@
 
 *mod_php-4.3.1 (18 Feb 2003)
 
+  02 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild:
+  Improve my java-config again.
+
   31 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild:
   Improve the slight java fix with java-config.
 
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index b9b3730797ae..8e68ac795bef 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,10 +1,10 @@
 MD5 48a4d1e841699a7dc2d4aae10254109f mod_php-4.3.2.ebuild 2768
 MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.1-r3.ebuild 2589
-MD5 e71b9c41e34ef0cd3a7c4330f727cf28 mod_php-4.3.1.ebuild 9213
+MD5 a00cd3eced04951a9aa6a5d38bd7f6b6 mod_php-4.3.1.ebuild 9225
 MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241
 MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071
 MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634
-MD5 b4c1c28da3fac9c187823fd1c6583521 ChangeLog 16553
+MD5 b11830a13f5a9857db985f892f820616 ChangeLog 16662
 MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853
diff --git a/dev-php/mod_php/mod_php-4.3.1.ebuild b/dev-php/mod_php/mod_php-4.3.1.ebuild
index 39cffc4aad9a..1eebd65ef298 100644
--- a/dev-php/mod_php/mod_php-4.3.1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1.ebuild,v 1.14 2003/05/31 21:41:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1.ebuild,v 1.15 2003/06/02 20:12:03 robbat2 Exp $
 
 inherit flag-o-matic 
 
@@ -116,7 +116,7 @@ src_unpack() {
 
 src_compile() {
 
-	php_check_java_config
+	use java && php_check_java_config
 
 	local myconf
 
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 13c5d6968441..febbc246081a 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.48 2003/05/31 22:32:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.49 2003/06/02 20:12:18 robbat2 Exp $
  
 *php-4.3.2 (31 May 2003)
 
@@ -37,6 +37,9 @@
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *php-4.3.1 (24 Feb 2003)
+  
+  02 June 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.1.ebuild:
+  Improve my java-config again.
 
   31 May 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.1.ebuild:
   Improve the slight java fix with java-config.
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 718e2578518c..b25aa0f5608d 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -2,9 +2,9 @@ MD5 0d1e14b4e015cbd589bc3a7d5886b602 php-4.3.1-r1.ebuild 8142
 MD5 c06db8bbd5bb6030cc4f41c35a7bfc67 php-4.3.0-r4.ebuild 8032
 MD5 75eada54a48637351e9c8444ebfa8e5a php-4.3.2.ebuild 2471
 MD5 32e507e008f3a07bf40463b7e8b0d1fe php-4.3.0-r3.ebuild 6737
-MD5 db07b5c392bb552093618f33dd73a839 php-4.3.1.ebuild 8487
+MD5 8af160385148468e64dcc62efdce0a95 php-4.3.1.ebuild 8500
 MD5 82c31a660af5431b5abd96f70ece4854 php-4.3.1-r2.ebuild 2436
-MD5 c3342361869bb079838e9fabea2cc1b4 ChangeLog 7022
+MD5 b5f3bcb606ba5861d34d91f60debf48d ChangeLog 7129
 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-php-4.3.0-r3 63
 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-php-4.3.0-r4 63
 MD5 316366d60770de4c45957483cde50fe8 files/digest-php-4.3.1-r1 63
diff --git a/dev-php/php/php-4.3.1.ebuild b/dev-php/php/php-4.3.1.ebuild
index d7fef2f6e5db..a95c0a262e2b 100644
--- a/dev-php/php/php-4.3.1.ebuild
+++ b/dev-php/php/php-4.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.1.ebuild,v 1.9 2003/05/31 22:26:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.1.ebuild,v 1.10 2003/06/02 20:12:18 robbat2 Exp $
 
 IUSE="truetype postgres tiff libwww nls jpeg readline ssl oci8 mysql X gdbm curl imap xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam spell"
 
@@ -104,7 +104,7 @@ src_unpack() {
 
 src_compile() {
 
-	php_check_java_config
+	use java && php_check_java_config
 
 	local myconf