Update TODOs.

4 files changed, 28 insertions, 91 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 56353dd8d79b..2d404dad50e5 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # 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.62 2004/06/21 05:33:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.63 2004/06/23 19:34:45 spyderous Exp $
+
+  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:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index dd55a875f559..534da6dbd9eb 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,6 @@
-MD5 acabcc9134760e022d86e1b79aac777e ChangeLog 14482
 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 3891ff3137ca69e7d151f71615432f21 xorg-x11-6.7.0.ebuild 40662
-MD5 501283a9c694bfad94162c9d06a3930a xorg-x11-6.7.0-r1.ebuild 41452
+MD5 85e6156e9a09b4a51a901e294c17ad07 xorg-x11-6.7.0.ebuild 38658
+MD5 7e0b92ebdda6a29c35a0fee596822469 xorg-x11-6.7.0-r1.ebuild 40305
+MD5 8e54125a6223e293972e371382922aed ChangeLog 14605
 MD5 763be7d84792d2e50ddafe861cdaee04 files/digest-xorg-x11-6.7.0 904
 MD5 1208c9b5939fffbf67f73393a543773f files/digest-xorg-x11-6.7.0-r1 989
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index eeb71335aba7..b36150cf2eef 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.15 2004/06/21 05:33:31 spyderous Exp $
-
-# This is a snapshot of the XORG-RELEASE-1 branch.
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.16 2004/06/23 19:34:45 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -10,49 +8,27 @@
 # libxkbfile.so, libxkbui.so
 
 # TODO
-# 14 March 2004 <spyderous@gentoo.org>
-#   TARGET: 1.0
-# 		spy: get sparc patch from weeve
-# 		spy: delete old fonts dirs if nothing's left in them.
-# 		spy: ati-drivers links to /usr/lib/opengl/xfree/{extensions,include}
-# 			check nvidia etc too
-# 		spy: #43491, #38232
-# 		cyfred: #29953
-# 		(DONE) spy: #23023
-# 		spy: #21120 needs to be ported
+# 23 June 2004 <spyderous@gentoo.org>
+#   TARGET: 1.2
+#		spy: #48095 -- add S3 support for laptop suspend
+#		spy: #49155 -- updated keymap for french-belgian azerty
+#		spy: #50562 -- add SDK/pie compat patch
+#		spy: #54132 -- config tools still add old font paths
+# 		spy: #38232 -- move 4152_all_4.3.0-allow-xdm-server-quotes.patch over
+#			from xfree-4.3.0-r7
+#		spy: Move 9000_all_4.3.0-lnx-evdev-core.patch,
+#			9001_all_4.3.0-lnx-evdev-keyboard.patch and
+#			9002_all_4.3.0-lnx-evdev-mouse.patch over from xfree-4.3.0-r7
+# 		spy: #21120 -- sun type6 kbd needs to be ported (by eradicator)
 # 		tseng: Update hardened patches
 # 			-Also see fd.o bug #296, it's been integrated
+#			-Follow fd.o 'debrix' work
 # 		spy: Check bugs fixed in Gentoo's xfree-4.3.0,4.3.99 lately
-# 		spy: External zlib
-# 		(DONE) spy: get _all_ necessary licenses added
-# 		(DONE) spy: Drop everything related to obsolete XftConfig
-# 		(DONE) spy: Check Fedora patches
-# 		(DONE) spy: port PAM circular dep fixes over
-# 		(DONE) spy: xorg default cursors installed to /usr/share/cursors/xfree
-# 		(DONE) spy: Move as much global stuff as possible to pkg_setup()
-# 			-- Bumped to 1.0_pre20040313-r1 for this
-# 		(DONE) spy: Rename media-fonts/corefonts to microsoft-fonts, provide
-# 			virtual/corefonts in combination with ttf-bitstream-vera, the
-# 			default
-# 			-- Invalidated by addition of bitstream fonts to source
-# 		(DONE) spy: add HaveLib64 switch instead of patch 0181
-# 		(DONE) spy: switch to use() instead of ${ARCH}
-# 		(DONE) tseng, spy: update pie USE
-# 		(DONE) spy: drop wacom
-# 		(DONE) spy: Drop MS corefonts, dep on virtual
-# 		(DONE) spy: Check SDK patches -- wacom, synaptics
-# 		(DONE) spy: Install docs to /usr/share/doc
-# 		(DONE) spy: Install man pages to /usr/share/man
-# 		(DONE) spy: Remove references to libxml. It was never actually used;
-# 			expat was instead. It's still sitting there for no reason
-# 		(DONE) spy: Install fonts to /usr/share/fonts/*
-# 		(DONE) spy: Add external xft, render, xrender drop-ins
-# 		(DONE) spy: Generate xrender.pc
-# 		(DONE) spy: Transition to new patch_exclude()
+# 		spy: Check Fedora patches
 #   TARGET: unknown
