Add blockers on all modular X packages to prevent weird issues with vanished files upon downgrade to monolithic and re-upgrade to modular.

(Portage version: 2.1.1_pre2-r4)

4 files changed, 883 insertions, 7 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 1411f8eba0e9..d7632196636d 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.561 2006/07/07 14:04:56 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.562 2006/07/07 18:21:17 dberkholz Exp $
+
+  07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-x11-6.8.2-r7.ebuild, xorg-x11-6.8.2-r8.ebuild,
+  xorg-x11-6.9.0-r3.ebuild:
+  Add blockers on all modular X packages to prevent weird issues with vanished
+  files upon downgrade to monolithic and re-upgrade to modular.
 
   07 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
   xorg-x11-7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r7.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r7.ebuild
index 49532c4c88f6..57964db791e1 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r7.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r7.ebuild
@@ -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/x11-base/xorg-x11/xorg-x11-6.8.2-r7.ebuild,v 1.2 2006/05/04 16:45:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r7.ebuild,v 1.3 2006/07/07 18:21:17 dberkholz Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -103,7 +103,297 @@ RDEPEND="
 		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
 		media-libs/libpng
 		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
+		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
+		!app-doc/opengl-manpages
+		!app-doc/xorg-docs
+		!app-doc/xorg-sgml-doctools
+		!media-fonts/encodings
+		!media-fonts/font-adobe-100dpi
+		!media-fonts/font-adobe-75dpi
+		!media-fonts/font-adobe-utopia-100dpi
+		!media-fonts/font-adobe-utopia-75dpi
+		!media-fonts/font-adobe-utopia-type1
+		!media-fonts/font-alias
+		!media-fonts/font-arabic-misc
+		!media-fonts/font-bh-100dpi
+		!media-fonts/font-bh-75dpi
+		!media-fonts/font-bh-lucidatypewriter-100dpi
+		!media-fonts/font-bh-lucidatypewriter-75dpi
+		!media-fonts/font-bh-ttf
+		!media-fonts/font-bh-type1
+		!media-fonts/font-bitstream-100dpi
+		!media-fonts/font-bitstream-75dpi
+		!media-fonts/font-bitstream-speedo
+		!media-fonts/font-bitstream-type1
+		!media-fonts/font-cronyx-cyrillic
+		!media-fonts/font-cursor-misc
+		!media-fonts/font-daewoo-misc
+		!media-fonts/font-dec-misc
+		!media-fonts/font-ibm-type1
+		!media-fonts/font-isas-misc
+		!media-fonts/font-jis-misc
+		!media-fonts/font-micro-misc
+		!media-fonts/font-misc-cyrillic
+		!media-fonts/font-misc-ethiopic
+		!media-fonts/font-misc-meltho
+		!media-fonts/font-misc-misc
+		!media-fonts/font-mutt-misc
+		!media-fonts/font-schumacher-misc
+		!media-fonts/font-screen-cyrillic
+		!media-fonts/font-sony-misc
+		!media-fonts/font-sun-misc
+		!media-fonts/font-util
+		!media-fonts/font-winitzki-cyrillic
+		!media-fonts/font-xfree86-type1
+		!media-libs/mesa
+		!x11-apps/appres
+		!x11-apps/bdftopcf
+		!x11-apps/beforelight
+		!x11-apps/bitmap
+		!x11-apps/editres
+		!x11-apps/fonttosfnt
+		!x11-apps/fslsfonts
+		!x11-apps/fstobdf
+		!x11-apps/iceauth
+		!x11-apps/ico
+		!x11-apps/lbxproxy
+		!x11-apps/listres
+		!x11-apps/luit
+		!x11-apps/mesa-progs
+		!x11-apps/mkcfm
+		!x11-apps/mkfontdir
+		!x11-apps/mkfontscale
+		!x11-apps/oclock
+		!x11-apps/proxymngr
+		!x11-apps/rgb
+		!x11-apps/rstart
+		!x11-apps/scripts
+		!x11-apps/sessreg
+		!x11-apps/setxkbmap
+		!x11-apps/showfont
+		!x11-apps/smproxy
+		!x11-wm/twm
+		!x11-apps/viewres
+		!x11-apps/x11perf
+		!x11-apps/xauth
+		!x11-apps/xbiff
+		!x11-apps/xcalc
+		!x11-apps/xclipboard
+		!x11-apps/xclock
+		!x11-apps/xcmsdb
+		!x11-apps/xconsole
+		!x11-apps/xcursorgen
+		!x11-apps/xdbedizzy
+		!x11-apps/xditview
+		!x11-apps/xdm
+		!x11-apps/xdpyinfo
+		!x11-apps/xdriinfo
+		!x11-apps/xedit
+		!x11-apps/xev
+		!x11-apps/xeyes
+		!x11-apps/xf86dga
+		!x11-apps/xfd
+		!x11-apps/xfindproxy
+		!x11-apps/xfontsel
+		!x11-apps/xfs
+		!x11-apps/xfsinfo
+		!x11-apps/xfwp
+		!x11-apps/xgamma
+		!x11-apps/xgc
+		!x11-apps/xhost
+		!x11-apps/xinit
+		!x11-apps/xkbcomp
+		!x11-apps/xkbevd
+		!x11-apps/xkbprint
+		!x11-apps/xkbutils
+		!x11-apps/xkill
+		!x11-apps/xload
+		!x11-apps/xlogo
+		!x11-apps/xlsatoms
+		!x11-apps/xlsclients
+		!x11-apps/xlsfonts
+		!x11-apps/xmag
+		!x11-apps/xman
+		!x11-apps/xmessage
+		!x11-apps/xmh
+		!x11-apps/xmodmap
+		!x11-apps/xmore
+		!x11-apps/xphelloworld
+		!x11-apps/xplsprinters
+		!x11-apps/xpr
+		!x11-apps/xprehashprinterlist
+		!x11-apps/xprop
+		!x11-apps/xrandr
+		!x11-apps/xrdb
+		!x11-apps/xrefresh
+		!x11-apps/xrx
+		!x11-apps/xset
+		!x11-apps/xsetmode
+		!x11-apps/xsetpointer
+		!x11-apps/xsetroot
+		!x11-apps/xsm
+		!x11-apps/xstdcmap
+		!x11-apps/xtrap
+		!x11-apps/xvidtune
+		!x11-apps/xvinfo
+		!x11-apps/xwd
+		!x11-apps/xwininfo
+		!x11-apps/xwud
+		!x11-base/xorg-server
+		!x11-drivers/xf86-input-acecad
+		!x11-drivers/xf86-input-aiptek
+		!x11-drivers/xf86-input-calcomp
+		!x11-drivers/xf86-input-citron
+		!x11-drivers/xf86-input-digitaledge
+		!x11-drivers/xf86-input-dmc
+		!x11-drivers/xf86-input-dynapro
+		!x11-drivers/xf86-input-elo2300
+		!x11-drivers/xf86-input-elographics
+		!x11-drivers/xf86-input-evdev
+		!x11-drivers/xf86-input-fpit
+		!x11-drivers/xf86-input-hyperpen
+		!x11-drivers/xf86-input-jamstudio
+		!x11-drivers/xf86-input-joystick
+		!x11-drivers/xf86-input-keyboard
+		!x11-drivers/xf86-input-magellan
+		!x11-drivers/xf86-input-magictouch
+		!x11-drivers/xf86-input-microtouch
+		!x11-drivers/xf86-input-mouse
+		!x11-drivers/xf86-input-mutouch
+		!x11-drivers/xf86-input-palmax
+		!x11-drivers/xf86-input-penmount
+		!x11-drivers/xf86-input-spaceorb
+		!x11-drivers/xf86-input-summa
+		!x11-drivers/xf86-input-tek4957
+		!x11-drivers/xf86-input-ur98
+		!x11-drivers/xf86-input-vmmouse
+		!x11-drivers/xf86-input-void
+		!x11-drivers/xf86-video-apm
+		!x11-drivers/xf86-video-ark
+		!x11-drivers/xf86-video-ati
+		!x11-drivers/xf86-video-chips
+		!x11-drivers/xf86-video-cirrus
+		!x11-drivers/xf86-video-cyrix
+		!x11-drivers/xf86-video-dummy
+		!x11-drivers/xf86-video-fbdev
+		!x11-drivers/xf86-video-glint
+		!x11-drivers/xf86-video-i128
+		!x11-drivers/xf86-video-i740
+		!x11-drivers/xf86-video-i810
+		!x11-drivers/xf86-video-imstt
+		!x11-drivers/xf86-video-mga
+		!x11-drivers/xf86-video-neomagic
+		!x11-drivers/xf86-video-newport
+		!x11-drivers/xf86-video-nsc
+		!x11-drivers/xf86-video-nv
+		!x11-drivers/xf86-video-rendition
+		!x11-drivers/xf86-video-s3
+		!x11-drivers/xf86-video-s3virge
+		!x11-drivers/xf86-video-savage
+		!x11-drivers/xf86-video-siliconmotion
+		!x11-drivers/xf86-video-sis
+		!x11-drivers/xf86-video-sisusb
+		!x11-drivers/xf86-video-sunbw2
+		!x11-drivers/xf86-video-suncg14
+		!x11-drivers/xf86-video-suncg3
+		!x11-drivers/xf86-video-suncg6
+		!x11-drivers/xf86-video-sunffb
+		!x11-drivers/xf86-video-sunleo
+		!x11-drivers/xf86-video-suntcx
+		!x11-drivers/xf86-video-tdfx
+		!x11-drivers/xf86-video-tga
+		!x11-drivers/xf86-video-trident
+		!x11-drivers/xf86-video-tseng
+		!x11-drivers/xf86-video-v4l
+		!x11-drivers/xf86-video-vesa
+		!x11-drivers/xf86-video-vga
+		!x11-drivers/xf86-video-via
+		!x11-drivers/xf86-video-vmware
+		!x11-drivers/xf86-video-voodoo
+		!x11-libs/libdmx
+		!x11-libs/libdrm
+		!x11-libs/libfontenc
+		!x11-libs/libFS
+		!x11-libs/libICE
+		!x11-libs/liblbxutil
+		!x11-libs/liboldX
+		!x11-libs/libSM
+		!x11-libs/libX11
+		!x11-libs/libXau
+		!x11-libs/libXaw
+		!x11-libs/libXcomposite
+		!x11-libs/libXcursor
+		!x11-libs/libXdamage
+		!x11-libs/libXdmcp
+		!x11-libs/libXevie
+		!x11-libs/libXext
+		!x11-libs/libXfixes
+		!x11-libs/libXfont
+		!x11-libs/libXfontcache
+		!x11-libs/libXft
+		!x11-libs/libXi
+		!x11-libs/libXinerama
+		!x11-libs/libxkbfile
+		!x11-libs/libxkbui
+		!x11-libs/libXmu
+		!x11-libs/libXp
+		!x11-libs/libXpm
+		!x11-libs/libXprintAppUtil
+		!x11-libs/libXprintUtil
+		!x11-libs/libXrandr
+		!x11-libs/libXrender
+		!x11-libs/libXres
+		!x11-libs/libXScrnSaver
+		!x11-libs/libXt
+		!x11-libs/libXTrap
+		!x11-libs/libXtst
+		!x11-libs/libXv
+		!x11-libs/libXvMC
+		!x11-libs/libXxf86dga
+		!x11-libs/libXxf86misc
+		!x11-libs/libXxf86vm
+		!x11-libs/xtrans
+		!x11-misc/gccmakedep
+		!x11-misc/imake
+		!x11-misc/lndir
+		!x11-misc/makedepend
+		!x11-misc/util-macros
+		!x11-misc/xbitmaps
+		!x11-misc/xkbdata
+		!x11-misc/xkeyboard-config
+		!x11-misc/xorg-cf-files
+		!x11-proto/bigreqsproto
+		!x11-proto/compositeproto
+		!x11-proto/damageproto
+		!x11-proto/dmxproto
+		!x11-proto/evieext
+		!x11-proto/fixesproto
+		!x11-proto/fontcacheproto
+		!x11-proto/fontsproto
+		!x11-proto/glproto
+		!x11-proto/inputproto
+		!x11-proto/kbproto
+		!x11-proto/printproto
+		!x11-proto/randrproto
+		!x11-proto/recordproto
+		!x11-proto/renderproto
+		!x11-proto/resourceproto
+		!x11-proto/scrnsaverproto
+		!x11-proto/trapproto
+		!x11-proto/videoproto
+		!x11-proto/xcmiscproto
+		!x11-proto/xextproto
+		!x11-proto/xf86bigfontproto
+		!x11-proto/xf86dgaproto
+		!x11-proto/xf86driproto
+		!x11-proto/xf86miscproto
+		!x11-proto/xf86rushproto
+		!x11-proto/xf86vidmodeproto
+		!x11-proto/xineramaproto
+		!x11-proto/xproto
+		!x11-proto/xproxymanagementprotocol
+		!x11-themes/gentoo-xcursors
+		!x11-themes/xcursor-themes"
 
 PDEPEND="x86? (
 			input_devices_synaptics? ( x11-drivers/synaptics )
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
index 92c6b7598cb5..3024f89f57a7 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
@@ -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/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild,v 1.8 2006/06/30 13:03:00 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild,v 1.9 2006/07/07 18:21:17 dberkholz Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -103,7 +103,297 @@ RDEPEND="
 		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
 		media-libs/libpng
 		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
