Drop unnecessary, unused cruft and update TODO.

Package-Manager: portage-2.0.51-r14

3 files changed, 23 insertions, 26 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 7d280540243d..b3e2305352d3 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.297 2005/01/24 08:58:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.298 2005/01/24 09:01:13 spyderous Exp $
+
+  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)
 
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 5c3c1645998b..d13a77d9b385 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 676b2fa43d103d83b6fb79de302b2244 ChangeLog 71206
+MD5 a3eb9a27402ea040464bece24fb198fa ChangeLog 71341
 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
 MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
-MD5 06c72cfd4b709b71efd97ed2659c88a9 xorg-x11-6.8.1.902.ebuild 50266
+MD5 c0011ac3fb628157bb67f054e73b0483 xorg-x11-6.8.1.902.ebuild 50159
 MD5 2ba8cd20695e2b40b024919462b366a9 xorg-x11-6.8.1.902-r1.ebuild 50169
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
index 8853a69dfe9a..c0a967fcd6bb 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902.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.1.902.ebuild,v 1.20 2005/01/24 05:23:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.21 2005/01/24 09:01:13 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -14,21 +14,25 @@
 # libxkbfile.so, libxkbui.so
 
 # TODO
-# 18 October 2004 <spyderous@gentoo.org>
-#   TARGET: 6.8.0-r2
-#		Add some logic so /usr/X11R6/lib can actually be a symlink
-#			- Move everything inside to /usr/lib while retaining its MD5 so
-#				it will still be uninstalled when portage follows the symlink.
-#				Note: A simple $(mv) does this. Do in pkg_preinst().
+# 24 January 2005 <spyderous@gentoo.org>
+#   TARGET: 6.8.1.902-r1
 #		Combine find loops for "Creating fonts.scale files," "Generating
 #			fonts.dir files and "Generating Xft cache"
-#		Mr_Bones_ the loop in pkg_postinst for removing Compose can probably
+#		<Mr_Bones_> the loop in pkg_postinst for removing Compose can probably
 #			be one line of bash expansion like rm -f ${ROOT}/usr/$(get_libdir)/
 #			X11/locale/{ja*|ko*|zh*}/Compose
-#   TARGET: 6.8.0-r3
-#		Same for /usr/X11R6/include
-#   TARGET: 6.8.0-r4
-#		Same for /usr/X11R6/bin
+#		Move /usr/X11R6/include to /usr/include/X11
+#		Move /usr/X11R6/bin to /usr/bin
+#		Clean up migration function
+#			- generalize to take arguments like:
+#				`migrate /usr/X11R6/lib /usr/lib` so we can use for bin, include
+#			- loop through lib* instead of repetition
+#			- consider alternate to 'mv', which dies when dirs exist in both
+#				- cpio, rsync, tar suggested
+#					- cpio dereferences symlinks, tar wastes time
+#		Fix direction of lib -> libdir symlink
+#		Functionalize ebuild more cleanly -- only call subfunctions in primary
+#			ebuild functions, no direct code
 
 inherit eutils flag-o-matic toolchain-funcs x11 linux-info
 
@@ -46,8 +50,6 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
 FILES_VER="0.3"
 PATCH_VER="0.1.2"
 XCUR_VER="0.3.1"
-#MGADRV_VER="1_3_0beta"
-#VIADRV_VER="0.1"
 XFSFT_ENC_VER="0.1"
 
 S=${WORKDIR}/xc
@@ -59,11 +61,6 @@ X_PATCHES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-$
 	http://dev.gentoo.org/~cyfred/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
-X_DRIVERS=""
-#	mirror://gentoo/${P}-drivers-via-${VIADRV_VER}.tar.bz2"
-# Latest Savage drivers:  http://www.probo.com/timr/savage40.html
-# Latest SIS drivers:  http://www.winischhofer.net/
-
 GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2
 	http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2
 	mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"
@@ -73,7 +70,6 @@ SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
 	!minimal? ( mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 )
 	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
 	${GENTOO_FILES}
-	${X_DRIVERS}
 	${X_PATCHES}
 	http://xorg.freedesktop.org/X11R6.8.2/${P}.tar.bz2"
 #	http://freedesktop.org/~xorg/X11R${PV}/src/X11R${PV}-src1.tar.gz
@@ -728,9 +724,6 @@ host_def_setup() {
 			use_build mmx HasMMXSupport
 			use_build 3dnow Has3DNowSupport
 			use_build sse HasSSESupport
-
-			# Compile the VIA driver
-			# echo "#define XF86ExtraCardDrivers via" >> ${HOSTCONF}
 		fi
 
 		# optimize Mesa for architecture