-# 		spy: Add Alan Cox's VIA 2D+3D driver from XFree86-4.3.0-57.src.rpm, use
-# 			XFree86-4.3.0-build-libXinerama-before-libGL-for-via-driver.patch
+#		spy: #54079 -- add unichrome drivers
 # 		batt: Backport IGP stuff from DRI CVS?
+#		spy: backport i915 driver from xorg CVS
 
 inherit eutils flag-o-matic gcc xfree
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
index 85fb1f280411..263f0ff080a4 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.49 2004/06/03 07:30:25 spyderous Exp $
-
-# This is a snapshot of the XORG-RELEASE-1 branch.
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.50 2004/06/23 19:34:45 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -10,49 +8,8 @@
 # libxkbfile.so, libxkbui.so
 
 # TODO
-# 14 March 2004 <spyderous@gentoo.org>
-#   TARGET: 1.0
-# 		spy: get sparc patch from weeve
-# 		spy: delete old fonts dirs if nothing's left in them.
-# 		spy: ati-drivers links to /usr/lib/opengl/xfree/{extensions,include}
-# 			check nvidia etc too
-# 		spy: #43491, #38232
-# 		cyfred: #29953
-# 		(DONE) spy: #23023
-# 		spy: #21120 needs to be ported
-# 		tseng: Update hardened patches
-# 			-Also see fd.o bug #296, it's been integrated
-# 		spy: Check bugs fixed in Gentoo's xfree-4.3.0,4.3.99 lately
-# 		spy: External zlib
-# 		(DONE) spy: get _all_ necessary licenses added
-# 		(DONE) spy: Drop everything related to obsolete XftConfig
-# 		(DONE) spy: Check Fedora patches
-# 		(DONE) spy: port PAM circular dep fixes over
-# 		(DONE) spy: xorg default cursors installed to /usr/share/cursors/xfree
-# 		(DONE) spy: Move as much global stuff as possible to pkg_setup()
-# 			-- Bumped to 1.0_pre20040313-r1 for this
-# 		(DONE) spy: Rename media-fonts/corefonts to microsoft-fonts, provide
-# 			virtual/corefonts in combination with ttf-bitstream-vera, the
-# 			default
-# 			-- Invalidated by addition of bitstream fonts to source
-# 		(DONE) spy: add HaveLib64 switch instead of patch 0181
-# 		(DONE) spy: switch to use() instead of ${ARCH}
-# 		(DONE) tseng, spy: update pie USE
-# 		(DONE) spy: drop wacom
-# 		(DONE) spy: Drop MS corefonts, dep on virtual
-# 		(DONE) spy: Check SDK patches -- wacom, synaptics
-# 		(DONE) spy: Install docs to /usr/share/doc
-# 		(DONE) spy: Install man pages to /usr/share/man
-# 		(DONE) spy: Remove references to libxml. It was never actually used;
-# 			expat was instead. It's still sitting there for no reason
-# 		(DONE) spy: Install fonts to /usr/share/fonts/*
-# 		(DONE) spy: Add external xft, render, xrender drop-ins
-# 		(DONE) spy: Generate xrender.pc
-# 		(DONE) spy: Transition to new patch_exclude()
-#   TARGET: unknown
-# 		spy: Add Alan Cox's VIA 2D+3D driver from XFree86-4.3.0-57.src.rpm, use
-# 			XFree86-4.3.0-build-libXinerama-before-libGL-for-via-driver.patch
-# 		batt: Backport IGP stuff from DRI CVS?
+# 23 June 2004 <spyderous@gentoo.org>
+#	Pull from portage. Affected by xdm security bug #53226
 
 inherit eutils flag-o-matic gcc xfree