Revert masking of PHP binary useflags, so that they are masked in base profile and unmasked only in the proper x86/amd64 profiles. See bug #159832.

47 files changed, 161 insertions, 580 deletions

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d72857923a5e..26e6840b9e2c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -124,3 +124,26 @@ fdftk
 # These are specific of Mac OS X
 aqua
 coreaudio
+
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Mask the flags for PHP that are available only on x86
+fdftk
+sybase-ct
+ingres
+birdstep
+adabas
+filepro
+pfpro
+informix
+empress
+empress-bcs
+sybase
+frontbase
+dbmaker
+esoob
+solid
+# Shared with amd64
+oci8
+oracle7
+firebird
+db2
diff --git a/profiles/default-bsd/fbsd/use.mask b/profiles/default-bsd/fbsd/use.mask
index 8bf273d6ce07..6a0f3b607a65 100644
--- a/profiles/default-bsd/fbsd/use.mask
+++ b/profiles/default-bsd/fbsd/use.mask
@@ -1,14 +1,11 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/use.mask,v 1.31 2006/12/26 12:16:11 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/use.mask,v 1.32 2007/01/04 21:49:28 flameeyes Exp $
 
 # Someone who knows kerberos is needed to make sure that this works
 kerberos
 krb4
 
-# Firebird fails make for some semaphore/shm stuff linux-specific
-firebird
-
 # Apache defaults to Apache 1.x, mask it for the time
 apache
 
diff --git a/profiles/default-bsd/use.mask b/profiles/default-bsd/use.mask
index af90bab25bb0..797d25117fe1 100644
--- a/profiles/default-bsd/use.mask
+++ b/profiles/default-bsd/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.28 2006/12/29 23:28:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.29 2007/01/04 21:49:28 flameeyes Exp $
 
 # Linux-dependant flags
 selinux
@@ -41,27 +41,12 @@ hardened
 termcap-compat
 
 # useflags for php commercial software
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-frontbase
 hyperwave-api
-informix
 interbase
 mnogosearch
 msql
-oci8
-oracle7
 ovrimos
-pfpro
 sapdb
-solid
-sybase
-sybase-ct
 
 # Java requires that new-style virtuals are prepared for kaffe
 java
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index 1bd02cb08eae..358b2f7732ae 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -18,9 +18,6 @@ hardened
 # VV requires device-mapper 
 on-the-fly-crypt
 oss
-solid
-sybase
-sybase-ct
 rtc
 voodoo3
 pvm
@@ -34,7 +31,6 @@ arts
 cjk
 doc
 esd
-firebird
 gnome
 jack-tmpfs
 kde
@@ -52,22 +48,6 @@ xmms
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
 # architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oci8
-oracle7
-pfpro
-solid
 
 # masks for x11-libs/qt
 odbc
diff --git a/profiles/default-linux/alpha/ChangeLog b/profiles/default-linux/alpha/ChangeLog
index cbf3e9c62c9d..b556d8871006 100644
--- a/profiles/default-linux/alpha/ChangeLog
+++ b/profiles/default-linux/alpha/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.19 2006/12/29 21:13:17 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.20 2007/01/04 21:49:28 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> use.mask:
   Mask fdftk useflag on base profile and unmask for x86 only.
diff --git a/profiles/default-linux/alpha/use.mask b/profiles/default-linux/alpha/use.mask
index aa37078e8608..421ca9b320b9 100644
--- a/profiles/default-linux/alpha/use.mask
+++ b/profiles/default-linux/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.54 2006/12/29 21:13:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.55 2007/01/04 21:49:28 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -27,9 +27,6 @@ java
 java-internal
 java-external
 
-# firebird appears to be x86-only (the db, not the browser)
-firebird
-
 # tcc is x86-only
 tcc
 
@@ -37,29 +34,6 @@ tcc
 # despite some internal Gentoo efforts (mine) to port it
 afs
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
-
 hardened
 hal
 howl
diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
index 7e2ab86f8c14..73cfcb967605 100644
--- a/profiles/default-linux/amd64/ChangeLog
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.47 2006/12/29 21:13:17 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.48 2007/01/04 21:49:28 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> use.mask:
   Mask fdftk useflag on base profile and unmask for x86 only.
