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

4 files changed, 13 insertions, 7 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index c4094fa64448..35e7ddeafe66 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2004/04/07 23:05:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.9 2004/04/07 23:14:53 spyderous Exp $
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  PATCH_VER 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.
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index a8c8c07f2e4d..4532f432f151 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 3a6c47703c2ed2a747c671f9906b7d39 ChangeLog 1226
-MD5 621c40825ee1246d2a492dd85bcd0abe xorg-x11-6.7.0.ebuild 36678
-MD5 0b2728a5313945c57032214fc9fa379c files/digest-xorg-x11-6.7.0 904
+MD5 69ce06bd33fdf98420b2f485ca53da71 ChangeLog 1555
+MD5 03fd376bd6e179cfbe8f5d9701256432 xorg-x11-6.7.0.ebuild 36678
+MD5 87c48d45b4407270857b2cb20d063717 files/digest-xorg-x11-6.7.0 904
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0
index b2f71ad52062..d7c9e8960583 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0
@@ -3,7 +3,7 @@ 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 2d091e7ca01bddd12a99f4d37b3b0234 xorg-x11-6.7.0-files-0.2.tar.bz2 9169
-MD5 01b2be6da5beabb673a7acc7f928a6f7 xorg-x11-6.7.0-patches-0.1.tar.bz2 79041
+MD5 94c4e978e4abe3b6ed36b6677942ce39 xorg-x11-6.7.0-patches-0.2.tar.bz2 79308
 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.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
index 924054afac18..9d474b5ba249 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
@@ -1,6 +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.7 2004/04/07 23:05:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.8 2004/04/07 23:14:53 spyderous Exp $
 
 # This is a snapshot of the XORG-RELEASE-1 branch.
 
@@ -66,7 +66,7 @@ IUSE="3dfx cjk debug doc hardened ipv6 nls pam sdk static pie"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.2"
-PATCH_VER="0.1"
+PATCH_VER="0.2"
 #RENDER_VER="0.8"
 #XRENDER_VER="0.8.4"
 #XFT_VER="2.1.5"