Added nptlonly and INPUT_DEVICES to parent profile and win32codecs to desktop.

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 8ceaad7545d60673dae1fcd297a5db43b4ed5430..02d0046b640d13d5fc9728285278d424a5aa9ff4 100644 (file)
--- a/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults
+++ b/profiles/default-linux/x86/dev/2006.1/desktop/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/desktop/make.defaults,v 1.1 2006/03/14 15:09:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.1/desktop/make.defaults,v 1.2 2006/03/14 15:43:23 wolf31o2 Exp $
 
-USE="alsa apm arts avi dbus eds emboss encode esd gif gnome gpm gstreamer gtk gtk2 hal imlib jpeg kde mad mikmod motif mp3 mpeg ogg opengl oss pdflib png qt quicktime sdl spell truetype vorbis X xml xmms xv"
+USE="alsa apm arts avi dbus eds emboss encode esd gif gnome gpm gstreamer gtk gtk2 hal imlib jpeg kde mad mikmod motif mp3 mpeg ogg opengl oss pdflib png qt quicktime sdl spell truetype vorbis win32codecs X xml xmms xv"

diff --git a/profiles/default-linux/x86/dev/2006.1/make.defaults b/profiles/default-linux/x86/dev/2006.1/make.defaults
index 40f3eafab0c4e36b7a4c2d713d067a8ea44699e9..e496506c08c0b5e404ec412d439eeec69b6571a4 100644 (file)
--- a/profiles/default-linux/x86/dev/2006.1/make.defaults
+++ b/profiles/default-linux/x86/dev/2006.1/make.defaults
@@ -1,9 +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.1 2006/03/14 15:13:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.1/make.defaults,v 1.2 2006/03/14 15:43:23 wolf31o2 Exp $
 
 # This is currently commented so that the stage1 tarball can also be used to
 # build no-nptl systems.
-#STAGE1_USE="nptl"
+STAGE1_USE="nptl nptlonly"
 
-USE="cups foomaticdb gdbm gpm ldap libg++ nptl udev"
+# These USE flags are what is common between the various sub-profiles.
+USE="cups foomaticdb gdbm gpm ldap libg++ nptl nptlonly udev"
+
+# By default, we enable keyboard and mouse support for the modular X.Org server.
+INPUT_DEVICES="mouse keyboard"