diff --git a/profiles/default-linux/amd64/use.mask b/profiles/default-linux/amd64/use.mask
index 5f230e5ea41a..7dba90edf1e6 100644
--- a/profiles/default-linux/amd64/use.mask
+++ b/profiles/default-linux/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.44 2006/12/29 21:13:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.45 2007/01/04 21:49:28 flameeyes Exp $
 
 # SECTION: Unmask
 
@@ -29,6 +29,13 @@
 -video_cards_fglrx
 -video_cards_vmware
 
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Unmask the flags for PHP that are available only on x86/amd64
+-oci8
+-oracle7
+-firebird
+-db2
+
 # SECTION: Unavailable/Broken
 
 # 2006/12/21 - Diego Pettenò <flameeyes@gentoo.org>
@@ -89,23 +96,3 @@ pvm
 3dfx
 
 # NOT NECESSARY - SECTION
-
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-pfpro
-solid
-sybase
-sybase-ct
diff --git a/profiles/default-linux/arm/use.mask b/profiles/default-linux/arm/use.mask
index b8548eee8390..12b96ade5b49 100644
--- a/profiles/default-linux/arm/use.mask
+++ b/profiles/default-linux/arm/use.mask
@@ -38,14 +38,6 @@ beagle
 nvtv
 mzscheme
 
-# Luca Longinotti <chtekk@gentoo.org>
-# fix dev-lang/php + arm + firebird
-firebird
-
-# Luca Longinotti <chtekk@gentoo.org>
-# mask Oracle
-oci8
-
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
 video_cards_apm
diff --git a/profiles/default-linux/hppa/ChangeLog b/profiles/default-linux/hppa/ChangeLog
index 99eeaa58c231..4397ec87503e 100644
--- a/profiles/default-linux/hppa/ChangeLog
+++ b/profiles/default-linux/hppa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for hppa profile
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/ChangeLog,v 1.6 2006/12/29 21:13:17 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/ChangeLog,v 1.7 2007/01/04 21:49:28 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> use.mask:
   Mask fdftk useflag on base profile and unmask for x86 only.
diff --git a/profiles/default-linux/hppa/use.mask b/profiles/default-linux/hppa/use.mask
index b3b57489b8e0..9e2fb87c202b 100644
--- a/profiles/default-linux/hppa/use.mask
+++ b/profiles/default-linux/hppa/use.mask
@@ -128,11 +128,6 @@ nptlonly
 # Wifi stuff not test yet because of lack of hardware
 wifi
 
-# 14 Jul 2004 Gustavo Zacarias <gustavoz@gentoo.org>
-# There's no oracle or informix port for linux/hppa
-oci8
-informix
-
 # 26 Feb 2003 Guy Martin <gmsoft@gentoo.org>
 # No lirc support on hppa
 lirc
@@ -186,31 +181,12 @@ pcmcia
 pda
 trusted
 wavelan
-firebird
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
 # architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
 ibm
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
 djbfft
 qdbm
 mzscheme
diff --git a/profiles/default-linux/ia64/ChangeLog b/profiles/default-linux/ia64/ChangeLog
index 71e0817f5d47..a319279be324 100644
--- a/profiles/default-linux/ia64/ChangeLog
+++ b/profiles/default-linux/ia64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for ia64 profile
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/ChangeLog,v 1.10 2006/12/29 21:13:17 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/ChangeLog,v 1.11 2007/01/04 21:49:28 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> use.mask:
   Mask fdftk useflag on base profile and unmask for x86 only.
diff --git a/profiles/default-linux/ia64/use.mask b/profiles/default-linux/ia64/use.mask
index b67087fdfb46..8130093e3e30 100644
--- a/profiles/default-linux/ia64/use.mask
+++ b/profiles/default-linux/ia64/use.mask
@@ -27,22 +27,6 @@ afs
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
 # architecture.
-adabas
-birdstep
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oci8
-pfpro
-solid
-sybase
-sybase-ct
 qdbm
 
 hardened
@@ -97,9 +81,6 @@ video_cards_nsc
 video_cards_newport
 video_cards_sis
 
-# dev-db/firebird-1.5.x entirely lacks ia64 support
-firebird
-
 # 01 july 2006 - Gustavo Zacarias <gustavoz@gentoo.org>
 # Seamonkey isn't keyworded for ia64, see bug #137198
 seamonkey
