firebird is x86 only on linux at the moment

3 files changed, 9 insertions, 9 deletions

diff --git a/eclass/php-2.eclass b/eclass/php-2.eclass
index 8958d9976e7d..8d0efab8147b 100644
--- a/eclass/php-2.eclass
+++ b/eclass/php-2.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-2.eclass,v 1.10 2004/01/08 07:13:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.11 2004/01/08 07:23:53 robbat2 Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic
@@ -55,7 +55,7 @@ RDEPEND="
    X? ( virtual/x11 )
    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
    curl? ( >=net-ftp/curl-7.10.2 )
-   firebird? ( >=dev-db/firebird-1.0 )
+   x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
    freetds? ( >=dev-db/freetds-0.53 )
    gd-external? ( media-libs/libgd >=media-libs/jpeg-6b 
                   >=media-libs/libpng-1.2.5 )
@@ -226,7 +226,7 @@ php_src_compile() {
 	fi
 
 	use crypt && myconf="${myconf} --with-mcrypt=/usr --with-mhash=/usr"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
+	use firebird && use x86 && myconf="${myconf} --with-interbase=/opt/interbase"
 	use flash && myconf="${myconf} --with-ming=/usr"
 	use flash && use x86 && myconf="${myconf} --with-swf=/usr"
 	use freetds && myconf="${myconf} --with-sybase=/usr"
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 9c9994b31af3..483a371a9122 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.2 2004/01/08 07:13:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.3 2004/01/08 07:23:53 robbat2 Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic
@@ -55,7 +55,7 @@ RDEPEND="
    X? ( virtual/x11 )
    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
    curl? ( >=net-ftp/curl-7.10.2 )
-   firebird? ( >=dev-db/firebird-1.0 )
+   x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
    freetds? ( >=dev-db/freetds-0.53 )
    gd-external? ( media-libs/libgd >=media-libs/jpeg-6b 
                   >=media-libs/libpng-1.2.5 )
@@ -247,7 +247,7 @@ php-sapi_src_compile() {
 	fi
 
 	myconf="${myconf} `use_with crypt mcrypt /usr` `use_with crypt mhash /usr`"
-	myconf="${myconf} `use_with firebird interbase /opt/interbase`"
+	use x86 && myconf="${myconf} `use_with firebird interbase /opt/interbase`"
 	myconf="${myconf} `use_with flash ming /usr`"
 	use x86 && myconf="${myconf} `use_with flash swf /usr`"
 	myconf="${myconf} `use_with freetds sybase /usr`"
diff --git a/eclass/php.eclass b/eclass/php.eclass
index fd7252451ddd..9c6f54365479 100644
--- a/eclass/php.eclass
+++ b/eclass/php.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.eclass,v 1.95 2004/01/08 07:13:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.96 2004/01/08 07:23:53 robbat2 Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 # This eclass is the old style of php, that was used before php-core was
@@ -61,7 +61,7 @@ RDEPEND="
    X? ( virtual/x11 )
    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
    curl? ( >=net-ftp/curl-7.10.2 )
-   firebird? ( >=dev-db/firebird-1.0 )
+   x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
    freetds? ( >=dev-db/freetds-0.53 )
    gd-external? ( media-libs/libgd >=media-libs/jpeg-6b 
                   >=media-libs/libpng-1.2.5 )
@@ -231,7 +231,7 @@ php_src_compile() {
 	fi
 
 	use crypt && myconf="${myconf} --with-mcrypt=/usr --with-mhash=/usr"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
+	use firebird && use x86 && myconf="${myconf} --with-interbase=/opt/interbase"
 	use flash && myconf="${myconf} --with-ming=/usr"
 	use flash && use x86 && myconf="${myconf} --with-swf=/usr"
 	use freetds && myconf="${myconf} --with-sybase=/usr"