Drop old-style virtuals for x11, glu, glut, xft, opengl, with the exception of macos, where we just drop x11 and leave the others defaulting to apple-xfree.

14 files changed, 31 insertions, 47 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8d836d8c81f4..d3c058971966 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.545 2007/07/21 23:58:51 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.546 2007/07/22 11:06:06 dberkholz Exp $
+
+  21 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  embedded/virtuals, selinux/mips/virtuals:
+  Pull old-style virtuals: glu, glut, opengl, x11, xft.
+
+  21 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  default-linux/ppc64/virtuals, default-darwin/macos/virtuals:
+  Drop old-style virtual/x11.
 
   21 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; package.mask:
   Unmask virtual/x11, it's gone.
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 3d038bd7fadb..cf042cd8dc7f 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.14 2007/07/08 03:49:58 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.15 2007/07/22 11:06:06 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; use.defaults:
+  virtual/x11 is gone.
 
   08 Jul 2007; Joshua Kinard <kumba@gentoo.org> use.mask:
   Remove ip28/ip32r10k USE masks; they're actually used by mips-sources when
diff --git a/profiles/base/use.defaults b/profiles/base/use.defaults
index 011ea54b07bb..2bbb17d7069e 100644
--- a/profiles/base/use.defaults
+++ b/profiles/base/use.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.defaults,v 1.30 2007/03/04 10:23:42 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.defaults,v 1.31 2007/07/22 11:06:06 dberkholz Exp $
 
 aalib				media-libs/aalib
 acl					sys-apps/acl
@@ -115,7 +115,6 @@ truetype			media-libs/freetype
 usb					dev-libs/libusb
 vorbis				media-libs/libvorbis
 wmf					media-libs/libwmf
-X					virtual/x11
 xine				media-libs/xine-lib
 xml					dev-libs/libxml
 xml2				dev-libs/libxml2
diff --git a/profiles/default-darwin/macos/virtuals b/profiles/default-darwin/macos/virtuals
index 8f6767622d8d..772f2add7d48 100644
--- a/profiles/default-darwin/macos/virtuals
+++ b/profiles/default-darwin/macos/virtuals
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/virtuals,v 1.12 2006/07/10 16:43:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/virtuals,v 1.13 2007/07/22 11:06:07 dberkholz Exp $
 
 # Use this virtuals file to either override the Darwin base profile's defined
 # virtuals, or add virtuals that are specific to the Mac OS X profiles
@@ -8,7 +8,6 @@
 virtual/commonlisp	dev-lisp/clisp
 virtual/mta	     	mail-mta/postfix
 virtual/glu			x11-base/apple-xfree
-virtual/x11			x11-base/apple-xfree
 virtual/xft			x11-base/apple-xfree
 virtual/opengl		x11-base/apple-xfree
 virtual/blackbox	x11-wm/fluxbox
diff --git a/profiles/default-linux/mips/ChangeLog b/profiles/default-linux/mips/ChangeLog
index 34fa4240fd2f..de709905d972 100644
--- a/profiles/default-linux/mips/ChangeLog
+++ b/profiles/default-linux/mips/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for MIPS profile directory
 # Copyright 2007-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/ChangeLog,v 1.3 2007/07/08 20:19:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/ChangeLog,v 1.4 2007/07/22 11:06:07 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; virtuals:
+  Pull old-style X virtuals: glu, glut, opengl, x11, xft.
 
   08 Jul 2007; Christian Heim <phreak@gentoo.org> package.use.mask:
   Package.use.mask mysql for dev-libs/apr-util. Apparently the apr_dbd_mysql
diff --git a/profiles/default-linux/mips/virtuals b/profiles/default-linux/mips/virtuals
index e0314c617586..3cfa567923d0 100644
--- a/profiles/default-linux/mips/virtuals
+++ b/profiles/default-linux/mips/virtuals
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.12 2007/02/20 22:34:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.13 2007/07/22 11:06:07 dberkholz Exp $
 
 virtual/alsa			sys-kernel/mips-sources
 virtual/linux-sources		sys-kernel/mips-sources
