Adjusted new default USE flags for dev-lang/php to be quite minimal. This (finally) closes bug #120088.

16 files changed, 21 insertions, 57 deletions

diff --git a/profiles/default-linux/alpha/2006.0/make.defaults b/profiles/default-linux/alpha/2006.0/make.defaults
index 72065c31c4a8..8f78b500668c 100644
--- a/profiles/default-linux/alpha/2006.0/make.defaults
+++ b/profiles/default-linux/alpha/2006.0/make.defaults
@@ -1,12 +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/alpha/2006.0/make.defaults,v 1.6 2006/03/14 14:51:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2006.0/make.defaults,v 1.7 2006/04/19 14:48:01 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/alpha/no-nptl/make.defaults b/profiles/default-linux/alpha/no-nptl/make.defaults
index fe42287349b6..d907ae4c8bb4 100644
--- a/profiles/default-linux/alpha/no-nptl/make.defaults
+++ b/profiles/default-linux/alpha/no-nptl/make.defaults
@@ -1,10 +1,7 @@
 # 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/no-nptl/make.defaults,v 1.5 2006/03/14 17:00:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/no-nptl/make.defaults,v 1.6 2006/04/19 14:48:01 wolf31o2 Exp $
 
 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 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 08e9daa3eb2b..11966be42fda 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.14 2006/04/09 13:18:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/make.defaults,v 1.15 2006/04/19 14:48:02 wolf31o2 Exp $
 
 FEATURES="sandbox autoconfig"
 
@@ -34,6 +34,3 @@ 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/amd64/make.defaults b/profiles/default-linux/amd64/make.defaults
index 6afb48b2c11a..ce79275da850 100644
--- a/profiles/default-linux/amd64/make.defaults
+++ b/profiles/default-linux/amd64/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.12 2006/04/09 13:18:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.13 2006/04/19 14:48:01 wolf31o2 Exp $
 
 # Default USE flags for amd64 (Systems and GRP)
-USE="alsa avi berkdb crypt cups eds emboss encode foomaticdb gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde lzw lzw-tiff mp3 mpeg ncurses nls opengl pam pdflib perl png python qt quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv -java"
+USE="alsa avi berkdb crypt cups eds emboss encode foomaticdb gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde lzw lzw-tiff mp3 mpeg ncurses nls opengl pam pdflib perl png python qt quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
diff --git a/profiles/default-linux/ia64/2006.0/make.defaults b/profiles/default-linux/ia64/2006.0/make.defaults
index 36767dbdc672..e786fc19acd8 100644
--- a/profiles/default-linux/ia64/2006.0/make.defaults
+++ b/profiles/default-linux/ia64/2006.0/make.defaults
@@ -1,8 +1,5 @@
 # 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.3 2006/03/14 14:53:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2006.0/make.defaults,v 1.4 2006/04/19 14:48:02 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/make.defaults b/profiles/default-linux/make.defaults
index dbdbdbbcac57..51a258433793 100644
--- a/profiles/default-linux/make.defaults
+++ b/profiles/default-linux/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/make.defaults,v 1.16 2006/03/29 19:02:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.17 2006/04/19 14:48:01 wolf31o2 Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -20,6 +20,6 @@ USE="${USE} fortran"
 # Modular X: Support direct rendering by default
 USE="${USE} dri"
 
-# 2006/03/13 - Chris Gianelloni <wolf31o2@gentoo.org>
+# 2006/04/19 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Make sure dev-lang/php works right.  See bug #120088 for more info.
-#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"
+USE="${USE} cli pcre reflection session spl"
diff --git a/profiles/default-linux/mips/2006.0/make.defaults b/profiles/default-linux/mips/2006.0/make.defaults
index 1e03239bd34d..09bdf5901cc9 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.4 2006/03/14 14:55:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.0/make.defaults,v 1.5 2006/04/19 14:48:02 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -15,6 +15,3 @@ 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 d19fd1b44b28..1224edf43b5c 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.4 2006/03/14 14:55:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2006.0/make.defaults,v 1.5 2006/04/19 14:48:02 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -24,6 +24,3 @@ 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 4ab52212b301..360f13cd1c43 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.4 2006/03/14 14:55:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults,v 1.5 2006/04/19 14:48:02 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -22,6 +22,3 @@ 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 f4ccbb32c36e..1148cd385309 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.5 2006/03/14 14:55:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults,v 1.6 2006/04/19 14:48:02 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,6 +33,3 @@ 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 9263e74a6a34..61209784ed95 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.4 2006/03/14 14:55:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults,v 1.5 2006/04/19 14:48:02 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -26,6 +26,3 @@ 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 754571841a24..ee788635eb3b 100644
--- a/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
+++ b/profiles/default-linux/ppc/ppc32/2006.0/make.defaults
@@ -1,13 +1,10 @@
 # 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.3 2006/03/29 19:15:16 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc32/2006.0/make.defaults,v 1.4 2006/04/19 14:48:02 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"
-
 # 2006/03/29 - Stefan Schweizer <genstef@gentoo.org>
 # isdn USE flag defaults
 USE="${USE} pppd isdnlog"
diff --git a/profiles/default-linux/ppc/ppc64/2006.0/make.defaults b/profiles/default-linux/ppc/ppc64/2006.0/make.defaults
deleted file mode 100644
index c98d4f28cfce..000000000000
--- a/profiles/default-linux/ppc/ppc64/2006.0/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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 1655fa13f450..6c82c8128966 100644
--- a/profiles/default-linux/s390/2006.0/make.defaults
+++ b/profiles/default-linux/s390/2006.0/make.defaults
@@ -1,4 +1,2 @@
+STAGE1_USE="nptl unicode"
 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/x86/2006.0/make.defaults b/profiles/default-linux/x86/2006.0/make.defaults
index 102e8b6f236f..93f73ce31d0b 100644
--- a/profiles/default-linux/x86/2006.0/make.defaults
+++ b/profiles/default-linux/x86/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/x86/2006.0/make.defaults,v 1.8 2006/03/29 19:06:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2006.0/make.defaults,v 1.9 2006/04/19 14:48:02 wolf31o2 Exp $
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
@@ -8,9 +8,6 @@
 
 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"
-
 # 2006/03/29 - Stefan Schweizer <genstef@gentoo.org>
 # isdn USE flag defaults
 USE="${USE} pppd isdnlog"
diff --git a/profiles/default-linux/x86/no-nptl/make.defaults b/profiles/default-linux/x86/no-nptl/make.defaults
index 81f421210ef9..694921deef7a 100644
--- a/profiles/default-linux/x86/no-nptl/make.defaults
+++ b/profiles/default-linux/x86/no-nptl/make.defaults
@@ -1,10 +1,11 @@
 # 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/no-nptl/make.defaults,v 1.5 2006/03/14 16:59:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/no-nptl/make.defaults,v 1.6 2006/04/19 14:48:02 wolf31o2 Exp $
 
 STAGE1_USE="-nptl"
 
 USE="alsa apm arts avi bitmap-fonts cups eds emboss encode fortran 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 truetype-fonts type1-fonts 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"
+# 2006/03/29 - Stefan Schweizer <genstef@gentoo.org>
+# isdn USE flag defaults
+USE="${USE} pppd isdnlog"