diff --git a/profiles/default-linux/m68k/use.mask b/profiles/default-linux/m68k/use.mask
index c28882f8e51f..5d7e6abd77ab 100644
--- a/profiles/default-linux/m68k/use.mask
+++ b/profiles/default-linux/m68k/use.mask
@@ -10,24 +10,6 @@ java
 # all of these are binary-only, and not presently available on this
 # architecture.
 php
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
 djbfft
 qdbm
 mzscheme
diff --git a/profiles/default-linux/mips/use.mask b/profiles/default-linux/mips/use.mask
index 836faa81477c..99a9735397e9 100644
--- a/profiles/default-linux/mips/use.mask
+++ b/profiles/default-linux/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.71 2006/12/29 21:13:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.72 2007/01/04 21:49:28 flameeyes Exp $
 
 # Untested on mips, masking for now.
 cdb
@@ -229,11 +229,8 @@ arts
 directfb
 dvdr
 ibm
-informix
-firebird
 ggi
 lirc
-oci8
 tcc
 trusted
 voodoo3
@@ -248,24 +245,6 @@ jpeg2k
 # all of these are binary-only, and not presently available on this
 # architecture.
 php
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
 djbfft
 glitz
 pike
diff --git a/profiles/default-linux/ppc/1.0/use.mask b/profiles/default-linux/ppc/1.0/use.mask
index 463928cf8fe1..142ad0c1075b 100644
--- a/profiles/default-linux/ppc/1.0/use.mask
+++ b/profiles/default-linux/ppc/1.0/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/1.0_rc/use.mask b/profiles/default-linux/ppc/1.0_rc/use.mask
index 463928cf8fe1..142ad0c1075b 100644
--- a/profiles/default-linux/ppc/1.0_rc/use.mask
+++ b/profiles/default-linux/ppc/1.0_rc/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/1.2/use.mask b/profiles/default-linux/ppc/1.2/use.mask
index 463928cf8fe1..142ad0c1075b 100644
--- a/profiles/default-linux/ppc/1.2/use.mask
+++ b/profiles/default-linux/ppc/1.2/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/1.4/use.mask b/profiles/default-linux/ppc/1.4/use.mask
index 463928cf8fe1..142ad0c1075b 100644
--- a/profiles/default-linux/ppc/1.4/use.mask
+++ b/profiles/default-linux/ppc/1.4/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2004.0/use.mask b/profiles/default-linux/ppc/2004.0/use.mask
index 83ac6745068f..9c8d6f5c6b20 100644
--- a/profiles/default-linux/ppc/2004.0/use.mask
+++ b/profiles/default-linux/ppc/2004.0/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2004.1/use.mask b/profiles/default-linux/ppc/2004.1/use.mask
index 258bd3038588..848d8e8e9158 100644
--- a/profiles/default-linux/ppc/2004.1/use.mask
+++ b/profiles/default-linux/ppc/2004.1/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2004.2/use.mask b/profiles/default-linux/ppc/2004.2/use.mask
index 258bd3038588..848d8e8e9158 100644
--- a/profiles/default-linux/ppc/2004.2/use.mask
+++ b/profiles/default-linux/ppc/2004.2/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2004.3/use.mask b/profiles/default-linux/ppc/2004.3/use.mask
index 83ac6745068f..9c8d6f5c6b20 100644
--- a/profiles/default-linux/ppc/2004.3/use.mask
+++ b/profiles/default-linux/ppc/2004.3/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
@@ -13,7 +11,6 @@ real
 tcc
 fmod
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2005.0/use.mask b/profiles/default-linux/ppc/2005.0/use.mask
index f527a65a792b..9c8d6f5c6b20 100644
--- a/profiles/default-linux/ppc/2005.0/use.mask
+++ b/profiles/default-linux/ppc/2005.0/use.mask
@@ -2,20 +2,15 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 lm_sensors
 real
 tcc
 fmod
-oci8
-oci8-direct-client
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2005.1/ppc/use.mask b/profiles/default-linux/ppc/2005.1/ppc/use.mask
index c66ba1bce9fc..300c48318706 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/use.mask
+++ b/profiles/default-linux/ppc/2005.1/ppc/use.mask
@@ -2,10 +2,8 @@
 
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cmucl
 hdf
 ip28
@@ -13,10 +11,7 @@ lm_sensors
 real
 tcc
 fmod
