*** empty log message ***

51 files changed, 4457 insertions, 354 deletions

diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog
index e161aacbd948..7e7b80a89e60 100644
--- a/x11-base/kdrive/ChangeLog
+++ b/x11-base/kdrive/ChangeLog
@@ -1,9 +1,134 @@
 # ChangeLog for x11-base/kdrive
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.1 2003/07/07 09:53:44 spyderous Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.1.1.1 2005/11/30 10:01:08 chriswhite Exp $
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/make-xv-configable.patch, kdrive-6.6.1_pre20050820.ebuild:
+  Add minimal USE flag, which disables xv, composite, xrecord and xres. Make
+  static USE flag actually build static servers -- this still works for
+  neither Xati, Xephyr, Xepson, Xfake or Xi810 among kdrive servers nor Xglx.
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/startxkd:
+  Fix up startxkd so it works better for me.
+
+*kdrive-6.6.1_pre20050820 (21 Aug 2005)
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/startxkd,
+  +kdrive-6.6.1_pre20050820.ebuild:
+  New snapshot of kdrive, a pack of tiny X servers. Perhaps the most
+  interesting part of this is Xglx, a server layered on top of OpenGL. It runs
+  on an OpenGL-enabled X server, similar to how Xnest works. Another
+  interesting new server is Xephyr, which is like Xnest but supports the
+  composite/damage extensions, also it can run at different bpp than the host,
+  e.g. 8bpp on a 24bpp host. The other included servers are: Xfbdev Xvesa
+  Xmach64 Xmga Xnvidia Xr128 Xsmi Xchips Xpm2 Xvia Xneomagic Xati Xfake Xi810
+  Xepson. Xfake can be useful in combination with apps like luminocity. This
+  builds against the modular X framework, so you need to be using modular X to
+  use it.
+
+  06 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  kdrive-4.3.0-r5.ebuild:
+  (#74869) USE flag cleanup, from Diego Pettenò <flameeyes@gentoo.org>.
+
+  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> kdrive-4.3.0-r5.ebuild:
+  Fixing bugs 65758 and 68531 -- this disables toshiba dpms support, unfortunately.
+
+  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> kdrive-4.3.0-r5.ebuild:
+  Converted over to new linux-info eclass, bug #68455
+
+  23 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  kdrive-4.3.0-r5.ebuild:
+  Change fs USE flag to font-server.
+
+  17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  kdrive-4.3.0-r5.ebuild:
+  Add debug to IUSE, and uncomment the video card listing, IUSE_VIDEO_CARDS.
+
+  20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree.
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  /usr/src/linux needs ${ROOT}.
+
+  23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  Reverting old kernel detection method for livecd, integrating koutput
+
+  12 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  Adding support for koutput in kernel tree
+
+  01 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  Move inherit up, above uses of flag-o-matic.
+
+  11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  xorg-x11 compatibility update.
+
+  24 Mar 2004; Martin Holzer <mholzer@gentoo.org> kdrive-4.3.0-r5.ebuild:
+  now shows description. closes 45530
+
+  19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r1.ebuild,
+  kdrive-4.3.0-r4.ebuild:
+  Pulling old revisions.
+
+*kdrive-4.3.0-r5 (19 Mar 2004)
+
+  19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r5.ebuild:
+  Removing PROVIDE=virtual/x11. This should be used for the libraries, not the
+  servers, because it's what other packages build against. Mark -r5 x86 also,
+  since only change from -r4 is the PROVIDE and that has no effect on stability.
+
+  24 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r1.ebuild:
+  Change is_kernel check so it defaults to running kernel if /usr/src/linux
+  doesn't exist so it works on LiveCD.
+
+  15 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0.ebuild:
+  Pulling old stable version, there's a newer one.
+
+  15 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r2.ebuild:
+  Pulling broken version, not here for any real reason I can see.
+
+*kdrive-4.3.0-r4 (28 Jan 2004)
+
+  28 Jan 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r3.ebuild,
+  kdrive-4.3.0-r4.ebuild:
+  Updating to install man pages correctly.
+
+*kdrive-4.3.0-r3 (21 Jan 2004)
+
+  21 Jan 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r3.ebuild:
+  Updated version fixes support for building on systems without XFree86
+  libraries, closes bug
+
+*kdrive-4.3.0-r2 (10 Nov 2003)
+
+  10 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r2.ebuild:
+  Add missing include patch to close bug #32368 and allow kdrive to compile
+  without xfree installed. Remove LBX support, add support for speedo, type1,
+  truetype, cid fonts, font server and xv. Clean up code -- Change M to MANDIR,
+  move it to a global var, move vesa() to the bottom, re-tab things properly.
+  Change epatch to bulk patching. Allow -Os and -fomit-frame-pointer CFLAGS. Fix
+  issue if /usr/src/linux doesn't exist. Always install all KDrive man pages,
+  since documentation on it is so slim.
+
+  12 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r1.ebuild:
+  Major reworking of ebuild, centered around removing repetitive statements.
+  Also smaller fixes. Moved to USE_EXPAND from local vcards variable.
+
+*kdrive-4.3.0-r1 (16 Sep 2003)
+
+  16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r1.ebuild:
+  Added an update from Keith Packard's CVS as well as a startxkd script that
+  works decently. KDrive is under heavy work so look forward to some new stuff
+  in the not-too-distant future.
+
+  16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0.ebuild:
+  Ebuild cleanup, disable type1 and truetype for now because they're useless in
+  the current setup.
+
+  18 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0.ebuild:
+  Marked stable for x86.
 
 *kdrive-4.3.0 (07 Jul 2003)
 
   07 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0.ebuild:
-  Initial commit.
+  Initial commit. Thanks to jjosegutierrez@terra.es for submitting an ebuild.
 
diff --git a/x11-base/kdrive/Manifest b/x11-base/kdrive/Manifest
index 9a373ff37900..95095ee4e4a5 100644
--- a/x11-base/kdrive/Manifest
+++ b/x11-base/kdrive/Manifest
@@ -1,3 +1,18 @@
-MD5 ddc019847d8b68d932988e5b875fefd0 kdrive-4.3.0.ebuild 10348
-MD5 449c48cfdf584aeeea15c0b34c2ad00f ChangeLog 339
-MD5 c1fefd05eb62aac375b37a764c0be440 files/digest-kdrive-4.3.0 253
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee8d76bbf67e4bb81f085a2ff39f681a ChangeLog 6063
+MD5 f3b9f93d1f90c34280f1524c055dc70c kdrive-4.3.0-r5.ebuild 10491
+MD5 16a5f9a7ba698acfeb4531400ee03595 kdrive-6.6.1_pre20050820.ebuild 2312
+MD5 857cb50121a1ff814cb50eec928a7ed7 metadata.xml 249
+MD5 150e6b8975ca879186466f40884bd085 files/digest-kdrive-6.6.1_pre20050820 70
+MD5 69b96dd899a580d0ad5d2516108ee97c files/make-xv-configable.patch 611
+MD5 df59ec9c062d8c091f496ba8d57f054e files/startxkd 392
+MD5 a6e0af618cce0a49bbda2a83d4704b53 files/digest-kdrive-4.3.0-r5 254
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLHJ2j5H05b2HAEkRAimYAJ0eNMMZvmf6wHa2Gx4olaLUjWq7qwCgovaF
+AtMXPNvyOkeGXy4Cl8rJ0VY=
+=k7D0
+-----END PGP SIGNATURE-----
diff --git a/x11-base/kdrive/files/startxkd b/x11-base/kdrive/files/startxkd
index cacdbc460fed..4906dee2fdd4 100755
--- a/x11-base/kdrive/files/startxkd
+++ b/x11-base/kdrive/files/startxkd
@@ -13,12 +13,13 @@ screen="-screen 1280x1024x16"
 
 rgb="-rgba rgb"
 
-mouse="-2button -mouse /dev/psaux -mouse /dev/input/mice,5"
+mouse="-mouse /dev/input/mice,5"
 
 opts="-dpi 96 -nolisten tcp"
 
-#switchcmd="-switchCmd /usr/X11R6/bin/touchpad"
+#switchcmd="-switchCmd /usr/bin/touchpad"
 
-fontpath="-fp /usr/share/fonts"
+#fontpath="-fp /usr/share/fonts"
+#fontpath=""
 
-exec ${dir}${server} $opts $rgb $screen $mouse $switchcmd $fontpath
+exec ${dir}${server} $opts $rgb $screen $mouse $switchcmd $fontpath $*
diff --git a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild b/x11-base/kdrive/kdrive-4.3.0-r5.ebuild
index bbeb2cc85fc7..2d540297fbbb 100644
--- a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild
+++ b/x11-base/kdrive/kdrive-4.3.0-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.1 2004/03/19 16:52:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.1.1.1 2005/11/30 10:01:08 chriswhite Exp $
 
 # If you don't want to build the Xvesa server, do this.
 # VESA="no" emerge kdrive
@@ -9,9 +9,11 @@
 # fonts (but support for built-in ``fixed'' and ``cursor'' fonts, and
 # normal support for bitmap fonts and font-server provided fonts).
 
-IUSE="ipv6 xinerama fbdev speedo type1 cjk truetype freetype fs xv"
+IUSE="ipv6 xinerama fbdev speedo type1 cjk truetype font-server xv debug"
 
-# VIDEO_CARDS="savage trident sis530 trio ts300 mach64 i810 igs"
+IUSE_VIDEO_CARDS="savage trident sis530 trio ts300 mach64 i810 igs"
+
+inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
 filter-flags "-funroll-loops"
 
@@ -48,7 +50,6 @@ BASE_PV="${PV}"
 MY_SV="${BASE_PV//\.}"
 S="${WORKDIR}/xc"
 SRC_PATH="mirror://xfree/${BASE_PV}/source"
-DESCRIPTION="Xfree86: famous and free X server. Tiny version (KDrive)"
 HOMEPAGE="http://www.xfree.org"
 SRC_URI="${SRC_PATH}/X${MY_SV}src-1.tgz
 	${SRC_PATH}/X${MY_SV}src-2.tgz
@@ -58,19 +59,17 @@ LICENSE="X11"
 SLOT="0"
 KEYWORDS="x86 amd64"
 # Need portage for USE_EXPAND
-DEPEND=">=sys-apps/baselayout-1.8.3
-	>=sys-libs/ncurses-5.1
+DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
 	>=sys-devel/flex-2.5.4a-r5
 	>=dev-libs/expat-1.95.3
 	>=sys-apps/sed-4
 	dev-lang/perl
 	media-libs/libpng
-	>=sys-apps/portage-2.0.49-r13"
+	>=sys-apps/portage-2.0.49-r13
+	truetype? ( media-libs/freetype )"
 
-#inherit needs to happen *after* DEPEND has been defined to have "newdepend"
-#do the right thing. Otherwise RDEPEND doesn't get set properly.
-inherit eutils flag-o-matic gcc xfree
+DESCRIPTION="Xfree86: famous and free X server. Tiny version (KDrive)"
 
 src_unpack() {
 	unpack ${A}
@@ -96,7 +95,7 @@ src_unpack() {
 		# We dont really want to spend twice as long compiling libraries
 		# if they exist of the system allready, so we check and change
 		# respectively here.
-		if [ "`best_version x11-base/xfree`" ] ; then
+		if [ "`best_version virtual/x11`" ] ; then
 			echo "#define BuildScreenSaverExt NO" >> config/cf/host.def
 			echo "#define BuildScreenSaverLibrary NO" >> config/cf/host.def
 			echo "#define SharedLibXss NO" >> config/cf/host.def
@@ -134,10 +133,11 @@ src_unpack() {
 			fi
 		fi
 
-		# Safe if /usr/src/linux doesn't exist
-		if ( [ -e "/usr/src/linux" ] && \
-			[ ! `is_kernel "2" "2"` ] ) || \
-			[ "`uname -r | cut -d. -f1,2`" != "2.2" ]
+		get_version
+		if [ "${KV_MAJOR}" -ge "2" -a "${KV_MINOR}" -ge "4" ] || \
+		     (  [ -e "${ROOT}/usr/src/linux" ] && \
+			      [ ! $(kernel_is "2" "2") ] ) || \
+				  [ "$(uname -r | cut -d. -f1,2)" != "2.2" ]
 		then
 			echo "#define HasLinuxInput YES" >> config/cf/host.def
 		fi
@@ -185,9 +185,9 @@ src_unpack() {
 		use speedo && echo "#define BuildSpeedo YES" >> config/cf/host.def
 		use type1 && echo "#define BuildType1 YES" >> config/cf/host.def
 		use cjk && echo "#define BuildCID YES" >> config/cf/host.def
-		use truetype && echo "#define BuildXTrueType YES" >> config/cf/host.def
-		use freetype && echo "#define BuildFreeType YES" >> config/cf/host.def
-		use fs && echo "#define FontServerAccess YES" >> config/cf/host.def
+		use truetype && echo "#define BuildXTrueType YES" >> config/cf/host.def \
+			&& echo "#define BuildFreeType YES" >> config/cf/host.def
+		use font-server && echo "#define FontServerAccess YES" >> config/cf/host.def
 
 		# Video
 		use xv && echo "#define BuildXvExt YES" >> config/cf/host.def
@@ -199,7 +199,7 @@ src_unpack() {
 	EPATCH_SUFFIX="patch" epatch ${PATCH_DIR}
 
 	# We need to modify xmakefile after it has been created
-	if [ ! "`best_version x11-base/xfree`" ] ; then
+	if [ ! "`best_version virtual/x11`" ] ; then
 		ebegin "Creating fake X includes..."
 			MY_PROJROOT="${S}/usr/X11R6/include/"
 			MY_INCROOT="${S}/include"
@@ -223,16 +223,15 @@ src_unpack() {
 	    eend 0
 	fi
 
+	# Fixing bugs #68531 and #65758 -- this will disable toshiba dpms support
+	sed '/#ifndef TOSHIBA_SMM/,/#endif/d' -i ${S}/programs/Xserver/hw/kdrive/vesa/vesa.c
 }
 
 src_compile() {
 
-	# Set MAKEOPTS to have proper -j? option ..
-	get_number_of_jobs
-
 	# If a user defines the MAKE_OPTS variable in /etc/make.conf instead of
-	# MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the
-	# xfree build will silently die. This is tricky to track down, so I'm
+	# MAKEOPTS, they'll redefine an internal X11 Makefile variable and the
+	# X11 build will silently die. This is tricky to track down, so I'm
 	# adding a preemptive fix for this issue by making sure that MAKE_OPTS is
 	# unset. (drobbins, 08 Mar 2003)
 	unset MAKE_OPTS
@@ -290,10 +289,10 @@ src_install() {
 	doexe ${PATCH_DIR}/startxkd
 
 	# Install man pages
-	if [ "`best_version x11-base/xfree`" ] ; then
-		doman -x11 ${MANDIR}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
+	if [ "`best_version virtual/x11`" ] ; then
+		doman ${MANDIR}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
 	else
-		doman -x11 ${MANDIR}/${S}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
+		doman ${MANDIR}/${S}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
 	fi
 }
 
diff --git a/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild b/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
index cd9f20bfe9c0..179a0cdf538d 100644
--- a/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
+++ b/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild,v 1.1 2005/08/21 02:55:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild,v 1.1.1.1 2005/11/30 10:01:08 chriswhite Exp $
 
 SNAPSHOT="yes"
 
 inherit flag-o-matic x-modular
 
+PATCHES="${FILESDIR}/make-xv-configable.patch"
+
 MY_PN="xserver"
 MY_P="${MY_PN}-${PV##*pre}"
 SRC_URI="http://dev.gentoo.org/~spyderous/overlay/distfiles/${MY_P}.tar.bz2"
 HOMEPAGE="http://xserver.freedesktop.org/wiki/Software/Xserver"
 DESCRIPTION="Experimental X11 implementations"
 KEYWORDS="~x86"
-IUSE="ipv6 static"
+IUSE="ipv6 static minimal"
 RDEPEND="x11-libs/libXdmcp
 	x11-libs/libX11
 	x11-libs/libXext
@@ -38,6 +40,10 @@ S="${WORKDIR}/${MY_P%%-[0-9]*}"
 
 pkg_setup() {
 	CONFIGURE_OPTIONS="$(use_enable ipv6)
+		$(use_enable !minimal xv)
+		$(use_enable !minimal composite)
+		$(use_enable !minimal xrecord)
+		$(use_enable !minimal xres)
 		--enable-xglserver
 		--enable-xglxserver
 		--disable-xeglserver
@@ -46,9 +52,18 @@ pkg_setup() {
 	#	--enable-xeglserver
 
 	append-ldflags -Wl,-z,now
+}
+
+src_compile() {
+	x-modular_src_configure
+
+	# Has to be after configure, or configure dies
 	if use static; then
-		append-ldflags -static
+		append-ldflags -all-static
 	fi
+
+	# Yes, we do need the LDFLAGS here in addition to the above append.
+	emake LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/x11-base/kdrive/metadata.xml b/x11-base/kdrive/metadata.xml
index c1a5f48a7b8d..a4e953f54f70 100644
--- a/x11-base/kdrive/metadata.xml
+++ b/x11-base/kdrive/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfree</herd>
+<herd>X11</herd>
 <longdescription>Xfree86: famous and free X server. Tiny version (Kdrive).</longdescription>
 </pkgmetadata>
diff --git a/x11-base/metadata.xml b/x11-base/metadata.xml
index 8419909f76ac..1b9d864b90e0 100644
--- a/x11-base/metadata.xml
+++ b/x11-base/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The x11-base category contains various X11 base implementations.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-base enthält verschiedene X11 Implementierungen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-base contiene varias implementaciones base de X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-baseカテゴリーには様々なX11を基本とした実行環境が含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De x11-base categorie bevat verschillende implementaties van X11.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-base chứa các bản cài đặt X11 cơ sở.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-base contiene varie implementazioni base di X11.
+	</longdescription>
 </catmetadata>
 
diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 18ff5a3ebb31..657967452734 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,540 @@
 # ChangeLog for x11-base/opengl-update
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.1 2002/05/12 18:33:22 azarah Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.1.1.1 2005/11/30 10:01:10 chriswhite Exp $
+
+  05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  opengl-update-3.0.0.ebuild:
+  Added more KEYWORDS for archs that got added to eselect and were in the
+  previous opengl-update.
+
+*opengl-update-2.2.4 (05 Sep 2005)
+
+  05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1.1, -files/opengl-update-2.2.2,
+  -files/opengl-update-2.2.3, +files/opengl-update-2.2.4,
+  -opengl-update-2.2.3.ebuild, -opengl-update-2.2.3-r1.ebuild,
+  +opengl-update-2.2.4.ebuild:
+  Backported 2 bug fixes from eselect module. Fixed symlinks to tls libs and
+  --impl-headers.
+
+  27 Aug 2005; MATSUU Takuto <matsuu@gentoo.org>
+  opengl-update-2.2.3-r1.ebuild:
+  Added ~sh to KEYWORDS.
+
+*opengl-update-2.2.3-r1 (17 Aug 2005)
+
+  17 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +opengl-update-2.2.3-r1.ebuild:
+  Revbump to bump the headers versions.
+
+  17 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-3.0.0.eselect, opengl-update-3.0.0.ebuild:
+  Moved eselect stuff to app-admin/eselect-opengl
+
+  13 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/opengl-update-3.0.0.eselect:
+  Some style changes at the suggestion of the eselect guys.
+
+*opengl-update-3.0.0 (13 Aug 2005)
+
+  13 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/opengl-update-3.0.0, +files/opengl-update-3.0.0.eselect,
+  files/glxext.h-inttypes.patch, -opengl-update-2.1.1-r1.ebuild,
+  opengl-update-2.2.1.ebuild, -opengl-update-2.2.2.ebuild,
+  opengl-update-2.2.3.ebuild, +opengl-update-3.0.0.ebuild:
+  Transition to eselect module, but we still have an opengl-update executable
+  as a frontend to it while users/ebuilds migrate. Also bump the versions of
+  the headers to latest upstream.
+
+*opengl-update-2.2.3 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-2.2.3, +opengl-update-2.2.3.ebuild:
+  Another bump for modular X -- install to /usr/lib/xorg/modules instead of
+  /usr/lib/modules if the former exists.
+
+*opengl-update-2.2.2 (10 Aug 2005)
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-2.2.2, +opengl-update-2.2.2.ebuild:
+  Bump to deal with modular X. Do this by only checking for a high enough
+  xorg-x11 version if xorg-x11's installed.
+
+  07 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  opengl-update-2.2.1.ebuild:
+  stable on mips
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  opengl-update-2.2.1.ebuild:
+  Stable on alpha.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> opengl-update-2.2.1.ebuild:
+  Stable on ppc64
+
+  31 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/opengl-update-2.2.1:
+  Added livecd check from spyderous. Since this only affects livecd users, the
+  version/revision has not been changed.
+
+  27 May 2005; Joseph Jezak <josejx@gentoo.org> opengl-update-2.2.1.ebuild:
+  Marked ppc stable.
+
+  15 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  opengl-update-2.2.1.ebuild:
+  Stable on hppa
+
+  15 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  opengl-update-2.2.1.ebuild:
+  Stable amd64, sparc, x86.
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild, opengl-update-2.2.1.ebuild:
+  Removing blocks on packages that were removed from portage.
+
+*opengl-update-2.2.1 (27 Apr 2005)
+
+  27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.2.0, +files/opengl-update-2.2.1,
+  -opengl-update-2.2.0.ebuild, +opengl-update-2.2.1.ebuild:
+  Fixed bug with --with-old not working properly.
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/opengl-update-2.2.0:
+  Set a sane umask.  Closes bug #83115.
+  Make --use-old fix the current implementation if it's broken rather than
+  exiting by doing nothing. Cleaned up --help output.
+
+*opengl-update-2.2.0 (26 Apr 2005)
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/opengl-update-2.2.0, +opengl-update-2.2.0.ebuild:
+  Bumped glext.h version to latest from upstream (27). Now use global headers
+  by default. You can use --impl-headers to use the ones from the specific
+  implementation. No longer mess with nvidia tls as that's handled by the
+  nvidia-glx ebuild instead. We just need to worry about libGL and libGLcore.
+  This fixes bug #85044 and #90047 for some people.
+
+  15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-1.7.2, -files/opengl-update-1.8.2,
+  -files/opengl-update-2.0_pre5, -opengl-update-1.7.2.ebuild,
+  -opengl-update-1.8.2.ebuild, -opengl-update-2.0_pre5.ebuild:
+  Removing versions of opengl-update which don't work with any remaining
+  xorg-x11 version in portage.
+
+  03 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.0_pre4, -opengl-update-2.0_pre4-r1.ebuild,
+  -opengl-update-2.1.1.ebuild:
+  Removing old versions.
+
+  10 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-2.1.1-r1.ebuild:
+  Stable x86 for 6.8.2.
+
+  10 Mar 2005; Ferris McCormick <fmccor@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild:
+  Stable for sparc; required for xorg-x11-s.8.2-r1 and bug 83598.
+
+  10 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild:
+  Marked stable on amd64.
+
+  09 Mar 2005; Stephen P. Becker <geoman@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild:
+  stable on mips - bug 83598
+
+  08 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild:
+  Stable on alpha, bug 83598.
+
+  17 Feb 2005; Markus Rothe <corsair@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild:
+  Stable on ppc64
+
+  17 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  opengl-update-2.1.1-r1.ebuild:
+  Stable on ppc.
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  opengl-update-2.0_pre5.ebuild:
+  Stable on alpha.
+
+*opengl-update-2.1.1-r1 (11 Feb 2005)
+
+  11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/glxext.h-inttypes.patch, +opengl-update-2.1.1-r1.ebuild:
+  Always #include <inttypes.h> regardless of C standard version requested.
+  Closes bug #81472.
+
+*opengl-update-2.1.1 (09 Feb 2005)
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1.0, files/opengl-update-2.1.1,
+  -opengl-update-2.1.0-r1.ebuild, +opengl-update-2.1.1.ebuild:
+  Fix removal of broken symlinks in headers. Check for /usr/libdir/opengl
+  rather than /usr/libdir. Fix install of libglx to the correct place. Closes
+  all open bugs (again). This should be the stable candidate (again).
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/opengl-update-2.1.1:
+  Version bump of script added to incrementally fix bugs before next release.
+
+*opengl-update-2.1.0-r1 (09 Feb 2005)
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +opengl-update-2.1.0-r1.ebuild, -opengl-update-2.1.0.ebuild:
+  Fixed #warn directive in glxext.h to be #warning.  See bug #81199.
+
+*opengl-update-2.1.0 (09 Feb 2005)
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-1.5, +files/opengl-update-2.1.0,
+  -files/opengl-update-2.1_pre4, -files/opengl-update-2.1_pre6,
+  -files/opengl-update-2.1_pre7, -opengl-update-1.5.ebuild,
+  +opengl-update-2.1.0.ebuild, -opengl-update-2.1_pre4.ebuild,
+  -opengl-update-2.1_pre6.ebuild, -opengl-update-2.1_pre7.ebuild:
+  Version bump to fix bug #81199 where header symlinks might point to nowhere
+  if the profile dir and global dir didn't have them.
+
+  08 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  opengl-update-2.1_pre7.ebuild:
+  Readding ~arm ~hppa ~ia64 as they now satisfy the >=xorg-x11-6.8.0-r4 DEPEND
+  with 6.8.1.904.
+
+*opengl-update-2.1_pre7 (08 Feb 2005)
+
+  08 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1_pre5, +files/opengl-update-2.1_pre7,
+  +opengl-update-2.1_pre7.ebuild:
+  Version bump does major code cleanup and adds --prefix and --dst-prefix
+  options to close bug #55212.
+
+*opengl-update-2.1_pre6 (07 Feb 2005)
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/opengl-update-2.1_pre6, -opengl-update-2.1_pre5.ebuild,
+  +opengl-update-2.1_pre6.ebuild:
+  Bump to latest glest.h and glxext.h headers.
+  Added support for XiG GL headers: glxext.h glxmd.h glxproto.h.
+
+*opengl-update-2.1_pre5 (06 Feb 2005)
+
+  06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/opengl-update-2.1_pre5, +opengl-update-2.1_pre5.ebuild:
+  Fixed bug which made lib32/tls directory on systems that don't use lib32.
+
+  06 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  opengl-update-2.0_pre5.ebuild:
+  Marked x86
+
+  05 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  opengl-update-2.0_pre4-r1.ebuild:
+  Marked stable on amd64.
+
+*opengl-update-2.0_pre5 (01 Feb 2005)
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/opengl-update-2.0_pre5, +opengl-update-2.0_pre5.ebuild:
+  Backport from the 2.1, should fix problems with programs linking using -rpath
+
+*opengl-update-2.1_pre4 (26 Jan 2005)
+
+  26 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1_pre3, +files/opengl-update-2.1_pre4,
+  -opengl-update-2.1_pre3.ebuild, +opengl-update-2.1_pre4.ebuild:
+  Fix bug where symlinks aren't made in lib32 if lib32 is a symlink to the
+  emul dir.
+
+*opengl-update-2.1_pre3 (25 Jan 2005)
+
+  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1_pre1, +files/opengl-update-2.1_pre3,
+  -opengl-update-2.1_pre1.ebuild, +opengl-update-2.1_pre3.ebuild:
+  Fixing bug #79539.  Fix misinstalling libglx.  Don't symlink libMesaGL.
+  Remove libMesaGL on preinst.
+
+*opengl-update-2.1_pre1 (24 Jan 2005)
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/opengl-update-2.1_pre1, +opengl-update-2.1_pre1.ebuild:
+  Version bump to fix multilib issues.  Also addresses bug #47598.
+
+  21 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  opengl-update-2.0_pre4-r1.ebuild:
+  stable on mips
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-2.0_pre4-r1.ebuild:
+  Unleash upon the x86 masses.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/opengl-update-1.7.1, -files/opengl-update-1.8.1,
+  -files/opengl-update-2.0_pre1, -files/opengl-update-2.0_pre2,
+  -files/opengl-update-2.0_pre3:
+  Clean out some overlooked files.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-2.0_pre4-r1.ebuild:
+  (#75628) Change warning message from >=6.8.0-r2 to >=6.8.0-r4.
+
+  20 Jan 2005; Ferris McCormick <fmccor@gentoo.org>
+  opengl-update-2.0_pre4-r1.ebuild:
+  Stable for sparc (required for xorg-x11-6.8.0-r4 upgrade).
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  -opengl-update-1.7.1.ebuild, -opengl-update-1.8.1-r1.ebuild,
+  -opengl-update-2.0_pre1.ebuild, -opengl-update-2.0_pre2.ebuild,
+  -opengl-update-2.0_pre3.ebuild:
+  Removing other 2.0_pre versions because of bad xorg-x11 check, pre4-r1 is
+  suitable; also removing the old MINOR versions.
+
+*opengl-update-2.0_pre4-r1 (27 Dec 2004)
+
+  27 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  files/opengl-update-2.0_pre4, +opengl-update-2.0_pre4-r1.ebuild,
+  -opengl-update-2.0_pre4.ebuild:
+  x11-base/xorg-x11-6.8.0-r2 doesn't exist, changing to die if revision is
+  less than 4
+
+*opengl-update-2.0_pre4 (19 Dec 2004)
+
+  19 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-2.0_pre4, +opengl-update-2.0_pre4.ebuild:
+  Old version died horribly on X versions lacking a revision number. Update
+  with regex match from portage code.
+
+*opengl-update-2.0_pre3 (30 Nov 2004)
+
+  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> +files/opengl-update-1.8.2,
+  +files/opengl-update-2.0_pre3, +opengl-update-1.8.2.ebuild,
+  +opengl-update-2.0_pre3.ebuild:
+  Changes to the NPTL detection mechanism.
+
+  12 Nov 2004; Ferris McCormick <fmccor@gentoo.org>
+  opengl-update-1.8.1-r1.ebuild:
+  Stable for sparc.
+
+  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  opengl-update-1.8.1-r1.ebuild:
+  Stable on alpha.
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  opengl-update-1.8.1-r1.ebuild:
+  Fixed typo in reason for userspace change
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  opengl-update-1.8.1-r1.ebuild, -opengl-update-1.8.1.ebuild:
+  Marking 1.8.1-r1 stable for use with the stablising of
+  nvidia-glx/kernel-1.0.6111-r3
+
+*opengl-update-2.0_pre2 (03 Nov 2004)
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-2.0_pre2, +opengl-update-2.0_pre2.ebuild:
+  Add minimum version detection, and don't run without at least
+  xorg-x11-6.8.0-r2.
+
+*opengl-update-2.0_pre1 (28 Oct 2004)
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-2.0_pre1, +opengl-update-2.0_pre1.ebuild:
+  Add version compatible with >=xorg-x11-6.8.0-r2. It could use a little
+  testing. It also produces a nicer help message, based on available
+  implementations.
+
+*opengl-update-1.8.1-r1 (30 Aug 2004)
+
+  30 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +opengl-update-1.8.1-r1.ebuild:
+  New version of glext.h, bumped for xorg-x11 pre-release consistency
+
+  27 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/glext.h-20040714.bz2,
+  opengl-update-1.8.1.ebuild:
+  Moving glext.h to distfiles
+
+  21 Aug 2004; Seemant Kulleen <seemant@gentoo.org> -files/glext.h-20040714,
+  +files/glext.h-20040714.bz2, opengl-update-1.8.1.ebuild:
+  use a bzip2 compressed version of glext.h to save on rsyncing bandwidth --
+  it's still a little big, and could do with mirror storing
+
+  31 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-1.8.1.ebuild:
+  Keyword ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~ppc64, since 1.7.x was
+  stabled on all these.
+
+  19 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; files/opengl-update-1.8.1:
+  Slight check added to make amd64 stuff more sensical.
+
+  18 Jul 2004; Travis Tilley <lv@gentoo.org> opengl-update-1.8.1.ebuild:
+  marking opengl-update 1.8.1 stable on amd64 so that i can un-break nvidia-glx
+
+*opengl-update-1.8.1 (18 Jul 2004)
+
+  18 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/opengl-update-1.8,
+  +files/opengl-update-1.8.1, -opengl-update-1.8-r1.ebuild,
+  +opengl-update-1.8.1.ebuild, -opengl-update-1.8.ebuild:
+  Making /usr/lib/tls back into a directory again, for future compatibility
+
+  18 Jul 2004; Bart Lauwers <blauwers@gentoo.org> opengl-update-1.8.ebuild:
+  Corrected typo.
+
+*opengl-update-1.8-r1 (17 Jul 2004)
+
+  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +opengl-update-1.8-r1.ebuild:
+  OK Making userspace fix the xfree problem which allows everyone to use
+  opengl-update-1.8
+
+*opengl-update-1.8 (17 Jul 2004)
+
+  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; +files/glext.h-20040714,
+  +files/opengl-update-1.8, +opengl-update-1.8.ebuild:
+  Version bump. We now provide a system with glext.h file from here for GL
+  implementations that do not provide one them selves. Also support is now
+  available for 32 bit compatibility libraries and TLS under the nvidia drivers.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> opengl-update-1.5.ebuild,
+  opengl-update-1.7.1.ebuild, opengl-update-1.7.2.ebuild:
+  glibc -> libc
+
+  27 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Fix Manifest, I hope.
+
+*opengl-update-1.7.2 (26 Jun 2004)
+
+  26 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-1.7.2, +opengl-update-1.7.2.ebuild:
+  Pushing out a fix for a really annoying hang, resulting from a grep that fails
+  after the first switch (#55120). Thanks to Michael Sterrett
+  <mr_bones_@gentoo.org>.
+
+  24 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/opengl-update-1.7, -opengl-update-1.7.ebuild:
+  Pull broken version.
+
+  24 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-1.7.1.ebuild:
+  Stable on every other arch.
+
+  14 Jun 2004; Tom Gall <tgall@gentoo.org> opengl-update-1.7.1.ebuild:
+  ~ppc64, initial x support bug #53763
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> opengl-update-1.7.ebuild:
+  Stable on alpha.
+
+  10 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/opengl-update-1.3, -files/opengl-update-1.4,
+  -files/opengl-update-1.6, -opengl-update-1.3.ebuild,
+  -opengl-update-1.4.ebuild, -opengl-update-1.6.ebuild:
+  Pull stale versions.
+
+  10 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-1.7.1.ebuild:
+  ppc sparc arm amd64.
+
+*opengl-update-1.7.1 (08 Jun 2004)
+
+  08 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-1.7.1, +opengl-update-1.7.1.ebuild:
+  Remove extra backslash in a sed that resulted in hangs (#53268).
+
+  31 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  files/opengl-update-1.7:
+  Add comments about --use-old and --get-implementation options (#21450).
+
+  29 May 2004; Ferris McCormick <fmccor@gentoo.org> opengl-update-1.7.ebuild:
+  Marked stable for sparc.
+
+  29 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-1.7.ebuild:
+  Need to force this to stable for amd64 so everybody else works properly.
+
+*opengl-update-1.7 (28 May 2004)
+
+  28 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/opengl-update-1.7, +opengl-update-1.7.ebuild:
+  New version. Fixes libtool archives for new X implementations (#48297), adds
+  --get-implementation (#21450) and mentions xorg-x11 as available option
+  (#47247). Also cleans up the usage help a little and makes source more
+  portable.
+
+  09 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/opengl-update-1.6:
+  Rather remove the .la symlink *before* testing if the selected profile have
+  it, else we might run into issues with profiles not having .la files, and not
+  supporting them properly.
+
+*opengl-update-1.6 (04 Feb 2004)
+
+  04 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  opengl-update-1.6.ebuild, files/opengl-update-1.6:
+  New version. Symlinks libGL.la whenever available, changes hardcoded
+  opengl-update to use basename in preparation for a possible symlink to
+  config-opengl, adds matrox and ati to supported list in help.
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> opengl-update-1.5.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  13 Nov 2003; <tuxus@gentoo.org> opengl-update-1.4.ebuild:
+  added mips to KEYWORDS
+
+*opengl-update-1.5 (30 Dec 2002)
+
+  04 Nov 2003; Joshua Kinard <kumba@gentoo.org> opengl-update-1.5.ebuild:
+  Added ~mips to KEYWORDS
+
+  16 Mar 2003; Guy Martin <gmsoft@gentoo.org> opengl-update-1.5.ebuild :
+  Added hppa to keywords.
+  
+  12 Mar 2003; Zach Welch <zwelch@gentoo.org> opengl-update-1.5.ebuild:
+  add arm keyword
+
+  30 Dec 2002; Martin Schlemmer <azarah@gentoo.org> opengl-update-1.5.ebuild :
+
+  Change test to show usage to:
+
+    [ "$#" -ne 1 -a "$#" -ne 2 ] || [ "$#" -eq 2 -a "$1" != "--use-old" ]
+
+  This should close bug #12827.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  
+  Changed sparc ~sparc keywords.
+ 
+*opengl-update-1.4 (9 Sep 2002)
+
+  16 Mar 2003; Guy Martin <gmsoft@gentoo.org> opengl-update-1.4.ebuild :
+  Added hppa to keywords.
+
+  9 Sep 2002; Martin Schlemmer <azarah@gentoo.org> opengl-update-1.4.ebuild :
+
+  New version that will keep user selected OpenGl implementation if "--use-old"
+  is given as first argument, followed by fallback implementation.
+
+*opengl-update-1.3 (1 June 2002)
+
+  15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Added PPC to KEYWORDS.
+
+  1 June 2002; Martin Schlemmer <azarah@gentoo.org> opengl-update-1.3.ebuild :
+
+  Fix error in opengl-update's help (should be "opengl-update xfree" and not
+  "opengl-update xfree86"); bug #3166.
+
+*opengl-update-1.2 (29 May 2002)
+
+  29 May 2002; Martin Schlemmer <azarah@gentoo.org> opengl-update-1.2.ebuild :
+
+  Ok, I promise to go to bed earlier ... removed the libGLU stuff again, as
+  it should not be moved.
+
+*opengl-update-1.1 (28 May 2002)
+
+  28 May 2002; Martin Schlemmer <azarah@gentoo.org> opengl-update-1.1.ebuild :
+
+  Update to also handle libGLU.so.
 
 *opengl-update-1.0 (12 May 2002)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 718d82a503fa..97743a3b374e 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,10 +1,22 @@
-MD5 d6f962646bc14741ded2e22d9874fd93 ChangeLog 1943
-MD5 a40de07637eb02d24722a1986d59fabf opengl-update-1.3.ebuild 534
-MD5 e499fdb211c888e3d937b42fd827a177 opengl-update-1.4.ebuild 529
-MD5 d531e1da42e33aba3b93429bddfb6099 opengl-update-1.5.ebuild 533
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
-MD5 bd8bae0601bd1ee736fd29ca26e2fdf0 files/opengl-update-1.3 3199
-MD5 51af427d47eed1b61ada5839b9722f26 files/opengl-update-1.4 3778
-MD5 0db87e7b174f832ec7f82d65d8d7abdf files/opengl-update-1.5 3792
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13a3bac65541408e8c38bacc4cf59543 ChangeLog 20202
+MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366
+MD5 f87231ba964818a1ad7eeea6dbd519b0 opengl-update-2.2.4.ebuild 2584
+MD5 47e72283d661e1735ac1b23e65bebf74 opengl-update-2.2.1.ebuild 2661
+MD5 d5d7a1913416618c1ce846c66c877445 opengl-update-3.0.0.ebuild 750
+MD5 d6b4a7de2926d22a6b52f4d129ce3e7f files/digest-opengl-update-2.2.4 116
+MD5 78f2778d5b41874016deb3135122b189 files/opengl-update-2.2.1 9849
+MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.1 116
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-3.0.0 0
+MD5 763717ca92a7b90da3ad6726770d2b77 files/opengl-update-3.0.0 4204
+MD5 23b30f7c0b9e658f78d0068999e68a80 files/opengl-update-2.2.4 9865
+MD5 600714175bf22abf40ed067b3dcb600d files/glxext.h-inttypes.patch 671
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHKuMArHZZzCEUG0RApxwAJ9lXDMOT6HIOHcbW6Mr2D8KHReZZwCeNAi5
+4UQBFeAFoImG0BYJ7NlUGao=
+=VgNr
+-----END PGP SIGNATURE-----
diff --git a/x11-base/opengl-update/files/digest-opengl-update-3.0.0 b/x11-base/opengl-update/files/digest-opengl-update-3.0.0
index f4e7bd416303..e69de29bb2d1 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-3.0.0
+++ b/x11-base/opengl-update/files/digest-opengl-update-3.0.0
@@ -1,2 +0,0 @@
-MD5 507d51b4e824b6a94f28c0e5d6793598 glext.h-29.bz2 33215
-MD5 2a8cc2e018a4fd8699d614718e61843e glxext.h-11.bz2 5900
diff --git a/x11-base/opengl-update/files/glxext.h-inttypes.patch b/x11-base/opengl-update/files/glxext.h-inttypes.patch
index 04a0e896347f..02f91849864f 100644
--- a/x11-base/opengl-update/files/glxext.h-inttypes.patch
+++ b/x11-base/opengl-update/files/glxext.h-inttypes.patch
@@ -1,5 +1,5 @@
---- glxext.h-10.orig	2005-01-20 00:38:56.000000000 -0800
-+++ glxext.h-10	2005-02-11 02:42:53.221321671 -0800
+--- glxext.h.orig	2005-01-20 00:38:56.000000000 -0800
++++ glxext.h	2005-02-11 02:42:53.221321671 -0800
 @@ -342,18 +342,7 @@ typedef struct {
  
  /* Define int32_t and int64_t types for UST/MSC */
diff --git a/x11-base/opengl-update/files/opengl-update-2.2.1 b/x11-base/opengl-update/files/opengl-update-2.2.1
index 9ee85698501b..29c1d36fbaff 100644
--- a/x11-base/opengl-update/files/opengl-update-2.2.1
+++ b/x11-base/opengl-update/files/opengl-update-2.2.1
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.1,v 1.1 2005/04/27 21:43:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.1,v 1.1.1.1 2005/11/30 10:01:10 chriswhite Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
@@ -31,9 +31,18 @@ check_user() {
 }
 
 check_version() {
-	if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then
-		eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4"
-		exit 1
+	# Don't die if we're booting from CD, since we probably lack portageq
+	for opt in $(</proc/cmdline); do
+		case ${opt} in
+			cdroot) local cdroot="true" ;;
+		esac
+	done
+
+	if [[ -z "${cdroot}" ]]; then
+		if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then
+			eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4"
+			exit 1
+		fi
 	fi
 }
 
@@ -328,7 +337,7 @@ DST_PREFIX="/usr"
 AVAIL_IMPLEMS=$(get_implementations)
 CURRENT_GL_IMPLEM=$(get_current_implem)
 USE_PROFILE_HEADERS="no"
-VERSION="2.2.0"
+VERSION="2.2.1"
 
 parse_options ${@}
 
diff --git a/x11-base/opengl-update/files/opengl-update-2.2.4 b/x11-base/opengl-update/files/opengl-update-2.2.4
index cf4d149d922b..7ba263d2c230 100644
--- a/x11-base/opengl-update/files/opengl-update-2.2.4
+++ b/x11-base/opengl-update/files/opengl-update-2.2.4
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.4,v 1.1 2005/09/05 19:43:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.4,v 1.1.1.1 2005/11/30 10:01:10 chriswhite Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
diff --git a/x11-base/opengl-update/files/opengl-update-3.0.0 b/x11-base/opengl-update/files/opengl-update-3.0.0
index bf9c0ef546e7..5296a9140aa5 100755
--- a/x11-base/opengl-update/files/opengl-update-3.0.0
+++ b/x11-base/opengl-update/files/opengl-update-3.0.0
@@ -1,12 +1,27 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-3.0.0,v 1.1 2005/08/13 07:42:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-3.0.0,v 1.1.1.1 2005/11/30 10:01:11 chriswhite Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
 # Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
 
+. /etc/init.d/functions.sh
+
+hasq() {
+	local x
+
+	local me=${1}
+	shift
+        
+	for x in "${@}"; do
+		if [[ "${x}" == "${me}" ]]; then
+			return 0
+		fi
+	done
+	return 1
+}
 
 print_usage() {
 	cat << FOO
@@ -33,8 +48,8 @@ Examples:
        This will setup things to use libGL.so from the nVidia drivers.
 
 WARNING: opengl-update is deprecated and is just a frontend to the opengl
-         eselect module.  A future version will drop support for the
-				 opengl-update command.  Please see 'eselect opengl help'
+         eselect module.  In the future, opengl-update will be removed
+         from portage.  Please see 'eselect opengl help'
 
 FOO
 }
@@ -123,15 +138,23 @@ case ${ACTION} in
 		eselect opengl show
 	;;
 	old-implementation)
+		ewarn "opengl-update is deprecated and is just a frontend to the opengl"
+		ewarn "eselect module.  In the future, opengl-update will be removed"
+		ewarn "from portage.  Please see 'eselect opengl help'"
+
 		eselect opengl set --use-old
 		exit $?
 	;;
 	set-implementation)
-		local myconf = "set ${NEW_GL_IMPLEM} --prefix=\"${PREFIX}\" --dst-prefix=\"${DST_PREFIX}\""
+		ewarn "opengl-update is deprecated and is just a frontend to the opengl"
+		ewarn "eselect module.  In the future, opengl-update will be removed"
+		ewarn "from portage.  Please see 'eselect opengl help'"
+
 		if [[ ${USE_PROFILE_HEADERS} == "yes" ]] ; then
-			myconf="${myconf} --impl-headers"
+			eselect opengl set ${NEW_GL_IMPLEM} --prefix="${PREFIX}" --dst-prefix="${DST_PREFIX}" --impl-headers
+		else
+			eselect opengl set ${NEW_GL_IMPLEM} --prefix="${PREFIX}" --dst-prefix="${DST_PREFIX}"
 		fi
-		eselect opengl ${myconf}
 	;;
 	usage)
 		print_usage
diff --git a/x11-base/opengl-update/metadata.xml b/x11-base/opengl-update/metadata.xml
index d8ef6bd5fa84..3de82b6a5e85 100644
--- a/x11-base/opengl-update/metadata.xml
+++ b/x11-base/opengl-update/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfree</herd>
-<longdescription>Utility to change the OpenGL interface being used. Used with nvidia or ati binary drivers.</longdescription>
+<herd>x11-drivers</herd>
+<maintainer>
+  <email>eradicator@gentoo.org</email>
+  <name>Jeremy Huddleston</name>
+</maintainer>
+<longdescription>Utility to switch opengl implementations between various providers.</longdescription>
 </pkgmetadata>
diff --git a/x11-base/opengl-update/opengl-update-2.2.1.ebuild b/x11-base/opengl-update/opengl-update-2.2.1.ebuild
index c250e7175102..da99b0fa3fc8 100644
--- a/x11-base/opengl-update/opengl-update-2.2.1.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.2.1.ebuild,v 1.1 2005/04/27 21:43:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.2.1.ebuild,v 1.1.1.1 2005/11/30 10:01:10 chriswhite Exp $
 
 inherit multilib toolchain-funcs eutils
 
@@ -19,23 +19,21 @@ SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 RESTRICT="multilib-pkg-force"
 
 DEPEND="virtual/libc
 	app-arch/bzip2"
 
-RDEPEND="!x11-base/xfree86
-	 !<x11-base/xorg-x11-6.8.0-r4
-	 !<media-video/ati-drivers-8.8.25-r3"
-
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 
+	mv glext.h-${GLEXT} glext.h
+	mv glxext.h-${GLXEXT} glxext.h
+
 	# Bugs #81199, #81472
 	epatch ${FILESDIR}/glxext.h-inttypes.patch
 }
@@ -80,15 +78,15 @@ src_install() {
 		for ABI in $(get_install_abis); do
 			# Install default glext.h
 			insinto /usr/$(get_libdir)/opengl/global/include
-			newins ${WORKDIR}/glext.h-${GLEXT} glext.h || die
-			newins ${WORKDIR}/glxext.h-${GLXEXT} glxext.h || die
+			doins ${WORKDIR}/glext.h || die
+			doins ${WORKDIR}/glxext.h || die
 		done
 		ABI="${OABI}"
 		unset OABI
 	else
 		# Install default glext.h
 		insinto /usr/$(get_libdir)/opengl/global/include
-		newins ${WORKDIR}/glext.h-${GLEXT} glext.h || die
-		newins ${WORKDIR}/glxext.h-${GLXEXT} glxext.h || die
+		doins ${WORKDIR}/glext.h || die
+		doins ${WORKDIR}/glxext.h || die
 	fi
 }
diff --git a/x11-base/opengl-update/opengl-update-2.2.4.ebuild b/x11-base/opengl-update/opengl-update-2.2.4.ebuild
index 9fb6c327eb5d..e7d4d3e7d009 100644
--- a/x11-base/opengl-update/opengl-update-2.2.4.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.2.4.ebuild,v 1.1 2005/09/05 19:43:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
 
 inherit multilib
 
diff --git a/x11-base/opengl-update/opengl-update-3.0.0.ebuild b/x11-base/opengl-update/opengl-update-3.0.0.ebuild
index 0b7f3cab6ca6..4e5e0f5d7cda 100644
--- a/x11-base/opengl-update/opengl-update-3.0.0.ebuild
+++ b/x11-base/opengl-update/opengl-update-3.0.0.ebuild
@@ -1,91 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-3.0.0.ebuild,v 1.1 2005/08/13 07:42:36 eradicator Exp $
-
-inherit multilib
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:01:10 chriswhite Exp $
 
 DESCRIPTION="Utility to change the OpenGL interface being used"
 HOMEPAGE="http://www.gentoo.org/"
 
-# Source:
-# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
-
-GLEXT="29"
-GLXEXT="11"
-
-SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
-	 http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
-RESTRICT="multilib-pkg-force"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="app-admin/eselect"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-
-	mv glext.h-${GLEXT} glext.h
-	mv glxext.h-${GLXEXT} glxext.h
-}
 
-pkg_preinst() {
-	# It needs to be before 04multilib
-	[ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
-
-	OABI="${ABI}"
-	for ABI in $(get_install_abis); do
-		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from xorg-x11 profile.  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
-		fi
-		if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
-		fi
-
-		for f in ${ROOT}/usr/$(get_libdir)/libGL.so.* ${ROOT}/usr/$(get_libdir)/libGLcore.so.* ${ROOT}/usr/$(get_libdir)/libnvidia-tls* ${ROOT}/usr/$(get_libdir)/tls/libnvidia-tls* ; do
-			[[ -e ${f} ]] && rm -f ${f}
-		done
-	done
-	ABI="${OABI}"
-	unset OABI
-}
-
-pkg_postinst() {
-	local impl="$(eselect opengl show)"
-	if [[ -n "${impl}" ]] ; then
-		eselect opengl set "${impl}"
-	fi
-}
+RDEPEND="app-admin/eselect-opengl"
 
 src_install() {
 	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-	insinto /usr/share/eselect/modules
-	newins ${FILESDIR}/opengl-update-${PV}.eselect opengl.eselect
+}
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			# Install default glext.h
-			insinto /usr/$(get_libdir)/opengl/global/include
-			doins ${WORKDIR}/glext.h || die
-			doins ${WORKDIR}/glxext.h || die
-		done
-		ABI="${OABI}"
-		unset OABI
-	else
-		# Install default glext.h
-		insinto /usr/$(get_libdir)/opengl/global/include
-		doins ${WORKDIR}/glext.h || die
-		doins ${WORKDIR}/glxext.h || die
-	fi
+pkg_postinst() {
+	einfo "opengl-update is deprecated and will eventually be removed from portage."
+	einfo "The opengl-update executable just calls the opengl eselect module."
 }
diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index 9671f49ba5c5..7630f890040b 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for x11-base/x11-drm
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.1 2004/08/29 08:11:06 battousai Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.1.1.1 2005/11/30 10:01:07 chriswhite Exp $
+
+*x11-drm-20051028 (29 Oct 2005)
+
+  29 Oct 2005; Bryan Stine <battousai@gentoo.org> x11-drm-20050807.ebuild,
+  +x11-drm-20051028.ebuild:
+  Snapshot bump to introduce new skeletal nv driver, provided for speedy EXA
+  via DMA transfers.
+  
+  Applied the patch provided by Alon Bar-Lev to properly identify the kernel
+  source directory and kernel version. Incidentally, also stopped SLOTting
+  against the kernel version. The patch fixes bug #105233.
+  
+  No longer installs libdrm files, since the only parts of libdrm needed for
+  this package are the object files at compile time. Thanks to Alon Bar-Lev
+  for pointing out the conflict with modular x11-libs/libdrm. Fixes bug
+  #108504.
+
+*x11-drm-20050807 (08 Aug 2005)
+
+  08 Aug 2005; Bryan Stine <battousai@gentoo.org> -x11-drm-20040827.ebuild,
+  -x11-drm-20040827-r1.ebuild, x11-drm-20050502.ebuild,
+  +x11-drm-20050807.ebuild:
+  Drop old dated snapshot. Added minor i915 fixes to 20050502 0.2 patchball,
+  marking that snapshot stable. Bumped up to a 20050807 snapshot.
+
+  18 May 2005; Bryan Stine <battousai@gentoo.org> x11-drm-4.3.0-r7.ebuild,
+  x11-drm-20040827.ebuild, x11-drm-20040827-r1.ebuild,
+  x11-drm-20050502.ebuild:
+  Remove invalid PROVIDE. Thanks Mr_Bones_.
+
+  10 May 2005; Bryan Stine <battousai@gentoo.org> -x11-drm-20050104.ebuild:
+  Goodbye, 20050104. You piece of crap.
+
+*x11-drm-20050502 (03 May 2005)
+
+  03 May 2005; Bryan Stine <battousai@gentoo.org> +x11-drm-20050502.ebuild:
+  New snapshot. Builds linux-core now, and as such has checks for proper
+  kernel config. Also warns when AGP is not enabled.
+
+  25 Apr 2005; <brix@gentoo.org> :
+  Dependency update: sys-apps/pcmcia-cs -> app-laptop/pcmcia-cs.
+
+  25 Apr 2005; <brix@gentoo.org> :
+  Dependency update: sys-apps/pcmcia-cs -> app-laptop/pcmcia-cs.
+
+  25 Apr 2005; <brix@gentoo.org> :
+  Dependency update: sys-apps/pcmcia-cs -> app-laptop/pcmcia-cs.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  24 Jan 2005; Bryan Stine <battousai@gentoo.org x11-drm-20050104.ebuild:
+  Forgot to remove IUSE="gatos".
+
+*x11-drm-20050104 (07 Jan 2005)
+
+  07 Jan 2005; Bryan D. Stine <battousai@gentoo.org> +x11-drm-20050104.ebuild:
+  New snapshot, 20050104. This needs testing and is hard-masked currently.
+
+*x11-drm-20040827-r1 (22 Dec 2004)
+
+  22 Dec 2004; Bryan D. Stine <battousai@gentoo.org>
+  +x11-drm-20040827-r1.ebuild, x11-drm-20040827.ebuild:
+  Gah, somehow forgot to bump the patchball revision. Also, ${PF} -> ${P} in
+  patchball SRC_URI.
+
+  15 Dec 2004; Bryan Stine <battousai@gentoo.org>; x11-drm-20040827.ebuild:
+  Add a patch to fix lockfile vulnerability (CAN-2004-1056: Insufficient
+  locking checks in DRM code). This bumps the patchball up to 0.2. Closes bug
+  #74464.
+
+  07 Dec 2004; Bryan Stine <battousai@gentoo.org>; x11-drm-20040827.ebuild:
+  Now with linux-mod eclass goodness, no more kernel-mod.
+
+  23 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -x11-drm-4.3.0-r6.ebuild:
+  Remove old version, last one with USE flags rather than VIDEO_CARDS.
+
+  04 Nov 2004; Bryan Stine <battousai@gentoo.org> x11-drm-20040827.ebuild:
+  Updated 20040827 snapshot ebuild for the kmod deprecation. Thanks to Stefan
+  Schweizer <sschweizer@gmail.com> for the patch. This closes bug #68453.
+
+  31 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Restore changelog entries from when it was xfree-drm.
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  x11-drm-20040827.ebuild, x11-drm-4.3.0-r6.ebuild, x11-drm-4.3.0-r7.ebuild:
+  Inherit x11, not xfree eclass.
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>; x11-drm-4.3.0-r7.ebuild:
+  moved to ppc stable
+  
+  01 Sep 2004; Bryan Stine <battousai@gentoo.org>; x11-drm-20040827.ebuild,
+  x11-drm-4.3.0-r7.ebuild:
+  Add sed to fix Makefile install location again. Closes 62188.
+
+  31 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  x11-drm-20040827.ebuild:
+  Fix use() invocation, thanks to Michael Sterrett <mr_bones_@gentoo.org>.
 
 *x11-drm-4.3.0-r6 (29 Aug 2004)
 
@@ -12,3 +111,335 @@
   is based on dri.sf.net drm snapshots. Improvements in the new snapshot include
   2.6 support for 2.6.6+ kernels and koutput, along with many upstream changes.
 
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild, xfree-drm-4.3.0-r7.ebuild,
+  xfree-drm-4.3.0-r8.ebuild:
+  /usr/src/linux needs ${ROOT}.
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild,
+  xfree-drm-4.3.0-r7.ebuild, xfree-drm-4.3.0-r8.ebuild:
+  QA - move video card tests into pkg_setup, fix use invocation
+
+  11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild, xfree-drm-4.3.0-r7.ebuild,
+  xfree-drm-4.3.0-r8.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r8.ebuild:
+  Change KEYWORDS to ~x86 only, at genone's request.
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r8.ebuild:
+  Drop kmod from inherit since it's not around yet.
+
+*xfree-drm-4.3.0-r8 (06 Apr 2004)
+
+  06 Apr 2004; Bryan Stine <bryan@gentoo.org> xfree-drm-4.3.0-r8.ebuild:
+  Added in-development version 4.3.0-r8. This is not ready for use yet. Changes
+  from previous include handling 2.6 kernels and the modules.d fix. I may have
+  forgotten something here and there may be more coming.
+
+  20 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r2.ebuild:
+  Pull old version. It was the only stable on amd64, but amd64 doesn't support
+  2.4 kernels (#39175).
+
+  16 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Fixing root@gentoo.org changelog entry.
+
+  14 Mar 2004; Bryan Stine <battousai@gentoo.org> xfree-drm-4.3.0-r7.ebuild,
+  files/modules.d-xfree-drm:
+  Changed the location where modules get installed to /lib/modules/KV/xfree-drm.
+  Consequently, I added the modules.d template to files/.
+
+  09 Mar 2004; <agriffis@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
+  stable on alpha and ia64
+
+  21 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  Move einfo for patch exclusion from xfree eclass to ebuild.
+
+  21 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  PATCH_VER 0.4. Add 210_ppc_mach64-drm-ioremap-agp.patch, made by David Holm
+  <dholm@gentoo.org> on bug #40314. Also contains a remade
+  010_ppc_drm-ioremap-agp.patch, again thanks to David. Change numbering of
+  patches also.
+
+  21 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  Start using new patch_exclude() from xfree.eclass for patch exclusion.
+
+  21 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  Cleanup, mostly comments and quotes.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
+  Fixed broken ioremap patch and added to ~ppc.
+
+  10 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  Fixing for ppc mach64 -- ioremap patch is broken. Trying without it for now to
+  see whether things work. David Holm <dholm@gentoo.org> reports it works with
+  forced PCI mode.
+
+  09 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  Adding warning about insecurity of mach64.
+
+  09 Feb 2004; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r7.ebuild:
+  Add ~alpha and ~ia64. matrox, i810 and i830 fail to build on alpha, but I'll
+  wait for that to be an issue for somebody before trying to fix it
+
+  08 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Use portage internal USE_EXPAND instead of xfree.eclass vcards(), add
+  IUSE_VIDEO_CARDS line.
+
+  23 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  Marking stable on x86. It's been in testing for a month and a half without a
+  whisper. Keep in mind that the gatos USE flag only works in combination with
+  the gatos USE flag on 4.3.0-r4 (soon to be released) and the ati-gatos
+  package.
+
+  19 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r2.ebuild, xfree-drm-4.3.0-r6.ebuild,
+  xfree-drm-4.3.0-r7.ebuild:
+  Changing homepage to dri.sf.net.
+
+  16 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  PATCH_VER 0.3. Update to 004_all_radeon-rage128-pci-id-updates-v2.patch, which
+  adds IGP cards and fixes a small typo in the naming of another card.
+
+  14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  PATCH_VER 0.2. Added 004_all_radeon-rage128-pci-id-updates.patch to try to
+  help newer cards work better. For standard DRM only.
+
+*xfree-drm-4.3.0-r7 (08 Dec 2003)
+
+  08 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r7.ebuild:
+  20031202 snapshot. Adds support for mach64. Also adds initial support for
+  gatos, accompanied by USE=gatos in xfree and a coming ati-gatos ebuild.
+  Obsoletes USE for video cards, moving to VIDEO_CARDS.
+
+  05 Dec 2003; <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
+  Stable on ia64
+
+  24 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Added warning for genkernel users to change processor type to something
+  greater than 386.
+
+  20 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Making warning for uncompiled kernel more verbose. Bug #31556.
+
+  16 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Making 2.6 kernel warning more verbose.
+
+  14 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Revert sis300 to sis, makes things easier.
+
+  14 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Moving VIDEO_CARDS=sis to sis300 to make it more clear that it doesn't work on
+  315 series. Preventing xfree-drm from emerging on 2.6 kernels, it doesn't work
+  yet so the kernel DRM must be used. Adding warning for SiS.
+
+  04 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r4.ebuild,
+  xfree-drm-4.3.0-r5.ebuild:
+  Pulling broken versions.
+
+  29 Sep 2003; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
+  Stable on alpha
+
+  12 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>
+  xfree-drm-4.3.0-r6.ebuild: Fixes for bug #25598 and bug #24415, general
+  cleanup.
+
+  28 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Bumped patchset to 0.3 to fix ppc problems with ioremap patch.
+
+  27 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Added drm-ioremap patch to fix PPC build.
+
+  22 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Moving to stable on x86. ppc still having issues.
+
+  16 Jul 2003; Donnie Berkholz <spyderous@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
+  Moved to ~arch for x86 and alpha. Still needs work for ppc.
+
+*xfree-drm-4.3.0-r6 (14 Jul 2003)
+
+  14 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Fixed Makefile so it actually uses /usr/src/linux, fixed sandbox issues,
+  updated drm to fix various bugs including i810 problems, fixed pte_offset
+  unresolved symbols issue.
+
+  13 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r5.ebuild:
+  Moving -r3 through -r5 to -ppc.
+
+  07 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r5.ebuild:
+  Moving to ~arch after MTRR_TYPE_WRCOMB problems with -r4.
+
+*xfree-drm-4.3.0-r5 (01 Jul 2003)
+
+  01 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r5.ebuild:
+  Updating to today's DRI, in hopes of solving a couple of problems with
+  MTRR_TYPE_WRCOMB. Masked for testing.
+
+  30 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r4.ebuild:
+  Changed XFREE_CARDS to VIDEO_CARDS so non-xfree apps can use it. Also made the
+  USE + VIDEO_CARDS work better.
+
+  29 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r4.ebuild:
+  Moved to -ppc until the patch works.
+
+  29 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r4.ebuild:
+  Add xfree.eclass for better XFREE_CARDS functionality.
+
+  29 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r4.ebuild:
+  Updated patch to fix sis not working.
+
+*xfree-drm-4.3.0-r4 (29 Jun 2003)
+
+  29 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r4.ebuild:
+  Updated sources to June 18 CVS. Added XFREE_CARDS functionality and deprecated
+  USE for video cards, similar to ALSA_CARDS for ALSA.
+
+  27 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r3.ebuild:
+  Now dies with error instead of compiling all modules when none are specified.
+  Also doesn't compile modules twice anymore.
+
+  15 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
+  reverting
+
+  14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r3.ebuild:
+  Magnade in #gentoo-dev fixed up the Makefile so that it installs all the
+  modules by default. Many thanks to him
+
+*xfree-drm-4.3.0-r3 (14 Jun 2003)
+
+  14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0-r1.ebuild,
+  xfree-drm-4.3.0-r2.ebuild, xfree-drm-4.3.0-r3.ebuild,
+  xfree-drm-4.3.0.ebuild, files/xfree-drm-4.3.0-gentoo-Makefile-fixup.patch,
+  files/xfree-drm-4.3.0-gentoo-ppc-Makefile-fixup.patch,
+  files/xfree-drm-4.3.0-r2-dristat.patch,
+  files/xfree-drm-4.3.0-r2-drm-ioremap.patch,
+  files/xfree-drm-4.3.0-r2-gentoo-Makefile-fixup.patch,
+  files/xfree-drm-4.3.0-r2-radeon-resume-v8.patch:
+  moved patches to mirrors. Also version bump to a more recent snapshot, with
+  daenzer's patches. This excellent work and the -r3 ebuild comes to you from
+  spyderous, who is Donnie Berkholz <donnie.berkholz@richmond.edu>
+
+  24 Apr 2003; Michael Fitzpatrick <leahcim@gentoo.org>
+  xfree-drm-4.3.0-r2.ebuild, files/xfree-drm-4.3.0-r2-dristat.patch: Add
+  dristat (modified patch from Mathias Hasselmann) bug #18799. Fixed slot.
+
+  23 Apr 2003; Luca Barbato <lu_zero@gentoo.org>
+  xfree-drm-4.3.0-r2.ebuild, xfree-drm-4.3.0.ebuild:
+  Fix the KV issue.
+
+*xfree-drm-4.3.0-r2 (22 Apr 2003)
+
+  22 Apr 2003; Michael Fitzpatrick <leahcim@gentoo.org>
+  xfree-drm-4.3.0-r2.ebuild, files/digest-xfree-drm-4.3.0-r2,
+  files/xfree-drm-4.3.0-r2-gentoo-Makefile-fixup.patch,
+  files/xfree-drm-4.3.0-r2-radeon-resume-v8.patch : 
+  Combine x86 and ppc builds. Added "radeon resume/suspend" patch. 
+
+  24 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xfree-drm-4.3.0.ebuild :
+  Update to rather use the "more official" DRM sources from
+  http://www.xfree86.org/~alanh/.  I did though rather create a date versioned
+  tarball on ibibilo, as they are only versioned on that site with the release
+  version of XFree86, and might change in future (bugfixes, etc).
+
+*xfree-drm-4.3.0-r1 (02 Mar 2003)
+
+  15 Mar 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.3.0-r1.ebuild :
+  set ppc in keywords
+
+  02 Mar 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.3.0-r1.ebuild files/digest-xfree-drm-4.3.0-r1 :
+  rev bump to match current xfree
+
+*xfree-drm-4.3.0 (28 Feb 2003)
+
+  21 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  xfree-drm-4.3.0.ebuild:
+  changed to stable x86. Awaiting leachim's -r2 which combines x86 and ppc (and
+  others?)
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild:
+  changed ibm USE to i8x0 USE which is more accurate. Thanks to: Marcin Wisnicki
+  <wisnia21@freeshell.org> in bug #18046
+
+  17 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild:
+  use KVERS which gets running kernel's version, instead of KV. Closes bug
+  #17545 by Sankara Krishnamoorthy <snkmoorthy@netscape.net>
+
+  05 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild:
+  using USE variables to determine which specific modules to install
+
+  28 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.3.0.ebuild,
+  files/xfree-drm-4.3.0-gentoo-Makefile-fixup.patch:
+  version bump to match xfree's version
+
+*xfree-drm-4.2.99.902 (26 Feb 2003)
+
+  26 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-drm-4.2.99.902.ebuild files/digest-xfree-drm-4.2.99.902 files/xfree-drm-4.2.99.902-gentoo-Makefile-fixup.patch :
+  version bump to match newest X snapshot
+
+*xfree-drm-4.2.99.4-r1 (07 Feb 2003)
+
+  19 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.2.99.4-r1.ebuild :
+  set -r1 to ~ppc only, had major issues with portage eating digests cause it couldn't deal with all the SRC_URI juggling with x86 vs. ppc.
+
+  08 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  files/digest-xfree-drm-4.2.99.4-r1 :
+
+  Added digest
+
+  07 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.2.99.4-r1.ebuild
+  files/xfree-drm-4.2.99.4-gentoo-ppc-Makefile-fixup.patch:
+  Major reworking of parts for ppc sections.  Using a drm tarball.
+  x86 not set at all as it's not tested yet (method stays same for 
+  x86). Set only as ~ppc
+
+*xfree-drm-4.2.99.4 (03 Feb 2003)
+
+  03 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  xfree-drm-4.2.99.4.ebuild
+  files/xfree-drm-4.2.99.4-gentoo-Makefile-fixup.patch
+  files/digest-xfree-drm-4.2.99.4 :
+
+  version bump for newer snapshot
+
+*xfree-drm-4.2.99.3 (03 Feb 2003)
+
+  03 Feb 2003; Martin Schlemmer <azarah@gentoo.org> xfree-drm-4.2.99.3.ebuild
+  files/xfree-drm-4.2.99.3-gentoo-Makefile-fixup.patch
+  files/digest-xfree-drm-4.2.99.3 :
+
+  Initial version submitted by myself.
+
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index e767c9a0c6ef..5e389f3f2f7a 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -1,5 +1,11 @@
-MD5 b22f33c1d80979a5dccf7e3d344d077a x11-drm-20040827.ebuild 5344
-MD5 b67cc82ec3e8786dbc0f8f5e7e37bcfc metadata.xml 360
-MD5 0da633cdf84a7960139bb6bb5847e2ac ChangeLog 546
-MD5 f7de985da1c53156a63bc43dea3b71ea files/digest-x11-drm-20040827 252
+MD5 2b43ed47d80db73eb551ecb4797aade7 ChangeLog 17935
+MD5 528f707ef73b50376334dd2a7abbdb83 files/digest-x11-drm-20050502 162
+MD5 05c0def6e3725175239b158187f61774 files/digest-x11-drm-20050807 162
+MD5 79ba7dd6f31beecd88dbf0836d41070e files/digest-x11-drm-20051028 162
+MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-x11-drm-4.3.0-r7 363
 MD5 88b8c90e440b3db246a7d06cf53640ae files/modules.d-x11-drm 40
+MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368
+MD5 1d3509bdfea18f00f6f8991b91368cbc x11-drm-20050502.ebuild 6072
+MD5 321db74e1fc38cf0e3c05b3eabd5945d x11-drm-20050807.ebuild 6267
+MD5 c46fc2a208c1471042a0ae90914fdc55 x11-drm-20051028.ebuild 6333
+MD5 37fcf89b80fc0225568cfbbc32edf4b6 x11-drm-4.3.0-r7.ebuild 7014
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20050502 b/x11-base/x11-drm/files/digest-x11-drm-20050502
index 80ef71e9d1ed..cbb6657efe36 100644
--- a/x11-base/x11-drm/files/digest-x11-drm-20050502
+++ b/x11-base/x11-drm/files/digest-x11-drm-20050502
@@ -1,2 +1,2 @@
-MD5 d4552c64415082ddba1515e24c2aef0e x11-drm-20050502-gentoo-0.1.tar.bz2 2095
+MD5 6646cb90fb5febbfa61308d3f2250efe x11-drm-20050502-gentoo-0.2.tar.bz2 3319
 MD5 498b496e25154f5bd6e7534ae16c15d4 linux-drm-20050502-kernelsource.tar.bz2 518178
diff --git a/x11-base/x11-drm/metadata.xml b/x11-base/x11-drm/metadata.xml
index 4c843cbdc63e..c8807e911bd7 100644
--- a/x11-base/x11-drm/metadata.xml
+++ b/x11-base/x11-drm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<herd>x11-drivers</herd>
 <maintainer>
   <email>battousai@gentoo.org</email>
   <name>Bryan Stine</name>
diff --git a/x11-base/x11-drm/x11-drm-20050502.ebuild b/x11-base/x11-drm/x11-drm-20050502.ebuild
index a4379ab8ea29..a3d5ba18ef89 100644
--- a/x11-base/x11-drm/x11-drm-20050502.ebuild
+++ b/x11-base/x11-drm/x11-drm-20050502.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20050502.ebuild,v 1.1 2005/05/03 18:10:57 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20050502.ebuild,v 1.1.1.1 2005/11/30 10:01:07 chriswhite Exp $
 
 inherit eutils x11 linux-mod
 
@@ -12,7 +12,7 @@ IUSE_VIDEO_CARDS="3dfx ffb i810 i830 i915 mach64 matrox rage128 radeon savage si
 RESTRICT="nostrip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.1"
+PATCHVER="0.2"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -23,14 +23,12 @@ SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
 
 SLOT="${KV}"
 LICENSE="X11"
-KEYWORDS="~x86 ~alpha ~ia64 ~ppc ~amd64"
+KEYWORDS="x86 ~alpha ~ia64 ~ppc ~amd64"
 
 DEPEND="virtual/x11
 	virtual/linux-sources
 	>=sys-apps/portage-2.0.49-r13"
 
-PROVIDE="virtual/drm"
-
 pkg_setup() {
 	get_version
 
@@ -127,9 +125,8 @@ src_install() {
 
 	dodoc README.drm
 
-	exeinto /usr/X11R6/bin
-	doexe dristat
-	doexe drmstat
+	dobin dristat
+	dobin drmstat
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
diff --git a/x11-base/x11-drm/x11-drm-20050807.ebuild b/x11-base/x11-drm/x11-drm-20050807.ebuild
index 3771ac99470c..474173225f5c 100644
--- a/x11-base/x11-drm/x11-drm-20050807.ebuild
+++ b/x11-base/x11-drm/x11-drm-20050807.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20050807.ebuild,v 1.1 2005/08/09 01:56:12 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20050807.ebuild,v 1.1.1.1 2005/11/30 10:01:08 chriswhite Exp $
 
 inherit eutils x11 linux-mod
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://dri.sf.net"
 SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
 	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
 
-SLOT="${KV}"
+SLOT="0"
 LICENSE="X11"
 KEYWORDS="~x86 ~alpha ~ia64 ~ppc ~amd64"
 
@@ -80,7 +80,7 @@ src_unpack() {
 	# Apply patches
 	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
 
-	# Substitute new directory under /lib/modules/${KV}
+	# Substitute new directory under /lib/modules/${KV_FULL}
 	cd ${SRC_BUILD}
 	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
 
@@ -97,7 +97,7 @@ src_compile() {
 	# This now uses an M= build system. Makefile does most of the work.
 	unset ARCH
 	make M="${SRC_BUILD}" \
-		LINUXDIR="${ROOT}/usr/src/linux" \
+		LINUXDIR="${KERNEL_DIR}" \
 		DRM_MODULES="${VIDCARDS}" \
 		modules || die_error
 
@@ -115,8 +115,8 @@ src_compile() {
 
 	cd ${SRC_BUILD}
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	make LINUXDIR="${ROOT}/usr/src/linux" dristat || die "Building dristat failed."
-	make LINUXDIR="${ROOT}/usr/src/linux" drmstat || die "Building drmstat failed."
+	make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
+	make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
 }
 
 src_install() {
@@ -124,10 +124,10 @@ src_install() {
 	cd ${SRC_BUILD}
 
 	unset ARCH
-	make KV="${KV}" \
-		LINUXDIR="${ROOT}/usr/src/linux" \
+	make KV="${KV_FULL}" \
+		LINUXDIR="${KERNEL_DIR}" \
 		DESTDIR="${D}" \
-		RUNNING_REL="${KV}" \
+		RUNNING_REL="${KV_FULL}" \
 		MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \
 		install || die "Install failed."
 
@@ -136,16 +136,13 @@ src_install() {
 	dobin dristat
 	dobin drmstat
 
-	cd ${S}
-	emake DESTDIR=${D} install || die "libdrm install failed."
-
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules
 
 	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
 	keepdir /etc/modules.d
 	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV}':g' ${D}/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
 }
 
 pkg_postinst() {
diff --git a/x11-base/x11-drm/x11-drm-20051028.ebuild b/x11-base/x11-drm/x11-drm-20051028.ebuild
index 13ae9eb51453..09cb10e69c20 100644
--- a/x11-base/x11-drm/x11-drm-20051028.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051028.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051028.ebuild,v 1.1 2005/10/29 03:18:25 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051028.ebuild,v 1.1.1.1 2005/11/30 10:01:08 chriswhite Exp $
 
 inherit eutils x11 linux-mod
 
diff --git a/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild b/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild
index 3e19a84eeadc..1820827e9533 100644
--- a/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild
+++ b/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild,v 1.1 2004/08/29 08:11:06 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-4.3.0-r7.ebuild,v 1.1.1.1 2005/11/30 10:01:07 chriswhite Exp $
 
 IUSE="gatos"
 IUSE_VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis mach64"
 
-inherit eutils xfree
+inherit eutils x11
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -39,15 +39,13 @@ SRC_URI="mirror://gentoo/${MY_PF}-gentoo-${PATCHVER}.tar.bz2
 
 SLOT="${KV}"
 LICENSE="X11"
-KEYWORDS="x86 alpha ia64 ~ppc"
+KEYWORDS="x86 alpha ia64 ppc"
 
 # Need new portage for USE_EXPAND
 DEPEND="virtual/x11
 	virtual/linux-sources
 	>=sys-apps/portage-2.0.49-r13"
 
-PROVIDE="virtual/drm"
-
 pkg_setup() {
 	# mach64 is exclusive of other modules
 	check_exclusive mach64
@@ -109,6 +107,7 @@ src_unpack() {
 
 	# Change the install location for the modules.d stuff
 	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile.linux
+	sed -ie "s:xfree-drm:${PN}:g" Makefile
 }
 
 src_compile() {
diff --git a/x11-base/xdirectfb/ChangeLog b/x11-base/xdirectfb/ChangeLog
index 49d9cda4e19b..aa40a3e134df 100644
--- a/x11-base/xdirectfb/ChangeLog
+++ b/x11-base/xdirectfb/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for x11-base/xdirectfb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.1 2002/06/17 08:28:54 naz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
+
+  10 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xdirectfb-1.0_rc5-r2.ebuild:
+  Fix x86 keyword.
+
+*xdirectfb-1.0_rc5-r2 (10 Sep 2005)
+
+  10 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdirectfb-1.0_rc5-r2.ebuild:
+  Revision bump.  Sync to CVS as of today and build against xorg-6.8.2 
+  instead of xfree86.  Fixes bug #76167.
+
+  25 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xdirectfb-1.0_rc5-r1.ebuild:
+  Changed cp -a to cp -pPR for BSD compatibility.
+
+  05 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Fix up digest -- remove unused entries.
+
+  26 Mar 2004; David Holm <dholm@gentoo.org> xdirectfb-1.0_rc5-r1.ebuild:
+  Added to ~ppc.
+
+  19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xdirectfb-1.0_rc5.ebuild:
+  Pulling old revisions.
+
+*xdirectfb-1.0_rc5-r1 (19 Mar 2004)
+
+  19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xdirectfb-1.0_rc5-r1.ebuild:
+  Removing PROVIDE=virtual/x11. This should be used for the libraries, not the
+  servers, because it's what other packages build against.
+
+  17 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xdirectfb-1.0_rc3-r1.ebuild, xdirectfb-1.0_rc4.ebuild:
+  Pull old versions.
+
+  17 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xdirectfb-1.0_rc5.ebuild:
+  Stable on x86.
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> xdirectfb-1.0_rc4.ebuild,
+  xdirectfb-1.0_rc5.ebuild:
+  add ~alpha (bug 21240)
+
+  02 Jan 2004; Sven Blumenstein <bazik@gentoo.org>
+  xdirectfb-1.0_rc3-r1.ebuild, xdirectfb-1.0_rc4.ebuild,
+  xdirectfb-1.0_rc5.ebuild:
+  Masked on sparc as DEPEND dev-libs/DirectFB is -sparc.
+
+  17 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xdirectfb-1.0_rc5.ebuild:
+  Removing X430-{4,5,6,7}.tgz from SRC_URI, as they seem unnecessary.
+
+  15 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; files/host.def:
+  Building a lot less redundant stuff ... e.g., fonts, other servers, drivers.
+
+*xdirectfb-1.0_rc5 (25 Jun 2003)
+
+  25 Jun 2003; Brandon Low <lostlogic@gentoo.org> xdirectfb-1.0_rc5.ebuild:
+  Bump
+
+*xdirectfb-1.0_rc4 (04 Apr 2003)
+
+  04 Apr 2003; Tilman Klar <phoenix@gentoo.org> xdirectfb-1.0_rc4.ebuild:
+  Fixed DEPENDency - check bug #10923 for further details.
+
+*xdirectfb-1.0_rc4 (25 Mar 2003)
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xdirectfb-1.0_rc4.ebuild:
+  version bump, and compiles against x-4.3
+
+*xdirectfb-1.0_rc3-r1 (02 Feb 2003)
+
+  02 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  xdirectfb-1.0_rc3-r1.ebuild files/digest-xdirectfb-1.0_rc3-r1 :
+
+  Updated to use DirectFB-0.9.16 and the xfree-cvs-4.2.99.4 snapshot.
+
+*xdirectfb-1.0_rc3 (16 Nov 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  16 Nov 2002; Seemant Kulleen <seemant@gentoo.org> xdirectfb-1.0_rc3.ebuild
+  files/digest-xdirectfb-1.0_rc3 :
+
+  Version bump.
+
+*xdirectfb-1.0_rc2-r1.ebuild (29 Aug 2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org>
+  xdirectfb-1.0_rc2-r2.ebuild files/digest-xdirectfb-1.0_rc2-r2 :
+
+  Update to use the X cvs snapshot from 20020827
+
+*xdirectfb-1.0_rc2-r1.ebuild (06 Jul 2002)
+
+  06 Jul 2002; M.Nazaroff <naz@gentoo.org> xdirectfb-1.0_rc2-r1.ebuild:
+  Updated startxdfb so it actually works and add a few more files to bring the
+  package all together, and added a slot to each ebuild. This should be finally
+  the package will be released.
 
 *xdirectfb-1.0_rc2.ebuild (16 Jun 2002)
 
diff --git a/x11-base/xdirectfb/Manifest b/x11-base/xdirectfb/Manifest
index f14a7306209c..e978f2e89d04 100644
--- a/x11-base/xdirectfb/Manifest
+++ b/x11-base/xdirectfb/Manifest
@@ -1,9 +1,10 @@
-MD5 9f9c300832f34ad2b863e7c07df2276f ChangeLog 1751
-MD5 f51f3894349592b6e5ac76cbce21abe9 xdirectfb-1.0_rc3-r1.ebuild 2288
-MD5 b297c783d550bd25c2e6f9d08ee0644a xdirectfb-1.0_rc4.ebuild 2215
+MD5 d9b0b90e2c0a02ee2329f92ac869afad ChangeLog 3780
+MD5 7191cffeda5249a1cafc736e2459daac metadata.xml 278
+MD5 b1468625b0df34d4cb3e06f2f3c039cb xdirectfb-1.0_rc5-r1.ebuild 2073
+MD5 cf892e3410f08429a7a685893c84e8d1 xdirectfb-1.0_rc5-r2.ebuild 2203
 MD5 53e2b736d916f4e4dbb287b52526f564 files/.dfbserverrc 940
 MD5 d38fb61c0ade184ffc8e4c080f25ea28 files/dfbserverrc 38
-MD5 6b4cf0b5bc65aa9dc38dd761cba3bb02 files/digest-xdirectfb-1.0_rc3-r1 392
-MD5 c065c19fb9d093bb5722c48973e0d3de files/digest-xdirectfb-1.0_rc4 545
-MD5 624e3d1ac258cc5835e6176f2102da5e files/host.def 172
+MD5 625e74462ca9d2751a3a2607382f9106 files/host.def 456
 MD5 d1bc78938748c36ba47bf119d923dfdb files/startxdfb 1436
+MD5 cfa9672e095e12c7ab91422ee06fdbf3 files/digest-xdirectfb-1.0_rc5-r1 308
+MD5 181bed9102110e91c4de60d7d211901b files/digest-xdirectfb-1.0_rc5-r2 211
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r1 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r1
index bc2ebb4a6a3f..873de08a2ab1 100644
--- a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r1
+++ b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc5-r1
@@ -1,9 +1,5 @@
 MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622
 MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239
 MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363
-MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
-MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
-MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
-MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
 MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
 MD5 fa7b791d117ab891080eedc71f923884 XDirectFB-1.0-rc5.tar.gz 96105
diff --git a/x11-base/xdirectfb/files/host.def b/x11-base/xdirectfb/files/host.def
index 0a6a373af32d..eee08618c4b0 100644
--- a/x11-base/xdirectfb/files/host.def
+++ b/x11-base/xdirectfb/files/host.def
@@ -3,3 +3,17 @@
 #define NothingOutsideProjectRoot No
 #define EtcX11Directory /etc/X11
 #define FontconfigDir /usr/X11R6/lib/fonts
+
+/* don't build fonts */
+#define BuildFonts NO
+
+/* don't build other servers */
+#define XF86Server NO
+#define XnestServer NO
+#define XVirtualFramebufferServer NO
+#define XprtServer NO
+#define BuildFontServer NO
+
+/* don't build drivers */
+#define XF86CardDrivers
+#define XInputDrivers
diff --git a/x11-base/xdirectfb/files/startxdfb b/x11-base/xdirectfb/files/startxdfb
index ce94f5a0fa44..b764ab4cec2c 100644
--- a/x11-base/xdirectfb/files/startxdfb
+++ b/x11-base/xdirectfb/files/startxdfb
@@ -1,127 +1,71 @@
 #!/bin/sh
 
-userclientrc=$HOME/.xinitrc
-sysclientrc=/usr/X11R6/lib/X11/xinit/xinitrc
-defaultclient=/usr/X11R6/bin/xterm
-defaultserver=/usr/X11R6/bin/XDirectFB
-defaultclientargs=""
-defaultserverargs=""
-clientargs=""
+userclientrc=$HOME/.xdfbrc
+userserverrc=$HOME/.dfbserverrc
+sysclientrc=/usr/X11R6/lib/X11/xinit/xdfbrc
+sysserverrc=/usr/X11R6/lib/X11/xinit/dfbserverrc
 serverargs=""
-
+clientargs=""
 
 if [ -f $userclientrc ]; then
-    defaultclientargs=$userclientrc
-elif [ -f $sysclientrc ]; then
-    defaultclientargs=$sysclientrc
+    clientargs=$userclientrc
+else if [ -f $sysclientrc ]; then
+    clientargs=$sysclientrc
+fi
 fi
 
+if [ -f $userserverrc ]; then
+    serverargs=$userserverrc
+else if [ -f $sysserverrc ]; then
+    serverargs=$sysserverrc
+fi
+fi
 
+display=:0
 whoseargs="client"
-while [ x"$1" != x ]; do
+while [ "x$1" != "x" ]; do
     case "$1" in
-    # '' required to prevent cpp from treating "/*" as a C comment.
-    /''*|\./''*)
-	if [ "$whoseargs" = "client" ]; then
-	    if [ x"$clientargs" = x ]; then
-		client="$1"
-	    else
-		clientargs="$clientargs $1"
-	    fi
-	else
-	    if [ x"$serverargs" = x ]; then
-		server="$1"
-	    else
-		serverargs="$serverargs $1"
-	    fi
-	fi
-	;;
     --)
-	whoseargs="server"
-	;;
+        whoseargs="server"
+        ;;
     *)
-	if [ "$whoseargs" = "client" ]; then
-	    clientargs="$clientargs $1"
-	else
-	    # display must be the FIRST server argument
-	    if [ x"$serverargs" = x ] && 		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
-
-		display="$1"
-	    else
-		serverargs="$serverargs $1"
-	    fi
-	fi
-	;;
+        if [ "$whoseargs" = "client" ]; then
+            clientargs="$clientargs $1"
+        else
+            serverargs="$serverargs $1"
+	    case "$1" in
+            :[0-9]*)
+                display="$1"
+                ;;
+            esac
+        fi
+        ;;
     esac
     shift
 done
-
-# process client arguments
-if [ x"$client" = x ]; then
-    # if no client arguments either, use rc file instead
-    if [ x"$clientargs" = x ]; then
-	client="$defaultclientargs"
-    else
-	client=$defaultclient
-    fi
-fi
-
-# process server arguments
-if [ x"$server" = x ]; then
-    # if no server arguments or display either, use rc file instead
-    if [ x"$serverargs" = x -a x"$display" = x ]; then
-	server="$defaultserverargs"
-    else
-	server=$defaultserver
-    fi
-fi
-
-if [ x"$XAUTHORITY" = x ]; then
+    
+if [ X"$XAUTHORITY" = X ]; then
     export XAUTHORITY=$HOME/.Xauthority
 fi
 
 removelist=
 
-
 # set up default Xauth info for this machine
-
-
-
-
-
-
-
-
-authdisplay=${display:-:0}
 mcookie=`mcookie`
-for displayname in $authdisplay `hostname -f`$authdisplay; do
+for displayname in $display `hostname -f`$display; do
     if ! xauth list "$displayname" | grep "$displayname " >/dev/null 2>&1; then
-	xauth add $displayname . $mcookie
-	removelist="$displayname $removelist"
+        xauth add $displayname . $mcookie
+        removelist="$displayname $removelist"
     fi
 done
 
-
-xinit $client $clientargs -- $server $display $serverargs
+echo $serverargs
+xinit $clientargs -- $serverargs
 
 if [ x"$removelist" != x ]; then
     xauth remove $removelist
 fi
 
-
-
-
-
 if command -v deallocvt > /dev/null 2>&1; then
     deallocvt
 fi
-
-
-
-
-
-
-
-
-
-
diff --git a/x11-base/xdirectfb/metadata.xml b/x11-base/xdirectfb/metadata.xml
index 5e72ff86afe0..576a4a3f1538 100644
--- a/x11-base/xdirectfb/metadata.xml
+++ b/x11-base/xdirectfb/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfree</herd>
+<herd>X11</herd>
 <longdescription>XDirectFB is a rootless XServer on top of DirectFB. This is an alternative to XFree86.</longdescription>
 </pkgmetadata>
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc5-r1.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc5-r1.ebuild
index 4433c55751be..c9321a9e97fb 100644
--- a/x11-base/xdirectfb/xdirectfb-1.0_rc5-r1.ebuild
+++ b/x11-base/xdirectfb/xdirectfb-1.0_rc5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc5-r1.ebuild,v 1.1 2004/03/19 16:47:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc5-r1.ebuild,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ HOMEPAGE="http://www.directfb.org"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="x86 -sparc ~alpha"
+KEYWORDS="x86 -sparc ~alpha ~ppc"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
@@ -34,7 +35,7 @@ src_unpack () {
 
 	cd ${X}
 	cp xc-directfb.diff ${S}
-	cp -a programs/Xserver/hw/directfb ${S}/programs/Xserver/hw
+	cp -pPR programs/Xserver/hw/directfb ${S}/programs/Xserver/hw
 	cp ${X}/config/cf/* ${S}/config/cf
 	cp ${FILESDIR}/host.def ${S}/config/cf/
 
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild
index 0bdc2e4d0243..51c71fb296b8 100644
--- a/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild
+++ b/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild,v 1.1 2005/09/10 06:17:32 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/xdirectfb-1.0_rc5-r2.ebuild,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.directfb.org"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="x86 -sparc ~alpha ~ppc"
+KEYWORDS="~x86 -sparc ~alpha ~ppc"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 4c3471d611f6..98d396b35c56 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,353 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.1 2005/08/08 06:37:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
+
+  14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-xkb-compile-path-2.patch, -files/fix-xkb-compile-path.patch,
+  xorg-server-0.99.3-r1.ebuild:
+  Remove CVS tags from patch as they don't do anything but break installs.
+  Fixes bug #112476.
+
+*xorg-server-0.99.3-r1 (14 Nov 2005)
+
+  14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-xkb-compile-path.patch, +xorg-server-0.99.3-r1.ebuild:
+  Fix xkb issue spotted by spyderous.
+
+*xorg-server-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-0.99.3.ebuild:
+  Bump for 7.0RC2.
+
+*xorg-server-0.99.2-r2 (09 Nov 2005)
+
+  09 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-server-0.99.2-r1.ebuild, +xorg-server-0.99.2-r2.ebuild:
+  Build against mesa 6.4 instead of 6.3.2.
+
+  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-server-0.99.1_p20051013-r1.ebuild, -xorg-server-0.99.2.ebuild:
+  Pull old versions.
+
+  29 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.2-r1.ebuild:
+  Note that X->Xorg symlink will be taken care of for any new snapshots, so we
+  can remove the line from the ebuild.
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.2-r1.ebuild:
+  Use --enable-install-setuid instead of manually changing permissions.
+
+*xorg-server-0.99.2-r1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.2-r1.ebuild:
+  (#109926) No need to specify xkb path anymore, it's wrong now as well.
+
+*xorg-server-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-server-0.99.1_p20051013-r1.ebuild:
+  added ~mips keyword
+
+  17 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1_p20051013-r1.ebuild:
+  (#109354) In some mystical way all the dependency changes got reverted in
+  the new revision.
+
+  16 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/0.99.1-r10-check-for-glproto.patch,
+  -files/0.99.1-r10_CAN-2005-2495.patch, -files/fix-transparencies.patch,
+  -xorg-server-0.99.1-r10.ebuild, -xorg-server-0.99.1_p20051013.ebuild:
+  Pull old ebuilds.
+
+*xorg-server-0.99.1_p20051013-r1 (16 Oct 2005)
+
+  16 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1_p20051013-r1.ebuild:
+  (#109467) Set a non-broken default font path so things like Xvfb actually work.
+
+  15 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  Add x11-libs/libXtst for dmx.
+
+  15 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  (#109354) Add lots of deps -- libXaw, libXpm, libXxf86misc, libXxf86vm. Add
+  notes on which parts depend on them.
+
+  14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  Also wrap dmxproto dep in minimal USE.
+
+  14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  (#109124) Add dep on libdmx, within check for USE=minimal. Also move libXres
+  dep within there, because it's for dmx.
+
+  14 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-0.99.1_p20051013.ebuild:
+  Add missing deps (x11-libs/libXres and x11-libs/libxkbui).
+
+  14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/0.99.1-r9_CAN-2005-2495.patch,
+  -files/0.99.1-r9-check-for-glproto.patch, -xorg-server-0.99.1-r9.ebuild:
+  Drop old revision.
+
+*xorg-server-0.99.1_p20051013 (14 Oct 2005)
+
+  14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1_p20051013.ebuild:
+  Update to today's CVS. Enable xprint USE flag. Stop filtering
+  -fomit-frame-pointer, because it works now. Add dep on
+  >=x11-proto/glproto-1.4.1_pre20051013 to fix build breakage.
+
+  04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/0.99.1-r10-check-for-glproto.patch,
+  +files/0.99.1-r10_CAN-2005-2495.patch:
+  Oops, forgot the version-dependent patches.
+
+*xorg-server-0.99.1-r10 (04 Oct 2005)
+
+  04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-transparencies.patch, +xorg-server-0.99.1-r10.ebuild:
+  Added fix for OO/wine transparencies from bug #96053.  Thanks to bartron for
+  both patches.
+
+  27 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r9.ebuild:
+  As of 20050927, xprint will require mkfontdir/mkfontscale for XpConfig.
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/0.99.1-r6-check-for-glproto.patch,
+  -files/0.99.1-r8-check-for-glproto.patch, -files/fix-xnest.patch,
+  -files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r7.ebuild,
+  -xorg-server-0.99.1-r8.ebuild:
+  Remove old versions and patches.
+
+*xorg-server-0.99.1-r9 (13 Sep 2005)
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/0.99.1-r9_CAN-2005-2495.patch,
+  +files/0.99.1-r9-check-for-glproto.patch, +xorg-server-0.99.1-r9.ebuild:
+  Bump to include security fix from bug #105688.
+
+  12 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r8.ebuild:
+  Add some deps so we get a server that actually runs after emerging it. In
+  specific: media-fonts/font-misc-misc media-fonts/font-cursor-misc
+  x11-misc/xbitmaps x11-misc/xkbdata x11-apps/iceauth x11-apps/rgb
+  x11-apps/xauth x11-apps/xinit.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+*xorg-server-0.99.1-r8 (08 Sep 2005)
+
+  08 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.99.1-r8-check-for-glproto.patch, +xorg-server-0.99.1-r8.ebuild:
+  Update to CVS HEAD as of 20050907. Update glproto patch to apply cleanly.
+
+  06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r7.ebuild:
+  Make --enable-xcsecurity always on, remove nvidia USE.
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-server-0.99.1-r7.ebuild:
+  Changed opengl-update envocation to use eselect instead.
+
+  03 Sep 2005; Doug Goldstein <cardoe@gentoo.org>
+  +xorg-server-0.99.1-r7.ebuild, -xorg-server-0.99.1-r6.ebuild:
+  Added support for the XCSecurity option, which is what's needed to make
+  binary Nvidia drivers work
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/0.99.1-r5-check-for-glproto.patch,
+  +files/0.99.1-r6-check-for-glproto.patch:
+  Apparently this patch has a package revision-based name.
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild,
+  +xorg-server-0.99.1-r6.ebuild:
+  Makes certain draw code endian-safe. Should fix things for big-endian
+  arches. Thanks to Stanislaw Skowronek and geoman in bug #104318.
+
+*xorg-server-0.99.1-r6 (02 Sep 2005)
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild,
+  +xorg-server-0.99.1-r6.ebuild:
+  Added fix to make colour calculations endian safe.  Thanks to Stanislaw
+  Skowronek for the patch and geoman for the heads-up.  Fixes bug #104318.
+
+  30 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
+  xorg-server-0.99.1-r5.ebuild:
+  s/lib/$(get_libdir)
+
+  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
+  -files/xorg-server-0.99.1-x86_64-1.patch, -xorg-server-0.99.1-r4.ebuild:
+  Pull old version.
+
+  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.99.1-r5-check-for-glproto.patch, xorg-server-0.99.1-r5.ebuild:
+  (#fd.o 3990) Add 0.99.1-r5-check-for-glproto.patch. Pass
+  --with-xkb-path=/usr/lib/X11/xkb in attempt to get VT switching closer to
+  working. Update CVS patch to 20050822-1, which makes xprint almost work.
+
+*xorg-server-0.99.1-r5 (22 Aug 2005)
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/fix-xnest.patch, +xorg-server-0.99.1-r5.ebuild:
+  Update to CVS as of 20050822. This should make amd64 and sparc work. Update
+  included mesa to 6.3.2. Stop forcing glx on, it's on by default. Add
+  --disable-static so we don't build .a files for server modules. Add
+  fix-xnest.patch to fix breakage in the Xnest linking, caused by the
+  configure.ac reworking a couple of days ago.
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r4.ebuild:
+  xprint build is broken; force it off.
+
+  21 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  xorg-server-0.99.1-r4.ebuild:
+  Marked ~ppc
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/xorg-composite.patch, -files/xorg-server-fbmmx-local.patch,
+  -xorg-server-0.99.1.ebuild, -xorg-server-0.99.1-r1.ebuild,
+  -xorg-server-0.99.1-r2.ebuild, -xorg-server-0.99.1-r3.ebuild:
+  Drop old versions.
+
+*xorg-server-0.99.1-r4 (21 Aug 2005)
+
+  21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1-r4.ebuild:
+  Update to today's CVS. This adds a USE flag for xprint. Also, get rid of the
+  glx USE flag, because everybody should get it.
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1.ebuild, xorg-server-0.99.1-r1.ebuild,
+  xorg-server-0.99.1-r2.ebuild, xorg-server-0.99.1-r3.ebuild:
+  panoramixproto moved to xineramaproto.
+
+  17 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-fbmmx-local.patch, xorg-server-0.99.1-r3.ebuild:
+  (fd.o #4073) Fix compilation failures at fbmmx.c. Patch from Diego Pettenò
+  <flameeyes@gentoo.org>.
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Wrap opengl things in `if use glx..`
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
+  xorg-server-0.99.1-r3.ebuild:
+  Marked ~amd64.
+
+  14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-0.99.1-x86_64-1.patch, xorg-server-0.99.1-r3.ebuild:
+  Add xorg-server-0.99.1-x86_64-1.patch to fix configure.ac on amd64.
+
+  14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Wrap pkg_postrm() module dir removal in ! has_version.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  No longer necessary to force --enable-composite; it's on by default.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Update opengl-update dependency to 2.2.3 for proper handling of
+  /usr/libdir/modules/extensions/.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Remove xinerama USE flag; building without it causes major issues.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Add pkg_postrm() to get rid of /usr/lib/xorg/modules. This should make
+  things work better for people crazy enough to downgrade to monolithic.
+
+*xorg-server-0.99.1-r3 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1-r3.ebuild:
+  Set /usr/bin/Xorg suid so it starts.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r2.ebuild:
+  Fix the patch that mysteriously broke.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
+  +xorg-server-0.99.1-r2.ebuild:
+  Re-add, this time with a huge patch on the mirror.
+
+  12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
+  -files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch,
+  -xorg-server-0.99.1-r2.ebuild:
+  Removed 0.99.1-r2 version (3.3MB patch is not good).
+
+*xorg-server-0.99.1-r2 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
+  +files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch,
+  +xorg-server-0.99.1-r2.ebuild:
+  Add xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch to fix big-endian
+  breakage, composite, some other stuff. Split out non-composite things from
+  xorg-composite.patch to check-for-glproto.patch and fix-xf86misc-typo.patch.
+
+  11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r1.ebuild:
+  Make an X->Xorg symlink in here until upstream can make one.
+
+  11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r1.ebuild:
+  Add more deps: inputproto, bigreqsproto, xcmiscproto. All reported by aaronf0.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1-r1.ebuild:
+  Move confopts into pkg_setup(), and therefore also CONFIGURE_OPTIONS.
+
+*xorg-server-0.99.1-r1 (10 Aug 2005)
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.1-r1.ebuild:
+  Rev bump to make sure people get working GL setup.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  Add GL handling, /usr/lib/opengl, opengl-update, etc.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  Add dep on x11-proto/kbproto, again from aaronf0.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  Add dep on fontsproto, reported by aaronf0 on irc.
+
+  09 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  (#101883) Add trapproto and panoramixproto as deps.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xorg-server-0.99.1.ebuild:
+  Add ~sparc keyword (prepare for X Modular testing).
+
+  08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  (#101749) Add dependencies on videoproto, scrnsaverproto and evieext.
+  Reported by Georgi Georgiev <chutz@gg3.net>.
 
 *xorg-server-0.99.1 (08 Aug 2005)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a1886c892a3f..5189e5bf5bbf 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,8 +1,9 @@
-MD5 f3e1cf11312a6e91949bd4206cca3dab xorg-server-0.99.1.ebuild 1780
-MD5 1acaac710ce78ecd2f4442dcee9830da files/digest-xorg-server-6.99.99.900 142
-MD5 692ba2a2df85c119c61ec1f1f3279b92 files/20050801-cw.h 5221
-MD5 139d1af499d5fd30cbb118284544e3f6 files/xorg-composite.patch 2397
-MD5 139d1af499d5fd30cbb118284544e3f6 files/xorg-composite-old.patch 2397
-MD5 0f5b8ee61b9651f378bad238ee00bd36 files/composite.patch 1416
-MD5 2ccb16e11ba17a9ccfb3aec8cbfe6a68 files/xorg-composite-include.patch 2532
-MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1 137
+MD5 c3501e991bbc8f09e3a903e8f08510ad ChangeLog 13931
+MD5 a4667dca1eda69c90ff9dede2d1c4e00 files/digest-xorg-server-0.99.2-r2 137
+MD5 c2222f9d7528b5e753eca9c857b47bad files/digest-xorg-server-0.99.3 137
+MD5 c2222f9d7528b5e753eca9c857b47bad files/digest-xorg-server-0.99.3-r1 137
+MD5 a659ef5f3be42a4e35146f7026f65864 files/fix-xkb-compile-path-2.patch 710
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a01a1416152f751b32b2ac812defee06 xorg-server-0.99.2-r2.ebuild 4014
+MD5 d30b118df9322a5d3546c74bed10fa97 xorg-server-0.99.3-r1.ebuild 4069
+MD5 c2c289a801304b85e5e623df89362c92 xorg-server-0.99.3.ebuild 4068
diff --git a/x11-base/xorg-server/xorg-server-0.99.2-r2.ebuild b/x11-base/xorg-server/xorg-server-0.99.2-r2.ebuild
index e71d9b999907..3067a5733cb8 100644
--- a/x11-base/xorg-server/xorg-server-0.99.2-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.2-r2.ebuild,v 1.1 2005/11/09 07:31:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
diff --git a/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild
index db70cfb1a520..fd096dcfd559 100644
--- a/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild,v 1.1 2005/11/14 01:05:34 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -15,7 +15,7 @@ MESA_PV="6.4"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
-PATCHES="${FILESDIR}/fix-xkb-compile-path.patch"
+PATCHES="${FILESDIR}/fix-xkb-compile-path-2.patch"
 
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"
diff --git a/x11-base/xorg-server/xorg-server-0.99.3.ebuild b/x11-base/xorg-server/xorg-server-0.99.3.ebuild
index 3e70e32dcac3..22b406667839 100644
--- a/x11-base/xorg-server/xorg-server-0.99.3.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.3.ebuild,v 1.1 2005/11/11 18:09:38 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.3.ebuild,v 1.1.1.1 2005/11/30 10:01:08 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index eeb05aa5d8c5..d93df1d67463 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,2519 @@
 # ChangeLog for x11-base/xorg-x11
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.1 2004/04/07 08:56:25 spyderous Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.1.1.1 2005/11/30 10:01:03 chriswhite Exp $
+
+  23 Nov 2005; Chris White <chriswhite@gentoo.org> xorg-x11-6.8.2-r6.ebuild:
+  x86 stable for bug #113307.
+
+  20 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  xorg-x11-6.8.99.15-r4.ebuild:
+  Added ~ppc64 keyword
+
+  16 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-7.0.0_rc1.ebuild, xorg-x11-7.0.0_rc2.ebuild:
+  Changed xorg-x11 blocker for clarity.
+
+*xorg-x11-7.0.0_rc2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-7.0.0_rc2.ebuild:
+  Bump for 7.0RC2.
+
+  10 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-7.0.0_rc1.ebuild:
+  Add eutils inherit.  Thanks to Ferris McCormick in bug #111976.
+
+  09 Nov 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-7.0.0_rc1.ebuild:
+  added ~mips keyword
+
+  06 Nov 2005; <dang@gentoo.org> xorg-x11-7.0.0_rc1.ebuild:
+  Marked ~amd64
+
+  05 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-7.0.0_rc1.ebuild:
+  Add a pkg_postinst(), so we can have a bunch of einfo help.
+
+  03 Nov 2005; Ferris McCormick <fmccor@gentoo.org>
+  xorg-x11-7.0.0_rc1.ebuild:
+  Add ~sparc keyword (facilitate X-modular testing).
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-7.0.0_rc1.ebuild:
+  Add xrandr to apps, also pulling in libXrandr.
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-7.0.0_rc1.ebuild:
+  (#111298) Add libXScrnSaver to deps, because it's again incredibly common.
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-7.0.0_rc1.ebuild:
+  Remove xinerama USE flag and make it mandatory. A large number of
+  applications have mandatory xinerama, so having the library optional makes
+  things unnecessarily complex.
+
+*xorg-x11-7.0.0_rc1 (02 Nov 2005)
+
+  02 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-7.0.0_rc1.ebuild:
+  Add metabuild for modular X.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.99.15-r4.ebuild:
+  -mips to ~mips
+
+  12 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-x11-6.8.2-r5.ebuild, -xorg-x11-6.8.99.15-r2.ebuild,
+  -xorg-x11-6.8.99.15-r3.ebuild:
+  Drop old revisions.
+
+  12 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog:
+  Add a patch for a missing NULL-check in the radeon driver.
+  https://bugs.freedesktop.org/show_bug.cgi?id=4001
+
+*xorg-x11-6.8.99.15-r3 (03 Oct 2005)
+
+  03 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-6.8.99.15-r3.ebuild:
+  Added fix for OO/wine transparencies as well as update to mmx code from bug
+  #96053, closing that bug.  Thanks to bartron for both patches.
+  
+  Also added patch from bug #104318 to fix colour swapping on big-endian
+  systems.  Thanks to Stephen Becker for that.
+
+*xorg-x11-6.8.2-r6 (03 Oct 2005)
+
+  03 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-6.8.2-r6.ebuild:
+  Added fix for OO/wine transparencies as well as update to mmx code from bug
+  #96053, closing that bug.  Thanks to bartron for both patches.
+
+  21 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r5.ebuild:
+  Add message on where to look for logs when a migration fails.
+
+  20 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-6.8.2-r5.ebuild:
+  Added gcc4 compile fix for fbmmx.c .  Closes bug #106305.
+
+  20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r5.ebuild,
+  xorg-x11-6.8.99.15-r2.ebuild:
+  Make util-linux conditional to GNU userland, added note for FBSD.
+
+*xorg-x11-6.8.2-r5 (20 Sep 2005)
+
+  20 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-6.8.2-r5.ebuild:
+  New revision.  Includes sparc-specific fixes from bugs #61940 and #79467.
+
+  19 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.99.15-r2.ebuild:
+  (#106311) Wrap unpacking of eurofonts in ! use minimal, since downloading is.
+
+*xorg-x11-6.8.99.15-r2 (17 Sep 2005)
+
+  17 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-x11-6.8.99.15-r1.ebuild, +xorg-x11-6.8.99.15-r2.ebuild:
+  Fixed security update as per bug #105859.
+
+  17 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog:
+  Fixed credits for patch and such.
+
+*xorg-x11-6.8.2-r4 (17 Sep 2005)
+
+  17 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-x11-6.8.2-r3.ebuild, +xorg-x11-6.8.2-r4.ebuild:
+  Fixed previous security update as it did not match upstream's patch.  Much
+  thanks to Alexander Brüning for providing and testing the new patch and
+  Peter Hyman for spotting the source of the problem.  Closes bug #105859.
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-6.8.99.15-r1.ebuild:
+  Added xdm stop fix to file set.
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-x11-6.8.99.14.ebuild, -xorg-x11-6.8.99.15.ebuild:
+  Clean out old/insecure versions.
+
+*xorg-x11-6.8.99.15-r1 (13 Sep 2005)
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-x11-6.8.99.15-r1.ebuild:
+  Security update with patch from bug #105688.
+
+  12 Sep 2005; Seemant Kulleen <seemant@gentoo.org>
+  -xorg-x11-6.8.2-r1.ebuild, -xorg-x11-6.8.2-r2.ebuild:
+  remove insecure versions
+
+*xorg-x11-6.8.2-r3 (12 Sep 2005)
+
+  12 Sep 2005; Seemant Kulleen <seemant@gentoo.org>
+  +xorg-x11-6.8.2-r3.ebuild:
+  Fix for bug #105688 -- buffer overflow in pixmap memory allocation. Also,
+  fixed xdm initscript (bug #104657).
+
+  10 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild:
+  (#105532) Add groff build-time dependency.
+
+  25 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.14.ebuild:
+  Changed cp -a to cp -pPR for the rest of the ebuilds. (BSD compatibility)
+
+  24 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-x11-6.8.99.15.ebuild:
+  Changed cp -a to cp -pPR for BSD compatibility.
+
+  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.14.ebuild, xorg-x11-6.8.99.15.ebuild:
+  (#103421) Don't feed enewuser a false login shell; it figures out a correct
+  one.
+
+  17 Aug 2005; Mike Frysinger <vapier@gentoo.org> xorg-x11-6.8.2-r1.ebuild,
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild,
+  xorg-x11-6.8.99.15.ebuild:
+  Add xterm back to DEPEND for uclibc systems #102402 by Yuri Vasilevski and
+  remove ugly arch-wrappings of 3dfx in DEPEND.
+
+  29 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild:
+  (#100392) Stick -j1 after the emake compilation calls.
+
+  26 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild:
+  Add MAKE="make" on debug build for BSD.
+
+  22 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Fileset 0.7. (#99534) Check the right return value on ttmkfdir in the ebuild
+  and in the xfs init script. Otherwise, mkfontscale overwrites the
+  fonts.alias files and breaks encodings including CP1251. Thanks to Alexander
+  Glyzov <isee@inbox.ru>.
+
+  21 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.99.13.ebuild:
+  Pull old snapshot.
+
+  21 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.15.ebuild:
+  Remove dlloader USE flag. dlloader is now the default upstream and we'll no
+  longer support elfloader. Binary drivers are already broken for other
+  reasons.
+
+  20 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.15.ebuild:
+  Patchset 0.1.2. Add 9500_all_6.8.99.15-dlloader-in-host-def-CVS-HEAD.patch
+  to fix problems with redefining MakeDllModules in host.def.
+
+  20 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.15.ebuild:
+  (#61940) No need for sparc to be stuck on the old keyboard driver anymore.
+
+*xorg-x11-6.8.99.15 (20 Jul 2005)
+
+  20 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.99.15.ebuild:
+  New snapshot. Pull mmx, sse and 3dnow USE flags. They're pointless, since what
+  they do is cause Mesa to support them, but Mesa already does runtime checks.
+  (#99534) Fix up return-code check on ttmkfdir, so we don't overwrite its files
+  with mkfontscale. mkfontscale cannot correctly generate CP1251 encodings,
+  among probable others. (#61940) Also, on sparc we can start using the kbd
+  driver like everyone else.
+
+  18 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.99.5.ebuild, -xorg-x11-6.8.99.8.ebuild:
+  Pull old development snapshots.
+
+  18 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild,
+  xorg-x11-6.8.99.13.ebuild, xorg-x11-6.8.99.14.ebuild:
+  Stop polluting /etc/profile.d/ with xprint stuff. Install it as a sample in
+  the doc directory instead.
+
+  11 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild:
+  When I say I don't want Xprint, don't give me Xprint anyway. Turn off
+  BuildXprintClients in addition to BuildXprint for USE="-xprint."
+
+  11 Jul 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r2.ebuild:
+  stable on alpha ia64
+
+  10 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild:
+  Clarify no-stripping message.
+
+  08 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild:
+  Fileset 0.6 for 6.8.2-r2, fileset 0.2 for 6.8.99.14. (#83680) Add a change
+  that's mostly useful on LiveCD's: Adding 'nox' to the boot prompt will cause
+  the xdm init script to skip starting a login manager. This will allow
+  selection between X and CLI-only on X-enabled LiveCD's, as well as serving a
+  rescue function for broken X installations.
+
+  08 Jul 2005; Ferris McCormick <fmccor@gentoo.org>
+  xorg-x11-6.8.2-r2.ebuild:
+  Stable for sparc.  This version runs fine.
+
+  07 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.2-r2.ebuild:
+  stable on mips
+
+  07 Jul 2005; Herbie Hopkins <herbs@gentoo.org> xorg-x11-6.8.2-r2.ebuild:
+  Stable on amd64.
+
+  07 Jul 2005; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r2.ebuild:
+  Stable on hppa.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r2.ebuild:
+  Stable on ppc64
+
+  07 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Stable on x86.
+
+  05 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Patchset 0.1.9. Add 4155_all_6.8.99.14-xdm-ipv6-without-kernel-ipv6.patch:
+  (fd.o #2901) This patch fixes several problems arising if xdm is compiled
+  with IPv6 support, but the (linux) kernel does not support IPv6.
+
+*xorg-x11-6.8.99.14 (05 Jul 2005)
+
+  05 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.99.14.ebuild:
+  New snapshot.
+
+  03 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.99.8.ebuild, xorg-x11-6.8.99.13.ebuild:
+  these versions seriously break displaying of icons in gtk and qt apps with
+  the newport driver, so changing keywords to -mips
+
+  30 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Patchset 0.1.8. Add 9925_all_6.8.2-fix-mtrr-endless-loop.patch: (#fd.o 2750)
+  Prevent mtrr_remove_offending from ending up in an endless loop if the
+  offending region refuses to be removed.
+
+  30 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Patchset 0.1.7. Add 9185_all_6.8.2-fix-cursor-memleak.patch: (#31982, fd.o
+  #1043) Xcursor animated themes cause memory leak.
+
+  29 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild,
+  xorg-x11-6.8.99.13.ebuild:
+  Use the correct USE flag for enewuser() etc.
+
+  29 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild:
+  Fileset 0.5 for 6.8.2-r2, fileset 0.2 for 6.8.99.13. (#80225) Remove
+  Gentoo-specific code from Xsetup_0 and start installing upstream version
+  instead.
+
+  28 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild:
+  (#77626) Add USE=nocxx to avoid ttmkfdir dependency and use. Substitute
+  mkfontscale instead, which reportedly is worse on CJK stuff. Patch from
+  Peter S. Mazinger <ps.m@gmx.net>.
+
+  28 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild:
+  (#93339) Set up USE=minimal drivers for sparc.
+
+  28 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild,
+  xorg-x11-6.8.99.13.ebuild:
+  (#94964) Use enewuser()/enewgroup() for xfs, so default /etc/passwd etc isn't
+  so huge.
+
+*xorg-x11-6.8.99.13 (27 Jun 2005)
+
+  27 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.99.13.ebuild:
+  New snapshot.
+
+  11 Jun 2005; Ferris McCormick <fmccor@gentoo.org>
+  xorg-x11-6.8.2-r2.ebuild:
+  Add ~sparc keyword.  This version runs fine for me (and does not
+  create the symbolic link loop for fonts in /usr/share/fonts).
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Update TODO.
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Remove miscellaneous commented-out symlinking and directory creation.
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Remove commented-out migrate_usr_x11r6_lib().
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Remove all migration methods besides rsync.
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Remove a ton of commented-out migration code.
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Use '-lt' instead of '-le' for sse tests, so we don't do them on gcc-3.4.4.
+
+  30 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Fileset 0.4 for 6.8.2-r2, fileset 0.2 for 6.8.99.8. (#93920) Don't specify
+  full path to pam modules in /etc/pam.d/ files. It breaks lib64-using
+  systems.
+
+  28 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.99.5.ebuild:
+  Propogate sse changes to the rest.
+
+  28 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.8.ebuild:
+  (#90672) Add die for combo of USE="sdk -dlloader," pending a fix.
+
+  27 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.99.3.ebuild:
+  Pull old snapshot.
+
+  27 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Have sse flag mangling only apply on gcc <3.4.4.
+
+  25 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.8.ebuild:
+  Patchset 0.1.3. (#93864, #90672#c18) Add missing comma. This fixes a parse
+  error in ATIDRIScreenInit in atidri.c.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.8.ebuild:
+  (#93856) Remove duplicated statement that checked for invalid USE combos.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Patchset 0.1.6 for 6.8.2-r2, patchset 0.1.2 for 6.8.99.8. (#89852) Update
+  5901_all_4.2.99.3-acecad-debug-v2.patch so it's compatible with BSD.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  (#89852) Ebuild changes for Gentoo/FreeBSD. Set MAKE, use wheel group
+  instead of root, exclude 0700_all_4.2.0-sessreg-highuid.patch on OpenBSD and
+  FreeBSD; the patch allows for high UIDs in a non-portable way. A suitably
+  motivated person could fix it.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Backports from 6.8.99.x, continued: Depend on opengl-update-2.2 for fixed
+  --use-old.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild:
+  Backports from 6.8.99.x. 1) Fix find syntax. 2) Stop setting BuildLinuxDocText.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.8.ebuild:
+  Add einfo on the binary driver breakage.
+
+*xorg-x11-6.8.99.8 (24 May 2005)
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.99.8.ebuild:
+  New snapshot. This one breaks some binary drivers; see
+  https://bugs.freedesktop.org/show_bug.cgi?id=3066.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  Patchset 0.1.5 for 6.8.2-r2, patchset 0.1.3 for 6.8.99.5. (#87361) Pull
+  5140_all_6.8.0-radeon-swsusp.patch, which seems to add a redundant
+  RadeonSetFBLocation() compared with CVS, where the bug it was supposed to
+  fix is fixed.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  Fileset 0.3 for 6.8.2-r2, fileset 0.2 for 6.8.99.5. (#24399) Stop *DM from
+  throwing errors on shutdown. (#91470) Don't force fc-cache in xfs init
+  script.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  Patchset 0.1.4 for 6.8.2-r2, patchset 0.1.2 for 6.8.99.5. (#85153, fd.o
+  #1958, fd.o #1951) Add 1050_all_6.8.2-xft-releasefile-crash.patch: libXft
+  dies when passing FT_Face objects directly to Xft.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.5.ebuild:
+  (#93034) There's a new FontEncDir that we also need to change to fit our FHS
+  compatibility.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  (#89235) Use has_hardened instead of hardened USE flag, because it checks
+  the active toolchain. Also looks like part of the last commit was missed
+  from 6.8.99.5.
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  (#77949) The doc and minimal USE flags don't work together. Add a warning to
+  this effect.
+
+  22 May 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.99.5.ebuild:
+  add ~alpha
+
+  18 May 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.99.5.ebuild:
+  added ~mips keyword
+
+  17 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.0-r5.ebuild:
+  Drop old version. Everyone's been stabled on 6.8.2-r1 since early April.
+  Also, dropping this should allow us to unconditionally use the new /usr
+  prefix for all other apps instead of some sort of x11-prefix.eclass
+  (#90789).
+
+  17 May 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.99.3.ebuild:
+  added ~mips keyword
+
+  12 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.5.ebuild:
+  Remove big warning about /usr/lib move, because everything in portage does
+  it now.
+
+  12 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.99.5.ebuild:
+  Add a note about Radeon tiling breaking direct rendering in snapshots.
+
+  12 May 2005; Donnie Berkholz <spyderous@gentoo.org>; :
+  Make ChangeLog more human-readable by replacing PATCH_VER and FILES_VER with
+  patchset and fileset.
+
+*xorg-x11-6.8.99.5 (03 May 2005)
+
+  03 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.99.5.ebuild:
+  New snapshot. Fix find syntax, as we fixed the xfs init script a while ago.
+  Pull BuildLinuxDocText from USE=doc, because it's only useful for sgml
+  building. (#63548, fd.o #3182) Add
+  9020_all_6.8.99.5-fix-dmx-doc-build.patch: fix USE="dmx doc" build. (#fd.o
+  3192) Add 9030_all_6.8.99.5-theatre200_reg.h-doesnt-exist.patch:
+  RageTheatre200 support added in 6.8.99.4 broke the SDK install.
+
+  02 May 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.2-r2.ebuild:
+  added ~mips keyword
+
+  29 Apr 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r2.ebuild,
+  xorg-x11-6.8.99.3.ebuild:
+  Added ~ppc64 to 6.8.2-r2; Added -ppc64 to 6.8.99.3: won't start..
+
+  27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.99.3.ebuild:
+  Updated dependency to opengl-update-2.2.0 so we can use 'opengl-update
+  --use-old' again.
+
+  21 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild:
+  Explicitly turn off dlloader with USE=-dlloader. Relevant on >=6.8.99.*, but
+  I'm trying to keep these two in parallel so I'm applying it to both. Caught
+  by sekretarz.
+
+  20 Apr 2005; Ferris McCormick <fmccor@gentoo.org>
+  xorg-x11-6.8.99.3.ebuild:
+  Add ~sparc keyword.  Builds, installs, and runs "out of the box".
+
+  20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild:
+  Marked ~amd64.
+
+  20 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild:
+  Better fix for the last issue.
+
+  20 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild:
+  (#89743) Remove /usr/share/fonts/fonts symlink if it exists. Circular
+  symlink causes major font slowdowns and seems to be some sort of migration
+  artifact.
+
+*xorg-x11-6.8.99.3 (19 Apr 2005)
+
+  19 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.99.3.ebuild:
+  Part of a series of development snapshots of CVS HEAD. Pull a ton of patches
+  that were committed upstream:
+  0440_all_6.8.0-support-cymotion-master-and-ibm-space-saver-keyboards.patch,
+  0485_all_6.8.0-afb-cfb-dlloader-fixes.patch,
+  0487_all_6.8.2-add-relocation-type-10-to-elfloader.patch,
+  2000_all_6.8.0-fb-convert-rgb-to-bgr-when-needed.patch,
+  5135_all_6.8.1-r128-ppc-vgaaccess.patch,
+  5160_all_6.8.1-benh-radeon-ppc-fixes-v2.patch,
+  5170_all_6.8.1.904-radeon-add-bioshotkeys-option.patch,
+  5180_all_6.8.2-back-out-extra-radeonsetfblocation.patch,
+  5190_all_6.8.2-radeon-render-byteswap.patch,
+  5200_all_6.8.0-newport-accel-v4.patch,
+  9355_all_6.7.99.2-xorgconfig-fontdir-fixes-v2.patch,
+  9370_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch,
+  9375_all_6.8.1.904-fix-duplicate-mfb-symbols.patch,
+  9930_all_6.8.0-xpm-secfix-CAN-2005-0605.patch. Update some patches to
+  reflect changes, such as 9360_all_6.7.99.2-ppc64-support-updates-v3.patch.
+  Also drop 9180_all_4.3.0-xcursorgen-check-malloc-return.patch, which just
+  caused a different kind of error. Drop the patched-in evdev driver (patches
+  9000-9003), because upstream now supplies its own, different evdev driver.
+  (#67578) Drop 0350_all_4.2.0-vt7.patch, which has poor rationale and doesn't
+  work very well.
+
+  15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.2-r2.ebuild:
+  multilib and some sparc64 cleanup.
+
+  15 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/xpm-secfix-thomas.diff, -xorg-x11-6.8.0-r3.ebuild:
+  Everyone seems to have newer stable versions, so pull this and its 55K patch.
+
+  15 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild:
+  (#89182) Don't always call the build Gentoo Linux, since we can build for
+  other OS's.
+
+*xorg-x11-6.8.2-r2 (14 Apr 2005)
+
+  14 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.2-r2.ebuild:
+  New revision, with a bunch of updates. Patchset 0.1.3. (#85363, fd.o #1765)
+  Add 0487_all_6.8.2-add-relocation-type-10-to-elfloader.patch: Add another
+  relocation type to the ELF loader. (#82039) Add
+  5137_all_6.8.2-fix-r128-undefined-write-depth.patch: Fix direct rendering on
+  R128 because of undefined WRITE_DEPTH. (#82705) Add
+  9003_all_6.8.2-lnx-evdev-keyboard-dont-grab.patch: Don't grab the keyboard,
+  so combo keyboard/mice work. (#80685) Add 9913_all_6.8.2-cfbgc-gcc4.patch,
+  9914_all_6.8.2-mmx-gcc4.patch and 9915_all_6.8.2-radeon-gcc4.patch: GCC4
+  compile fixes. (fd.o #2750) Add 9920_all_6.8.2-fix-write-combining.patch:
+  Fix case where a smaller write-combining region blocks write-combining
+  setting of the whole frame buffer. Fix bug in wc setting code when regions
+  are first splitted and setting of write-combining then fails. (#82735) Fix
+  find(1) syntax in xfs init script. (#86890) Install release notes. (#82791)
+  Add s3 and vesa drivers on alpha. (#81728) ebegin() use shouldn't contain
+  trailing periods.
+
+  09 Apr 2005; Tom Gall <tgall@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  add mga on ppc64, it works!
+
+  06 Apr 2005; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  Fixed build with USE=-xv on hppa.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  stable on ia64
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  Stable on hppa.
+
+  13 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild:
+  Stable x86. Sorry about the two upgrades in a few days thing, but the first
+  was a security bug so there was some time pressure involved. I figured it's
+  better to stable this sooner so we can save a compile for people who don't
+  sync every day.
+
+  12 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.7.0-r3.ebuild, -xorg-x11-6.8.0-r4.ebuild,
+  -xorg-x11-6.8.2.ebuild:
+  (#83598) Remove vulnerable versions except xorg-x11-6.8.0-r3, which is
+  forced to stay until arm, hppa, ia64 stable xorg-x11-6.8.2-r1.
+
+  11 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild:
+  Stop manually setting HasLinuxInput, as it broke BSD and was only needed for
+  2.2 kernels. So, 2.2 kernels are no longer supported.
+
+  11 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild:
+  No need to add acecad to ExtraXInputDrivers, it's already in XInputDrivers.
+
+  10 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r5.ebuild:
+  (#83598) Stable x86. 6.8.2-r1 may be stabled soon but it's pending
+  >=freetype-2.1.8, which I need to discuss with the maintainers, and this
+  can't wait.
+
+  10 Mar 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  Stable for sparc, closing Bug 83598 --- security patch for XPM.
+
+  10 Mar 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  Stable for sparc, Bug 83598.
+
+  10 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  xorg-x11-6.8.2-r1.ebuild:
+  Marked stable on amd64.
+
+  09 Mar 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.2-r1.ebuild:
+  stable on mips - bug 83598
+
+  08 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  xorg-x11-6.8.2-r1.ebuild:
+  Stable on alpha, bug 83598.
+
+  06 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2.ebuild:
+  Make freetype dep versions in DEPEND and RDEPEND match. Reported by Park
+  Ji-In <mithrandir@tisphie.net>.
+
+  06 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  xorg-x11-6.8.0-r5.ebuild:
+  Marked stable on amd64; Security BUG #83598.
+
+  06 Mar 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r1.ebuild:
+  Stable on ppc64; bug #83598
+
+  06 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xorg-x11-6.8.2-r1.ebuild:
+  Stable on ppc.
+
+*xorg-x11-6.8.0-r5 (05 Mar 2005)
+
+  05 Mar 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.0-r5.ebuild, +xorg-x11-6.8.2-r1.ebuild:
+  (#83598, fd.o #1920) Fix more overflows in libXpm.
+
+  02 Mar 2005; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.8.2.ebuild:
+  Different switch_opengl_implem logic, should fix bug #83645
+
+  26 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.1.901-r1.ebuild:
+  Pull development version.
+
+  25 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.2.ebuild:
+  dosyms should've been ln -s in postinst's migration code.
+
+  20 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2.ebuild:
+  Fix hardcoded lib instead of $(get_libdir) in xprint_init_install(), thanks
+  to Daniel Ostrow <dostrow@gentoo.org>.
+
+  19 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2.ebuild:
+  Stable on ppc64
+
+  17 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> xorg-x11-6.8.2.ebuild:
+  Stable on ppc.
+
+  14 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.2.ebuild:
+  Unfubar libdir symlinks made by migration.
+
+  13 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2.ebuild:
+  (#81851) Clarify local cursor settings info.
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> xorg-x11-6.8.2.ebuild:
+  ~alpha keyword.
+
+  11 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2.ebuild:
+  Install glxext.h, glxmd.h and glxproto.h to /usr/lib/opengl. Stop symlinking
+  glext.h manually because we depend on new enough opengl-update now.
+
+  11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.2.ebuild:
+  Moved fix_libtool_libdir_paths after the opengl .las get moved to their
+  final locations.
+
+  11 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.1.902-r1.ebuild, -xorg-x11-6.8.1.902.ebuild,
+  -xorg-x11-6.8.1.903.ebuild, -xorg-x11-6.8.1.904.ebuild:
+  Pull old versions. Still waiting for 6.8.2 to be ~alpha so 6.8.1.901-r1 can
+  be pulled.
+
+  11 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2.ebuild:
+  Update opengl-update dependency to >=2.1.1 -- lower versions were broken in
+  various ways.
+
+*xorg-x11-6.8.2 (11 Feb 2005)
+
+  11 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.2.ebuild:
+  Here 'tis. Add 5180_all_6.8.2-back-out-extra-radeonsetfblocation.patch --
+  Somehow when applying fd.o #1220 and fd.o #1912, things got mixed up. An
+  extra call to RadeonSetFBLocation() was added to RADEONAdjustFrame(). Back
+  this out. Michel Daenzer says: As I said before: it's unnecessary writes to
+  GPU memory controller registers. In the best case, there's an unnecessary
+  slight delay maybe; in the worst case, the GPU might wedge. (#81283, fd.o
+  #2164) Add 5190_all_6.8.2-radeon-render-byteswap.patch -- Forgot to return
+  TRUE at the end of RADEONSetupRenderByteswap() so some render-accelerated
+  stuff was screwed up. (#76807) Break up xbox patch into two patches and
+  update it: 9990_x86_6.8.0-nvxbox-20050107.patch and
+  9991_x86_6.8.1.904-xbox-pci-20050207.patch. (#81459) Fix up libtool archives
+  for multilib; stop installing libMesaGLU.so symlink; Stop having
+  /usr/X11R6/lib in libtool archives because /usr/X11R6 is just a symlink now.
+
+  10 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.1.904.ebuild:
+  Don't install libMesaGLU.so.  Fix 'libdir' in .la files.
+
+  09 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.904.ebuild:
+  (#81431) We should only be removing libGL.*, but unfortunately the dot
+  matched any character so we needed libGL\.* instead. Note that this has been
+  around since xfree-4.3.0.
+
+  08 Feb 2005; David Holm <dholm@gentoo.org> xorg-x11-6.8.1.904.ebuild:
+  Added to ~ppc.
+
+  07 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.904.ebuild:
+  Patchset 0.1.3. Add
+  9250_all_6.8.1.904-respect-xfree86configtools-setting.patch -- respect
+  whether configuration tools are desired. Also some other USE=minimal
+  enhancements: Stop building unneeded static libraries, the DPS libraries,
+  the config tools and xf8* (unneeded for these drivers). The install size is
+  now 22MB.
+
+  05 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> xorg-x11-6.8.0-r4.ebuild:
+  Marked stable on amd64.
+
+  05 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.903.ebuild, xorg-x11-6.8.1.904.ebuild:
+  (#80740) Block <=app-emulation/emul-linux-x86-xlibs-1.2-r3 at eradicator's
+  request until problem with lib32 is fixed, which should be in 1.2-r4.
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.904.ebuild:
+  Fileset 0.2. Remove PATH and ROOTPATH from /etc/env.d/10xorg, as
+  everything's in /usr/bin now. Also remove LIBGL_DRIVERS_PATH. I was told
+  this was necessary if they weren't in /usr/X11R6/lib/modules/dri, but really
+  it seems it's only if they aren't in the compile-time UsrLibDir.
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.11.3. (#79497, #80736) Add
+  9380_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch. xorgcfg / X
+  -configure produce a bunch of unresolved cfb symbols. This can also break
+  the build in some cases. (#78147, #80736) Add
+  9385_all_6.8.1.904-fix-duplicate-mfb-symbols.patch. Build can break because
+  of duplicate mfb symbols.
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.904.ebuild:
+  Patchset 0.1.2. (#79497) Update
+  9370_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch. Use more correct
+  version committed to HEAD rather than from our Bugzilla. (#78147, #80736)
+  Add 9375_all_6.8.1.904-fix-duplicate-mfb-symbols.patch. Build can break
+  because of duplicate mfb symbols.
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.904.ebuild:
+  pkg_preinst(): Add checks for more symlinks: /usr/bin/X11,
+  /usr/include/GL/GL and /usr/include/X11/X11. Reported by Ferris McCormick
+  <fmccor@gentoo.org>.
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.904.ebuild:
+  Symlink '../share/man /usr/X11R6/man' doesn't really make sense anymore --
+  results in a /usr/man symlink, which is just weird.
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.904.ebuild:
+  There aren't cases when a symlink '../include ${ROOT}/usr/X11R6/include'
+  would be useful anymore. Reported by Ferris McCormick <fmccor@gentoo.org>.
+
+  04 Feb 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.1.904.ebuild:
+  added ~mips keyword
+
+  03 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> xorg-x11-6.8.1.904.ebuild:
+  Marked ~amd64.
+
+  03 Feb 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.1.904.ebuild:
+  Add ~sparc keyword.  This release is working well for me (hardened and patched
+  for sunffb+xaa and for sunleo, as described at Bug 79467).
+
+  03 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.904.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*xorg-x11-6.8.1.904 (03 Feb 2005)
+
+  03 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.1.904.ebuild:
+  6.8.2 RC4. Hopefully the last one. (#79497) Fixes duplicate cfb* symbols on
+  `X -configure` and xorgcfg. (#79033, fd.o #2000) Add BIOSHotkeys option to
+  radeon driver, which allows people to enable hotkeys that the driver
+  disables by default -- from CVS HEAD.
+
+  02 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.903.ebuild:
+  Remove /usr/include/GL and /usr/include/X11 symlinks if needed, so migration
+  works properly. /usr/include/GL was particularly annoying, since the X build
+  created it, so set LinkGLToUsrInclude to NO. This should be turned into a
+  source patch that prevents the link if $(SYSTEMUSRINCDIR) = $(INCDIR) and
+  sent upstream. Also add ukr to G_FONTDIRS if USE=nls. Problems reported by
+  Daniel Ostrow <dostrow@gentoo.org> and Ferris McCormick <fmccor@gentoo.org>.
+
+  02 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.903.ebuild:
+  Change die() to ewarn() if a directory exists in both font locations in
+  remove_font_dirs(). The migration should catch that problem, so there's no
+  need to die. Also append cyrillic to G_FONTDIRS if USE=nls, so its fonts.*
+  files get cleaned. Reported by Andres Järv <andresjarv@gmail.com>.
+
+  02 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.903.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  01 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.903.ebuild:
+  Check whether $G_FONTDIR is a directory in remove_font_dirs(), not just
+  whether it exists. fonts.cache-1 can apparently exist in /usr/share/fonts/
+  sometimes. Reported by Roman Gaufman <hackeron@gmail.com>.
+
+*xorg-x11-6.8.1.903 (01 Feb 2005)
+
+  01 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.1.903.ebuild:
+  6.8.2 RC3. As a bonus, also migrates everything out of /usr/X11R6 and turns
+  it into a symlink to /usr. It uses rsync by default, although you can test
+  the probably-broken tar or known-broken mv if you'd like.
+
+  30 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r3.ebuild:
+  (#80131) Update some URLs for patchsets.
+
+  29 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  Rename patch() to do_patch() so it doesn't overlap with the patch utility
+  and cause some fun infinite recursion. Thanks much to vapier for helping out
+  with this, because I never would've figured it out.
+
+  25 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild, xorg-x11-6.8.1.902.ebuild:
+  (#47598) Stop installing libMesaGL -- it's a remnant from years ago and
+  shouldn't be used. Any app using it is broken.
+
+  25 Jan 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.1.902.ebuild:
+  Add ~sparc keyword for testing --- builds and runs for me.  Track for sparc
+  at Bug 79467.
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  Update TODO.
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  libGLU symlink was only done on ! use opengl, which seems as if it's reversed.
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  Functionalize src_install(). Rename a number of poorly named functions that
+  e.g., have setup_ in the name but happen in src_install().
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  Functionalize pkg_preinst(), pkg_postinst(), pkg_postrm().
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902-r1.ebuild:
+  Functionalize pkg_setup(), src_unpack(), src_compile().
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902.ebuild:
+  Drop unnecessary, unused cruft and update TODO.
+
+*xorg-x11-6.8.1.902-r1 (24 Jan 2005)
+
+  24 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.1.902-r1.ebuild:
+  Add -* so we get CVS history of gradual changes instead of changing 500
+  lines in a revision bump all at once.
+
+  23 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902.ebuild:
+  Pull a bunch of implied Mesa optimizations.
+
+  22 Jan 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.902.ebuild:
+  removed ppc64 specific functions pkg_prerm() and relink_dlloader_files() as
+  they are no longer needed
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  (#79019) SSE, MMX, 3DNOW! were getting turned off for x86 people because of
+  the amd64 changes.
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  Install OpenGL stuff to /usr/libdir/opengl/$PN/lib, not
+  /usr/libdir/opengl/$PN/libdir. Again thanks to eradicator for the libdir
+  advice.
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  Need to apply last change in lib as well as libdir.
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  eradicator discovered that some really bothersome packages leave dotfiles in
+  /usr/X11R6/lib, which breaks the migration because rmdir won't run.
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r3.ebuild, xorg-x11-6.8.0-r3.ebuild,
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  Remove xfree blocker, since xfree's no longer in the tree.
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  (#78930) Update tarball location.
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  Drop blocker on app-text/dgs, which no longer exists in the tree. Apparently
+  this breaks things for some people, although I'm unable to reproduce it.
+
+  21 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.0-r4.ebuild:
+  stable on mips
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  Add a match for lib to RgbPath fixing so libdir != lib cases work.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Unleash upon the x86 masses.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.902.ebuild:
+  (#76985) Add pointer to docs.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.11.2. Backport fixes from 6.8.1.902 for #76356, #38549, fd.o
+  #1895 and #38549. See its ChangeLog entry for more details on them.
+  Fileset 0.7. Backport fix for #76356, again from 6.8.1.902.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902.ebuild:
+  Fileset 0.3. The fix for #76356 was incorrect.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  (#77979) Force SSE, MMX, 3DNOW! on amd64.
+
+  20 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild,
+  xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.902.ebuild:
+  (#67729) Libtool archives need to be installed from FILES_DIR/lib, not
+  $(get_libdir).
+
+  20 Jan 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.0-r4.ebuild:
+  Stable for sparc, closes tracking bug 63994.
+
+  19 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.902.ebuild:
+  Patchset 0.1.2. (fd.o #1895, #38549) Add
+  2000_all_6.8.0-fb-convert-rgb-to-bgr-when-needed.patch: DIX didn't always
+  convert RGB to BGR. (#38549) Bump 5200_all_6.8.0-newport-accel-v4.patch: The
+  color problem was actually because of fd.o #1895. Fileset 0.2. (#76356)
+  Add "redundant" LDPATH=/usr/lib to /etc/env.d/10xorg because nomachine
+  provides a duplicate libX11 with changes that break pretty much everything,
+  and we need to trump it.
+
+  19 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.7.0-r2.ebuild, -xorg-x11-6.8.0-r1.ebuild:
+  (#71642) Drop vulnerable versions -- everyone's keyworded safely for a newer
+  6.7.0 or 6.8.0.
+
+  19 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r3.ebuild:
+  (#77589, #71642) keyword ia64, spanky-approved.
+
+  19 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.1.901.ebuild:
+  Pull "old" version.
+
+  19 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Backport (#76537) migration fixes and (#76074) xprint fixes from 6.8.1.*.
+
+  17 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
+  xorg-x11-6.8.1.902.ebuild:
+  Marked ~amd64. seemant tested.
+
+  15 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.902.ebuild:
+  (#78074) DO NOT use '-d' in test because it's true on symlinks to dirs too.
+
+  15 Jan 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.902.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  14 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.901.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  added ~mips keyword
+
+  14 Jan 2005; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.8.1.902.ebuild:
+  Marked ~ppc
+
+*xorg-x11-6.8.1.902 (13 Jan 2005)
+
+  13 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.1.902.ebuild:
+  6.8.2 RC2. I expect most archs will work roughly the same with this as with
+  6.8.2 RC1, but I'll let them do their own testing to confirm or deny. (fd.o
+  #2144) Update BenH's patch to fix some issues with miscalculation of MCLK
+  and SCLK values from his old patch.
+
+  13 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901-r1.ebuild:
+  Keyword ~x86 ~sparc ~ppc64 ~ppc ~amd64 ~alpha, like 6.8.1.901 is. No
+  arch-dependent source-code changes. The migration particularly needs to be
+  tested on amd64, but I've had multiple success reports.
+
+*xorg-x11-6.8.1.901-r1 (12 Jan 2005)
+
+  12 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.1.901-r1.ebuild:
+  Patchset 0.3.4. (#70712) Add 9865_all_add-nodeadkeys-to-gb.patch. Enable
+  deadkeys for gb keymap. They got lost sometime between XFree86 4.3.0 and
+  X.Org 6.8.0. (#76537, probably others) Also, do some work on the migration
+  function that should fix things up for amd64 users and anyone else with a
+  libdir != lib. (#76074) Install xprint scripts correctly, thanks to Stefan
+  Briesenick <sbriesen@gmx.de>.
+
+  12 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.0-r4.ebuild:
+  forgot newport in 6.8.0-r4, added
+
+  11 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.7.0-r3.ebuild, xorg-x11-6.8.0-r3.ebuild,
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  various stabilizations on mips for bug 77588, also restrict drivers to
+  newport and fbdev on mips
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild,
+  xorg-x11-6.8.1.901.ebuild:
+  Only do amd64 libdir overriding on older profiles.
+
+  10 Jan 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.1.901.ebuild:
+  add ~alpha
+
+  07 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  (#76936) USE=opengl and USE=xv are mutually interdependent -- not only one way.
+
+  05 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  Strip -momit-leaf-frame-pointer on sparc, since -fomit-frame-pointer is also
+  stripped.
+
+  04 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  Add -momit-leaf-frame-pointer to ALLOWED_FLAGS. Read the gcc man page for
+  why this is cool.
+
+  04 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  For USE=minimal, add BuildLBX NO.
+
+  02 Jan 2005; Marcus Hanwell <cryos@gentoo.org> xorg-x11-6.8.1.901.ebuild:
+  Marked ~amd64.
+
+  28 Dec 2004; Tom Martin <slarti@gentoo.org> xorg-x11-6.8.0-r4.ebuild:
+  Marked ~amd64.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Dec 2004; David Holm <dholm@gentoo.org> xorg-x11-6.8.1.901.ebuild:
+  Added to ~ppc.
+
+  24 Dec 2004; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.0-r4.ebuild,
+  xorg-x11-6.8.1.901.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  23 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.11.1. (fd.o #2114, #66223) Add
+  9370_all_6.7.0-ppc64-linux26-headers-v2.patch. See when it was added to
+  6.8.1.901 for a further description.
+
+  23 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild,
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r3.ebuild,
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild:
+  (#75034, #75329) Fix kernel_is() calls, various problems with subshells and
+  tests. Thanks to splite for some of the fixes.
+
+  22 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901.ebuild:
+  Update freetype dep to >=media-libs/freetype-2.1.8 from
+  >=media-libs/freetype-2.1.4, so we don't use stale libs. X also has an
+  internal freetype, and 2.1.8 is where it's at in 6.8.
+
+  22 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901.ebuild:
+  Patchset 0.3.3. (#75174) 9370_all_6.7.0-ppc64-linux26-headers-v2.patch was
+  in a generic PPC section when it needed to apply only for PPC64.
+
+  20 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild,
+  xorg-x11-6.8.1.901.ebuild:
+  (#75067) SSE3 is also broken on gcc 3.4, so append -mno-sse3.
+
+  19 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901.ebuild:
+  Patchset 0.3.2. (#66223) Add 9370_all_6.7.0-ppc64-linux26-headers.patch.
+  Architectures with arch-specific eieio() routines require this. PPC64 is one
+  example, with >=linux-headers-2.6.
+
+  19 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901.ebuild:
+  Patchset 0.3.1. This should help out PPC users on Radeon and Rage128.
+  
+  (fd.o #2064) Add 5160_all_6.8.1-benh-radeon-ppc-fixes.patch, with tons of
+  changes:
+  
+  1. This patch adds the "VGAAccess" option (defaults to NO on PPC and YES on
+  others) that disables all legacy VGA stuffs in the driver, since they are
+  causing various issues on non-x86 machines.
+  
+  2. This patch makes sure CRTC2_OFFSET_CNTL is cleared. None of the options in
+  this register should be enabled with our current driver, and some firmwares
+  setup a tiled display, which we _must_ disable for now. Without this, the
+  second screen is completely scrambled on some PowerMacs.
+  
+  3. This patch fix the routine that probes for PLL values in absence of a
+  BIOS ROM. The measure is more precise, done several times to avoid
+  "gliches" caused by scheduling latencies, plus the patch fixes actual
+  bugs in the previous iteration of the code. It also add calculation of
+  the mclk and sclk values for proper display bandwidth calculation and
+  adds proper min/max PLL values for r420 type cards.
+  
+  4. The display bandwidth calculation code has a small bug when looking at
+  the memory controller setup on r300 chips. Hui from ATI confirmed that
+  this was the right fix.
+  
+  5. When using MergedFB, the driver would call RADEONInitPLLRegisters for the
+  first head even when UseBiosDividers was set to TRUE, which was incorrect.
+  This patch fixes it by moving the test of UseBiosDividers into
+  RADEONInitPLLRegisters which simplifies the code in the caller and is more
+  logical.
+  
+  6. The dual head setup was recently re-broken (after having been fixed a while
+  ago) with SURFACE_CNTL beeing written with the wrong value from the second
+  head. The problem is that usually, only the first head had a correct value
+  in there, and the driver would regular mixup which register setup was used to
+  restore that value. This patch fixes it once for all by making sure the
+  second head does carry the proper value too.
+  
+  7. The second digital output of the radeon chip doesn't like when the P2PLL
+  is set with an odd post-divider value. This makes sure we never chose
+  a "wrong" value when calculating the P2PLL setting on a non-CRT screen.
+  
+  8. On some cards where no BIOS provided output mapping infos is available, the
+  driver would get the DDC flipped between the two outputs of the card. This
+  typically happen on recent Mac cards. This adds an option to force the
+  driver to reverse what it thinks is the primary display DDC and the
+  secondary display DDC. Ultimately, we'll have to do a better job of
+  recognizing those Mac cards though.
+  
+  9. RadeonValidateFPModes() has a bug where it could try to dereference
+  a NULL pointer in some cases when linking in modes. This fixes it.
+  
+  10. This patch adds an option for probing the PLL value at server init time
+  for LVDS panels and re-using it later (by setting UseBiosDividers). It's
+  useful on machines without an X86 BIOS image providing the proper set of
+  divider values for the LVDS, as the value calculated by
+  RADEONInitPLLRegisters() tend not to be suitable for some LVDS panels.
+  It also changes a bit the way the panel infos are extracted, the previous
+  code didn't quite work for me, and after discussing with Hui, I decided
+  to move the detection earlier in the discovery process and to do it slightly
+  differently.
+  
+  (fd.o #2089) Add 5135_all_6.8.1-r128-ppc-vgaaccess.patch. This patch adds the
+  "VGAAccess" option (defaults to NO on PPC and YES on others) that disables
+  all legacy VGA stuffs in the driver, since they are causing various issues on
+  non-x86 machines.
+
+*xorg-x11-6.8.1.901 (18 Dec 2004)
+
+  18 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.1.901.ebuild:
+  Add 6.8.2 release candidate 1.
+
+  14 Dec 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.0-r4.ebuild:
+  Add ~sparc keyword in anticipation of impending unmasking.  So far,
+  tests stable for sparc.
+
+  13 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.11. (fd.o #1934, #47922) Add the highly demanded fix for DPMS
+  problems: 9830_all_6.8.0-fix-random-dpms-blanks.patch. Fix
+  0455_all_6.8.0-prevent-keyboard-hardware-repeat-v2.patch with new code from
+  upstream (fd.o #1651 comment #9). Add three sparc patches: (#fd.o #1114,
+  #61063) 0485_all_6.8.0-afb-cfb-dlloader-fixes.patch, which allows sunffb+cfb
+  to work with dlloader; (fd.o #2072, #61063)
+  0490_all_6.8.0-sparc-dlloader-cflags.patch, which defines
+  LargePositionIndependentCflags when Mesa is built for the dlloader; and
+  (fd.o #2073, #61063) 0495_all_6.8.0-sunffb-imake.patch, which prevents the
+  incompatible CFLAGS combination of '-mcpu=ultrasparc -mv8' because Xorg
+  wrongly tries to not build a 64-bit version when it shouldn't be doing this.
+  Also, fix the ebuild to work with new sparc patches and to respect that
+  dlloader+sdk has worked for quite a while.
+
+  12 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Fix up kernel_is() calls, thanks to Georgi Georgiev <chutz@gg3.net>.
+
+  10 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Change munging of config file RgbPath to match where it's currently
+  installed, and use get_libdir() for it.
+
+  10 Dec 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.0-r3.ebuild:
+  Stable on hppa.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild,
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r3.ebuild:
+  Move from custom is_kernel() in x11.eclass to kernel_is() in
+  linux-info.eclass. It's not maintained by us, and that's a plus in itself.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Move from custom is_kernel() in x11.eclass to kernel_is() in
+  linux-info.eclass. It's not maintained by us, and that's a plus in itself.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Try pulling get_number_of_jobs(), on suggestion of Michael Sterrett
+  <mr_bones_@gentoo.org>. The only reason I'd guess it might be there is
+  related to comment #5 on bug #13565.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Remove duplication in library stripping. Thanks to Georgi Georgiev
+  <chutz@gg3.net>.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Remove double definition of HOSTCONF. Thanks to Georgi Georgiev
+  <chutz@gg3.net>.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Change LibDir to /usr/libdir/X11 instead of /usr/libdir. Remove some related
+  hacks, and fix paths of relevant things. Suggested by Georgi Georgiev
+  <chutz@gg3.net>.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Switch around comments for UsrLibDir and LibDir.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Fix an xkb symlink that was hardcoded lib rather than using get_libdir().
+  Reported by Georgi Georgiev <chutz@gg3.net>.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Add another sed match to fix xorg.conf.example.
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Add >=x11-misc/ttmkfdir-3.0.9-r2 to RDEPEND. It slipped out of RDEPEND in
+  the dependency cleanup a while back. Thanks to Georgi Georgiev
+  <chutz@gg3.net> for catching this.
+
+  04 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.10. Add 0450_all_6.8.0-set-default-xkbmodel-to-pc105.patch. In
+  the old 'keyboard' driver, pc105 was the default. Restore the new 'kbd'
+  driver to the same. This is from upstream CVS. It may fix some bugs relating
+  to certain keys not working. Add
+  0455_all_6.8.0-prevent-keyboard-hardware-repeat.patch. (fd.o #1651) Filter
+  out autorepeat scancodes from the keyboard, because X does this already.
+  This is from upstream CVS. Add
+  6200_all_6.8.0-fix-glxquerycontextinfo-libgl-segfault.patch. (fd.o #1672)
+  Ian Romanick: the request structure for this case is never allocated, so we
+  write through an uninitialized pointer if glx version > 1.2. This is from
+  upstream CVS. Move 9930_all_6.8.1-xpm-secfix-CAN-2004-0914.patch from
+  xpm-secfix-thomas.diff in FILESDIR. Add
+  9930_all_6.8.1-xpm-secfix-CAN-2004-0914.patch. (fd.o #1924, #71842) The new
+  sanity checks prevent using file names that start with a "/" which along
+  with other checks wouldn't let you use libXpm to write files that aren't in
+  or beneath the process's current working directory. This breaks GIMP's xpm
+  plugin, among other things. Add 9945_all_6.8.1-xmodmap-overflows.patch.
+  (fd.o #1818) Fix overflow in xmodmap. A less user-visible change is the
+  switch from PatchChangelog to the DESCRIPTIONS file, which aims to describe
+  the reason for every patch being applied. It's far from complete, but it's
+  something.
+
+  04 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.8.0-r2.ebuild:
+  Remove stale, vulnerable version.
+
+  23 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild,
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild,
+  xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild:
+  Update homepage (#72274).
+
+  23 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Work around portage bug with parentheses in PROVIDE.
+
+  22 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Stop requiring the BREAKME variable. This should be to a point where it's
+  working reasonably well.
+
+  22 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Fix problem where one could end up with '/usr/lib/fonts' font paths in
+  xorg.conf.example by adding a new sed match. This happens because we changed
+  from /usr/X11R6/libdir to /usr/libdir.
+
+  22 Nov 2004; Tom Gall <tgall@gentoo.org>;
+  xorg-x11-6.7.0-r3.ebuild:
+  stable on ppc64
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Fix broken SRC_URI.
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Only provide virtual/glu and virtual/opengl if USE=opengl. Also don't create
+  GLU symlinks when USE=-opengl, since GLU isn't built.
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Don't hide things behind USE=minimal that are already behind other USE
+  flags, so we can combine minimal with various other things.
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  For USE=minimal, remove all unnecessary fonts. This saves ~5.5MB.
+  Unfortunately, this is a temporary hack -- we should really patch
+  xc/fonts/bdf/misc/Imakefile to never build them in the first place. Also
+  only add CID to G_FONTDIRS for USE=cjk, so other people don't have a symlink
+  pointing to nothing.
+
+  20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.9. Add 1110_all_6.8.0-force-build-font-utils-if-needed.patch.
+  USE=minimal will now start successfully, because enough fonts are built.
+  When BuildClients is off and BuildFonts is on, mkfontscale and mkfontdir
+  aren't built. But mkfontscale is used during the build process and mkfontdir
+  is needed later, so we should build them anyway if UseInstalled isn't on.
+  This fixes the USE=minimal build. Also, build the RGB database and xinit for
+  a couple of non-essential but nearly always desired things. We require
+  bdftopcf too. Also add xauth so startx works nicely. Problems still remain
+  with switching back to the console using the ctrl-alt-Fn sequence, probably
+  because of us not doing something with xkb. Don't worry about changing
+  definition of i386Drivers because we don't use it anymore in USE=minimal.
+  Only add i810 for amd64, rather than for everyone. GLU depends on GL being
+  built, so fix that. XF86Rush similarly depends on XV.
+
+  20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Commit it properly this time.
+
+  20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Revert last commit, it had too much in it.
+
+  20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Reduce USE=minimal x86 drivers to: vmware vesa vga dummy fbdev v4l.
+
+  19 Nov 2004; Tom Gall <tgall@gentoo.org> xorg-x11-6.8.0-r3.ebuild:
+  revert to ~ppc64, needs work
+
+  18 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  For USE=minimal, drop cursor sets other than core and handhelds.
+
+  18 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Add a backwards-compat symlink for /usr/X11R6/libdir/X11/config (#71654).
+
+  18 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  For USE=uclibc, stop building glxgears and glxinfo. But build GLU library
+  again.
+
+  17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Update credits on xpm-secfix-thomas.diff.
+
+  17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Patchset 0.2.8. Update Newport acceleration patch to
+  5200_all_6.8.0-newport-accel-v3.patch (#38549). This fixes a red/blue swap
+  for applications using RENDER acceleration such as gnome-terminal, gvim and
+  xchat2.
+
+*xorg-x11-6.8.0-r4 (17 Nov 2004)
+
+  17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.0-r4.ebuild:
+  Add xpm-secfix-thomas.diff. This is a continuation of the hard-masked 6.8.0-r2.
+
+  17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r3.ebuild:
+  Remove ppc64-specific relinking for dlloader issues, because it's fixed in
+  6.8. Requested by Markus Rothe <corsair@gentoo.org>.
+
+*xorg-x11-6.8.0-r3 (17 Nov 2004)
+
+  17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xpm-secfix-thomas.diff, +xorg-x11-6.7.0-r3.ebuild,
+  +xorg-x11-6.8.0-r3.ebuild:
+  Security update: Add xpm-secfix-thomas.diff to fix many issues, including:
+  integer issues resulting in infinite loops and buffer overflows; a one-byte
+  buffer overflow; stack-based overflows with sprintf() and string functions;
+  replaces popen() with s_popen(); path traversal issues; buffer underruns;
+  and memory leaks (missing free(), found by Egbert Eich). Patch by Thomas
+  Biege and Matthiew Herrb. Petr Mladek identified the initial vulnerabilities
+  and provided a patch that was later expanded on. Jacques A. Vidrine aided in
+  the code audit and patch review. This issue is identified as CAN-2004-0914.
+
+  16 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Patchset 0.2.7. Update Newport acceleration patch to
+  5200_all_6.8.0-newport-accel-v2.patch. This fixes an error "structure has no
+  member named `PUToScreenTextureDstFormats'," which should start with CPU,
+  not PU. It also moves the autoloading of the xaa module around (#38549).
+  Newport acceleration patch is by Dominik Behr, with mods by Adam Jackson.
+  Drop 0155_all_4.3.0-Xi-Xinitthreads-locking-bug.patch. It was fixed in an
+  alternate way in the release, and this was causing problems with totem and
+  kaffeine (#64929, #59746, maybe #60131). Add
+  6100_all_6.8.0-xnest-uninitialized-GetWindowPixmap.patch (#70431). Alexander
+  Gottwald says on fd.o #1404: "pScreen->GetWindowPixmap is never initialized
+  in Xnest startup and contains random data. After some server resets it
+  crashes with segfault because pScreen->GetWindowPixmap is called but is not
+  a valid function. A quick fix was to set the complete ScreenRec structure to
+  null after allocating it in dix/main.c (AddScreen)."
+
+  15 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+  Bug number for no-sse2 is 57602, not 56702. Thanks cyfred.
+
+  15 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  In backward_compat_setup(), add a symlink for the keysym database, XKeysymDB
+  (#70927). Also fix a hard-coded lib rather than get_libdir.
+
+  04 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add 'minimal' USE flag. It turns off the build of most clients and all
+  fonts, as well as a number of drivers I guessed would be mostly unused by
+  people wanting this functionality (video drivers turned off only for x86).
+  It also stops installing the man pages and docs, as well as Xvfb and Xnest.
+  Finally, it doesn't install Gentoo custom cursors. On a minimal test build
+  with USE="-3dfx +3dnow -bitmap-fonts -cjk -debug -dlloader -dmx -doc
+  -font-server -hardened -insecure-drivers -ipv6 +minimal +mmx -nls -opengl
+  -pam -sdk +sse -static -truetype-fonts -type1-fonts -xprint -xv", the total
+  installation was 28M.
+
+  04 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Increase functionalization to the point that the primary functions are
+  actually readable.
+
+  04 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Reorganize functions, so primary ebuild functions are at the top and
+  sub-functions are below them. This gives us a big-picture view to start,
+  followed by all the nitty gritty.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add some einfo about the /usr/X11R6/libdir -> /usr/libdir move.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add a sed to change RgbPath to the new location in config files. Reported by
+  agaffney. Symptoms include things like "can't load color "Black"" or
+  "Couldn't open RGB_DB."
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add some more debugging CFLAGS to ALLOWED_FLAGS.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Rework gcc-version-dependent things to remove redundant calls to
+  gcc-*-version(). Also, only strip -Os for <gcc-3.2.2 (#12775).
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Change SRC_URI order so the mirror://gentoo stuff is at the bottom. It
+  should be searching them beforehand anyway.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  When removing stale GL stuff, only remove libGL.*, not libGL*. The latter
+  catches libGLU* and others.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Missed another spot with a bad xkb symlink.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Fix a bug in the xkb symlink.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add some checking features to migrate_usr_x11r6_lib() so we don't redo
+  things that were already done. Also, migrate xkb stuff properly.
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
+  Marked ~ppc64; bug #67403
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Wrap font-server USE around things affecting /etc/X11/fs/config.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Combine the dri USE flag into the opengl USE flag, since there's no way to
+  control just the build of the 3D drivers at present.
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Patchset 0.2.6. Add 9990_x86_6.8.0-xbox-20041024.patch for the Xbox's
+  nvidia driver (#68726). Add 1100_all_6.8.0-build-all-lucida-fonts.patch
+  (#68414). The 75dpi and 100dpi fonts weren't being built. This is from
+  upstream CVS. Add 5200_all_6.8.0-newport-accel.patch (#38549). Hopefully
+  will go upstream. This adds acceleration for Newport video cards (mostly
+  MIPS users). Add 5160_all_6.8.0-radeon-fix-monitor-detection.patch (#67845,
+  fd.o #1559). This fixes issues with dual-monitor setups not being detected
+  properly. Add
+  0440_all_6.8.0-support-cymotion-master-and-ibm-space-saver-keyboards.patch
+  (#63767). This adds support for the Cherry CyMotion Master XPress and the
+  IBM Space Saver keyboards. It's from upstream CVS. Fileset 0.6. Add
+  xprint.init, a Gentoo-style init-script wrapper for the RH-style init script
+  provided by xorg, and install it on USE=xprint (#68316). In addition, fix
+  the function for migration from /usr/X11R6/libdir to /usr/libdir,
+  migrate_usr_x11r6_lib(). It now works properly even when .keep files are
+  left behind and when /usr/libdir/X11 is a symlink.
+
+  02 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Try to fix ${ROOT} support -- it's assumed to be a chroot. To aid this, also
+  make all symlinks relative.
+
+  02 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add a symlink "../../../lib/xkb /usr/X11R6/lib/X11/xkb" so libxklavier and
+  other things looking for that location continue to work.
+
+  01 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add blocker on app-text/dgs, since they install the same libs. Need to
+  confirm compilation of its deps, however.
+
+  29 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Sync opengl-update deps in DEPEND and RDEPEND.
+
+  29 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add migrate_usr_x11r6_lib() to aid migration from /usr/X11R6/libdir to
+  /usr/libdir. Thanks to jstubbs for an idea. Also move update_config_files()
+  to a more appropriate place.
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  USE=xv wrongly requires USE=opengl, but this is a bug in the source
+  (#67996). Forcing them to be used together until upstream fixes it.
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  /usr/libdir, not /usr/libdir/X11.
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Modify opengl-update dep, the token wasn't quite matching the proper versions.
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Change glx USE to opengl.
+
+  28 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Update opengl-update dep to >=2* for /usr/lib move.
+
+  24 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Fix herd case.
+
+  21 Oct 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
+  stable on alpha and ia64
+
+  20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Fileset 0.5. Update /etc/env.d/10xorg to reflect shift from
+  /usr/X11R6/{lib,lib64} to parallel in /usr/lib.
+
+  20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Patchset 0.2.5. Add 6000_all_6.8.0-libgl-double-free.patch to stop a libGL
+  segfault when /dev/dri/card* is not readable for a user (fd.o #1501).
+
+  20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Change xfs USE to font-server to stop duplication with xfs filesystem.
+
+  20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild,
+  xorg-x11-6.8.0-r2.ebuild:
+  Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree.
+  Update license syntax so I can commit.
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  USE=dri requires USE=glx.
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Coding style rework. Move logic operators to beginnings of lines rather than
+  ends; Keep 'then' on same line as 'if', same for 'for' and 'do'; indent ';;'
+  of case statements one tab past the current switch.
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Tons of code cleanups, again thanks to mr_bones_. There are a few more left in
+  the TODO list.
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add die messages. Also try emake -C instead of moving into a dir, make, then
+  moving out.
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Move some variables to locals. Note that all of this cleanup is thanks to
+  mr_bones.
+
+  19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Change negative uses to bash style instead of portage-specific one.
+
+  18 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Replace all commands in backticks `` with commands in $().
+
+  18 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+  Combine two consecutive instances of "use ! bitmap-fonts."
+
+  18 Oct 2004; Stephen P. Becker <geoman@gentoo.org>
+  xorg-x11-6.8.0-r1.ebuild:
+  stable on mips wrt bug 67326
+
+  18 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Commit initial changes for moving /usr/X11R6/lib to /usr/lib.
+
+  17 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+  Fix problem for lib64 get_libdir users that resulted in *.la files not being
+  installed (#67729).
+
+  14 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild,
+  xorg-x11-6.8.0-r2.ebuild:
+  Update ebuild to reflect that gcc-getCC no longer exports CC.
+
+  13 Oct 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
+  stable on amd64
+
+  13 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+  Bad logic on BuildXprintLib. It should've been defined only when the rest of
+  xprint WASN'T built, because when xprint is built, it's turned on
+  automatically (#67400).
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
+  Stable on hppa.
+
+  12 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  x86. This should be ready to stable on other archs too. See bug #67326.
+
+  12 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Fix keywords: remove everything except ~x86, since this is still hard-masked,
+  in development and only tested on x86.
+
+  12 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Patchset 0.2.2.1. Add 9940_all_6.8.0-libX11-stack-overflow.patch to fix a
+  non-exploitable problem (fd.0 #1459). Add 5140_all_6.8.0-radeon-swsusp.patch
+  to fix software suspend on Radeons (fd.o #1220). Fileset 0.4. Add
+  /usr/X11R6/lib64 to LDPATH in /etc/env.d/10xorg, so things work for
+  architectures that install to there.
+
+  12 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Patchset 0.2.4. Add 9940_all_6.8.0-libX11-stack-overflow.patch to fix a
+  non-exploitable problem (fd.0 #1459). Add 5140_all_6.8.0-radeon-swsusp.patch
+  to fix software suspend on Radeons (fd.o #1220). Fileset 0.4. Add
+  /usr/X11R6/lib64 to LDPATH in /etc/env.d/10xorg, so things work for
+  architectures that install to there.
+
+  11 Oct 2004; Mike Frysinger <vapier@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
+  remove baselayout DEPEND
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Patchset 0.2.3. Add 9910_all_use-nonow-ldflag-for-hardenedgccspecs.patch. In
+  combination with HardenedGccSpecs YES, this will fix up a lot of the
+  unresolved symbol problems with dlloader (#64618). Patch is by Adam Jackson
+  <ajax@nwnk.net> with some mods by solar, applied to vanilla 6.8.0 by swtaylor
+  and to ours by me. Pull 9970_all_dlloader-imake-fix.patch. Its functionality
+  was pulled into patch 9910. Also bump to fileset 0.3.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Patchset 0.2.2. Update 9001_all_4.3.0-lnx-evdev-keyboard-v2.patch to restore
+  case insensitivity of Option "Protocol" "Standard" for keyboard by Alan
+  Swanson <swanson@ukfsn.org> (#63568). Fileset 0.3. Fix xfs lockup so it's
+  usable again (#61737). Also, fix xdm init script for empty DISPLAYMANAGER in
+  /etc/rc.conf (#65586).
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add HardenedGccSpecs if USE="hardened dlloader" (#64618). A patchset is
+  forthcoming.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add comment on what DMX actually is.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Do libGLU* stuff all in the same place.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add three new USE flags: truetype-fonts, type1-fonts and xv. The fonts ones
+  enable building of that type of font, and xv enables the XVideo library and
+  extension.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Allow FEATURES=nostrip to prevent stripping, and add ${CHOST}-strip support
+  from solar (#66531).
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add uclibc support by making build a little more minimal with USE=uclibc,
+  thanks to iggy.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add dri and glx USE flags. dri builds direct rendering support into drivers.
+  glx builds the GLX library and extension. The dri flag is a subset of the glx
+  flag.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Fix up dependency list, thanks to iggy.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Make font server optional with xfs USE flag.
+
+*xorg-x11-6.8.0-r2 (11 Oct 2004)
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.0-r2.ebuild:
+  Add in-progress ebuild. It's broken, don't waste your time trying it yet.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Remove bogus sgmltools-lite dependency.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Disallow USE="dmx doc" (#63548).
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Build libXp even when USE=-xprint, at ajax's suggestion. RH does the same.
+  USE=-xprint now disables the Xprt server and clients. This means we can remove
+  xprint from make.defaults.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Remove erroneous comment that seems to be enabling SDK.
+
+  11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Fix best_version call so PAM is enabled.
+
+  10 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Fix new installs with USE=debug. X tries to use makeg, which doesn't exist on
+  the system yet -- use the one within the source instead (#63759).
+
+  29 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.7.0-r1.ebuild, -xorg-x11-6.8.0.ebuild:
+  Pull vulnerable versions (#64152).
+
+  25 Sep 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
+  Stable for sparc, clearing Bug 64152 on sparc. See also Bug 63994.
+
+  22 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -xorg-x11-6.7.99.902.ebuild, -xorg-x11-6.7.99.903.ebuild,
+  -xorg-x11-6.7.99.904.ebuild:
+  Drop 6.7.99.x builds.
+
+  22 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild:
+  x86 (#64152).
+
+  22 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r1.ebuild:
+  Patchset 0.2.1. Add
+  0430_all_6.8.0-sparc-add-mach64-to-devel-dri-drivers.patch (#63994). This plus
+  other ebuild modifications from that bug should enable sparc guys to use
+  6.8.0-r1. Ebuild mods include adding hardened flag for sparc to append
+  -fno-PIE and -fno-pie as well as change the assembler command. Also build the
+  deprecated keyboard driver for sparc on kernels != 2.6 and a weird hack to
+  stop a sparc32-SMP compiler bug (#56593).
+
+  18 Sep 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.7.0-r2.ebuild,
+  xorg-x11-6.8.0-r1.ebuild:
+  Removed build of unneeded drivers. 6.7.0-r2 Stable on hppa.
+
+  18 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  xorg-x11-6.8.0-r1.ebuild:
+  Add ~alpha to keywords.
+
+  18 Sep 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r2.ebuild,
+  xorg-x11-6.8.0-r1.ebuild:
+  6.7.0-r2 stable, 6.8.0-r1 testing on mips - bug 64152
+
+  17 Sep 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
+  Add ~sparc keyword, partially addressing bug 64152.  Testing needed before
+  stable for sparc is appropriate.
+
+  17 Sep 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
+  stable on amd64
+
+  17 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  xorg-x11-6.7.0-r2.ebuild:
+  Stable on alpha, bug 64152.
+
+  17 Sep 2004; <SeJo@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
+  unstable ppc bug:64152
+
+  17 Sep 2004; <SeJo@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
+  stable ppc bug:64152
+
+*xorg-x11-6.8.0-r1 (16 Sep 2004)
+
+  16 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.8.0-r1.ebuild:
+  Patchset 0.2. Security release. Add
+  9925_all_6.7.0-libXpm-CAN-2004-0687-CAN-2004-0688.patch to fix stack and
+  integer overflows in libXpm (Chris Evans, Alan Coopersmith, Matthiew Herrb)
+  (#64152).
+
+  15 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild:
+  Patchset 1.3. Security release. Add
+  9925_all_6.7.0-libXpm-CAN-2004-0687-CAN-2004-0688.patch to fix stack and
+  integer overflows in libXpm (Chris Evans, Alan Coopersmith, Matthiew Herrb)
+  (#64152). Also add 5170_all_6.7.0-xvideo-allocation.patch (#64092, fd.o #474),
+  which made it into 6.8.0. 5170 should fix those annoying xvideo memory
+  problems.
+
+  15 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.0.ebuild:
+  Fix SRC_URI inconsistency issues (#64117).
+
+  14 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.0.ebuild:
+  Fileset 0.2. Support any future display managers (#23957) and update MANPATH
+  (#63645).
+
+  14 Sep 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.8.0.ebuild:
+  Added -mtune to ALLOWED_FLAGS for mips.
+
+  12 Sep 2004; Daniel Goller <morfic@gentoo.org> xorg-x11-6.8.0.ebuild:
+   ppend -mno-sse2 with gcc3.4 for bug #57602 
+
+  09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
+  check XF86Config-4, and also fix the if condition
+
+  09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
+  adjust the regex to fix bug #63425 by Don Seiler <rizzo@gentoo.org>
+
+  09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
+  keyboard->kbd in XF86Config as well as xorg.conf
+
+  08 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
+  For users with cascading profiles, the bitmap-fonts and xprint USE flags will
+  not show up yet. So echo a message out
+
+  08 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild:
+  fix logic in cjk/nls
+
+*xorg-x11-6.8.0 (09 Sep 2004)
+
+  09 Sep 2004; Andrew Bevitt <cyfred@gentoo.org>; +xorg-x11-6.8.0.ebuild:
+  Xorg release 6.8.0
+
+  07 Sep 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.904.ebuild:
+  create lib symlink in /usr/$(get_libdir)/opengl/xorg-x11/ if $(get_libdir) !=
+  lib. fixes bug 62990
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> xorg-x11-6.7.0-r1.ebuild,
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.99.902.ebuild,
+  xorg-x11-6.7.99.903.ebuild, xorg-x11-6.7.99.904.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  04 Sep 2004; Seemant Kulleen <seemant@gentoo.org>
+  xorg-x11-6.7.99.904.ebuild:
+  ok, ready to me unmasked. This is the Swegener-Rocks Release for Gentoo. The
+  not-enough-xv-memory should go away with mplayer with this. Additionally, this
+  closes bug #60470 from Spanky.
+
+  03 Sep 2004; Seemant Kulleen <seemant@gentoo.org>
+  xorg-x11-6.7.99.904.ebuild:
+  ok this is still -*'d -- please don't file bugs about segfaults and fonts
+  errors. Those are known issues and we're working on them.
+
+*xorg-x11-6.7.99.904 (02 Sep 2004)
+
+  02 Sep 2004; Seemant Kulleen <seemant@gentoo.org>
+  +xorg-x11-6.7.99.904.ebuild:
+  copy ebuild over, for coming version bump
+
+  31 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.903.ebuild:
+  I've added an override for amd64 that will use lib64 as the lib directory even
+  when CONF_LIBDIR isnt lib64. This should allow for bug 62110 to be fixed
+  (locales broken for 32bit apps).
+
+  30 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
+  xorg-x11-6.7.99.903.ebuild:
+  add patch for dlloader fix from ajax in the fd.o bugzilla
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.903.ebuild:
+  made xorg-x11-6.7.99.903 CONF_LIBDIR aware for installing to lib64 instead of
+  lib
+
+*xorg-x11-6.7.99.903 (28 Aug 2004)
+
+  28 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
+  +xorg-x11-6.7.99.903.ebuild:
+  version bump to latest snapshot.  ppc should work with this
+
+  28 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.902.ebuild:
+  added a host.def define (StaticNeedsPicForShared) for amd64 that fixes the
+  problem with building gdm or kdebase PIE
+
+  25 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.99.902.ebuild:
+  Delete encodings that make ttmkfdir segfault: large/cns11643-1.enc
+  large/cns11643-2.enc large/cns11643-3.enc suneu-greek.enc (#60470).
+
+  25 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.99.902.ebuild:
+  Add some more debugging support. Add '-gstabs+ -gstabs -ggdb' to
+  ALLOWED_FLAGS. Also, cause USE=debug to prevent stripping of binaries and
+  libraries.
+
+  22 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild,
+  xorg-x11-6.7.99.2.ebuild, xorg-x11-6.7.99.902.ebuild:
+  replace-cpu-flags had args in the wrong order, resulting in p3's being
+  compiled with p4 badness (#60597).
+
+  21 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
+  xorg-x11-6.7.99.902.ebuild:
+  OK, this is the real ebuild. I'm calling this the
+  Latexer-isnt-made-from-rubber release. Test away, and look for xcompmgr in
+  x11-misc
+
+*xorg-x11-6.7.99.902 (21 Aug 2004)
+
+  21 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
+  +xorg-x11-6.7.99.902.ebuild:
+  Version bump to rc2, but this is an identical ebuild to 99.2 just so we can
+  easily make diffs of the changes. Real ebuild to follow momentarily
+
+  20 Aug 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.7.99.2.ebuild:
+  fix sed properly, thanks to ciaranm and swegener
+
+  14 Aug 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.7.99.2.ebuild:
+  nothing separate to unpack for USE=doc, since we're using one tarball
+
+  13 Aug 2004; Brandon Hale <tseng@gentoo.org> xorg-x11-6.7.99.2.ebuild:
+  Minor adjustment to einfo for USE=dlloader, rework sed to replace keyboard
+  with kbd driver, move that bit into setup_config_files and clean up that
+  function a bit.
+
+*xorg-x11-6.7.99.2 (13 Aug 2004)
+
+  13 Aug 2004; Seemant Kulleen <seemant@gentoo.org> +xorg-x11-6.7.99.2.ebuild:
+  New snapshot: FOR TESTING ONLY.  I'm calling this the "Use Ajax for
+  everything" release in portage.
+
+  02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+  fc-cache -f breaks the font eclass, according to foser.
+
+  02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Note that the last commit was fileset 0.3.
+
+  02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+  Fix font setup (#53753). Previously we trashed fonts.scale for all scalable
+  fonts, even though we only regenerated it for TrueType fonts. ttmkfdir can't
+  regenerate fonts.scale for Type1 or OpenType fonts, so we start using
+  mkfontscale for that. We trashed any other fonts.scale files that happened to
+  be around, such as Speedo/CID. We stop doing that. Also fixed the regexps in
+  the ebuild and the xfs init script to use ttmkfdir for TrueType only and
+  mkfontscale for Type1 and OpenType. Change INFODIR to INFOPATH also (#54275).
+  Also update Gentoo copyright and licensing info in files tarball to be
+  consistent with everything else.
+
+  28 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+  Add more info on pam-X circular dep (#54378, #35468).
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+  Add ${ROOT} to absolute path references that need it.
+
+  24 Jul 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r1.ebuild,
+  xorg-x11-6.7.0-r2.ebuild:
+  -r1 stable, -r2 testing on mips
+
+  20 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild:
+  Remove commented-out 'HasMotif YES' #define (#57271). Part of what patch 9385
+  was intended to fix was actually committed post-6.7.0, so it wasn't here to
+  start with. If anyone requests motif support, we'll look into some sort of
+  conditional enabling, probably similar to pam's, to avoid circular
+  dependencies.
+
+  19 Jul 2004; Martin Schlemmer <azarah@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
+  Enabling Motif by default is is bogus, as XFree86/XOrg-X11 have never been
+  built against Motif, and 9385_all_6.7.0-motif-allow-fhs-and-default-off.patch
+  do not enable/disable it, but just addsome more bits _if_ and _only_if_ its
+  enabled in host.def, which it never was ...
+  
+    http://bugs.gentoo.org/show_bug.cgi?id=57271#c21
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
+  Added to ~ppc.
+
+  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; xorg-x11-6.7.0-r2.ebuild:
+  Adding ~amd64 keyword, tested and inline for opengl-update commits
+
+  16 Jul 2004; Tom Gall <tgall@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
+  stable on ppc64 baby!
+
+  16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+  Update TODOs.
+
+*xorg-x11-6.7.0-r2 (16 Jul 2004)
+
+  16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.7.0-r2.ebuild:
+  Patchset 1.2. Add
+  9395_all_6.7.0-savage-disable-xrandr-for-shadowfb-rotate.patch, given to Tim
+  Roberts by anonymous user, posted to devel@xfree86.org mailing list. Without
+  this patch, an attempt to use Xrandr with shadowFB-based rotation will result
+  in an unusable display. Add
+  9390_all_6.7.0-add-french-belgian-azerty-ppc-keyboard.patch, which adds a
+  keymap new in G4/G5 macs (#49155). Add
+  9385_all_6.7.0-motif-allow-fhs-and-default-off.patch, which looks outside of
+  /usr/X11R6 for motif and defaults it to OFF on Linux and BSD. Add
+  9375_all_6.7.0-radeon-resume-from-S3-suspend.patch (#48095), which allows the
+  ACPI S3 suspend state to work for at least some Radeons. Add
+  9000_all_4.3.0-lnx-evdev-core.patch, 9001_all_4.3.0-lnx-evdev-keyboard.patch
+  and 9002_all_6.7.0-lnx-evdev-mouse.patch from xfree-4.3.0-r7 to add event
+  interface device support (#29953, #56159). Add
+  9010_all_4.3.0-logitech-ps2-plusplus.patch from xfree-4.3.0-r7 to add support
+  for the PS/2++ protocol used by some of the newer Logitech mice (#29953,
+  #56159). Add 9365_all_6.7.0-fix-render-cplastbit-def.patch to correct the
+  definition of CPLastBit to account for ComponentAlpha, which may fix behavior
+  of the server's SetPictureToDefaults. Add
+  9370_all_6.7.0-install-xrender-pkgconfig-file.patch to install xrender.pc in a
+  cleaner way than former manual hack. OTHER CHANGES: Install glext.h to
+  /usr/lib/opengl/xorg-x11 like the other GL includes (#54984) and set up a
+  symlink manually to avoid an opengl-update circular dependency. Pull out the
+  external drop-in driver code entirely to clean up the ebuild. Enable the i810
+  driver on x86_64 (RH #126687). Set HasMotif to YES in the ebuild to counteract
+  9385_all_6.7.0-motif-allow-fhs-and-default-off.patch.
+
+  16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  USE flag pie renamed to dlloader. Remove USE flag hardened, because it did
+  nothing.
+
+  16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Build dlloader things for ppc64 and relink them properly (#56248).
+
+  10 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Bump opengl-update requirement from >=1.7 to >=1.7.2 to make sure people don't
+  get caught up.
+
+  10 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  x86
+
+  06 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Allow pie+sdk builds, now that we added patch for it.
+
+  06 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Patchset 1.1.1. Move ppc64 patch over from its formerly bad placement as a
+  separate file into the patchball as
+  9360_all_6.7.0-ppc64-support-updates.patch. Add
+  4152_all_4.3.0-allow-xdm-server-quotes.patch from xfree-4.3.0-r7 (#38232).
+  This allows quoted expressions in /etc/X11/xdm/Xservers to be used properly.
+  Add 0425_all_6.7.0-sun-type6-keyboard.patch from xfree-4.3.0-r7 (#21120),
+  ported by reporter. Add 9855_all_6.7.0-fix-SDK-pie-build.patch to fix a module
+  naming problem on pie builds, which resulted in the SDK install breaking
+  (#50562). Add 9355_all_6.7.0-xorgconfig-fontdir-fixes.patch, which stops the
+  tool from adding /usr/X11R6 font paths when fonts are installed elsewhere
+  (#54132). Also update TODO and add a little more warning for the auto-PAM
+  stuff. This should be ready to go stable on x86 if nothing huge comes up.
+
+  05 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; -xorg-x11-6.7.0.ebuild:
+  Pull old version, vulnerable to security hole.
+
+  05 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Update TODO to more realistically reflect time to stable for x86.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  stable on ia64 #53226
+
+  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0-r1.ebuild,
+  xorg-x11-6.7.0.ebuild:
+  QA - fix use invocation
+
+  23 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0.ebuild:
+  Update TODOs.
+
+  21 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Forgot to stop building xterm, somehow (#54051).
+
+  19 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Move how font directories are defined into a host.def setting.
+
+  16 Jun 2004; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  Marked ppc for security reason, see Bug #53226
+
+  16 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Digest fix, looks like tgall forgot FEATURES=cvs
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-x11-6.7.0-r1.ebuild:
+  Added ~amd64.
+
+  15 Jun 2004; David Holm <dholm@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  Added to ~ppc.
+
+  14 Jun 2004; Tom Gall <tgall@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  ~ppc64 initial x support #53763
+
+  14 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Major refactoring of code. No end-user difference, so no bump.
+
+  14 Jun 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  Marked stable for sparc (Bug 53226).
+
+  13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Workaround for #50562 -- disallow pie+sdk build.
+
+  13 Jun 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  Added ~mips keyword -- bug 53226
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  ~alpha keyword, bug #53226.
+
+  11 Jun 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0-r1.ebuild:
+  Add ~sparc keyword. (Bug 53226)
+
+*xorg-x11-6.7.0-r1 (11 Jun 2004)
+
+  11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-x11-6.7.0-r1.ebuild:
+  Patchset 1.1. Add 9920_all_6.7.0-xdm-open-chooserfd-CAN-2004-0419.patch to
+  stop xdm from ignoring its "DisplayManager.requestPort" setting. xdm opens its
+  "chooserFd" TCP socket on all network interfaces without this patch (xf86
+  #1376). Update 9840_all_4.3.0-SDK-add-missing-includes-for-gatos-v2.patch for
+  new gatos -- another include needed (battousai@gentoo.org). Update
+  0120_all_4.3.99-parallel-make-v2.patch to remove a patched-in .rej and some
+  patched-in .orig's (#49455). Update 0126_all_4.2.99.3-startx-v2.patch to
+  remove pointless dependency on xvt (#49455). Big chunk of backports from CVS:
+  9305_all_6.7.0-chips-segfault-on-mode-switch-and-video-overlay.patch to fix a
+  segfault on video mode switching when pScrn->currentMode does not contain a
+  valid mode. Also fix video overlays for double scan modes; Add
+  9310_all_6.7.0-config-cf-cleanup.patch to clean up xorg.cf by factoring out
+  many common defines. Make the fbdev driver only build on Linux (fbdevhw is
+  just stubs on other OSes). Add AFB to AMD64 build, and include
+  XF86OSCardDrivers. I continue adding things that aren't supported under Gentoo
+  (BSD-related, or other archs) because I want to pre-emptively have work done
+  for any ports. Also, it makes other backports easier. (fd.o #448, 449); Add
+  9315_all_6.7.0-fb-render-fixes.patch to fix problems in render fb
+  implementation found by rendercheck; Add
+  9320_all_6.7.0-getconfig-xorg-name.patch to fix problem with getconfig where
+  file '/usr/X11R6/lib/X11/getconfig/xorg.cfg' has bad signature (Change "Xorg
+  Project" to "Xorg Foundation" to match getconfig script) (fd.o #678); Add
+  9325_all_6.7.0-improve-xdm-auth-1-cookie.patch to improve 'uniqueness' of
+  authorization cookie sent by client for XDM-AUTHORIZATION-1. Old 'uniqueness'
+  consisted of the PID of the client, a time stamp (in seconds) and a number
+  obtained by starting to count down from 0xffff. When a client did an
+  XOpenDisplay() then execv'ed a child and did XOpenDisplay() again within the
+  same second, the cookie was identical to the previous one (as the PID did not
+  change but the static 'count down' variable was reinitialized) and thus
+  refused by the server; Add 9330_all_6.7.0-link-with-pam-on-pam-builds.patch to
+  link with PamLibraries if building with PAM support; Add
+  9335_all_6.7.0-modular-imake-build.patch to fix build glitches when building
+  modules independently using Imake; Add
+  9340_all_6.7.0-remove-xmu-dep-on-xaw-header.patch to remove Xaw header
+  dependency from Xmu library build (fd.o #634); Add
+  9345_all_6.7.0-unlock-xauthority-on-sigpipe.patch to make xauth unlock
+  .Xauthority on SIGPIPE (fd.o #550); Add
+  9350_all_6.7.0-xrender-xorgconfig-xdmcp-msgs.patch to muffle compiler warnings
+  in lib/Xrender/Xrender.c, fix an option name in a log message of
+  programs/Xserver/hw/xfree86/common/xf86Configure.c and improve debugging
+  messages in programs/xdm/xdmcp.c.
+
+  03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Add credit for netwinder.org ARM patch.
+
+  03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 1.0. This patchset should get xorg-x11-6.7.0 ready to go stable on
+  all archs that have tested it. Many of them have already stabled it, so I'm
+  holding some non-crucial patches out for 6.7.0-r1.
+  
+  -Add 9210_all_XFree86-4.3.0-arm32-compiler.h.patch (#52707) from
+  netwinder.org. This fixes compiles for the ARM architecture. Patch from PhilB,
+  according to netwinder's RPM spec file.
+  -Add 9215_all_xorg-x11-6.7.0-char-bit-and-ia64-asm-page.patch to remove a
+  compiler-intrinsic define since it dies on makedepend otherwise (fd.o #601),
+  and fix the IA64 build (broken because it includes kernel header asm/page.h,
+  which doesn't work with -ansi) (fd.o #605).
+  -Add 9220_all_xorg-x11-6.7.0-install-vera-italic.patch to install VeraIt.ttf.
+  It was getting left out. Patch from xorg CVS by Eric Anholt.
+  -Add 9225_all_xorg-x11-6.7.0-install-xfree86-lst.patch (fd.o #531) to install
+  xfree86.lst. This should fix some XKB problems.
+  -Add 9230_all_xorg-x11-6.7.0-try-tcp-without-local-and-fix-ipv6-xdmauth-
+  segfault.patch to make XOpenDisplay try tcp connection if local fails (fd.o
+  #546), and fix Xlib segfaults with IPv6 if compiled with HASXDMAUTH (NetBSD
+  #25098).
+  -Add 9235_all_xorg-x11-6.7.0-libxf86config-monitor-freq-fix.patch from RH.
+  This prevents writing out the HorizSync/VertRefresh lines commented out, which
+  forces all default X config files written out by this library to rely on DDC.
+  Poor assumption that DDC is always available. Patch by Mike Harris.
+  -Add 9240_all_xorgconfig-naming-xkb-font-path-fixes.patch to do a few things:
+    - Clean up server name changes from TM branch
+    - Set default XKB rules file name correctly
+    - Use default font path from Imake configuration for the default font path
+      in generated xorg.conf files.
+    - Use path variables from Imake configuration for paths to files, in case
+      vendor has configured them to install somewhere other than the defaults.
+    Patch from xorg CVS by Alan Coopersmith.
+
+  03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Fix typo in xrender.pc generation, includ to include.
+
+  02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Fix generation of xrender.pc so version is resolved (#52843).
+
+  03 Jun 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xorg-x11-6.7.0.ebuild:
+  Masked stable on ppc
+
+  02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Work around upgrade problem where people have Option "XkbRules" "xfree86" in
+  their config file.
+
+  01 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Prevent -fomit-frame-pointer and k6 flags from being used together (#49310).
+
+  29 May 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0.ebuild:
+  Marked stable for sparc.
+
+  29 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Force opengl-update to change to xorg-x11 if xfree is currently selected, else
+  default to old behavior.
+
+  28 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 0.7. Add 9860_all_xorg-xkb_winkeys.patch to fix broken windows keys
+  (#48307).
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> xorg-x11-6.7.0.ebuild:
+  removed hardened-gcc checks
+
+  05 May 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Remove our custom SharedLibraryLoadFlags as a workaround until #49038 (fd.o
+  #600) is fixed.
+
+  25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Update so gcc-3.4 is respected (#48933).
+
+  21 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add a couple of missing definitions for USE=sse -- HasSSESupport and
+  MesaUseSSE, from eikke on Freenode.
+
+  19 Apr 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0.ebuild:
+  Add ~alpha and ~ia64
+
+  19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 0.6. Add 9200_all_6.7.0-fix-zh-cn-utf8-crashes.patch, which fixes
+  crashes when using core fonts in the zh_CN.UTF-8 locale. See fd.o bug #368.
+
+  19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add them to IUSE.
+
+  19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Don't autodetect MMX/SSE/3DNOW, it breaks cross-compilation.
+
+  19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Don't remove fonts.* or encodings.dir in dirs not provided by this package
+  (#30698).
+
+  18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add more backwards compatibility things -- symlinks for all former font, doc
+  and man dirs as well as autogeneration of new config files. Fix generation of
+  xrender.pc.
+
+  18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add explicit xfree to blockers.
+
+  18 Apr 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.0.ebuild:
+  marking stable on amd64 with the full realisation that the normal time period
+  for waiting to mark things stable has yet to be met. A security vulnerability,
+  outlined in bug 48107, forced me to mark the new xine-lib stable on amd64,
+  where it will not compile with any unmasked version of xfree due to -fPIC
+  errors (see bugs 48261, 44274, and 40646). Xorg-x11 is the only truly stable
+  and fully functional option on amd64! Xfree 4.3.0, in general, is simply not
+  amd64-friendly. Please CC me for any bugs relating to xorg-x11.
+
+  14 Apr 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0.ebuild:
+  Added ~mips keyword.
+
+  12 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  ~hppa at gmsoft's request.
+
+  12 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 0.5. Add 9500_all_6.7.0-hppa-fixes.patch so it builds on HPPA. Add
+  HPPA fixes to 5900_all_6.7.0-acecad-v2.patch. Thanks to Guy Martin
+  <gmsoft@gentoo.org> for these.
+
+  12 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 0.4. Add 9300_all_4.3.0-ncurses-xf86cfg-bool-conflict.patch to avoid
+  conflict of bool between ncurses-5.4 and xf86cfg (#43491).
+
+  11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add some arch-specific CFLAGS mangling.
+
+  11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Added -g to ALLOWED_FLAGS at request of ajax on Freenode #xorg.
+
+  10 Apr 2004; Jason Wever <weeve@gentoo.org> xorg-x11-6.7.0.ebuild:
+  Added ~sparc keyword.
+
+  10 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add sys-apps/util-linux to DEPEND, reported by IceD^ in Freenode #gentoo.
+
+  09 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 0.3. Add 9110_all_xorg-6.7.0-pci-domains.patch to close #43630. This
+  makes 2.6 kernels, sparc and X work together.
+
+  09 Apr 2004; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.7.0.ebuild:
+  Marked ~ppc
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Drop extra quote in OptimizedCplusplusDebugFlags.
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add patchset to XVendorString. It could come in handy.
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Change XVendorString to be compatible with upstream so people can strstr for
+  The X.Org Foundation.
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add GccAliasingArgs to the optimized CFLAGS and CXXFLAGS setup, so we get
+  -fno-strict-aliasing. This avoids broken code, pending a patch from Luca to
+  fix.
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Remove xterm from DEPEND, it's still in PDEPEND. I accidentally copied instead
+  of pasted earlier.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Drop BuildLinuxDocText. It caused a bunch of docs to NOT be installed on
+  USE=doc.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Use gcc-getCC instead of manual hack.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Patchset 0.2. Added 9400_all_4.3.0-mkcfm-FHS-install.patch to fix hard-coded
+  path. Rework 9113_all_4.3.0-xterm-make-optional.patch to apply to xorg.cf
+  instead of xfree86.cf and rename it
+  9113_all_6.7.0-xterm-make-optional-v2.patch (#47100).
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Add x11-terms/xterm to PDEPEND.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Change blocker on xfree to blocker on other virtual/x11.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Fileset 0.2. Fix libGL.la path -- #47100.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Drop references to xterm since we're going external now.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Change homepage to wiki.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  Change a couple of XF86Config references to xorg.conf.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; :
+  Looks like repoman doesn't auto-add Manifests.
 
 *xorg-x11-6.7.0 (07 Apr 2004)
 
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 4be163ffe405..3d0f9b0a8a4e 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,22 @@
-MD5 c10d00976ddd951c64faf96083382f3f xorg-x11-6.7.0.ebuild 37084
-MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 da63b13e6158daf781e652d7e54f35e9 ChangeLog 363
-MD5 c305741fe2de5205c547329d88b4881d files/digest-xorg-x11-6.7.0 904
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
+MD5 4fa3e1a7e16370e45dce303b64ea2801 ChangeLog 109138
+MD5 b975e2d9781a47a6cf3c63d26b4a5bac xorg-x11-7.0.0_rc2.ebuild 2760
+MD5 2ce63a2168e02ff184581b857f3967e0 xorg-x11-6.8.2-r6.ebuild 55218
+MD5 b068c974395c8b72ec46ef7f9d66cac1 xorg-x11-6.8.99.15-r4.ebuild 54184
+MD5 aa1fdddf5e2240d1b9001668019c55a7 xorg-x11-6.8.2-r4.ebuild 55108
+MD5 8252e5e7dfd036c4c26cc7e44bfd0e1f xorg-x11-7.0.0_rc1.ebuild 2761
+MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc2 0
+MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc1 0
+MD5 a60034cf312e05f28a2da6b202d53e44 files/digest-xorg-x11-6.8.2-r6 504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDhALBFdQwWVoAgN4RAgklAKDaqPLdsoAFBSPGt9pl6jxOLzugfACg0wlw
+tAq3LKXZnNkZCsaoYYfOkRQ=
+=djij
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
index 6b086c7ee9ee..26b7e0083c13 100644
--- a/x11-base/xorg-x11/metadata.xml
+++ b/x11-base/xorg-x11/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfree</herd>
+<herd>x11</herd>
 <longdescription>X11 implementation by X.Org Foundation</longdescription>
 </pkgmetadata>
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
index ebef6e96f9c4..52dcc807dce1 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.1 2005/09/17 06:15:12 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.1.1.1 2005/11/30 10:01:07 chriswhite Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -87,13 +87,14 @@ DEPEND=">=sys-libs/ncurses-5.1
 	opengl? ( >=x11-base/opengl-update-2.2.0 )
 	!nocxx? ( >=x11-misc/ttmkfdir-3.0.9-r2 )
 	>=sys-apps/sed-4
-	sys-apps/util-linux
+	userland_GNU? ( sys-apps/util-linux )
 	dev-lang/perl
 	media-libs/libpng
 	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
 	!virtual/xft
 	!virtual/x11"
 # x11-libs/xft -- blocked because of interference with xorg's
+# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="
 		>=sys-libs/zlib-1.1.3-r2
@@ -479,7 +480,9 @@ unpack_all() {
 		if use nls; then
 			unpack gemini-koi8-u.tar.bz2 > /dev/null
 		fi
-		unpack eurofonts-X11.tar.bz2 > /dev/null
+		if ! use minimal; then
+			unpack eurofonts-X11.tar.bz2 > /dev/null
+		fi
 		if use font-server; then
 			unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null
 		fi
@@ -1423,6 +1426,8 @@ check_migrate_return() {
 	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
 		einfo "rsync successful!"
 	else
+		eerror "rsync failed."
+		eerror "Check for migrate-* files in ${T}."
 		die "rsync failed. Exit code: ${MIGRATE_RETURN}."
 	fi
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
index 812b65e6b1da..9b194e5715e0 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.1 2005/10/03 19:50:38 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.1.1.1 2005/11/30 10:01:04 chriswhite Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -75,7 +75,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild
index 292db4b0cf1c..329effe7e85b 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild,v 1.1 2005/10/12 05:38:18 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15-r4.ebuild,v 1.1.1.1 2005/11/30 10:01:05 chriswhite Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -77,7 +77,7 @@ LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
 	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
index 3d0c09484572..745baeee45b7 100644
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild,v 1.1 2005/11/02 06:37:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:01:07 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta
 package)"
@@ -8,11 +10,11 @@ HOMEPAGE="http://xorg.freedesktop.org"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="xinerama xprint"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
+IUSE="xprint"
 
 # Collision protect will scream bloody murder if we install over old versions
-RDEPEND="!<x11-base/xorg-x11-7.0.0_rc0"
+RDEPEND="!<=x11-base/xorg-x11-6.9"
 
 # Server
 RDEPEND="${RDEPEND}
@@ -24,7 +26,8 @@ RDEPEND="${RDEPEND}
 	>=x11-apps/xauth-0.99.1
 	>=x11-apps/xhost-0.99.1
 	>=x11-apps/xinit-0.99.2
-	>=x11-apps/xmodmap-0.99.1"
+	>=x11-apps/xmodmap-0.99.1
+	>=x11-apps/xrandr-0.99.1"
 
 # Common Libraries - move these to eclass eventually
 RDEPEND="${RDEPEND}
@@ -35,7 +38,8 @@ RDEPEND="${RDEPEND}
 	>=x11-libs/libXfixes-3.0.0
 	>=x11-libs/libXv-0.99.1
 	>=x11-libs/libXxf86dga-0.99.1
-	xinerama? ( >=x11-libs/libXinerama-0.99.1 )
+	>=x11-libs/libXinerama-0.99.1
+	>=x11-libs/libXScrnSaver-0.99.2
 	xprint? ( >=x11-libs/libXp-0.99.1 )"
 
 # Some fonts
@@ -48,3 +52,40 @@ DEPEND="${RDEPEND}"
 
 # We need some checks for weird symlinks on migrate
 # /usr/lib/X11/xdm -> ../../../etc/X11/xdm
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	echo
+	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}."
+	einfo "Any custom cursor sets should be placed in that directory."
+	echo
+	einfo "If you wish to set system-wide default cursors, please create"
+	einfo "/usr/local/share/cursors/${PN}/default/index.theme"
+	einfo "with content: \"Inherits=theme_name\" so that future"
+	einfo "emerges will not overwrite those settings."
+	echo
+	einfo "Listening on TCP is disabled by default with startx."
+	einfo "To enable it, edit /usr/bin/startx."
+	echo
+
+	ewarn "Please read the modular X migration guide at"
+	ewarn "http://dev.gentoo.org/~spyderous/xorg-x11/migrating_to_modular_x_howto.txt"
+	echo
+	einfo "If you encounter any non-configuration issues, please file a bug at"
+	einfo "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux"
+	einfo "and attach /etc/X11/xorg.conf, /var/log/Xorg.0.log and emerge info"
+	echo
+	einfo "In the future, you will be able to affect which drivers are installed"
+	einfo "with the VIDEO_CARDS and INPUT_DEVICES settings."
+	echo
+
+	# (#76985)
+	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
+	einfo "for more information on configuring X."
+	echo
+
+	# Try to get people to read this, pending #11359
+	ebeep 5
+	epause 10
+}
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
index e77f99cd51e4..6b90ddf686a5 100644
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild,v 1.1 2005/11/11 20:12:03 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild,v 1.1.1.1 2005/11/30 10:01:03 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="xprint"
 
 # Collision protect will scream bloody murder if we install over old versions
-RDEPEND="!<x11-base/xorg-x11-7.0.0_rc0"
+RDEPEND="!<=x11-base/xorg-x11-6.9"
 
 # Server
 RDEPEND="${RDEPEND}
diff --git a/x11-base/y-windows/ChangeLog b/x11-base/y-windows/ChangeLog
index c6ac10d31fcf..bfe28e242d42 100644
--- a/x11-base/y-windows/ChangeLog
+++ b/x11-base/y-windows/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/y-windows
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/y-windows/ChangeLog,v 1.1 2004/02/28 17:37:29 hhg Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/y-windows/ChangeLog,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> y-windows-0.2.ebuild:
+  adding categorie. see 45110 for details
+
+  29 Feb 2004; David Holm <dholm@gentoo.org> y-windows-0.2.ebuild:
+  Added to ~ppc.
 
 *y-windows-0.2 (28 Feb 2004)
 
diff --git a/x11-base/y-windows/Manifest b/x11-base/y-windows/Manifest
index 1cf154409e48..b068ea60fc5f 100644
--- a/x11-base/y-windows/Manifest
+++ b/x11-base/y-windows/Manifest
@@ -1,4 +1,4 @@
-MD5 ad18148cf238a28b7c471928457665b3 metadata.xml 306
-MD5 6dc8ed48df6d71a9a6169ad16d48b9ae ChangeLog 332
-MD5 2e7e5fd9020994e967e458c5a339865d y-windows-0.2.ebuild 1018
+MD5 da65efc493eec06328a8ac17969ccca5 ChangeLog 616
+MD5 5df1cb4b263d366d479b9cd97d1d8a95 y-windows-0.2.ebuild 1146
+MD5 901a8fb13ce6a30791697c4380f3fbd2 metadata.xml 304
 MD5 74dd1e33b0b212c642a7c46dbd37682e files/digest-y-windows-0.2 62
diff --git a/x11-base/y-windows/metadata.xml b/x11-base/y-windows/metadata.xml
index 0e64d1250529..f90580bb69d5 100644
--- a/x11-base/y-windows/metadata.xml
+++ b/x11-base/y-windows/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfree</herd>
+<herd>x11</herd>
 <maintainer>
 	<email>hhg@gentoo.org</email>
 	<name>Hallgrimur H. Gunnarsson</name>
diff --git a/x11-base/y-windows/y-windows-0.2.ebuild b/x11-base/y-windows/y-windows-0.2.ebuild
index 9049c531cdcc..5a53023a62a1 100644
--- a/x11-base/y-windows/y-windows-0.2.ebuild
+++ b/x11-base/y-windows/y-windows-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc., Doug Goldstein
+# Copyright 1999-2004 Gentoo Foundation, Doug Goldstein
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/y-windows/y-windows-0.2.ebuild,v 1.1 2004/02/28 17:37:29 hhg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/y-windows/y-windows-0.2.ebuild,v 1.1.1.1 2005/11/30 10:01:09 chriswhite Exp $
 
 DESCRIPTION="Y Windows"
 HOMEPAGE="http://www.y-windows.org/"
@@ -8,11 +8,12 @@ SRC_URI="http://www.cardoe.com/y-base/patches/Y-patch26.tar.bz2"
 LICENSE="GPL-2 LGPL-2 CPL-1.0"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
 
 DEPEND="virtual/x11
-	>=automake-1.8
-	>=autoconf-2.58
+	>=sys-devel/automake-1.8
+	>=sys-devel/autoconf-2.58
 	>=media-libs/libsdl-1.2.0
 	>=media-libs/freetype-2.1.3
 	=dev-libs/libsigc++-1.0*