PATCH_VER 0.2.11.3. (#79497, #80736) Add 9380_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch. xorgcfg / X -configure produce a bunch of unresolved cfb symbols. This can also break the build in some cases. (#78147, #80736) Add 9385_all_6.8.1.904-fix-duplicate-mfb-symbols.patch. Build can break because of duplicate mfb symbols.

Package-Manager: portage-2.0.51-r15

4 files changed, 16 insertions, 7 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2f11e9923c1b..75a4a9ac205b 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,15 @@
 # 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.321 2005/02/05 07:36:30 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.322 2005/02/05 07:39:50 spyderous Exp $
+
+  04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  PATCH_VER 0.2.11.3. (#79497, #80736) Add
+  9380_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch. xorgcfg / X
+  -configure produce a bunch of unresolved cfb symbols. This can also break
+  the build in some cases. (#78147, #80736) Add
+  9385_all_6.8.1.904-fix-duplicate-mfb-symbols.patch. Build can break because
+  of duplicate mfb symbols.
 
   04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.1.904.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index d37c07eddda0..de2b7b0f227b 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,16 +1,16 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 2b9b70a8a132d04ffa84b047fc2736bb xorg-x11-6.7.0-r3.ebuild 38110
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
-MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258
+MD5 8d8428a783b50f11e33d67af88ee9bc4 xorg-x11-6.8.0-r4.ebuild 52258
 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453
 MD5 44835fc4c8bb9d475d312cfb96671654 xorg-x11-6.8.1.902-r1.ebuild 50722
 MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073
-MD5 737b86951ccbc044e698cea951d32b79 ChangeLog 76635
+MD5 cd996340ea6c725fdd5710e81942bc44 ChangeLog 77061
 MD5 f0a1630bdfcd21822fe30cd226f06514 xorg-x11-6.8.1.903.ebuild 57859
 MD5 3c61b783ef90ec2e38d56b70cf687e0a xorg-x11-6.8.1.904.ebuild 58131
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
-MD5 fa94b81b33045020143c8d9ded15a3ac files/digest-xorg-x11-6.8.0-r4 911
+MD5 0fa47dcdfd673d5824ea3a6cfe17ade0 files/digest-xorg-x11-6.8.0-r4 911
 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902 517
 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
index ebaa034f0c64..c51434d9cd90 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
@@ -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 337d0cfbafa5623229c7a8894f995e97 xorg-x11-6.8.0-files-0.7.tar.bz2 10124
-MD5 32605f4a5c84df37f69d9ad48fd77c1f xorg-x11-6.8.0-patches-0.2.11.2.tar.bz2 169883
+MD5 7e2fdd4d02c9708f06bea56ce5fe610b xorg-x11-6.8.0-patches-0.2.11.3.tar.bz2 171354
 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-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 48cf96e7ddaa..80607598dc94 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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.0-r4.ebuild,v 1.60 2005/01/22 02:21:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.61 2005/02/05 07:39:50 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -44,7 +44,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.7"
-PATCH_VER="0.2.11.2"
+PATCH_VER="0.2.11.3"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"