-oci8
-oci8-direct-client
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 i8x0
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/use.mask b/profiles/default-linux/ppc/2005.1/ppc64/use.mask
index 636e0275348a..2e470d07fe81 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/use.mask
+++ b/profiles/default-linux/ppc/2005.1/ppc64/use.mask
@@ -13,7 +13,6 @@ pcmcia
 pda
 prelude
 ruby
-firebird
 mzscheme
 chasen
 mono
@@ -27,28 +26,6 @@ junit
 
 guile
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-pfpro
-solid
-sybase
-sybase-ct
-
 # dietlibc
 diet
 
diff --git a/profiles/default-linux/ppc/ChangeLog b/profiles/default-linux/ppc/ChangeLog
index 58e621577bda..4b9dc1313dd1 100644
--- a/profiles/default-linux/ppc/ChangeLog
+++ b/profiles/default-linux/ppc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for Gentoo/ppc profile directory
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.3 2006/12/29 21:13:17 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.4 2007/01/04 21:49:28 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> 1.0/use.mask,
+  1.0_rc/use.mask, 1.2/use.mask, 1.4/use.mask, 2004.0/use.mask,
+  2004.1/use.mask, 2004.2/use.mask, 2004.3/use.mask, 2005.0/use.mask,
+  2005.1/ppc/use.mask, 2005.1/ppc64/use.mask, use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> 1.0/use.mask,
   1.0_rc/use.mask, 1.2/use.mask, 1.4/use.mask, 2004.0/use.mask,
diff --git a/profiles/default-linux/ppc/use.mask b/profiles/default-linux/ppc/use.mask
index e24a53be5a45..85585b5f7b9a 100644
--- a/profiles/default-linux/ppc/use.mask
+++ b/profiles/default-linux/ppc/use.mask
@@ -8,7 +8,6 @@ lm_sensors
 rar
 
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 # Unmask our instruction sets
@@ -19,32 +18,6 @@ interbase
 # codec support
 -x264
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-pfpro
-solid
-sybase
-sybase-ct
-
-# Luca Longinotti <chtekk@gentoo.org>
-# mask Oracle
-oci8
-
 # cg is only provided by nvidia's binary only cg toolkit
 cg
 
diff --git a/profiles/default-linux/ppc64/use.mask b/profiles/default-linux/ppc64/use.mask
index ff4846397e19..a3f57cad498e 100644
--- a/profiles/default-linux/ppc64/use.mask
+++ b/profiles/default-linux/ppc64/use.mask
@@ -13,7 +13,6 @@ pcmcia
 pda
 prelude
 ruby
-firebird
 mzscheme
 chasen
 mono
@@ -28,29 +27,6 @@ junit
 
 guile
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
-
 # dietlibc
 diet
 
diff --git a/profiles/default-linux/s390/use.mask b/profiles/default-linux/s390/use.mask
index 5ab5ddf33d22..f0d96af2426f 100644
--- a/profiles/default-linux/s390/use.mask
+++ b/profiles/default-linux/s390/use.mask
@@ -10,10 +10,7 @@ afs
 alsa
 apm
 directfb
-informix
-firebird
 lirc
-oci8
 trusted
 voodoo3
 wavelan
@@ -28,23 +25,6 @@ socks5
 # not working for now
 mzscheme
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-dbmaker
-empress
-empress-bcs
-frontbase
-hyperwave
-pfpro
-solid
-sybase
-sybase-ct
-
-
 # masked until xorg builds
 xv
 gtk
diff --git a/profiles/default-linux/sh/use.mask b/profiles/default-linux/sh/use.mask
index 44a3b70c378c..d369ac6f59e3 100644
--- a/profiles/default-linux/sh/use.mask
+++ b/profiles/default-linux/sh/use.mask
@@ -27,7 +27,6 @@ afs
 lesstif
 mono
 lm_sensors
-firebird
 qdbm
 fftw
 netjack
@@ -39,10 +38,6 @@ nvtv
 xine
 ocaml
 
-# Luca Longinotti <chtekk@gentoo.org>
-# mask Oracle
-oci8
-
 # 2006/03/07 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures lacking direct rendering      
 dri
