diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-01-08 07:13:36 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-01-08 07:13:36 +0000 |
| commit | 9428ffdf2f35a363c3e4607611d557439034e2e8 (patch) | |
| tree | 1957cf45b98b4a75ab3ae1778ee15145e40cb9b1 /eclass/php-sapi.eclass | |
| parent | updated ebuild Copyright years (diff) | |
| download | historical-9428ffdf2f35a363c3e4607611d557439034e2e8.tar.gz historical-9428ffdf2f35a363c3e4607611d557439034e2e8.tar.bz2 historical-9428ffdf2f35a363c3e4607611d557439034e2e8.zip | |
do some use !alpha stuff to cut down repoman warnings
Diffstat (limited to 'eclass/php-sapi.eclass')
| -rw-r--r-- | eclass/php-sapi.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 9d5897cfde3c..9c9994b31af3 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-sapi.eclass @@ -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/eclass/php-sapi.eclass,v 1.1 2004/01/08 04:05:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.2 2004/01/08 07:13:36 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -61,7 +61,7 @@ RDEPEND=" >=media-libs/libpng-1.2.5 ) gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) - java? ( =virtual/jdk-1.4* dev-java/java-config ) + !alpha? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) ) jpeg? ( >=media-libs/jpeg-6b ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( >=dev-db/mysql-3.23.26 ) @@ -225,7 +225,7 @@ php-sapi_src_compile() { [ -f "/proc/self/stat" ] || die "You need /proc mounted for configure to complete correctly!" - use java && php-sapi_check_java_config + use java && use !alpha && php-sapi_check_java_config if use berkdb; then einfo "Enabling NBDM" @@ -252,7 +252,7 @@ php-sapi_src_compile() { use x86 && myconf="${myconf} `use_with flash swf /usr`" myconf="${myconf} `use_with freetds sybase /usr`" myconf="${myconf} `use_with gdbm gdbm /usr`" - myconf="${myconf} `use_with java java ${JAVA_HOME}`" + use !alpha && myconf="${myconf} `use_with java java ${JAVA_HOME}`" myconf="${myconf} `use_with mcal mcal /usr`" [ -n "${INFORMIXDIR}" ] && myconf="${myconf} `use_with informix informix ${INFORMIXDIR}`" [ -n "${ORACLE_HOME}" ] && myconf="${myconf} `use_with oci8 oci8 ${ORACLE_HOME}`" @@ -483,7 +483,7 @@ php-sapi_src_install() { einfo "Setting extension_dir in php.ini" sed -e "s|extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc} - if use java; then + if use java && use !alpha; then # we put these into /usr/lib so that they cannot conflict with # other versions of PHP (e.g. PHP 4 & PHP 5) insinto ${PHPEXTDIR} |