@@ -8,9 +8,4 @@ virtual/os-headers		sys-kernel/mips-headers
 virtual/dev-manager		sys-fs/udev
 virtual/modutils		sys-apps/module-init-tools
 virtual/logger			app-admin/syslog-ng
-virtual/glu			media-libs/mesa
-virtual/opengl			x11-base/xorg-x11
-virtual/x11			x11-base/xorg-x11
-virtual/xft			x11-base/xorg-x11
-virtual/glut			media-libs/freeglut
 virtual/cdrtools		app-cdr/cdrtools
diff --git a/profiles/default-linux/ppc/1.0/virtuals b/profiles/default-linux/ppc/1.0/virtuals
index 8c6951575eb5..d1cc8353b221 100644
--- a/profiles/default-linux/ppc/1.0/virtuals
+++ b/profiles/default-linux/ppc/1.0/virtuals
@@ -1,10 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/virtuals,v 1.19 2006/07/06 10:28:05 nelchael Exp $
-virtual/glu			x11-base/xorg-x11
-virtual/opengl			x11-base/xorg-x11
-virtual/x11			x11-base/xorg-x11
-virtual/xft			x11-base/xorg-x11
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/virtuals,v 1.20 2007/07/22 11:06:07 dberkholz Exp $
 virtual/bootloader		sys-boot/yaboot
 
 virtual/ooo			app-office/openoffice
diff --git a/profiles/default-linux/ppc/1.0_rc/virtuals b/profiles/default-linux/ppc/1.0_rc/virtuals
index 946fa7fd7b8b..623de622957c 100644
--- a/profiles/default-linux/ppc/1.0_rc/virtuals
+++ b/profiles/default-linux/ppc/1.0_rc/virtuals
@@ -1,10 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/virtuals,v 1.19 2006/07/06 10:28:05 nelchael Exp $
-virtual/glu			x11-base/xorg-x11
-virtual/opengl			x11-base/xorg-x11
-virtual/x11			x11-base/xorg-x11
-virtual/xft			x11-base/xorg-x11
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/virtuals,v 1.20 2007/07/22 11:06:07 dberkholz Exp $
 virtual/bootloader		sys-boot/yaboot
 
 virtual/ooo			app-office/openoffice
diff --git a/profiles/default-linux/ppc/1.2/virtuals b/profiles/default-linux/ppc/1.2/virtuals
index 6feca5f2ca2b..3f0186c25acc 100644
--- a/profiles/default-linux/ppc/1.2/virtuals
+++ b/profiles/default-linux/ppc/1.2/virtuals
@@ -1,10 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/virtuals,v 1.19 2006/07/06 10:28:06 nelchael Exp $
-virtual/glu			x11-base/xorg-x11
-virtual/opengl			x11-base/xorg-x11
-virtual/x11			x11-base/xorg-x11
-virtual/xft			x11-base/xorg-x11
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/virtuals,v 1.20 2007/07/22 11:06:07 dberkholz Exp $
 virtual/bootloader		sys-boot/yaboot
 
 virtual/ooo			app-office/openoffice
diff --git a/profiles/default-linux/ppc/1.4/virtuals b/profiles/default-linux/ppc/1.4/virtuals
index 5dccea0e3833..0f210d0d8bdd 100644
--- a/profiles/default-linux/ppc/1.4/virtuals
+++ b/profiles/default-linux/ppc/1.4/virtuals
@@ -1,10 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/virtuals,v 1.19 2006/07/06 10:28:06 nelchael Exp $
-virtual/glu			x11-base/xorg-x11
-virtual/opengl			x11-base/xorg-x11
-virtual/x11			x11-base/xorg-x11
-virtual/xft			x11-base/xorg-x11
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/virtuals,v 1.20 2007/07/22 11:06:07 dberkholz Exp $
 virtual/bootloader		sys-boot/yaboot
 
 virtual/ooo			app-office/openoffice