diff --git a/profiles/default-linux/sparc/ChangeLog b/profiles/default-linux/sparc/ChangeLog
index 50577da56608..c84f5f0900f0 100644
--- a/profiles/default-linux/sparc/ChangeLog
+++ b/profiles/default-linux/sparc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sparc profile
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.14 2006/12/29 21:13:18 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.15 2007/01/04 21:49:29 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> use.mask:
   Mask fdftk useflag on base profile and unmask for x86 only.
diff --git a/profiles/default-linux/sparc/use.mask b/profiles/default-linux/sparc/use.mask
index a13848ddc517..0752f1ce9df8 100644
--- a/profiles/default-linux/sparc/use.mask
+++ b/profiles/default-linux/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.101 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.102 2007/01/04 21:49:29 flameeyes Exp $
 
 # This file contains a list of useflags that cannot be used on sparc.
 
@@ -21,14 +21,12 @@ glitz
 graphlcd
 i8x0
 ibm
-informix
 lirc
 lm_sensors
 mod
 modplug
 mpm-peruser
 nvtv
-oci8
 oracle
 pbs
 pcmcia
@@ -76,23 +74,8 @@ doomsday
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
 # architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
 hyperwave-api
-ingres
 libedit
-oracle7
-pfpro
-solid
-sybase
-sybase-ct
 
 # Unmask ultra1
 -ultra1
diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog
index 716b17389491..f8240211deb7 100644
--- a/profiles/default-linux/x86/ChangeLog
+++ b/profiles/default-linux/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.45 2006/12/29 21:13:18 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.46 2007/01/04 21:49:29 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> use.mask:
+  Revert masking of PHP binary useflags.
 
   29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> use.mask:
   Mask fdftk useflag on base profile and unmask for x86 only.
diff --git a/profiles/default-linux/x86/use.mask b/profiles/default-linux/x86/use.mask
index 121f4f3b981d..5ee38d26b655 100644
--- a/profiles/default-linux/x86/use.mask
+++ b/profiles/default-linux/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.24 2006/12/31 16:31:45 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.25 2007/01/04 21:49:29 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # x86 profile.  This works, for example, if another architecture's
@@ -58,5 +58,25 @@ ibm
 # psyco works on x86
 -psyco
 
-# Adobe FDF toolkit is x86 only.
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Unmask the flags for PHP that are available only on x86
 -fdftk
+-sybase-ct
+-ingres
+-birdstep
+-adabas
+-filepro
+-pfpro
+-informix
+-empress
+-empress-bcs
+-sybase
+-frontbase
+-dbmaker
+-esoob
+-solid
+# Shared with amd64
+-oci8
+-oracle7
+-firebird
+-db2
diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask
index 0193653b4492..fb828e062700 100644
--- a/profiles/hardened/amd64/use.mask
+++ b/profiles/hardened/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.20 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.21 2007/01/04 21:49:29 flameeyes Exp $
 
 # 2006/06/13 - Danny van Dyk <kugelfang@gentoo.org>
 # Mask clvm on amd64, as it isn't keyworded at all.
@@ -81,7 +81,6 @@ pvm
 
 # 2004/06/22 - Taken from 2004.0 profile
 # Firebird doesnt build on amd64
-firebird
 
 # 2004/06/22 - Taken from 2004.0 profile
 # masked
@@ -89,26 +88,6 @@ firebird
 
 # NOT NECESSARY - SECTION
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-pfpro
-solid
-sybase
-sybase-ct
-
 # dev-lang/tcc won't build
 tcc
 
@@ -125,3 +104,10 @@ vidix
 -3dnowext
 -sse
 -sse2
+
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Unmask the flags for PHP that are available only on x86/amd64
+-oci8
+-oracle7
+-firebird
+-db2
diff --git a/profiles/hardened/ppc/use.mask b/profiles/hardened/ppc/use.mask
index 36ccccc4dc86..eb11bf538fcc 100644
--- a/profiles/hardened/ppc/use.mask
+++ b/profiles/hardened/ppc/use.mask
@@ -1,43 +1,24 @@
 mmx
 3dfx
 acpi
-adabas
 afs
 avi
-birdstep
 cg
 clvm
 cmucl
-db2
-dbmaker
 dmi
-empress
-empress-bcs
-esoob
-filepro
-firebird
 fmod
-frontbase
 fusion
 hdf
-hyperwave
 i8x0
-informix
-ingres
 interbase
 ip28
 kqemu
 lm_sensors
 mbrola
 nvtv
