Patchset 0.1.5 for 6.8.2-r2, patchset 0.1.3 for 6.8.99.5. (#87361) Pull 5140_all_6.8.0-radeon-swsusp.patch, which seems to add a redundant RadeonSetFBLocation() compared with CVS, where the bug it was supposed to fix is fixed.

6 files changed, 19 insertions, 12 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index aaf4494b2395..c3c473532599 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,13 @@
 # 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.389 2005/05/24 03:12:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.390 2005/05/24 03:29:52 spyderous Exp $
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  Patchset 0.1.5 for 6.8.2-r2, patchset 0.1.3 for 6.8.99.5. (#87361) Pull
+  5140_all_6.8.0-radeon-swsusp.patch, which seems to add a redundant
+  RadeonSetFBLocation() compared with CVS, where the bug it was supposed to
+  fix is fixed.
 
   24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 7480c81c42d6..917600d81a94 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 2a9834518373d30105bf3deba9f2624e xorg-x11-6.8.99.3.ebuild 60101
-MD5 33e94f081726c84dc0101c2e723a333f xorg-x11-6.8.2-r2.ebuild 60231
-MD5 9332ece7d866debafd5229e06eaa08db ChangeLog 92089
+MD5 a5124aa4b24709380c6a24cc9b7a2c82 xorg-x11-6.8.2-r2.ebuild 60231
+MD5 c305d700ed97cf7e0ec4abf407ccedd5 ChangeLog 92434
 MD5 fb5fe55f00e3567aeb6ea6d4465fc62b xorg-x11-6.8.2-r1.ebuild 59275
-MD5 620dfd5420884215efd1aba44f89d600 xorg-x11-6.8.99.5.ebuild 60280
+MD5 8b76b2dd6d719ed8a204fddccc3d3481 xorg-x11-6.8.99.5.ebuild 60280
 MD5 a98e64cce8a02182077d2a3705073df3 files/digest-xorg-x11-6.8.99.3 514
-MD5 480d2c106e14e4b8ea66810eb0174e54 files/digest-xorg-x11-6.8.99.5 514
-MD5 4dd5c4da0c5eec9fae267e42779d0953 files/digest-xorg-x11-6.8.2-r2 504
+MD5 72332f87c0620ede7d4a45a4e2bf237b files/digest-xorg-x11-6.8.99.5 514
+MD5 f2f16ad5c4b0abf8a71e80a7a83dd99e files/digest-xorg-x11-6.8.2-r2 504
 MD5 dbe3264aa4246537122c1b6f2faba70d files/digest-xorg-x11-6.8.2-r1 504
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2
index c993a70c32f2..1382adbbceab 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2
@@ -3,5 +3,5 @@ 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 114275ecde4a7196875eeda9c35a7bcd xorg-x11-6.8.2-files-0.3.tar.bz2 10111
-MD5 8ed892d6142c013fbf9f9d8b76b56097 xorg-x11-6.8.2-patches-0.1.4.tar.bz2 163075
+MD5 c70c201f1fd4d8300ad96bb5361c5974 xorg-x11-6.8.2-patches-0.1.5.tar.bz2 162795
 MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.5 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.5
index ba958afcf6e7..1f74800b4d3c 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.5
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.5
@@ -3,5 +3,5 @@ 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 b2d7959bb5b25177d7bb345042d7a75c xorg-x11-6.8.99.5-files-0.2.tar.bz2 10105
-MD5 0a50093fc67a160bdd9848482307c4b8 xorg-x11-6.8.99.5-patches-0.1.2.tar.bz2 119737
+MD5 0ed636236f724a9236ba2bb753e76ab7 xorg-x11-6.8.99.5-patches-0.1.3.tar.bz2 119514
 MD5 6dc46c7c0d41c47d24729e85125832d2 xorg-x11-6.8.99.5.tar.bz2 44728392
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
index 1cd0031828fa..1cb1e1df279d 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.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.2-r2.ebuild,v 1.13 2005/05/24 03:12:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.14 2005/05/24 03:29:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -51,7 +51,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.3"
-PATCH_VER="0.1.4"
+PATCH_VER="0.1.5"
 XCUR_VER="0.3.1"
 XFSFT_ENC_VER="0.1"
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
index 37bba421d1cc..d3a667c94f22 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.5.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.99.5.ebuild,v 1.10 2005/05/24 03:12:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild,v 1.11 2005/05/24 03:29:52 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -51,7 +51,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.2"
-PATCH_VER="0.1.2"
+PATCH_VER="0.1.3"
 XCUR_VER="0.3.1"
 XFSFT_ENC_VER="0.1"