Adding qt3 and qt4 USE flags.

6 files changed, 24 insertions, 16 deletions

diff --git a/profiles/default-linux/amd64/2005.0/make.defaults b/profiles/default-linux/amd64/2005.0/make.defaults
index c0e9bb0a03ec..8a6f298ef68d 100644
--- a/profiles/default-linux/amd64/2005.0/make.defaults
+++ b/profiles/default-linux/amd64/2005.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/2005.0/make.defaults,v 1.22 2006/06/09 15:12:46 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/make.defaults,v 1.23 2006/06/27 15:32:37 wolf31o2 Exp $
 
 #removed because managers vote requires us to do so
 #("when we go nptl, we all go nptl")
@@ -11,4 +11,4 @@
 # that point.
 FEATURES="sandbox autoconfig -multilib-pkg"
 
-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"
+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 qt3 qt4 quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2005.1/make.defaults b/profiles/default-linux/amd64/2005.1/make.defaults
index c34d7b030d9f..b5d8e7e892d8 100644
--- a/profiles/default-linux/amd64/2005.1/make.defaults
+++ b/profiles/default-linux/amd64/2005.1/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/2005.1/make.defaults,v 1.8 2006/06/09 15:12:46 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/make.defaults,v 1.9 2006/06/27 15:32:37 wolf31o2 Exp $
 
 #removed because managers vote requires us to do so
 #("when we go nptl, we all go nptl")
@@ -11,4 +11,4 @@
 # that point.
 FEATURES="sandbox autoconfig -multilib-pkg"
 
-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"
+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 qt3 qt4 quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2006.0/make.defaults b/profiles/default-linux/amd64/2006.0/make.defaults
index 7ee30f7d7b77..21bb812fffaf 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.18 2006/06/10 00:59:13 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/make.defaults,v 1.19 2006/06/27 15:32:37 wolf31o2 Exp $
 
 FEATURES="sandbox autoconfig"
 
@@ -12,4 +12,4 @@ SYMLINK_LIB="yes"
 # Switch to nptl, but no nptlonly yet.
 USE="nptl -nptlonly"
 
-USE="${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"
+USE="${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 qt3 qt4 quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2006.1/desktop/make.defaults b/profiles/default-linux/amd64/2006.1/desktop/make.defaults
index 7137471fae12..4dfdaf9e8836 100644
--- a/profiles/default-linux/amd64/2006.1/desktop/make.defaults
+++ b/profiles/default-linux/amd64/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/amd64/2006.1/desktop/make.defaults,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.1/desktop/make.defaults,v 1.2 2006/06/27 15:32:37 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 ldap 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 firefox gif gnome gpm gstreamer gtk gtk2 hal jpeg kde ldap mad mikmod mp3 mpeg ogg opengl oss pdflib png qt3 qt4 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/amd64/2006.1/make.defaults b/profiles/default-linux/amd64/2006.1/make.defaults
index 8f18fef15350..b6c2a07cbc0c 100644
--- a/profiles/default-linux/amd64/2006.1/make.defaults
+++ b/profiles/default-linux/amd64/2006.1/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.1/make.defaults,v 1.2 2006/06/11 02:38:38 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.1/make.defaults,v 1.3 2006/06/27 15:32:37 wolf31o2 Exp $
 
 ABI=amd64
 
@@ -11,11 +11,7 @@ STAGE1_USE="nptl nptlonly unicode"
 
 # General 2006.1 profile settings
 # These USE flags are what is common between the various sub-profiles.
-USE="cups gdbm gpm libg++ nptl nptlonly udev unicode"
-# Possibly removed in the future.
-USE="${USE} foomaticdb"
-# Possibly added in the future
-#USE="${USE} ppds"
+USE="cups gdbm gpm libg++ nptl nptlonly ppds udev unicode"
 
 # By default, we enable keyboard and mouse support for the modular X.Org server.
-INPUT_DEVICES="mouse keyboard"
+INPUT_DEVICES="evdev mouse keyboard"
diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
index cbdf4d96d531..e5be46280673 100644
--- a/profiles/default-linux/amd64/ChangeLog
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.4 2006/06/26 03:13:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.5 2006/06/27 15:32:37 wolf31o2 Exp $
+
+  27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> 2005.0/make.defaults,
+  2005.1/make.defaults, 2006.0/make.defaults, 2006.1/desktop/make.defaults,
+  2006.1/make.defaults:
+  I made a few changes to the AMD64 profiles.  This brings the profiles mostly
+  in line with the x86 profiles.
+  
+  * Added qt3 and qt4 to default USE on 2005.0, 2005.1, and 2006.0 profiles
+  * Replaced qt with qt3 and qt4 on the 2006.1/desktop profile
+  * Added firefox to the default USE on the 2006.1/desktop profile
+  * Removed foomaticdb from the default USE on the 2006.1 profile
+  * Added ppds to the default USE on the 2006.1 profile
 
   20 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org> make.defaults:
   Added ASFLAGS_x86