-oci8
-oracle7
-pfpro
 rar
 real
-solid
-sybase
-sybase-ct
 tcc
 uml
 video_cards_apm
diff --git a/profiles/hardened/ppc64/use.mask b/profiles/hardened/ppc64/use.mask
index e6164b55c77e..5c8eddc22585 100644
--- a/profiles/hardened/ppc64/use.mask
+++ b/profiles/hardened/ppc64/use.mask
@@ -17,7 +17,6 @@ pcmcia
 pda
 prelude
 ruby
-firebird
 mzscheme
 chasen
 mono
@@ -31,29 +30,6 @@ junit
 
 guile
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
-
 # dietlibc
 diet
 
diff --git a/profiles/hardened/x86/use.mask b/profiles/hardened/x86/use.mask
index a67b5911201d..19d74a03b0af 100644
--- a/profiles/hardened/x86/use.mask
+++ b/profiles/hardened/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.25 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.26 2007/01/04 21:49:29 flameeyes Exp $
 
 -3dnow
 -3dnowext
@@ -45,5 +45,25 @@ ibm
 #input_devices_wacom
 -x264
 
-# Adobe FDF toolkit is x86 only.
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Unmask the flags for PHP that are available only on x86
 -fdftk
+-sybase-ct
+-ingres
+-birdstep
+-adabas
+-filepro
+-pfpro
+-informix
+-empress
+-empress-bcs
+-sybase
+-frontbase
+-dbmaker
+-esoob
+-solid
+# Shared with amd64
+-oci8
+-oracle7
+-firebird
+-db2
diff --git a/profiles/selinux/2005.1/alpha/use.mask b/profiles/selinux/2005.1/alpha/use.mask
index 02289f5c2181..e42ff910a6a0 100644
--- a/profiles/selinux/2005.1/alpha/use.mask
+++ b/profiles/selinux/2005.1/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/alpha/use.mask,v 1.5 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/alpha/use.mask,v 1.6 2007/01/04 21:49:29 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -30,7 +30,6 @@ java-internal
 java-external
 
 # firebird appears to be x86-only (the db, not the browser)
-firebird
 
 # tcc is x86-only
 tcc
@@ -39,29 +38,6 @@ tcc
 # despite some internal Gentoo efforts (mine) to port it
 afs
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
-
 hal
 howl
 jack
diff --git a/profiles/selinux/2005.1/amd64/use.mask b/profiles/selinux/2005.1/amd64/use.mask
index 78fab91732dd..be080a25b628 100644
--- a/profiles/selinux/2005.1/amd64/use.mask
+++ b/profiles/selinux/2005.1/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/use.mask,v 1.7 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/amd64/use.mask,v 1.8 2007/01/04 21:49:29 flameeyes Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # multilib is forced on when we have ${MULTILIB_ABIS} defined
@@ -16,7 +16,6 @@ drac
 
 # 2004/06/22 - Taken from 2004.0 profile
 # Firebird doesnt build on amd64
-firebird
 
 # 2004/06/22 - Taken from 2004.0 profile
 # x86 binary only, used by php
@@ -31,23 +30,3 @@ firebird
 libcaca
 
 # NOT NECESSARY - SECTION
-
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-pfpro
-solid
-sybase
-sybase-ct
diff --git a/profiles/selinux/alpha/use.mask b/profiles/selinux/alpha/use.mask
index f17db42c4e17..6b03d31d4409 100644
--- a/profiles/selinux/alpha/use.mask
+++ b/profiles/selinux/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/use.mask,v 1.5 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/alpha/use.mask,v 1.6 2007/01/04 21:49:29 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -28,7 +28,6 @@ java-internal
 java-external
 
 # firebird appears to be x86-only (the db, not the browser)
-firebird
 
 # tcc is x86-only
 tcc
@@ -37,29 +36,6 @@ tcc
 # despite some internal Gentoo efforts (mine) to port it
 afs
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
-
 hardened
 hal
 howl
diff --git a/profiles/selinux/amd64/use.mask b/profiles/selinux/amd64/use.mask
index 626c940d7ab5..c14eebbf33ec 100644
--- a/profiles/selinux/amd64/use.mask
+++ b/profiles/selinux/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/use.mask,v 1.4 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/amd64/use.mask,v 1.5 2007/01/04 21:49:29 flameeyes Exp $
 
 # SECTION: Unmask
 
