I added some recommended USE flags from the php team for dev-lang/php per bug #120088 and to bring this inline with what was used fo the 2006.0 release. This is being done here to keep from breaking non default-linux profiles.

14 files changed, 53 insertions, 12 deletions

diff --git a/profiles/default-linux/alpha/2006.0/make.defaults b/profiles/default-linux/alpha/2006.0/make.defaults
index c29b8a73fba8..72065c31c4a8 100644
--- a/profiles/default-linux/alpha/2006.0/make.defaults
+++ b/profiles/default-linux/alpha/2006.0/make.defaults
@@ -1,9 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2006.0/make.defaults,v 1.5 2006/01/31 23:02:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2006.0/make.defaults,v 1.6 2006/03/14 14:51:24 wolf31o2 Exp $
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
 #STAGE1_USE="nptl"
 
 USE="alsa apache2 arts avi bitmap-fonts cups eds encode esd fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl nptlonly ogg opengl oss pdflib png qt quicktime sdl spell truetype truetype-fonts type1-fonts udev vorbis X xml xmms xv"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/amd64/2006.0/make.defaults b/profiles/default-linux/amd64/2006.0/make.defaults
index f41e56e88940..2361b99c611f 100644
--- a/profiles/default-linux/amd64/2006.0/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/make.defaults
@@ -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/amd64/2006.0/make.defaults,v 1.10 2006/03/10 15:24:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/make.defaults,v 1.11 2006/03/14 15:01:09 wolf31o2 Exp $
 
 FEATURES="sandbox autoconfig"
 
@@ -32,3 +32,6 @@ SYMLINK_LIB="yes"
 
 # Switch to nptl, but no nptlonly yet.
 USE="nptl -nptlonly"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/ia64/2006.0/make.defaults b/profiles/default-linux/ia64/2006.0/make.defaults
index 194601eb451e..36767dbdc672 100644
--- a/profiles/default-linux/ia64/2006.0/make.defaults
+++ b/profiles/default-linux/ia64/2006.0/make.defaults
@@ -1,5 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2006.0/make.defaults,v 1.2 2006/01/31 22:40:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2006.0/make.defaults,v 1.3 2006/03/14 14:53:01 wolf31o2 Exp $
 
 USE="apache2 cups eds encode foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mikmod motif ogg opengl oss pdflib png qt quicktime sdl spell truetype udev vorbis X xml2 xmms xv"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/mips/2006.0/make.defaults b/profiles/default-linux/mips/2006.0/make.defaults
index c78acccae5bd..1e03239bd34d 100644
--- a/profiles/default-linux/mips/2006.0/make.defaults
+++ b/profiles/default-linux/mips/2006.0/make.defaults
@@ -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/mips/2006.0/make.defaults,v 1.3 2006/01/31 22:52:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.0/make.defaults,v 1.4 2006/03/14 14:55:30 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -15,3 +15,6 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/mips/cobalt/2006.0/make.defaults b/profiles/default-linux/mips/cobalt/2006.0/make.defaults
index f7988559488f..d19fd1b44b28 100644
--- a/profiles/default-linux/mips/cobalt/2006.0/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2006.0/make.defaults
@@ -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/mips/cobalt/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2006.0/make.defaults,v 1.4 2006/03/14 14:55:32 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -24,3 +24,6 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults b/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults
index f0d6b6c510d4..4ab52212b301 100644
--- a/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults
@@ -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/mips/mips64/ip28/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults,v 1.4 2006/03/14 14:55:32 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -22,3 +22,6 @@ ACCEPT_KEYWORDS="mips"
 
 STAGE1_USE="ip28"
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults b/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults
index a87a7d2a9ff9..f4ccbb32c36e 100644
--- a/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults
@@ -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/mips/mips64/multilib/2006.0/make.defaults,v 1.4 2006/02/01 13:41:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults,v 1.5 2006/03/14 14:55:32 wolf31o2 Exp $
 
 USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales png xml acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
@@ -33,3 +33,6 @@ LIBDIR_n64="lib64"
 # In case someone wants to help out by setting FEATURES="multilib-strict"
 MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
 MULTILIB_STRICT_DENY="(64-bit|32-bit N32).*shared object"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults b/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults
