Removed ldap from 2006.1 profile and moved it to the sub-profiles, since we don't want to build 'system' with LDAP support.

3 files changed, 6 insertions, 6 deletions

diff --git a/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults b/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults
index 97cfe60d564e..fbc49cddb5e8 100644
--- a/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults
+++ b/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults
@@ -1,11 +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/dev/2006.1/desktop/make.defaults,v 1.8 2006/06/06 16:02:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults,v 1.9 2006/06/07 01:20:55 wolf31o2 Exp $
 
 # This will be commented and replaced with just STAGE1_USE="unicode" if we do
 # not end up with a stable glibc 2.4 by 2006.1's release.
 STAGE1_USE="nptl nptlonly unicode"
 
-USE="alsa arts avi cairo cdr dbus dvd dvdr eds emboss encode esd fam gif gnome gpm gstreamer gtk gtk2 hal jpeg kde mad mikmod mp3 mpeg ogg opengl oss pdflib png qt quicktime sdl spell truetype vorbis win32codecs unicode X xml xv"
+USE="alsa arts avi cairo cdr dbus dvd dvdr eds emboss encode esd fam gif gnome gpm gstreamer gtk gtk2 hal jpeg kde ldap mad mikmod mp3 mpeg ogg opengl oss pdflib png qt quicktime sdl spell truetype vorbis win32codecs unicode X xml xv"
 # Possible flags for removal (gentoo-dev mailing list)
 USE="${USE} apm imlib motif xmms"
diff --git a/profiles/default-linux/x86/dev/2006.1/make.defaults b/profiles/default-linux/x86/dev/2006.1/make.defaults
index d0fe187df2fa..7480c985644d 100644
--- a/profiles/default-linux/x86/dev/2006.1/make.defaults
+++ b/profiles/default-linux/x86/dev/2006.1/make.defaults
@@ -1,13 +1,13 @@
 # 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/dev/2006.1/make.defaults,v 1.5 2006/06/06 13:57:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.1/make.defaults,v 1.6 2006/06/07 01:20:55 wolf31o2 Exp $
 
 # This will be commented and replaced with just STAGE1_USE="unicode" if we do
 # not end up with a stable glibc 2.4 by 2006.1's release.
 STAGE1_USE="nptl nptlonly"
 
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm gpm ldap libg++ nptl nptlonly udev"
+USE="cups gdbm gpm libg++ nptl nptlonly udev"
 # Pooibly removed in the future.
 USE="${USE} foomaticdb"
 # Possibly added in the future
diff --git a/profiles/default-linux/x86/dev/2006.1/server/make.defaults b/profiles/default-linux/x86/dev/2006.1/server/make.defaults
index 442c72c43f56..bdd5bf1209d0 100644
--- a/profiles/default-linux/x86/dev/2006.1/server/make.defaults
+++ b/profiles/default-linux/x86/dev/2006.1/server/make.defaults
@@ -1,5 +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/x86/dev/2006.1/server/make.defaults,v 1.2 2006/04/19 14:56:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.1/server/make.defaults,v 1.3 2006/06/07 01:20:55 wolf31o2 Exp $
 
-USE="apache2 ctype dba expat fastbuild force-cgi-redirect ftp gd mailwrapper memlimit mysql posix simplexml snmp soap sockets tokenizer truetype xml xsl"
+USE="apache2 ldap mailwrapper mysql snmp truetype xml"