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.

8 files changed, 35 insertions, 167 deletions

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