diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-05-31 21:41:23 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-05-31 21:41:23 +0000 |
| commit | b8e287459d10c2bba15be540780f121deaa45b49 (patch) | |
| tree | e3d17bdf5e9313ae1b92fdecd8b1c543553460e0 /dev-php/mod_php | |
| parent | Improve the slight java fix with java-config. (diff) | |
| download | gentoo-2-b8e287459d10c2bba15be540780f121deaa45b49.tar.gz gentoo-2-b8e287459d10c2bba15be540780f121deaa45b49.tar.bz2 gentoo-2-b8e287459d10c2bba15be540780f121deaa45b49.zip | |
Improve the slight java fix with java-config.
Diffstat (limited to 'dev-php/mod_php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-php/mod_php/Manifest | 6 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.1.ebuild | 15 |
3 files changed, 19 insertions, 7 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index fe5124db900d..f84adfd409e6 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,6 @@ # 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.76 2003/05/27 12:55:53 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.77 2003/05/31 21:41:21 robbat2 Exp $ *mod_php-4.3.1-r3 (23 Apr 2003) @@ -73,6 +73,9 @@ *mod_php-4.3.1 (18 Feb 2003) + 31 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild: + Improve the slight java fix with java-config. + 22 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1.ebuild: Slight fix to the java stuff to forestall problems for the moment. Bump version requirements on Sabltron for bug #21229. diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index d61a0085497a..69cd834605d8 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,15 +1,13 @@ -MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.2.ebuild 2589 MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.1-r3.ebuild 2589 -MD5 ec77ebae880bd19afa8027c4dc90a8a2 mod_php-4.3.1.ebuild 8929 +MD5 e71b9c41e34ef0cd3a7c4330f727cf28 mod_php-4.3.1.ebuild 9213 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 251daeeb712b49d70e8ceadb84ab0c5b ChangeLog 16135 +MD5 de0bcd491f54f02d62b78b2c02a862b6 ChangeLog 16260 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 MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1 63 -MD5 5123f10b8c04d755f87e65e6aeb66fa2 files/digest-mod_php-4.3.2 126 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422 MD5 ad1869c3f2c3a60b4d7c4d26026373cf files/digest-mod_php-4.2.3-r2 63 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-mod_php-4.3.0-r2 63 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 fd533d46cdcb..39cffc4aad9a 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.13 2003/05/23 03:54:28 robbat2 Exp $ +# $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 $ inherit flag-o-matic @@ -55,12 +55,21 @@ DEPEND="|| ( pdflib? ( >=media-libs/pdflib-4.0.1-r2 ) postgres? ( >=dev-db/postgresql-7.1 ) gd? ( media-libs/libgd ) - java? ( =virtual/jdk-1.4* ) + java? ( =virtual/jdk-1.4* dev-java/java-config ) " # Only needed by CGI-Version # readline? ( >=sys-libs/ncurses-5.1 # >=sys-libs/readline-4.1 )" +php_check_java_config() { + JDKHOME="`java-config --jdk-home`" + NOJDKERROR="You need to use java-config to set your JVM to a JDK!" + if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then + eerror "${NOJDKERROR}" + die "${NOJDKERROR}" + fi +} + RDEPEND=" xml? ( >=app-text/sablotron-0.97 ) qt? ( >=x11-libs/qt-2.3.0 )" @@ -107,6 +116,8 @@ src_unpack() { src_compile() { + php_check_java_config + local myconf # readline can only be used w/ CGI build, so I'll turn it off |