diff --git a/profiles/default-linux/ppc/ChangeLog b/profiles/default-linux/ppc/ChangeLog
index 673b4b529db8..c99d7e20e493 100644
--- a/profiles/default-linux/ppc/ChangeLog
+++ b/profiles/default-linux/ppc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/ppc profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.20 2007/06/28 14:29:43 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ChangeLog,v 1.21 2007/07/22 11:06:07 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; 1.0/virtuals,
+  1.0_rc/virtuals, 1.2/virtuals, 1.4/virtuals:
+  Pull old-style X virtuals: glu, glut, opengl, x11, xft.
 
   28 Jun 2007; Joseph Jezak <josejx@gentoo.org> package.use.mask, use.mask:
   Added LCD masks for bug #180683.
diff --git a/profiles/default-linux/ppc64/virtuals b/profiles/default-linux/ppc64/virtuals
index b58f44aa7160..d149224c0c3d 100644
--- a/profiles/default-linux/ppc64/virtuals
+++ b/profiles/default-linux/ppc64/virtuals
@@ -1,7 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.8 2006/07/06 10:28:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.9 2007/07/22 11:06:07 dberkholz Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/linux-sources  sys-kernel/gentoo-sources
-virtual/x11            x11-base/xorg-x11
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
index cfdbcef1eca4..8a4b513852b5 100644
--- a/profiles/embedded/virtuals
+++ b/profiles/embedded/virtuals
@@ -10,8 +10,6 @@ virtual/editor			app-editors/nano
 virtual/ghc			dev-lang/ghc-bin
 virtual/glibc			sys-libs/glibc
 virtual/libc			sys-libs/glibc
-virtual/glu			x11-base/xorg-x11
-virtual/glut			media-libs/glut
 virtual/gzip			app-arch/gzip
 virtual/imap-c-client		net-libs/c-client
 virtual/imapUW			net-mail/uw-imap
@@ -24,7 +22,6 @@ virtual/lpr			net-print/cups
 virtual/mda			mail-filter/procmail
 virtual/modutils		sys-apps/modutils
 virtual/mta			mail-mta/ssmtp
-virtual/opengl			x11-base/xorg-x11
 virtual/os-headers		sys-kernel/linux-headers
 virtual/python			dev-lang/python
 virtual/quicktime		media-libs/libquicktime
@@ -35,9 +32,7 @@ virtual/sylpheed		mail-client/sylpheed
 virtual/tetex			app-text/tetex
 virtual/tftp			net-ftp/tftp-hpa
 virtual/wine			app-emulation/wine
-virtual/x11			x11-base/xorg-x11
 virtual/xemacs			app-editors/xemacs
-virtual/xft			x11-base/xorg-x11
 virtual/motif          x11-libs/openmotif
 virtual/utempter 		sys-apps/utempter
 virtual/eject				sys-apps/eject
diff --git a/profiles/selinux/mips/virtuals b/profiles/selinux/mips/virtuals
index 118c6a382ae9..7df541d21067 100644
--- a/profiles/selinux/mips/virtuals
+++ b/profiles/selinux/mips/virtuals
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/virtuals,v 1.3 2007/02/20 21:29:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/mips/virtuals,v 1.4 2007/07/22 11:06:07 dberkholz Exp $
 
 virtual/alsa			sys-kernel/mips-sources
 virtual/linux-sources		sys-kernel/mips-sources
@@ -8,9 +8,4 @@ virtual/os-headers		sys-kernel/mips-headers
 virtual/dev-manager		sys-fs/udev
 virtual/modutils		sys-apps/module-init-tools
 virtual/logger			app-admin/syslog-ng
-virtual/glu			media-libs/mesa
-virtual/opengl			x11-base/xorg-x11
-virtual/x11			x11-base/xorg-x11
-virtual/xft			x11-base/xorg-x11
-virtual/glut			media-libs/freeglut
 virtual/cdrtools		app-cdr/cdrtools