summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/cobalt-mips-1.4/use.defaults2
-rw-r--r--profiles/cobalt-mips-2004.1/use.defaults2
-rw-r--r--profiles/default-1.0-gcc3/packages2
-rw-r--r--profiles/default-1.0-gcc3/use.defaults2
-rw-r--r--profiles/default-1.0-gcc3/virtuals8
-rw-r--r--profiles/default-1.0/packages2
-rw-r--r--profiles/default-1.0/use.defaults2
-rw-r--r--profiles/default-1.0/virtuals8
-rw-r--r--profiles/default-alpha-1.4/packages2
-rw-r--r--profiles/default-alpha-1.4/use.defaults2
-rw-r--r--profiles/default-alpha-1.4/virtuals8
-rw-r--r--profiles/default-alpha-2004.0/packages2
-rw-r--r--profiles/default-alpha-2004.0/use.defaults2
-rw-r--r--profiles/default-alpha-2004.0/virtuals8
-rw-r--r--profiles/default-amd64-1.4/packages2
-rw-r--r--profiles/default-amd64-1.4/use.defaults2
-rw-r--r--profiles/default-amd64-1.4/virtuals8
-rw-r--r--profiles/default-amd64-2004.0/packages2
-rw-r--r--profiles/default-amd64-2004.0/use.defaults2
-rw-r--r--profiles/default-amd64-2004.2/use.defaults2
-rw-r--r--profiles/default-ia64-1.4/packages2
-rw-r--r--profiles/default-ia64-1.4/use.defaults2
-rw-r--r--profiles/default-linux/ppc/1.0/virtuals8
-rw-r--r--profiles/default-linux/ppc/1.0_rc/virtuals8
-rw-r--r--profiles/default-linux/ppc/1.2/virtuals8
-rw-r--r--profiles/default-linux/ppc/1.4/virtuals8
-rw-r--r--profiles/default-linux/x86/xbox/packages4
-rw-r--r--profiles/default-mips64-1.4/use.defaults2
-rw-r--r--profiles/default-ppc-1.0/packages2
-rw-r--r--profiles/default-ppc-1.0/use.defaults2
-rw-r--r--profiles/default-ppc-1.0/virtuals8
-rw-r--r--profiles/default-ppc-1.4/use.defaults2
-rw-r--r--profiles/default-ppc-1.4/virtuals8
-rw-r--r--profiles/default-ppc/packages2
-rw-r--r--profiles/default-ppc/use.defaults2
-rw-r--r--profiles/default-ppc/virtuals6
-rw-r--r--profiles/default-s390-2004.0/use.defaults2
-rw-r--r--profiles/default-s390-2004.0/virtuals8
-rw-r--r--profiles/default-s390-2004.1/use.defaults2
-rw-r--r--profiles/default-s390-2004.1/virtuals8
-rw-r--r--profiles/default-sparc-1.4/packages2
-rw-r--r--profiles/default-sparc-2004.0/packages2
-rw-r--r--profiles/default-sparc64-1.4/packages2
-rw-r--r--profiles/default-sparc64-2004.0/packages2
-rw-r--r--profiles/default-x86-1.4/packages2
-rw-r--r--profiles/default-x86-1.4/use.defaults2
-rw-r--r--profiles/default-x86-1.4/virtuals8
-rw-r--r--profiles/default-x86-2004.0/packages2
-rw-r--r--profiles/default-x86-2004.0/virtuals8
-rw-r--r--profiles/default-x86-obsd-2004/virtuals8
-rw-r--r--profiles/embedded/virtuals8
-rw-r--r--profiles/gcc33-sparc64-1.4/packages2
-rw-r--r--profiles/gcc33-sparc64-1.4/use.defaults2
-rw-r--r--profiles/gcc33-sparc64-1.4/virtuals8
-rw-r--r--profiles/gcc34-amd64-2004.1/use.defaults2
-rw-r--r--profiles/hardened-x86-2004.0/packages4
-rw-r--r--profiles/hardened-x86-2004.0/use.defaults2
-rw-r--r--profiles/hardened-x86-2004.0/virtuals8
-rw-r--r--profiles/hardened/amd64/packages2
-rw-r--r--profiles/hardened/amd64/use.defaults2
-rw-r--r--profiles/hardened/x86/packages4
-rw-r--r--profiles/n32-mips-2004.1/use.defaults2
-rw-r--r--profiles/xbox-x86-2004.0/packages4
-rw-r--r--profiles/xbox-x86-2004.0/use.defaults2
-rw-r--r--profiles/xbox-x86-2004.0/virtuals8
65 files changed, 131 insertions, 131 deletions
diff --git a/profiles/cobalt-mips-1.4/use.defaults b/profiles/cobalt-mips-1.4/use.defaults
index eaa2388e2cf8..dc43358f674f 100644
--- a/profiles/cobalt-mips-1.4/use.defaults
+++ b/profiles/cobalt-mips-1.4/use.defaults
@@ -29,7 +29,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/cobalt-mips-2004.1/use.defaults b/profiles/cobalt-mips-2004.1/use.defaults
index eaa2388e2cf8..dc43358f674f 100644
--- a/profiles/cobalt-mips-2004.1/use.defaults
+++ b/profiles/cobalt-mips-2004.1/use.defaults
@@ -29,7 +29,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-1.0-gcc3/packages b/profiles/default-1.0-gcc3/packages
index 4491dc9fed95..7595853324a2 100644
--- a/profiles/default-1.0-gcc3/packages
+++ b/profiles/default-1.0-gcc3/packages
@@ -41,7 +41,7 @@ virtua/os-headers
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# sash - static shell for system recovery
*app-shells/sash
diff --git a/profiles/default-1.0-gcc3/use.defaults b/profiles/default-1.0-gcc3/use.defaults
index 59f420611733..2b2a99febebc 100644
--- a/profiles/default-1.0-gcc3/use.defaults
+++ b/profiles/default-1.0-gcc3/use.defaults
@@ -31,7 +31,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-1.0-gcc3/virtuals b/profiles/default-1.0-gcc3/virtuals
index 63027f1942e4..c664d2e41feb 100644
--- a/profiles/default-1.0-gcc3/virtuals
+++ b/profiles/default-1.0-gcc3/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
virtual/krb5 app-crypt/mit-krb5
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
virtual/jack media-sound/jack-audio-connection-kit
diff --git a/profiles/default-1.0/packages b/profiles/default-1.0/packages
index c09e6484c83d..7c2b553b8f25 100644
--- a/profiles/default-1.0/packages
+++ b/profiles/default-1.0/packages
@@ -47,7 +47,7 @@ virtual/os-headers
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.1.0-r2
+>=x11-base/xorg-x11-4.1.0-r2
# sash - static shell for system recovery
*app-shells/sash
diff --git a/profiles/default-1.0/use.defaults b/profiles/default-1.0/use.defaults
index 75fa300cedc4..605cc36f9d99 100644
--- a/profiles/default-1.0/use.defaults
+++ b/profiles/default-1.0/use.defaults
@@ -56,6 +56,6 @@ tcltk dev-lang/tcl dev-lang/tk
tcpd sys-apps/tcp-wrappers
tetex app-text/tetex
tiff media-libs/tiff
-X x11-base/xfree
+X x11-base/xorg-x11
diff --git a/profiles/default-1.0/virtuals b/profiles/default-1.0/virtuals
index d7c5768e1d4c..2379e568d059 100644
--- a/profiles/default-1.0/virtuals
+++ b/profiles/default-1.0/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -23,7 +23,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/default-alpha-1.4/packages b/profiles/default-alpha-1.4/packages
index b6d68e6e1591..3daa5e8d42ce 100644
--- a/profiles/default-alpha-1.4/packages
+++ b/profiles/default-alpha-1.4/packages
@@ -40,7 +40,7 @@
virtual/os-headers
>=app-admin/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/default-alpha-1.4/use.defaults b/profiles/default-alpha-1.4/use.defaults
index 3d98f58ed5ba..7fa6187cab0f 100644
--- a/profiles/default-alpha-1.4/use.defaults
+++ b/profiles/default-alpha-1.4/use.defaults
@@ -19,7 +19,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-alpha-1.4/virtuals b/profiles/default-alpha-1.4/virtuals
index 597cd9cea1ea..ab1d89d8647d 100644
--- a/profiles/default-alpha-1.4/virtuals
+++ b/profiles/default-alpha-1.4/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/alpha-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/compaq-jdk
@@ -23,7 +23,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/aboot
virtual/editor app-editors/nano
diff --git a/profiles/default-alpha-2004.0/packages b/profiles/default-alpha-2004.0/packages
index 1ab13ae97b25..fe6ff52057ee 100644
--- a/profiles/default-alpha-2004.0/packages
+++ b/profiles/default-alpha-2004.0/packages
@@ -97,4 +97,4 @@
*virtual/modutils
virtual/os-headers
*virtual/ssh
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
diff --git a/profiles/default-alpha-2004.0/use.defaults b/profiles/default-alpha-2004.0/use.defaults
index 3d98f58ed5ba..7fa6187cab0f 100644
--- a/profiles/default-alpha-2004.0/use.defaults
+++ b/profiles/default-alpha-2004.0/use.defaults
@@ -19,7 +19,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-alpha-2004.0/virtuals b/profiles/default-alpha-2004.0/virtuals
index caad46cab45c..4cddb0f01146 100644
--- a/profiles/default-alpha-2004.0/virtuals
+++ b/profiles/default-alpha-2004.0/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/alpha-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/compaq-jdk
@@ -23,7 +23,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/aboot
virtual/editor app-editors/nano
diff --git a/profiles/default-amd64-1.4/packages b/profiles/default-amd64-1.4/packages
index d248a9b20f57..e1203dc38a28 100644
--- a/profiles/default-amd64-1.4/packages
+++ b/profiles/default-amd64-1.4/packages
@@ -9,7 +9,7 @@
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/default-amd64-1.4/use.defaults b/profiles/default-amd64-1.4/use.defaults
index d8297770387e..0ee59561a754 100644
--- a/profiles/default-amd64-1.4/use.defaults
+++ b/profiles/default-amd64-1.4/use.defaults
@@ -30,7 +30,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-amd64-1.4/virtuals b/profiles/default-amd64-1.4/virtuals
index d9c3ea1300b7..c2278e8c4ff7 100644
--- a/profiles/default-amd64-1.4/virtuals
+++ b/profiles/default-amd64-1.4/virtuals
@@ -7,9 +7,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-dev-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -24,7 +24,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub-static
virtual/editor app-editors/nano
diff --git a/profiles/default-amd64-2004.0/packages b/profiles/default-amd64-2004.0/packages
index ac15c282f4ba..86caaaaf4b1e 100644
--- a/profiles/default-amd64-2004.0/packages
+++ b/profiles/default-amd64-2004.0/packages
@@ -9,7 +9,7 @@
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/default-amd64-2004.0/use.defaults b/profiles/default-amd64-2004.0/use.defaults
index d8297770387e..0ee59561a754 100644
--- a/profiles/default-amd64-2004.0/use.defaults
+++ b/profiles/default-amd64-2004.0/use.defaults
@@ -30,7 +30,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-amd64-2004.2/use.defaults b/profiles/default-amd64-2004.2/use.defaults
index 9100c21dbeca..a41758eb47c2 100644
--- a/profiles/default-amd64-2004.2/use.defaults
+++ b/profiles/default-amd64-2004.2/use.defaults
@@ -30,7 +30,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-ia64-1.4/packages b/profiles/default-ia64-1.4/packages
index b6d68e6e1591..3daa5e8d42ce 100644
--- a/profiles/default-ia64-1.4/packages
+++ b/profiles/default-ia64-1.4/packages
@@ -40,7 +40,7 @@
virtual/os-headers
>=app-admin/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/default-ia64-1.4/use.defaults b/profiles/default-ia64-1.4/use.defaults
index 3d98f58ed5ba..7fa6187cab0f 100644
--- a/profiles/default-ia64-1.4/use.defaults
+++ b/profiles/default-ia64-1.4/use.defaults
@@ -19,7 +19,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-linux/ppc/1.0/virtuals b/profiles/default-linux/ppc/1.0/virtuals
index dda82f8f729c..dd0ffd1e3d33 100644
--- a/profiles/default-linux/ppc/1.0/virtuals
+++ b/profiles/default-linux/ppc/1.0/virtuals
@@ -1,4 +1,4 @@
-virtual/glu x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/x11 x11-base/xfree
-virtual/xft x11-base/xfree
+virtual/glu x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
diff --git a/profiles/default-linux/ppc/1.0_rc/virtuals b/profiles/default-linux/ppc/1.0_rc/virtuals
index dda82f8f729c..dd0ffd1e3d33 100644
--- a/profiles/default-linux/ppc/1.0_rc/virtuals
+++ b/profiles/default-linux/ppc/1.0_rc/virtuals
@@ -1,4 +1,4 @@
-virtual/glu x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/x11 x11-base/xfree
-virtual/xft x11-base/xfree
+virtual/glu x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
diff --git a/profiles/default-linux/ppc/1.2/virtuals b/profiles/default-linux/ppc/1.2/virtuals
index 3f04c57ced7c..ff79dcb3d918 100644
--- a/profiles/default-linux/ppc/1.2/virtuals
+++ b/profiles/default-linux/ppc/1.2/virtuals
@@ -1,6 +1,6 @@
-virtual/glu x11-base/xfree
+virtual/glu x11-base/xorg-x11
virtual/jdk dev-java/blackdown-jdk
virtual/jre dev-java/blackdown-jre
-virtual/opengl x11-base/xfree
-virtual/x11 x11-base/xfree
-virtual/xft x11-base/xfree
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
diff --git a/profiles/default-linux/ppc/1.4/virtuals b/profiles/default-linux/ppc/1.4/virtuals
index 3f04c57ced7c..ff79dcb3d918 100644
--- a/profiles/default-linux/ppc/1.4/virtuals
+++ b/profiles/default-linux/ppc/1.4/virtuals
@@ -1,6 +1,6 @@
-virtual/glu x11-base/xfree
+virtual/glu x11-base/xorg-x11
virtual/jdk dev-java/blackdown-jdk
virtual/jre dev-java/blackdown-jre
-virtual/opengl x11-base/xfree
-virtual/x11 x11-base/xfree
-virtual/xft x11-base/xfree
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
diff --git a/profiles/default-linux/x86/xbox/packages b/profiles/default-linux/x86/xbox/packages
index 0418cfa9db4a..6adb4ac6c3d1 100644
--- a/profiles/default-linux/x86/xbox/packages
+++ b/profiles/default-linux/x86/xbox/packages
@@ -1,9 +1,9 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/packages,v 1.2 2004/11/04 17:12:38 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/packages,v 1.3 2005/01/04 06:52:00 spyderous Exp $
# version specific stuff for xbox support
>=app-misc/lirc-0.7.0_pre6
->=x11-base/xfree-4.3.0-r6
+>=x11-base/xorg-x11-4.3.0-r6
>=media-sound/alsa-driver-1.0.5a
>=x11-base/xorg-6.8.0-r2
diff --git a/profiles/default-mips64-1.4/use.defaults b/profiles/default-mips64-1.4/use.defaults
index eaa2388e2cf8..dc43358f674f 100644
--- a/profiles/default-mips64-1.4/use.defaults
+++ b/profiles/default-mips64-1.4/use.defaults
@@ -29,7 +29,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-ppc-1.0/packages b/profiles/default-ppc-1.0/packages
index eb2ee503b86f..3e847530dcce 100644
--- a/profiles/default-ppc-1.0/packages
+++ b/profiles/default-ppc-1.0/packages
@@ -80,7 +80,7 @@ sys-kernel/ppc-sources
sys-apps/sysklogd
*>=dev-lang/python-2.2-r4
->=x11-base/xfree-4.1.0-r2
+>=x11-base/xorg-x11-4.1.0-r2
*virtual/editor
#*app-editors/vim # Vim emerges xfree ... this sucks
*sys-fs/hfsutils
diff --git a/profiles/default-ppc-1.0/use.defaults b/profiles/default-ppc-1.0/use.defaults
index 424731eff4b2..a690f140a8f5 100644
--- a/profiles/default-ppc-1.0/use.defaults
+++ b/profiles/default-ppc-1.0/use.defaults
@@ -32,7 +32,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-ppc-1.0/virtuals b/profiles/default-ppc-1.0/virtuals
index 3624c27cc345..6d15ec493642 100644
--- a/profiles/default-ppc-1.0/virtuals
+++ b/profiles/default-ppc-1.0/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -23,7 +23,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/yaboot
virtual/editor app-editors/nano
diff --git a/profiles/default-ppc-1.4/use.defaults b/profiles/default-ppc-1.4/use.defaults
index 1add5167de93..7985f2e13397 100644
--- a/profiles/default-ppc-1.4/use.defaults
+++ b/profiles/default-ppc-1.4/use.defaults
@@ -32,7 +32,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-ppc-1.4/virtuals b/profiles/default-ppc-1.4/virtuals
index f3c8a7362a28..59af5072633e 100644
--- a/profiles/default-ppc-1.4/virtuals
+++ b/profiles/default-ppc-1.4/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -24,7 +24,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/yaboot
virtual/editor app-editors/nano
diff --git a/profiles/default-ppc/packages b/profiles/default-ppc/packages
index 4db13358ffc9..14220f97bfd1 100644
--- a/profiles/default-ppc/packages
+++ b/profiles/default-ppc/packages
@@ -53,7 +53,7 @@ sys-boot/grub
sys-apps/sysklogd
*>=dev-lang/python-2.2-r4
->=x11-base/xfree-4.1.0-r2
+>=x11-base/xorg-x11-4.1.0-r2
*virtual/editor
#*app-editors/vim # Vim emerges xfree ... this sucks
*sys-fs/hfsutils
diff --git a/profiles/default-ppc/use.defaults b/profiles/default-ppc/use.defaults
index 564ded9f5c05..3d6984b4c126 100644
--- a/profiles/default-ppc/use.defaults
+++ b/profiles/default-ppc/use.defaults
@@ -31,7 +31,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-ppc/virtuals b/profiles/default-ppc/virtuals
index 49c93d73254c..6631b16013f9 100644
--- a/profiles/default-ppc/virtuals
+++ b/profiles/default-ppc/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/ibm-jdk-bin
diff --git a/profiles/default-s390-2004.0/use.defaults b/profiles/default-s390-2004.0/use.defaults
index b11ffd22aa00..988d986fc803 100644
--- a/profiles/default-s390-2004.0/use.defaults
+++ b/profiles/default-s390-2004.0/use.defaults
@@ -20,7 +20,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
tcpd sys-apps/tcp-wrappers
pam sys-libs/pam
diff --git a/profiles/default-s390-2004.0/virtuals b/profiles/default-s390-2004.0/virtuals
index adcacbc6b732..2eb4655ed1bb 100644
--- a/profiles/default-s390-2004.0/virtuals
+++ b/profiles/default-s390-2004.0/virtuals
@@ -5,9 +5,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -27,7 +27,7 @@ virtual/mda mail-filter/procmail
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-s390-2004.1/use.defaults b/profiles/default-s390-2004.1/use.defaults
index b11ffd22aa00..988d986fc803 100644
--- a/profiles/default-s390-2004.1/use.defaults
+++ b/profiles/default-s390-2004.1/use.defaults
@@ -20,7 +20,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
tcpd sys-apps/tcp-wrappers
pam sys-libs/pam
diff --git a/profiles/default-s390-2004.1/virtuals b/profiles/default-s390-2004.1/virtuals
index adcacbc6b732..2eb4655ed1bb 100644
--- a/profiles/default-s390-2004.1/virtuals
+++ b/profiles/default-s390-2004.1/virtuals
@@ -5,9 +5,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -27,7 +27,7 @@ virtual/mda mail-filter/procmail
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-sparc-1.4/packages b/profiles/default-sparc-1.4/packages
index d9c5135287f2..4a5ce31a0a2a 100644
--- a/profiles/default-sparc-1.4/packages
+++ b/profiles/default-sparc-1.4/packages
@@ -52,7 +52,7 @@
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
*app-shells/sash
*dev-lang/perl
*virtual/editor
diff --git a/profiles/default-sparc-2004.0/packages b/profiles/default-sparc-2004.0/packages
index 32e20ad6cffa..fbb5bf3b7dcc 100644
--- a/profiles/default-sparc-2004.0/packages
+++ b/profiles/default-sparc-2004.0/packages
@@ -53,7 +53,7 @@
*dev-lang/python
*app-portage/gentoolkit
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
*app-shells/sash
*dev-lang/perl
*virtual/editor
diff --git a/profiles/default-sparc64-1.4/packages b/profiles/default-sparc64-1.4/packages
index 9f06fab8d6b1..d07d35529703 100644
--- a/profiles/default-sparc64-1.4/packages
+++ b/profiles/default-sparc64-1.4/packages
@@ -70,7 +70,7 @@
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
*app-shells/sash
*dev-lang/perl
*virtual/editor
diff --git a/profiles/default-sparc64-2004.0/packages b/profiles/default-sparc64-2004.0/packages
index fd255882a460..3ef9cee4fb3a 100644
--- a/profiles/default-sparc64-2004.0/packages
+++ b/profiles/default-sparc64-2004.0/packages
@@ -71,7 +71,7 @@
*dev-lang/python
*app-portage/gentoolkit
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
*app-shells/sash
*dev-lang/perl
*virtual/editor
diff --git a/profiles/default-x86-1.4/packages b/profiles/default-x86-1.4/packages
index 04acb4e0329e..80f84d2ffd14 100644
--- a/profiles/default-x86-1.4/packages
+++ b/profiles/default-x86-1.4/packages
@@ -44,7 +44,7 @@ virtual/os-headers
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/default-x86-1.4/use.defaults b/profiles/default-x86-1.4/use.defaults
index 36b4bbadb579..4559d5c166ca 100644
--- a/profiles/default-x86-1.4/use.defaults
+++ b/profiles/default-x86-1.4/use.defaults
@@ -31,7 +31,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/default-x86-1.4/virtuals b/profiles/default-x86-1.4/virtuals
index 076d50826298..c2356a7d69f2 100644
--- a/profiles/default-x86-1.4/virtuals
+++ b/profiles/default-x86-1.4/virtuals
@@ -7,9 +7,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -24,7 +24,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/default-x86-2004.0/packages b/profiles/default-x86-2004.0/packages
index 04acb4e0329e..80f84d2ffd14 100644
--- a/profiles/default-x86-2004.0/packages
+++ b/profiles/default-x86-2004.0/packages
@@ -44,7 +44,7 @@ virtual/os-headers
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/default-x86-2004.0/virtuals b/profiles/default-x86-2004.0/virtuals
index e304e045cb27..08e1c41da574 100644
--- a/profiles/default-x86-2004.0/virtuals
+++ b/profiles/default-x86-2004.0/virtuals
@@ -7,9 +7,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -24,7 +24,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/default-x86-obsd-2004/virtuals b/profiles/default-x86-obsd-2004/virtuals
index 70668e8a961f..8688deaa0be9 100644
--- a/profiles/default-x86-obsd-2004/virtuals
+++ b/profiles/default-x86-obsd-2004/virtuals
@@ -5,9 +5,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
index 9250321f709a..63eeb3d6a7c4 100644
--- a/profiles/embedded/virtuals
+++ b/profiles/embedded/virtuals
@@ -12,7 +12,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/glu x11-base/xfree
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -30,7 +30,7 @@ virtual/lpr net-print/cups
virtual/mda mail-filter/procmail
virtual/modutils sys-apps/modutils
virtual/mta mail-mta/ssmtp
-virtual/opengl x11-base/xfree
+virtual/opengl x11-base/xorg-x11
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
@@ -47,6 +47,6 @@ virtual/textbrowser net-www/links
virtual/tftp net-ftp/tftp-hpa
virtual/wine app-emulation/wine
virtual/winkernel sys-kernel/win4lin-sources
-virtual/x11 x11-base/xfree
+virtual/x11 x11-base/xorg-x11
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
diff --git a/profiles/gcc33-sparc64-1.4/packages b/profiles/gcc33-sparc64-1.4/packages
index 8cbdb590d62d..0e7df6bd050c 100644
--- a/profiles/gcc33-sparc64-1.4/packages
+++ b/profiles/gcc33-sparc64-1.4/packages
@@ -69,7 +69,7 @@
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.2.1
+>=x11-base/xorg-x11-4.2.1
*app-shells/sash
*dev-lang/perl
*virtual/editor
diff --git a/profiles/gcc33-sparc64-1.4/use.defaults b/profiles/gcc33-sparc64-1.4/use.defaults
index 532fa8e78b88..20895b1870c8 100644
--- a/profiles/gcc33-sparc64-1.4/use.defaults
+++ b/profiles/gcc33-sparc64-1.4/use.defaults
@@ -20,7 +20,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/gcc33-sparc64-1.4/virtuals b/profiles/gcc33-sparc64-1.4/virtuals
index a2284d84b1af..042ae4b9e4ee 100644
--- a/profiles/gcc33-sparc64-1.4/virtuals
+++ b/profiles/gcc33-sparc64-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -27,7 +27,7 @@ virtual/mda mail-filter/procmail
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/gcc34-amd64-2004.1/use.defaults b/profiles/gcc34-amd64-2004.1/use.defaults
index d8297770387e..0ee59561a754 100644
--- a/profiles/gcc34-amd64-2004.1/use.defaults
+++ b/profiles/gcc34-amd64-2004.1/use.defaults
@@ -30,7 +30,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/hardened-x86-2004.0/packages b/profiles/hardened-x86-2004.0/packages
index dd13e5ed55df..674ea4a612df 100644
--- a/profiles/hardened-x86-2004.0/packages
+++ b/profiles/hardened-x86-2004.0/packages
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/packages,v 1.8 2004/12/01 14:04:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/packages,v 1.9 2005/01/04 06:52:00 spyderous Exp $
# base system stuff
>dev-lang/gpc-2.1
@@ -19,7 +19,7 @@ virtual/os-headers
# regular package defs
>=app-admin/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# <zhen@gentoo.org> waiting for solar ...
#*app-misc/pax-utils
*app-shells/sash
diff --git a/profiles/hardened-x86-2004.0/use.defaults b/profiles/hardened-x86-2004.0/use.defaults
index 20479174f093..1b53c7c68afc 100644
--- a/profiles/hardened-x86-2004.0/use.defaults
+++ b/profiles/hardened-x86-2004.0/use.defaults
@@ -31,7 +31,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/hardened-x86-2004.0/virtuals b/profiles/hardened-x86-2004.0/virtuals
index fff8c445c55c..79fad00e2150 100644
--- a/profiles/hardened-x86-2004.0/virtuals
+++ b/profiles/hardened-x86-2004.0/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -23,7 +23,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/hardened/amd64/packages b/profiles/hardened/amd64/packages
index 2076e24b8557..0b9928e40152 100644
--- a/profiles/hardened/amd64/packages
+++ b/profiles/hardened/amd64/packages
@@ -9,7 +9,7 @@
>=sys-apps/sysklogd-1.4.1
*dev-lang/python
->=x11-base/xfree-4.3.0-r6
+>=x11-base/xorg-x11-4.3.0-r6
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
diff --git a/profiles/hardened/amd64/use.defaults b/profiles/hardened/amd64/use.defaults
index d8297770387e..0ee59561a754 100644
--- a/profiles/hardened/amd64/use.defaults
+++ b/profiles/hardened/amd64/use.defaults
@@ -30,7 +30,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/hardened/x86/packages b/profiles/hardened/x86/packages
index a5b78e41ad62..86f8c995f92d 100644
--- a/profiles/hardened/x86/packages
+++ b/profiles/hardened/x86/packages
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.6 2004/12/01 14:04:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.7 2005/01/04 06:52:00 spyderous Exp $
# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
@@ -37,7 +37,7 @@
*>=sys-devel/binutils-2.13.90.0.4
->=x11-base/xfree-4.1.0-r2
+>=x11-base/xorg-x11-4.1.0-r2
*sys-devel/bin86
*sys-devel/libtool
diff --git a/profiles/n32-mips-2004.1/use.defaults b/profiles/n32-mips-2004.1/use.defaults
index eaa2388e2cf8..dc43358f674f 100644
--- a/profiles/n32-mips-2004.1/use.defaults
+++ b/profiles/n32-mips-2004.1/use.defaults
@@ -29,7 +29,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/xbox-x86-2004.0/packages b/profiles/xbox-x86-2004.0/packages
index ec9296d2bc51..65e8955dce7a 100644
--- a/profiles/xbox-x86-2004.0/packages
+++ b/profiles/xbox-x86-2004.0/packages
@@ -45,7 +45,7 @@ virtual/os-headers
*dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xorg-x11-4.1.0-r12
# sash - static shell for system recovery
*app-shells/sash
*dev-lang/perl
@@ -109,6 +109,6 @@ virtual/os-headers
# version specific stuff for xbox support
>=app-misc/lirc-0.7.0_pre6
->=x11-base/xfree-4.3.0-r6
+>=x11-base/xorg-x11-4.3.0-r6
>=media-sound/alsa-driver-1.0.5a
>=x11-base/xorg-x11-6.8.0-r2
diff --git a/profiles/xbox-x86-2004.0/use.defaults b/profiles/xbox-x86-2004.0/use.defaults
index 36b4bbadb579..4559d5c166ca 100644
--- a/profiles/xbox-x86-2004.0/use.defaults
+++ b/profiles/xbox-x86-2004.0/use.defaults
@@ -31,7 +31,7 @@ guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
+X x11-base/xorg-x11
sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
diff --git a/profiles/xbox-x86-2004.0/virtuals b/profiles/xbox-x86-2004.0/virtuals
index beb67b86697e..683576a0f079 100644
--- a/profiles/xbox-x86-2004.0/virtuals
+++ b/profiles/xbox-x86-2004.0/virtuals
@@ -6,9 +6,9 @@ virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/xbox-sources
virtual/glibc sys-libs/glibc
virtual/libc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
+virtual/x11 x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/glu x11-base/xorg-x11
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -23,7 +23,7 @@ virtual/php dev-php/mod_php
virtual/httpd-php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda mail-filter/procmail
-virtual/xft x11-base/xfree
+virtual/xft x11-base/xorg-x11
virtual/krb5 app-crypt/mit-krb5
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano