diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-05-31 22:26:34 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-05-31 22:26:34 +0000 |
| commit | b37d34054408a56c9ac75372305c93f7ebda545a (patch) | |
| tree | 5e43042812a44476a34a289f8f343bf47fb8b855 /dev-php | |
| parent | unmasking portage 48-r1 for ~mask (diff) | |
| download | historical-b37d34054408a56c9ac75372305c93f7ebda545a.tar.gz historical-b37d34054408a56c9ac75372305c93f7ebda545a.tar.bz2 historical-b37d34054408a56c9ac75372305c93f7ebda545a.zip | |
Improve the slight java fix with java-config.
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-php/php/Manifest | 4 | ||||
| -rw-r--r-- | dev-php/php/php-4.3.1.ebuild | 18 |
3 files changed, 21 insertions, 6 deletions
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog index 6bfd50d0dcd3..c394ecd009c9 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.46 2003/05/26 23:28:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.47 2003/05/31 22:26:32 robbat2 Exp $ *php-4.3.1-r2 (22 Apr 2003) @@ -30,6 +30,9 @@ *php-4.3.1 (24 Feb 2003) + 31 May 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.1.ebuild: + Improve the slight java fix with java-config. + 03 Mar 2003; Seemant Kulleen <seemant@gentoo.org> php-4.3.1-r1.ebuild, php-4.3.1.ebuild: added spell support diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest index 0448c70e5af5..51f3d0a83561 100644 --- a/dev-php/php/Manifest +++ b/dev-php/php/Manifest @@ -1,9 +1,9 @@ MD5 0d1e14b4e015cbd589bc3a7d5886b602 php-4.3.1-r1.ebuild 8142 MD5 c06db8bbd5bb6030cc4f41c35a7bfc67 php-4.3.0-r4.ebuild 8032 MD5 32e507e008f3a07bf40463b7e8b0d1fe php-4.3.0-r3.ebuild 6737 -MD5 70c4aff8641931b5be8397696e68d520 php-4.3.1.ebuild 8189 +MD5 db07b5c392bb552093618f33dd73a839 php-4.3.1.ebuild 8487 MD5 82c31a660af5431b5abd96f70ece4854 php-4.3.1-r2.ebuild 2436 -MD5 c394fbea1f7e76eb7c2a423ab8c4ef97 ChangeLog 6621 +MD5 e09d35fb0ebb99ab284dfed7f7fb14e9 ChangeLog 6741 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 8fbd084fe803..d7fef2f6e5db 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.8 2003/03/06 04:20:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.1.ebuild,v 1.9 2003/05/31 22:26:32 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" @@ -48,7 +48,7 @@ DEPEND=" postgres? ( >=dev-db/postgresql-7.1 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) - java? ( virtual/jdk )" + java? ( =virtual/jdk-1.4* dev-java/java-config )" #Removed #java? ( virtual/jdk ) @@ -56,7 +56,17 @@ DEPEND=" RDEPEND=" xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 ) qt? ( >=x11-libs/qt-2.3.0 ) - java? ( virtual/jdk )" + java? ( =virtual/jdk-1.4* )" + +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 +} + src_unpack() { unpack ${MY_P}.tar.bz2 @@ -94,6 +104,8 @@ src_unpack() { src_compile() { + php_check_java_config + local myconf use readline && myconf="${myconf} --with-readline" |