summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/base/virtuals10
-rw-r--r--profiles/build-ppc/virtuals2
-rw-r--r--profiles/build/virtuals2
-rw-r--r--profiles/cobalt-mips-1.4/virtuals8
-rw-r--r--profiles/default-1.0-gcc3/virtuals8
-rw-r--r--profiles/default-1.0/virtuals8
-rw-r--r--profiles/default-alpha-1.4/virtuals8
-rw-r--r--profiles/default-alpha-2004.0/virtuals8
-rw-r--r--profiles/default-amd64-1.4/virtuals8
-rw-r--r--profiles/default-amd64-2004.0/virtuals8
-rw-r--r--profiles/default-hppa-1.4/virtuals8
-rw-r--r--profiles/default-hppa-2004.0/virtuals8
-rw-r--r--profiles/default-ia64-1.4/virtuals8
-rw-r--r--profiles/default-linux/ppc/1.0/virtuals8
-rw-r--r--profiles/default-linux/ppc/1.0_rc/virtuals6
-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/ppc/2004.0/virtuals8
-rw-r--r--profiles/default-linux/ppc/2004.1/virtuals8
-rw-r--r--profiles/default-linux/sparc/sparc32/virtuals8
-rw-r--r--profiles/default-linux/sparc/virtuals8
-rw-r--r--profiles/default-mips-1.4/virtuals8
-rw-r--r--profiles/default-mips64-1.4/virtuals8
-rw-r--r--profiles/default-ppc-1.0/virtuals8
-rw-r--r--profiles/default-ppc-1.4/virtuals8
-rw-r--r--profiles/default-ppc-2004.0/virtuals8
-rw-r--r--profiles/default-ppc/virtuals6
-rw-r--r--profiles/default-ppc64-1.4/virtuals8
-rw-r--r--profiles/default-ppc64-2004.0/virtuals8
-rw-r--r--profiles/default-s390-2004.0/virtuals8
-rw-r--r--profiles/default-sparc-1.4/virtuals8
-rw-r--r--profiles/default-sparc-2004.0/virtuals8
-rw-r--r--profiles/default-sparc64-1.4/virtuals8
-rw-r--r--profiles/default-sparc64-2004.0/virtuals8
-rw-r--r--profiles/default-x86-1.4/virtuals8
-rw-r--r--profiles/default-x86-2004.0/virtuals8
-rw-r--r--profiles/embedded/uclibc-x86-1.4/virtuals8
-rw-r--r--profiles/gcc33-sparc64-1.4/virtuals8
-rw-r--r--profiles/hardened-x86-1.4/virtuals8
-rw-r--r--profiles/hardened-x86-2004.0/virtuals8
-rw-r--r--profiles/selinux-ppc-1.4/virtuals8
-rw-r--r--profiles/selinux-sparc64-1.4/virtuals8
-rw-r--r--profiles/selinux-x86-1.4/virtuals8
43 files changed, 165 insertions, 165 deletions
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index 460968ffdcd0..f4321e70170b 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/virtuals
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.8 2004/04/07 09:00:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.9 2004/04/07 19:40:33 spyderous Exp $
# This file describes the packages that by default satisfy a certain virtual
# That this file exists in the base profile implies that these packages will
@@ -19,7 +19,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -35,7 +35,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/mpg123 media-sound/mpg123
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/php dev-php/mod_php
virtual/python dev-lang/python
virtual/quicktime media-libs/libquicktime
@@ -48,7 +48,7 @@ virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/tftp net-misc/tftp-hpa
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
diff --git a/profiles/build-ppc/virtuals b/profiles/build-ppc/virtuals
index ad8ac272e599..0b58d0d65e48 100644
--- a/profiles/build-ppc/virtuals
+++ b/profiles/build-ppc/virtuals
@@ -7,7 +7,7 @@ virtual/alsa sys-kernel/linux
virtual/bash app-shells/bash
virtual/kernel sys-kernel/linux
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
sys-apps/reiserfs-utils sys-fs/reiserfsprogs
virtual/os-headers sys-kernel/linux-headers
diff --git a/profiles/build/virtuals b/profiles/build/virtuals
index d5874ee58d81..f874d53d9137 100644
--- a/profiles/build/virtuals
+++ b/profiles/build/virtuals
@@ -6,7 +6,7 @@ virtual/alsa sys-kernel/linux
virtual/bash app-shells/bash
virtual/kernel sys-kernel/linux
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
sys-apps/reiserfs-utils sys-fs/reiserfsprogs
virtual/os-headers sys-kernel/linux-headers
diff --git a/profiles/cobalt-mips-1.4/virtuals b/profiles/cobalt-mips-1.4/virtuals
index 03f5f73faadc..9ce931191db5 100644
--- a/profiles/cobalt-mips-1.4/virtuals
+++ b/profiles/cobalt-mips-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/mips-headers
virtual/linux-sources sys-kernel/mips-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -24,7 +24,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/editor app-editors/nano
virtual/bootloader sys-boot/dvhtool
diff --git a/profiles/default-1.0-gcc3/virtuals b/profiles/default-1.0-gcc3/virtuals
index 57553fbb2a83..9a856bf172f6 100644
--- a/profiles/default-1.0-gcc3/virtuals
+++ b/profiles/default-1.0-gcc3/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -25,7 +25,7 @@ virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
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/virtuals b/profiles/default-1.0/virtuals
index 2a08761ee723..e476436d1f2b 100644
--- a/profiles/default-1.0/virtuals
+++ b/profiles/default-1.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/default-alpha-1.4/virtuals b/profiles/default-alpha-1.4/virtuals
index 798513b2f5af..a8d8324ada71 100644
--- a/profiles/default-alpha-1.4/virtuals
+++ b/profiles/default-alpha-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/alpha-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/compaq-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/aboot
virtual/editor app-editors/nano
diff --git a/profiles/default-alpha-2004.0/virtuals b/profiles/default-alpha-2004.0/virtuals
index ca583836c2c9..0d87666e1c63 100644
--- a/profiles/default-alpha-2004.0/virtuals
+++ b/profiles/default-alpha-2004.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/alpha-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/compaq-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/aboot
virtual/editor app-editors/nano
diff --git a/profiles/default-amd64-1.4/virtuals b/profiles/default-amd64-1.4/virtuals
index efde9de4c105..d679d6d00bd5 100644
--- a/profiles/default-amd64-1.4/virtuals
+++ b/profiles/default-amd64-1.4/virtuals
@@ -9,9 +9,9 @@ virtual/alsa sys-kernel/gentoo-dev-sources
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-dev-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -28,7 +28,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub-static
virtual/editor app-editors/nano
diff --git a/profiles/default-amd64-2004.0/virtuals b/profiles/default-amd64-2004.0/virtuals
index 2f234906b7df..8d1066d3dcac 100644
--- a/profiles/default-amd64-2004.0/virtuals
+++ b/profiles/default-amd64-2004.0/virtuals
@@ -9,9 +9,9 @@ virtual/alsa sys-kernel/gentoo-dev-sources
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-dev-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -28,7 +28,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub-static
virtual/editor app-editors/nano
diff --git a/profiles/default-hppa-1.4/virtuals b/profiles/default-hppa-1.4/virtuals
index 7bddcee5be64..686e70fee2a7 100644
--- a/profiles/default-hppa-1.4/virtuals
+++ b/profiles/default-hppa-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/hppa-headers
virtual/linux-sources sys-kernel/hppa-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -24,7 +24,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/palo
virtual/editor app-editors/nano
diff --git a/profiles/default-hppa-2004.0/virtuals b/profiles/default-hppa-2004.0/virtuals
index a05a52820ec6..ca0fbd17926d 100644
--- a/profiles/default-hppa-2004.0/virtuals
+++ b/profiles/default-hppa-2004.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/hppa-headers
virtual/linux-sources sys-kernel/hppa-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -24,7 +24,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/palo
virtual/editor app-editors/nano
diff --git a/profiles/default-ia64-1.4/virtuals b/profiles/default-ia64-1.4/virtuals
index 2c76ff14b0a9..1b7c2bd72a86 100644
--- a/profiles/default-ia64-1.4/virtuals
+++ b/profiles/default-ia64-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ia64-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/jrockit
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-apps/elilo
virtual/editor app-editors/nano
diff --git a/profiles/default-linux/ppc/1.0/virtuals b/profiles/default-linux/ppc/1.0/virtuals
index 5a9effd272a0..08a3e1941de4 100644
--- a/profiles/default-linux/ppc/1.0/virtuals
+++ b/profiles/default-linux/ppc/1.0/virtuals
@@ -13,7 +13,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -31,7 +31,7 @@ virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mpg123 media-sound/mpg123
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -44,6 +44,6 @@ virtual/sylpheed net-mail/sylpheed
virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
diff --git a/profiles/default-linux/ppc/1.0_rc/virtuals b/profiles/default-linux/ppc/1.0_rc/virtuals
index d897bc7c5be5..4bcd6eae74b8 100644
--- a/profiles/default-linux/ppc/1.0_rc/virtuals
+++ b/profiles/default-linux/ppc/1.0_rc/virtuals
@@ -13,7 +13,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -30,7 +30,7 @@ virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mpg123 media-sound/mpg123
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -43,6 +43,6 @@ virtual/sylpheed net-mail/sylpheed
virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/x11-web-browser net-www/mozilla
x11-libs/xaw x11-libs/Xaw3d
diff --git a/profiles/default-linux/ppc/1.2/virtuals b/profiles/default-linux/ppc/1.2/virtuals
index 5a9effd272a0..08a3e1941de4 100644
--- a/profiles/default-linux/ppc/1.2/virtuals
+++ b/profiles/default-linux/ppc/1.2/virtuals
@@ -13,7 +13,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -31,7 +31,7 @@ virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mpg123 media-sound/mpg123
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -44,6 +44,6 @@ virtual/sylpheed net-mail/sylpheed
virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
diff --git a/profiles/default-linux/ppc/1.4/virtuals b/profiles/default-linux/ppc/1.4/virtuals
index 54a7a56c3618..bf1f721f95f6 100644
--- a/profiles/default-linux/ppc/1.4/virtuals
+++ b/profiles/default-linux/ppc/1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -23,7 +23,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/yaboot
virtual/editor app-editors/nano
diff --git a/profiles/default-linux/ppc/2004.0/virtuals b/profiles/default-linux/ppc/2004.0/virtuals
index c577b6d48421..524083e05d6d 100644
--- a/profiles/default-linux/ppc/2004.0/virtuals
+++ b/profiles/default-linux/ppc/2004.0/virtuals
@@ -15,7 +15,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -32,7 +32,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -46,9 +46,9 @@ virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/tftp net-misc/tftp-hpa
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
virtual/mpg123 media-sound/mpg123
virtual/jack media-sound/jack-audio-connection-kit
diff --git a/profiles/default-linux/ppc/2004.1/virtuals b/profiles/default-linux/ppc/2004.1/virtuals
index c577b6d48421..524083e05d6d 100644
--- a/profiles/default-linux/ppc/2004.1/virtuals
+++ b/profiles/default-linux/ppc/2004.1/virtuals
@@ -15,7 +15,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -32,7 +32,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -46,9 +46,9 @@ virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/tftp net-misc/tftp-hpa
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
virtual/mpg123 media-sound/mpg123
virtual/jack media-sound/jack-audio-connection-kit
diff --git a/profiles/default-linux/sparc/sparc32/virtuals b/profiles/default-linux/sparc/sparc32/virtuals
index e15e0e1c04fc..be5a0c433120 100644
--- a/profiles/default-linux/sparc/sparc32/virtuals
+++ b/profiles/default-linux/sparc/sparc32/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-linux/sparc/virtuals b/profiles/default-linux/sparc/virtuals
index ab6fc2714601..e634759499a0 100644
--- a/profiles/default-linux/sparc/virtuals
+++ b/profiles/default-linux/sparc/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-mips-1.4/virtuals b/profiles/default-mips-1.4/virtuals
index 03f5f73faadc..9ce931191db5 100644
--- a/profiles/default-mips-1.4/virtuals
+++ b/profiles/default-mips-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/mips-headers
virtual/linux-sources sys-kernel/mips-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -24,7 +24,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/editor app-editors/nano
virtual/bootloader sys-boot/dvhtool
diff --git a/profiles/default-mips64-1.4/virtuals b/profiles/default-mips64-1.4/virtuals
index 03f5f73faadc..9ce931191db5 100644
--- a/profiles/default-mips64-1.4/virtuals
+++ b/profiles/default-mips64-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/mips-headers
virtual/linux-sources sys-kernel/mips-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -24,7 +24,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/editor app-editors/nano
virtual/bootloader sys-boot/dvhtool
diff --git a/profiles/default-ppc-1.0/virtuals b/profiles/default-ppc-1.0/virtuals
index 3151fc1b594f..4bb1f6d5ee59 100644
--- a/profiles/default-ppc-1.0/virtuals
+++ b/profiles/default-ppc-1.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -23,7 +23,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/yaboot
virtual/editor app-editors/nano
diff --git a/profiles/default-ppc-1.4/virtuals b/profiles/default-ppc-1.4/virtuals
index 54a7a56c3618..bf1f721f95f6 100644
--- a/profiles/default-ppc-1.4/virtuals
+++ b/profiles/default-ppc-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -23,7 +23,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/yaboot
virtual/editor app-editors/nano
diff --git a/profiles/default-ppc-2004.0/virtuals b/profiles/default-ppc-2004.0/virtuals
index c577b6d48421..524083e05d6d 100644
--- a/profiles/default-ppc-2004.0/virtuals
+++ b/profiles/default-ppc-2004.0/virtuals
@@ -15,7 +15,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -32,7 +32,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -46,9 +46,9 @@ virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/tftp net-misc/tftp-hpa
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
virtual/mpg123 media-sound/mpg123
virtual/jack media-sound/jack-audio-connection-kit
diff --git a/profiles/default-ppc/virtuals b/profiles/default-ppc/virtuals
index 6d951787e2fd..e74da2c3dc57 100644
--- a/profiles/default-ppc/virtuals
+++ b/profiles/default-ppc/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
diff --git a/profiles/default-ppc64-1.4/virtuals b/profiles/default-ppc64-1.4/virtuals
index 5294281ce933..811a5c5cb391 100644
--- a/profiles/default-ppc64-1.4/virtuals
+++ b/profiles/default-ppc64-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -23,7 +23,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/yaboot
virtual/editor app-editors/nano
diff --git a/profiles/default-ppc64-2004.0/virtuals b/profiles/default-ppc64-2004.0/virtuals
index dba54ca2ba28..0dc0b1707117 100644
--- a/profiles/default-ppc64-2004.0/virtuals
+++ b/profiles/default-ppc64-2004.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/ppc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -23,7 +23,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/yaboot-static
virtual/editor app-editors/nano
diff --git a/profiles/default-s390-2004.0/virtuals b/profiles/default-s390-2004.0/virtuals
index e4528fb01701..25ea23ac4ea6 100644
--- a/profiles/default-s390-2004.0/virtuals
+++ b/profiles/default-s390-2004.0/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
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/virtuals b/profiles/default-sparc-1.4/virtuals
index e15e0e1c04fc..be5a0c433120 100644
--- a/profiles/default-sparc-1.4/virtuals
+++ b/profiles/default-sparc-1.4/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-sparc-2004.0/virtuals b/profiles/default-sparc-2004.0/virtuals
index e15e0e1c04fc..be5a0c433120 100644
--- a/profiles/default-sparc-2004.0/virtuals
+++ b/profiles/default-sparc-2004.0/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-sparc64-1.4/virtuals b/profiles/default-sparc64-1.4/virtuals
index 5789f44a3041..fa0db313098a 100644
--- a/profiles/default-sparc64-1.4/virtuals
+++ b/profiles/default-sparc64-1.4/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-sparc64-2004.0/virtuals b/profiles/default-sparc64-2004.0/virtuals
index ab6fc2714601..e634759499a0 100644
--- a/profiles/default-sparc64-2004.0/virtuals
+++ b/profiles/default-sparc64-2004.0/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/default-x86-1.4/virtuals b/profiles/default-x86-1.4/virtuals
index 09149f80da44..b04f56fe742d 100644
--- a/profiles/default-x86-1.4/virtuals
+++ b/profiles/default-x86-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/default-x86-2004.0/virtuals b/profiles/default-x86-2004.0/virtuals
index 4f8d4dd354ed..53c91063f705 100644
--- a/profiles/default-x86-2004.0/virtuals
+++ b/profiles/default-x86-2004.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gs-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/embedded/uclibc-x86-1.4/virtuals b/profiles/embedded/uclibc-x86-1.4/virtuals
index d7b7087ab2ca..f38043ca69fb 100644
--- a/profiles/embedded/uclibc-x86-1.4/virtuals
+++ b/profiles/embedded/uclibc-x86-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/uclibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/gcc33-sparc64-1.4/virtuals b/profiles/gcc33-sparc64-1.4/virtuals
index f838fb38fad3..9f85a9cccc13 100644
--- a/profiles/gcc33-sparc64-1.4/virtuals
+++ b/profiles/gcc33-sparc64-1.4/virtuals
@@ -4,9 +4,9 @@ virtual/mta net-mail/ssmtp
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/sparc-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
x11-libs/xaw x11-libs/Xaw3d
@@ -26,7 +26,7 @@ virtual/mda net-mail/procmail
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/silo
virtual/editor app-editors/nano
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/ghc dev-lang/ghc-bin
virtual/modutils sys-apps/modutils
diff --git a/profiles/hardened-x86-1.4/virtuals b/profiles/hardened-x86-1.4/virtuals
index 73593fa229fa..4828725f2ee2 100644
--- a/profiles/hardened-x86-1.4/virtuals
+++ b/profiles/hardened-x86-1.4/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/hardened-x86-2004.0/virtuals b/profiles/hardened-x86-2004.0/virtuals
index 73593fa229fa..4828725f2ee2 100644
--- a/profiles/hardened-x86-2004.0/virtuals
+++ b/profiles/hardened-x86-2004.0/virtuals
@@ -5,9 +5,9 @@ virtual/alsa media-sound/alsa-driver
virtual/kernel sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/opengl x11-base/xfree x11-base/xorg-x11
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/opengl x11-base/xfree
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imapUW net-mail/uw-imap
virtual/jdk dev-java/blackdown-jdk
@@ -22,7 +22,7 @@ virtual/sylpheed net-mail/sylpheed
virtual/php dev-php/mod_php
virtual/textbrowser net-www/links
virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
virtual/krb5 app-crypt/heimdal
virtual/bootloader sys-boot/grub
virtual/editor app-editors/nano
diff --git a/profiles/selinux-ppc-1.4/virtuals b/profiles/selinux-ppc-1.4/virtuals
index cc76ee2766e8..671308252248 100644
--- a/profiles/selinux-ppc-1.4/virtuals
+++ b/profiles/selinux-ppc-1.4/virtuals
@@ -12,7 +12,7 @@ virtual/emacs app-editors/emacs
virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imap-c-client net-libs/c-client
virtual/imapUW net-mail/uw-imap
@@ -28,7 +28,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/modutils sys-apps/module-init-tools
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -39,8 +39,8 @@ virtual/snmp net-analyzer/net-snmp
virtual/sylpheed net-mail/sylpheed
virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
-virtual/x11 x11-base/xfree x11-base/xorg-x11
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
virtual/tftp net-misc/tftp-hpa
virtual/gzip app-arch/gzip
diff --git a/profiles/selinux-sparc64-1.4/virtuals b/profiles/selinux-sparc64-1.4/virtuals
index 658dc48b3516..34ca21e75282 100644
--- a/profiles/selinux-sparc64-1.4/virtuals
+++ b/profiles/selinux-sparc64-1.4/virtuals
@@ -12,7 +12,7 @@ virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/ghostscript app-text/ghostscript
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/gzip app-arch/gzip
virtual/imap-c-client net-libs/c-client
@@ -29,7 +29,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/modutils sys-apps/module-init-tools
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -43,9 +43,9 @@ virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
virtual/tftp net-misc/tftp-hpa
virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
virtual/mpg123 media-sound/mpg123
virtual/dhcpc net-misc/dhcpcd
diff --git a/profiles/selinux-x86-1.4/virtuals b/profiles/selinux-x86-1.4/virtuals
index b87864c16016..ef835ea76714 100644
--- a/profiles/selinux-x86-1.4/virtuals
+++ b/profiles/selinux-x86-1.4/virtuals
@@ -12,7 +12,7 @@ virtual/emacs app-editors/emacs
virtual/flim app-emacs/flim
virtual/ghc dev-lang/ghc-bin
virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree x11-base/xorg-x11
+virtual/glu x11-base/xfree
virtual/glut media-libs/glut
virtual/imap-c-client net-libs/c-client
virtual/imapUW net-mail/uw-imap
@@ -29,7 +29,7 @@ virtual/lpr net-print/cups
virtual/mda net-mail/procmail
virtual/modutils sys-apps/modutils
virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree x11-base/xorg-x11
+virtual/opengl x11-base/xfree
virtual/os-headers sys-kernel/linux-headers
virtual/php dev-php/mod_php
virtual/python dev-lang/python
@@ -40,9 +40,9 @@ virtual/snmp net-analyzer/net-snmp
virtual/sylpheed net-mail/sylpheed
virtual/tetex app-text/tetex
virtual/textbrowser net-www/links
-virtual/x11 x11-base/xfree x11-base/xorg-x11
+virtual/x11 x11-base/xfree
virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree x11-base/xorg-x11
+virtual/xft x11-base/xfree
x11-libs/xaw x11-libs/Xaw3d
virtual/tftp net-misc/tftp-hpa
virtual/gzip app-arch/gzip