PATCH_VER 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. FILES_VER 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.

4 files changed, 55 insertions, 9 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index cd6df1b0e9b0..aae62dd0e3e9 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.186 2004/11/03 00:34:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.187 2004/11/03 08:33:38 spyderous Exp $
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  PATCH_VER 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. FILES_VER 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:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index f064baac2d2b..1db03df0b5ba 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332
-MD5 e9e31bb47489bacf7c97029be8eb959e ChangeLog 40115
-MD5 2ad08ea26cc74fdb6f62a6fb5c0263f8 xorg-x11-6.8.0-r2.ebuild 44817
+MD5 8fc9750e3b216a3948576f82b298bcb0 ChangeLog 41316
+MD5 615cb030342b95f53b7788997830a0b6 xorg-x11-6.8.0-r2.ebuild 45717
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
-MD5 4948d68fce0cc80c309f112474e37303 files/digest-xorg-x11-6.8.0-r2 906
+MD5 b7a56cbcde55a013564f056f87e59867 files/digest-xorg-x11-6.8.0-r2 908
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2
index f30e0e8e9f38..3823961c3156 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2
@@ -2,8 +2,8 @@ MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 5bf6629c8f05547a0ab3e2dcc29a7c0a xorg-x11-6.8.0-files-0.5.tar.bz2 9947
-MD5 9d39936125d414bf8392f579e93aba99 xorg-x11-6.8.0-patches-0.2.5.tar.bz2 63118
+MD5 8e8905cf6863546481ec52f1101b6984 xorg-x11-6.8.0-files-0.6.tar.bz2 10139
+MD5 27809390a76d466f0b139c192c1b354f xorg-x11-6.8.0-patches-0.2.6.tar.bz2 149692
 MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275
 MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901
 MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index a82050ea1339..c320c602a24b 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0-r2.ebuild,v 1.41 2004/11/03 00:34:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.42 2004/11/03 08:33:38 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -39,8 +39,8 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc dri font-server
 	truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
-FILES_VER="0.5"
-PATCH_VER="0.2.5"
+FILES_VER="0.6"
+PATCH_VER="0.2.6"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"
@@ -565,6 +565,12 @@ patch_setup() {
 		patch_exclude 9960_all_4.3.0-exec-shield-GNU
 		patch_exclude 9961_all_4.3.0-libGL-exec-shield
 
+		# Xbox nvidia driver, patch is a total hack, tears apart xc/config/cf
+		# (#68726). Only apply when necessary so we don't screw other stuff up.
+		if [ ! "${PROFILE_ARCH}" = "xbox" ]; then
+			patch_exclude 9990
+		fi
+
 		# this patch comments out the Xserver line in xdm's config
 		# We only want it here
 		if ! use s390; then
@@ -1026,6 +1032,17 @@ src_install() {
 		doins ${S}/extras/drm/shared/drm.h
 	fi
 
+	# If we want xprint, save the init script before deleting /etc/rc.d/
+	# Requested on #68316
+	if use xprint; then
+		# RH-style init script, we provide a wrapper
+		exeinto /usr/lib/misc
+		doexe ${D}/etc/rc.d/xprint
+		# Install the wrapper
+		exeinto /etc/init.d
+		doexe ${FILES_DIR}/xprint.init
+	fi
+
 	# Remove the /etc/rc.d nonsense -- not everyone is RedHat
 	rm -rf ${D}/etc/rc.d
 
@@ -1038,8 +1055,18 @@ migrate_usr_x11r6_lib() {
 	# whose files we move don't lose track of them. As such, we need
 	# _absolutely nothing_ in /usr/X11R6/lib so we can make such a symlink.
 	# Donnie Berkholz <spyderous@gentoo.org> 20 October 2004
+
+	# Get rid of "standard" symlink from <6.8.0-r2
+	# We can't overwrite symlink with directory w/ $(mv -f)
+	[ -L ${ROOT}usr/$(get_libdir)/X11 ] \
+		&& rm ${ROOT}usr/$(get_libdir)/X11
+	# Move everything
 	mv -f ${ROOT}usr/X11R6/$(get_libdir)/* ${ROOT}usr/$(get_libdir)
+	# Remove any floating .keep files so we can run rmdir
+	find ${ROOT}usr/X11R6/$(get_libdir) -name '\.keep' -exec rm -f {} \;
+	# Get rid of the directory
 	rmdir ${ROOT}usr/X11R6/$(get_libdir)
+	# Put a symlink in its place
 	ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir)
 }