PATCH_VER 1.1.1. Move ppc64 patch over from patchball. Add 4152_all_4.3.0-allow-xdm-server-quotes.patch (#38232), 0425_all_6.7.0-sun-type6-keyboard.patch (#21120), 9855_all_6.7.0-fix-SDK-pie-build.patch (#50562), 9355_all_6.7.0-xorgconfig-fontdir-fixes.patch (#54132). Update TODO, add more auto-PAM warnings.

3 files changed, 23 insertions, 19 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 6333e8316316..357ad9775d23 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,21 @@
 # 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.68 2004/07/05 22:42:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.69 2004/07/06 11:42:55 spyderous Exp $
+
+  06 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  PATCH_VER 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.
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1
index 52d57c44d206..59427b95da6e 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1
@@ -1,10 +1,9 @@
 MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
-MD5 bfc0a1f785808794c4ac9fb4fb4e0724 xorg-x11-6.7.0-ppc64-support-updates.patch 8401
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 2d091e7ca01bddd12a99f4d37b3b0234 xorg-x11-6.7.0-files-0.2.tar.bz2 9169
-MD5 f90212bc4e48e79e20b264ec07f3f225 xorg-x11-6.7.0-patches-1.1.tar.bz2 63902
+MD5 19f3cea9c811b89d9e33da0c3e7fe3fc xorg-x11-6.7.0-patches-1.1.1.tar.bz2 68883
 MD5 22465263bae7a2e9f5ad77e172cf1ab5 X11R6.7.0-src1.tar.gz 30039655
 MD5 6ef4e8f7647a28f080c10ea1bcf01f79 X11R6.7.0-src2.tar.gz 5739983
 MD5 4c7144786522bbce383b21ace72bf669 X11R6.7.0-src3.tar.gz 10855793
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 9016925f1991..e3447d27bd9b 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,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.7.0-r1.ebuild,v 1.20 2004/07/05 22:34:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.21 2004/07/06 11:42:55 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,
@@ -8,14 +8,8 @@
 # libxkbfile.so, libxkbui.so
 
 # TODO
-# 05 July 2004 <spyderous@gentoo.org>
-#   TARGET: 1.1.1
-#		spy: #50562 -- add SDK/pie compat patch
-#		spy: #54132 -- xorgconfig still adds old font paths
-# 		spy: #38232 -- move 4152_all_4.3.0-allow-xdm-server-quotes.patch over
-#			from xfree-4.3.0-r7
-# 		spy: #21120 -- sun type6 kbd patch ported from xfree 4.3.0
-#   TARGET: 1.2 (6.7.0-r2)
+# 06 July 2004 <spyderous@gentoo.org>
+#   TARGET: patchset 1.2 (6.7.0-r2)
 #		spy: #48095 -- add S3 support for laptop suspend
 #		spy: #49155 -- updated keymap for french-belgian azerty
 #		spy: Move 9000_all_4.3.0-lnx-evdev-core.patch,
@@ -42,7 +36,7 @@ IUSE="3dfx 3dnow cjk debug doc hardened ipv6 mmx nls pam pie sdk sse static"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.2"
-PATCH_VER="1.1"
+PATCH_VER="1.1.1"
 #RENDER_VER="0.8"
 # Needed for xrender.pc in addition to external libs
 XRENDER_VER="0.8.4"
@@ -76,7 +70,6 @@ GENTOO_FILES="http://dev.gentoo.org/~spyderous/xorg/${PN}/patchsets/${PV}/${P}-f
 
 SRC_URI="mirror://gentoo/eurofonts-X11.tar.bz2
 	http://dev.gentoo.org/~spyderous/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2
-	http://dev.gentoo.org/~tgall/xorg-x11-6.7.0-ppc64-support-updates.patch
 	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2
 	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
 	${GENTOO_FILES}
@@ -202,8 +195,10 @@ pkg_setup() {
 	# See bug #35468, circular pam-X11 dep
 	if use pam && [ "`best_version x11-base/${PN}`" ]
 	then
+		einfo "Previous X installation detected"
 		einfo "Enabling PAM features in ${PN}..."
 	else
+		einfo "Previous X installation NOT detected"
 		einfo "Disabling PAM features in ${PN}..."
 	fi
 
@@ -634,11 +629,6 @@ fi
 		cd ${S}
 	fi
 
-	if [ "${ARCH}" == "ppc64" ]
-	then
-		cp $DISTDIR/xorg-x11-6.7.0-ppc64-support-updates.patch ${PATCHDIR}/9999_all_6.7.0-ppc64-support-updates.patch
-	fi
-
 	patch_setup
 
 	# Bulk patching - based on patch name