@@ -85,37 +85,19 @@ mzscheme
 pvm
 
 # 2004/06/22 - Taken from 2004.0 profile
-# Firebird doesnt build on amd64
-firebird
-
-# 2004/06/22 - Taken from 2004.0 profile
 # masked
 3dfx
 
 # NOT NECESSARY - SECTION
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-pfpro
-solid
-sybase
-sybase-ct
-
-
 # new keyword zrtp related to 
 # net-libs/libzrtpcpp package
 # masked pending testing - bug #149793
 zrtp
+
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Unmask the flags for PHP that are available only on x86/amd64
+-oci8
+-oracle7
+-firebird
+-db2
diff --git a/profiles/selinux/mips/use.mask b/profiles/selinux/mips/use.mask
index e2d2d39d0334..181153305b08 100644
--- a/profiles/selinux/mips/use.mask
+++ b/profiles/selinux/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/use.mask,v 1.4 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/use.mask,v 1.5 2007/01/04 21:49:29 flameeyes Exp $
 
 # Untested on mips, masking for now.
 cdb
@@ -225,11 +225,8 @@ arts
 directfb
 dvdr
 ibm
-informix
-firebird
 ggi
 lirc
-oci8
 tcc
 trusted
 voodoo3
@@ -244,24 +241,6 @@ jpeg2k
 # all of these are binary-only, and not presently available on this
 # architecture.
 php
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-oci8
-pfpro
-solid
-sybase
-sybase-ct
 djbfft
 glitz
 pike
diff --git a/profiles/selinux/ppc/use.mask b/profiles/selinux/ppc/use.mask
index 4f2273a559d6..9f5e34c5215c 100644
--- a/profiles/selinux/ppc/use.mask
+++ b/profiles/selinux/ppc/use.mask
@@ -8,7 +8,6 @@ lm_sensors
 rar
 
 #keep and eye on firebird and interbase as pair
-firebird
 interbase
 
 # Unmask our instruction sets
@@ -19,32 +18,6 @@ interbase
 # codec support
 -x264
 
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oracle7
-pfpro
-solid
-sybase
-sybase-ct
-
-# Luca Longinotti <chtekk@gentoo.org>
-# mask Oracle
-oci8
-
 # cg is only provided by nvidia's binary only cg toolkit
 cg
 
diff --git a/profiles/selinux/sparc/use.mask b/profiles/selinux/sparc/use.mask
index fd333f70d62d..a7e14b53581f 100644
--- a/profiles/selinux/sparc/use.mask
+++ b/profiles/selinux/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/use.mask,v 1.6 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/sparc/use.mask,v 1.7 2007/01/04 21:49:29 flameeyes Exp $
 
 # This file contains a list of useflags that cannot be used on sparc.
 
@@ -21,14 +21,12 @@ glitz
 hal
 i8x0
 ibm
-informix
 lirc
 lm_sensors
 mod
 modplug
 mpm-peruser
 nvtv
-oci8
 pbs
 pcmcia
 pmount
@@ -75,23 +73,8 @@ doomsday
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
 # architecture.
-adabas
-birdstep
-db2
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
 hyperwave-api
-ingres
 libedit
-oracle7
-pfpro
-solid
-sybase
-sybase-ct
 
 # Unmask ultra1
 -ultra1
diff --git a/profiles/selinux/x86/use.mask b/profiles/selinux/x86/use.mask
index 251e7ce77b56..eaf03aabb729 100644
--- a/profiles/selinux/x86/use.mask
+++ b/profiles/selinux/x86/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/x86/use.mask,v 1.2 2006/12/29 21:13:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/x86/use.mask,v 1.3 2007/01/04 21:49:29 flameeyes Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # x86 profile.  This works, for example, if another architecture's
@@ -55,5 +55,25 @@ ibm
 # psyco works on x86
 -psyco
 
-# Adobe FDF toolkit is x86 only.
+# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
+# Unmask the flags for PHP that are available only on x86
 -fdftk
+-sybase-ct
+-ingres
+-birdstep
+-adabas
+-filepro
+-pfpro
+-informix
+-empress
+-empress-bcs
+-sybase
+-frontbase
+-dbmaker
+-esoob
+-solid
+# Shared with amd64
+-oci8
+-oracle7
+-firebird
+-db2