index 9c13ec4bb986..9263e74a6a34 100644
--- a/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults
@@ -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/mips/mips64/n32/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults,v 1.4 2006/03/14 14:55:32 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -26,3 +26,6 @@ ACCEPT_KEYWORDS="mips ~mips"
 
 STAGE1_USE="n32"
 USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/ppc/ppc32/2006.0/make.defaults b/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
index a736752530f8..ae3933df8709 100644
--- a/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
+++ b/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
@@ -1,6 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.0/make.defaults,v 1.1 2006/02/22 10:44:12 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.0/make.defaults,v 1.2 2006/03/14 14:55:58 wolf31o2 Exp $
 
 STAGE1_USE="unicode"
 USE="${STAGE1_USE} alsa apache2 apm arts avi bitmap-fonts bonobo cdr cups dvd eds emboss encode esd foomaticdb fortran gdbm gif gnome gpm gstreamer gtk gtk2 gtkhtml imlib jpeg kde ldap libg++ libwww mad mikmod motif mozilla mp3 mpeg ogg opengl pam pdflib png qt quicktime ruby sdl spell truetype truetype-fonts type1-fonts udev vorbis X xml xmms xv"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/ppc/ppc64/2006.0/make.defaults b/profiles/default-linux/ppc/ppc64/2006.0/make.defaults
new file mode 100644
index 000000000000..c98d4f28cfce
--- /dev/null
+++ b/profiles/default-linux/ppc/ppc64/2006.0/make.defaults
@@ -0,0 +1,2 @@
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/s390/2006.0/make.defaults b/profiles/default-linux/s390/2006.0/make.defaults
index 3ebf9a705601..1655fa13f450 100644
--- a/profiles/default-linux/s390/2006.0/make.defaults
+++ b/profiles/default-linux/s390/2006.0/make.defaults
@@ -1 +1,4 @@
 USE="nptl unicode"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/sparc/sparc32/2006.0/make.defaults b/profiles/default-linux/sparc/sparc32/2006.0/make.defaults
index 041ddf360084..a181bc9b5068 100644
--- a/profiles/default-linux/sparc/sparc32/2006.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2006.0/make.defaults
@@ -1,6 +1,9 @@
 # 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/sparc32/2006.0/make.defaults,v 1.6 2006/02/09 17:14:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2006.0/make.defaults,v 1.7 2006/03/14 14:58:35 wolf31o2 Exp $
 
 # USE settings
 USE="apache2 berkdb bitmap-fonts crypt cups dlloader fortran fbcon foomaticdb gdbm gif gstreamer gtk gtk2 imlib jpeg libwww motif ncurses nls oss pam perl png python readline spell ssl tcpd truetype truetype-fonts type1-fonts udev X xml zlib"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/make.defaults b/profiles/default-linux/sparc/sparc64/2006.0/make.defaults
index 1b28bd68b903..fe774f910551 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2006.0/make.defaults
@@ -1,6 +1,9 @@
 # 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/sparc64/2006.0/make.defaults,v 1.10 2006/02/09 17:14:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/make.defaults,v 1.11 2006/03/14 14:58:59 wolf31o2 Exp $
 
 # USE settings
 USE="apache2 arts avi berkdb bitmap-fonts crypt cups dlloader eds encode esd fortran fbcon foomaticdb gdbm gcc64 gif gstreamer gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls nptl ogg oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts udev vorbis X xv xml xmms zlib"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"
diff --git a/profiles/default-linux/x86/2006.0/make.defaults b/profiles/default-linux/x86/2006.0/make.defaults
index 8737d0d0ba98..105b5a4c45e4 100644
--- a/profiles/default-linux/x86/2006.0/make.defaults
+++ b/profiles/default-linux/x86/2006.0/make.defaults
@@ -1,9 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.0/make.defaults,v 1.6 2006/01/31 23:03:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.0/make.defaults,v 1.7 2006/03/14 14:49:22 wolf31o2 Exp $
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
 #STAGE1_USE="nptl"
 
 USE="alsa apache2 apm arts avi cups eds emboss encode esd foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl ogg opengl oss pdflib png qt quicktime sdl spell truetype udev vorbis X xml xmms xv"
+
+# These are added to make dev-lang/php behave properly.  See bug #120088
+USE="${USE} apache2 cli ctype dba expat fastbuild force-cgi-redirect ftp gd memlimit nls pcre posix session simplexml soap sockets spl ssl tokenizer truetype xml xsl zlib"