+		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
+		!app-doc/opengl-manpages
+		!app-doc/xorg-docs
+		!app-doc/xorg-sgml-doctools
+		!media-fonts/encodings
+		!media-fonts/font-adobe-100dpi
+		!media-fonts/font-adobe-75dpi
+		!media-fonts/font-adobe-utopia-100dpi
+		!media-fonts/font-adobe-utopia-75dpi
+		!media-fonts/font-adobe-utopia-type1
+		!media-fonts/font-alias
+		!media-fonts/font-arabic-misc
+		!media-fonts/font-bh-100dpi
+		!media-fonts/font-bh-75dpi
+		!media-fonts/font-bh-lucidatypewriter-100dpi
+		!media-fonts/font-bh-lucidatypewriter-75dpi
+		!media-fonts/font-bh-ttf
+		!media-fonts/font-bh-type1
+		!media-fonts/font-bitstream-100dpi
+		!media-fonts/font-bitstream-75dpi
+		!media-fonts/font-bitstream-speedo
+		!media-fonts/font-bitstream-type1
+		!media-fonts/font-cronyx-cyrillic
+		!media-fonts/font-cursor-misc
+		!media-fonts/font-daewoo-misc
+		!media-fonts/font-dec-misc
+		!media-fonts/font-ibm-type1
+		!media-fonts/font-isas-misc
+		!media-fonts/font-jis-misc
+		!media-fonts/font-micro-misc
+		!media-fonts/font-misc-cyrillic
+		!media-fonts/font-misc-ethiopic
+		!media-fonts/font-misc-meltho
+		!media-fonts/font-misc-misc
+		!media-fonts/font-mutt-misc
+		!media-fonts/font-schumacher-misc
+		!media-fonts/font-screen-cyrillic
+		!media-fonts/font-sony-misc
+		!media-fonts/font-sun-misc
+		!media-fonts/font-util
+		!media-fonts/font-winitzki-cyrillic
+		!media-fonts/font-xfree86-type1
+		!media-libs/mesa
+		!x11-apps/appres
+		!x11-apps/bdftopcf
+		!x11-apps/beforelight
+		!x11-apps/bitmap
+		!x11-apps/editres
+		!x11-apps/fonttosfnt
+		!x11-apps/fslsfonts
+		!x11-apps/fstobdf
+		!x11-apps/iceauth
+		!x11-apps/ico
+		!x11-apps/lbxproxy
+		!x11-apps/listres
+		!x11-apps/luit
+		!x11-apps/mesa-progs
+		!x11-apps/mkcfm
+		!x11-apps/mkfontdir
+		!x11-apps/mkfontscale
+		!x11-apps/oclock
+		!x11-apps/proxymngr
+		!x11-apps/rgb
+		!x11-apps/rstart
+		!x11-apps/scripts
+		!x11-apps/sessreg
+		!x11-apps/setxkbmap
+		!x11-apps/showfont
+		!x11-apps/smproxy
+		!x11-wm/twm
+		!x11-apps/viewres
+		!x11-apps/x11perf
+		!x11-apps/xauth
+		!x11-apps/xbiff
+		!x11-apps/xcalc
+		!x11-apps/xclipboard
+		!x11-apps/xclock
+		!x11-apps/xcmsdb
+		!x11-apps/xconsole
+		!x11-apps/xcursorgen
+		!x11-apps/xdbedizzy
+		!x11-apps/xditview
+		!x11-apps/xdm
+		!x11-apps/xdpyinfo
+		!x11-apps/xdriinfo
+		!x11-apps/xedit
+		!x11-apps/xev
+		!x11-apps/xeyes
+		!x11-apps/xf86dga
+		!x11-apps/xfd
+		!x11-apps/xfindproxy
+		!x11-apps/xfontsel
+		!x11-apps/xfs
+		!x11-apps/xfsinfo
+		!x11-apps/xfwp
+		!x11-apps/xgamma
+		!x11-apps/xgc
+		!x11-apps/xhost
+		!x11-apps/xinit
+		!x11-apps/xkbcomp
+		!x11-apps/xkbevd
+		!x11-apps/xkbprint
+		!x11-apps/xkbutils
+		!x11-apps/xkill
+		!x11-apps/xload
+		!x11-apps/xlogo
+		!x11-apps/xlsatoms
+		!x11-apps/xlsclients
+		!x11-apps/xlsfonts
+		!x11-apps/xmag
+		!x11-apps/xman
+		!x11-apps/xmessage
+		!x11-apps/xmh
+		!x11-apps/xmodmap
+		!x11-apps/xmore
+		!x11-apps/xphelloworld
+		!x11-apps/xplsprinters
+		!x11-apps/xpr
+		!x11-apps/xprehashprinterlist
+		!x11-apps/xprop
+		!x11-apps/xrandr
+		!x11-apps/xrdb
+		!x11-apps/xrefresh
+		!x11-apps/xrx
+		!x11-apps/xset
+		!x11-apps/xsetmode
+		!x11-apps/xsetpointer
+		!x11-apps/xsetroot
+		!x11-apps/xsm
+		!x11-apps/xstdcmap
+		!x11-apps/xtrap
+		!x11-apps/xvidtune
+		!x11-apps/xvinfo
+		!x11-apps/xwd
+		!x11-apps/xwininfo
+		!x11-apps/xwud
+		!x11-base/xorg-server
+		!x11-drivers/xf86-input-acecad
+		!x11-drivers/xf86-input-aiptek
+		!x11-drivers/xf86-input-calcomp
+		!x11-drivers/xf86-input-citron
+		!x11-drivers/xf86-input-digitaledge
+		!x11-drivers/xf86-input-dmc
+		!x11-drivers/xf86-input-dynapro
+		!x11-drivers/xf86-input-elo2300
+		!x11-drivers/xf86-input-elographics
+		!x11-drivers/xf86-input-evdev
+		!x11-drivers/xf86-input-fpit
+		!x11-drivers/xf86-input-hyperpen
+		!x11-drivers/xf86-input-jamstudio
+		!x11-drivers/xf86-input-joystick
+		!x11-drivers/xf86-input-keyboard
+		!x11-drivers/xf86-input-magellan
+		!x11-drivers/xf86-input-magictouch
+		!x11-drivers/xf86-input-microtouch
+		!x11-drivers/xf86-input-mouse
+		!x11-drivers/xf86-input-mutouch
+		!x11-drivers/xf86-input-palmax
+		!x11-drivers/xf86-input-penmount
+		!x11-drivers/xf86-input-spaceorb
+		!x11-drivers/xf86-input-summa
+		!x11-drivers/xf86-input-tek4957
+		!x11-drivers/xf86-input-ur98
+		!x11-drivers/xf86-input-vmmouse
+		!x11-drivers/xf86-input-void
+		!x11-drivers/xf86-video-apm
+		!x11-drivers/xf86-video-ark
+		!x11-drivers/xf86-video-ati
+		!x11-drivers/xf86-video-chips
+		!x11-drivers/xf86-video-cirrus
+		!x11-drivers/xf86-video-cyrix
+		!x11-drivers/xf86-video-dummy
+		!x11-drivers/xf86-video-fbdev
+		!x11-drivers/xf86-video-glint
+		!x11-drivers/xf86-video-i128
+		!x11-drivers/xf86-video-i740
+		!x11-drivers/xf86-video-i810
+		!x11-drivers/xf86-video-imstt
+		!x11-drivers/xf86-video-mga
+		!x11-drivers/xf86-video-neomagic
+		!x11-drivers/xf86-video-newport
+		!x11-drivers/xf86-video-nsc
+		!x11-drivers/xf86-video-nv
+		!x11-drivers/xf86-video-rendition
+		!x11-drivers/xf86-video-s3
+		!x11-drivers/xf86-video-s3virge
+		!x11-drivers/xf86-video-savage
+		!x11-drivers/xf86-video-siliconmotion
+		!x11-drivers/xf86-video-sis
+		!x11-drivers/xf86-video-sisusb
+		!x11-drivers/xf86-video-sunbw2
+		!x11-drivers/xf86-video-suncg14
+		!x11-drivers/xf86-video-suncg3
+		!x11-drivers/xf86-video-suncg6
+		!x11-drivers/xf86-video-sunffb
+		!x11-drivers/xf86-video-sunleo
+		!x11-drivers/xf86-video-suntcx
+		!x11-drivers/xf86-video-tdfx
+		!x11-drivers/xf86-video-tga
+		!x11-drivers/xf86-video-trident
+		!x11-drivers/xf86-video-tseng
+		!x11-drivers/xf86-video-v4l
+		!x11-drivers/xf86-video-vesa
+		!x11-drivers/xf86-video-vga
+		!x11-drivers/xf86-video-via
+		!x11-drivers/xf86-video-vmware
+		!x11-drivers/xf86-video-voodoo
+		!x11-libs/libdmx
+		!x11-libs/libdrm
+		!x11-libs/libfontenc
+		!x11-libs/libFS
+		!x11-libs/libICE
+		!x11-libs/liblbxutil
+		!x11-libs/liboldX
+		!x11-libs/libSM
+		!x11-libs/libX11
+		!x11-libs/libXau
+		!x11-libs/libXaw
+		!x11-libs/libXcomposite
+		!x11-libs/libXcursor
+		!x11-libs/libXdamage
+		!x11-libs/libXdmcp
+		!x11-libs/libXevie
+		!x11-libs/libXext
+		!x11-libs/libXfixes
+		!x11-libs/libXfont
+		!x11-libs/libXfontcache
+		!x11-libs/libXft
+		!x11-libs/libXi
+		!x11-libs/libXinerama
+		!x11-libs/libxkbfile
+		!x11-libs/libxkbui
+		!x11-libs/libXmu
+		!x11-libs/libXp
+		!x11-libs/libXpm
+		!x11-libs/libXprintAppUtil
+		!x11-libs/libXprintUtil
+		!x11-libs/libXrandr
+		!x11-libs/libXrender
+		!x11-libs/libXres
+		!x11-libs/libXScrnSaver
+		!x11-libs/libXt
+		!x11-libs/libXTrap
+		!x11-libs/libXtst
+		!x11-libs/libXv
+		!x11-libs/libXvMC
+		!x11-libs/libXxf86dga
+		!x11-libs/libXxf86misc
+		!x11-libs/libXxf86vm
+		!x11-libs/xtrans
+		!x11-misc/gccmakedep
+		!x11-misc/imake
+		!x11-misc/lndir
+		!x11-misc/makedepend
+		!x11-misc/util-macros
+		!x11-misc/xbitmaps
+		!x11-misc/xkbdata
+		!x11-misc/xkeyboard-config
+		!x11-misc/xorg-cf-files
+		!x11-proto/bigreqsproto
+		!x11-proto/compositeproto
+		!x11-proto/damageproto
+		!x11-proto/dmxproto
+		!x11-proto/evieext
+		!x11-proto/fixesproto
+		!x11-proto/fontcacheproto
+		!x11-proto/fontsproto
+		!x11-proto/glproto
+		!x11-proto/inputproto
+		!x11-proto/kbproto
+		!x11-proto/printproto
+		!x11-proto/randrproto
+		!x11-proto/recordproto
+		!x11-proto/renderproto
+		!x11-proto/resourceproto
+		!x11-proto/scrnsaverproto
+		!x11-proto/trapproto
+		!x11-proto/videoproto
+		!x11-proto/xcmiscproto
+		!x11-proto/xextproto
+		!x11-proto/xf86bigfontproto
+		!x11-proto/xf86dgaproto
+		!x11-proto/xf86driproto
+		!x11-proto/xf86miscproto
+		!x11-proto/xf86rushproto
+		!x11-proto/xf86vidmodeproto
+		!x11-proto/xineramaproto
+		!x11-proto/xproto
+		!x11-proto/xproxymanagementprotocol
+		!x11-themes/gentoo-xcursors
+		!x11-themes/xcursor-themes"
 
 PDEPEND="x86? (
 			input_devices_synaptics? ( x11-drivers/synaptics )
diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
index 1090837019d4..36f97e2fee32 100644
--- a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
@@ -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/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild,v 1.1 2006/07/01 06:41:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild,v 1.2 2006/07/07 18:21:17 dberkholz Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -95,7 +95,297 @@ RDEPEND="
 		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
 		media-libs/libpng
 		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
+		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
+		!app-doc/opengl-manpages
+		!app-doc/xorg-docs
+		!app-doc/xorg-sgml-doctools
+		!media-fonts/encodings
+		!media-fonts/font-adobe-100dpi
+		!media-fonts/font-adobe-75dpi
+		!media-fonts/font-adobe-utopia-100dpi
+		!media-fonts/font-adobe-utopia-75dpi
+		!media-fonts/font-adobe-utopia-type1
+		!media-fonts/font-alias
+		!media-fonts/font-arabic-misc
+		!media-fonts/font-bh-100dpi
+		!media-fonts/font-bh-75dpi
+		!media-fonts/font-bh-lucidatypewriter-100dpi
+		!media-fonts/font-bh-lucidatypewriter-75dpi
+		!media-fonts/font-bh-ttf
+		!media-fonts/font-bh-type1
+		!media-fonts/font-bitstream-100dpi
+		!media-fonts/font-bitstream-75dpi
+		!media-fonts/font-bitstream-speedo
+		!media-fonts/font-bitstream-type1
+		!media-fonts/font-cronyx-cyrillic
+		!media-fonts/font-cursor-misc
+		!media-fonts/font-daewoo-misc
+		!media-fonts/font-dec-misc
+		!media-fonts/font-ibm-type1
+		!media-fonts/font-isas-misc
+		!media-fonts/font-jis-misc
+		!media-fonts/font-micro-misc
+		!media-fonts/font-misc-cyrillic
+		!media-fonts/font-misc-ethiopic
+		!media-fonts/font-misc-meltho
+		!media-fonts/font-misc-misc
+		!media-fonts/font-mutt-misc
+		!media-fonts/font-schumacher-misc
+		!media-fonts/font-screen-cyrillic
+		!media-fonts/font-sony-misc
+		!media-fonts/font-sun-misc
+		!media-fonts/font-util
+		!media-fonts/font-winitzki-cyrillic
+		!media-fonts/font-xfree86-type1
+		!media-libs/mesa
+		!x11-apps/appres
+		!x11-apps/bdftopcf
+		!x11-apps/beforelight
+		!x11-apps/bitmap
+		!x11-apps/editres
+		!x11-apps/fonttosfnt
+		!x11-apps/fslsfonts
+		!x11-apps/fstobdf
+		!x11-apps/iceauth
+		!x11-apps/ico
+		!x11-apps/lbxproxy
+		!x11-apps/listres
+		!x11-apps/luit
+		!x11-apps/mesa-progs
+		!x11-apps/mkcfm
+		!x11-apps/mkfontdir
+		!x11-apps/mkfontscale
+		!x11-apps/oclock
+		!x11-apps/proxymngr
+		!x11-apps/rgb
+		!x11-apps/rstart
+		!x11-apps/scripts
+		!x11-apps/sessreg
+		!x11-apps/setxkbmap
+		!x11-apps/showfont
+		!x11-apps/smproxy
+		!x11-wm/twm
+		!x11-apps/viewres
+		!x11-apps/x11perf
+		!x11-apps/xauth
+		!x11-apps/xbiff
+		!x11-apps/xcalc
+		!x11-apps/xclipboard
+		!x11-apps/xclock
+		!x11-apps/xcmsdb
+		!x11-apps/xconsole
+		!x11-apps/xcursorgen
+		!x11-apps/xdbedizzy
+		!x11-apps/xditview
+		!x11-apps/xdm
+		!x11-apps/xdpyinfo
+		!x11-apps/xdriinfo
+		!x11-apps/xedit
+		!x11-apps/xev
+		!x11-apps/xeyes
+		!x11-apps/xf86dga
+		!x11-apps/xfd
+		!x11-apps/xfindproxy
+		!x11-apps/xfontsel
+		!x11-apps/xfs
+		!x11-apps/xfsinfo
+		!x11-apps/xfwp
+		!x11-apps/xgamma
+		!x11-apps/xgc
+		!x11-apps/xhost
+		!x11-apps/xinit
+		!x11-apps/xkbcomp
+		!x11-apps/xkbevd
+		!x11-apps/xkbprint
+		!x11-apps/xkbutils
+		!x11-apps/xkill
+		!x11-apps/xload
+		!x11-apps/xlogo
+		!x11-apps/xlsatoms
+		!x11-apps/xlsclients
+		!x11-apps/xlsfonts
+		!x11-apps/xmag
+		!x11-apps/xman
+		!x11-apps/xmessage
+		!x11-apps/xmh
+		!x11-apps/xmodmap
+		!x11-apps/xmore
+		!x11-apps/xphelloworld
+		!x11-apps/xplsprinters
+		!x11-apps/xpr
+		!x11-apps/xprehashprinterlist
+		!x11-apps/xprop
+		!x11-apps/xrandr
+		!x11-apps/xrdb
+		!x11-apps/xrefresh
+		!x11-apps/xrx
+		!x11-apps/xset
+		!x11-apps/xsetmode
+		!x11-apps/xsetpointer
+		!x11-apps/xsetroot
+		!x11-apps/xsm
+		!x11-apps/xstdcmap
+		!x11-apps/xtrap
+		!x11-apps/xvidtune
+		!x11-apps/xvinfo
+		!x11-apps/xwd
+		!x11-apps/xwininfo
+		!x11-apps/xwud
+		!x11-base/xorg-server
+		!x11-drivers/xf86-input-acecad
+		!x11-drivers/xf86-input-aiptek
+		!x11-drivers/xf86-input-calcomp
+		!x11-drivers/xf86-input-citron
+		!x11-drivers/xf86-input-digitaledge
+		!x11-drivers/xf86-input-dmc
+		!x11-drivers/xf86-input-dynapro
+		!x11-drivers/xf86-input-elo2300
+		!x11-drivers/xf86-input-elographics
+		!x11-drivers/xf86-input-evdev
+		!x11-drivers/xf86-input-fpit
+		!x11-drivers/xf86-input-hyperpen
+		!x11-drivers/xf86-input-jamstudio
+		!x11-drivers/xf86-input-joystick
+		!x11-drivers/xf86-input-keyboard
+		!x11-drivers/xf86-input-magellan
+		!x11-drivers/xf86-input-magictouch
+		!x11-drivers/xf86-input-microtouch
+		!x11-drivers/xf86-input-mouse
+		!x11-drivers/xf86-input-mutouch
+		!x11-drivers/xf86-input-palmax
+		!x11-drivers/xf86-input-penmount
+		!x11-drivers/xf86-input-spaceorb
+		!x11-drivers/xf86-input-summa
+		!x11-drivers/xf86-input-tek4957
+		!x11-drivers/xf86-input-ur98
+		!x11-drivers/xf86-input-vmmouse
+		!x11-drivers/xf86-input-void
+		!x11-drivers/xf86-video-apm
+		!x11-drivers/xf86-video-ark
+		!x11-drivers/xf86-video-ati
+		!x11-drivers/xf86-video-chips
+		!x11-drivers/xf86-video-cirrus
+		!x11-drivers/xf86-video-cyrix
+		!x11-drivers/xf86-video-dummy
+		!x11-drivers/xf86-video-fbdev
+		!x11-drivers/xf86-video-glint
+		!x11-drivers/xf86-video-i128
+		!x11-drivers/xf86-video-i740
+		!x11-drivers/xf86-video-i810
+		!x11-drivers/xf86-video-imstt
+		!x11-drivers/xf86-video-mga
+		!x11-drivers/xf86-video-neomagic
+		!x11-drivers/xf86-video-newport
+		!x11-drivers/xf86-video-nsc
+		!x11-drivers/xf86-video-nv
+		!x11-drivers/xf86-video-rendition
+		!x11-drivers/xf86-video-s3
+		!x11-drivers/xf86-video-s3virge
+		!x11-drivers/xf86-video-savage
+		!x11-drivers/xf86-video-siliconmotion
+		!x11-drivers/xf86-video-sis
+		!x11-drivers/xf86-video-sisusb
+		!x11-drivers/xf86-video-sunbw2
+		!x11-drivers/xf86-video-suncg14
+		!x11-drivers/xf86-video-suncg3
+		!x11-drivers/xf86-video-suncg6
+		!x11-drivers/xf86-video-sunffb
+		!x11-drivers/xf86-video-sunleo
+		!x11-drivers/xf86-video-suntcx
+		!x11-drivers/xf86-video-tdfx
+		!x11-drivers/xf86-video-tga
+		!x11-drivers/xf86-video-trident
+		!x11-drivers/xf86-video-tseng
+		!x11-drivers/xf86-video-v4l
+		!x11-drivers/xf86-video-vesa
+		!x11-drivers/xf86-video-vga
+		!x11-drivers/xf86-video-via
+		!x11-drivers/xf86-video-vmware
+		!x11-drivers/xf86-video-voodoo
+		!x11-libs/libdmx
+		!x11-libs/libdrm
+		!x11-libs/libfontenc
+		!x11-libs/libFS
+		!x11-libs/libICE
+		!x11-libs/liblbxutil
+		!x11-libs/liboldX
+		!x11-libs/libSM
+		!x11-libs/libX11
+		!x11-libs/libXau
+		!x11-libs/libXaw
+		!x11-libs/libXcomposite
+		!x11-libs/libXcursor
+		!x11-libs/libXdamage
+		!x11-libs/libXdmcp
+		!x11-libs/libXevie
+		!x11-libs/libXext
+		!x11-libs/libXfixes
+		!x11-libs/libXfont
+		!x11-libs/libXfontcache
+		!x11-libs/libXft
+		!x11-libs/libXi
+		!x11-libs/libXinerama
+		!x11-libs/libxkbfile
+		!x11-libs/libxkbui
+		!x11-libs/libXmu
+		!x11-libs/libXp
+		!x11-libs/libXpm
+		!x11-libs/libXprintAppUtil
+		!x11-libs/libXprintUtil
+		!x11-libs/libXrandr
+		!x11-libs/libXrender
+		!x11-libs/libXres
+		!x11-libs/libXScrnSaver
+		!x11-libs/libXt
+		!x11-libs/libXTrap
+		!x11-libs/libXtst
+		!x11-libs/libXv
+		!x11-libs/libXvMC
+		!x11-libs/libXxf86dga
+		!x11-libs/libXxf86misc
+		!x11-libs/libXxf86vm
+		!x11-libs/xtrans
+		!x11-misc/gccmakedep
+		!x11-misc/imake
+		!x11-misc/lndir
+		!x11-misc/makedepend
+		!x11-misc/util-macros
+		!x11-misc/xbitmaps
+		!x11-misc/xkbdata
+		!x11-misc/xkeyboard-config
+		!x11-misc/xorg-cf-files
+		!x11-proto/bigreqsproto
+		!x11-proto/compositeproto
+		!x11-proto/damageproto
+		!x11-proto/dmxproto
+		!x11-proto/evieext
+		!x11-proto/fixesproto
+		!x11-proto/fontcacheproto
+		!x11-proto/fontsproto
+		!x11-proto/glproto
+		!x11-proto/inputproto
+		!x11-proto/kbproto
+		!x11-proto/printproto
+		!x11-proto/randrproto
+		!x11-proto/recordproto
+		!x11-proto/renderproto
+		!x11-proto/resourceproto
+		!x11-proto/scrnsaverproto
+		!x11-proto/trapproto
+		!x11-proto/videoproto
+		!x11-proto/xcmiscproto
+		!x11-proto/xextproto
+		!x11-proto/xf86bigfontproto
+		!x11-proto/xf86dgaproto
+		!x11-proto/xf86driproto
+		!x11-proto/xf86miscproto
+		!x11-proto/xf86rushproto
+		!x11-proto/xf86vidmodeproto
+		!x11-proto/xineramaproto
+		!x11-proto/xproto
+		!x11-proto/xproxymanagementprotocol
+		!x11-themes/gentoo-xcursors
+		!x11-themes/xcursor-themes"
 
 PDEPEND="x86? (
 			input_devices_synaptics? ( x11-drivers/synaptics )