summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-11-04 04:25:49 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-11-04 04:25:49 +0000
commit8eec3f66e641a45a3cc42369cd8d8b06fb1ba9a3 (patch)
treecb444d1ae80ee356ab99fb7e291c3adc9c6e1fce /x11-base
parentBlocks >=sys-apps/groff-1.19. Removed old ebuilds and marked 20040915 stable ... (diff)
downloadhistorical-8eec3f66e641a45a3cc42369cd8d8b06fb1ba9a3.tar.gz
historical-8eec3f66e641a45a3cc42369cd8d8b06fb1ba9a3.tar.bz2
historical-8eec3f66e641a45a3cc42369cd8d8b06fb1ba9a3.zip
Add a sed to change RgbPath to the new location in config files. Reported by agaffney. Symptoms include things like "can't load color "Black"" or "Couldn't open RGB_DB."
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog8
-rw-r--r--x11-base/xorg-x11/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild6
3 files changed, 14 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index b87f1bc24a62..3ee8bcc174c8 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.197 2004/11/04 03:00:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.198 2004/11/04 04:25:49 spyderous Exp $
+
+ 03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r2.ebuild:
+ Add a sed to change RgbPath to the new location in config files. Reported by
+ agaffney. Symptoms include things like "can't load color "Black"" or
+ "Couldn't open RGB_DB."
03 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 6e0a19787d3a..39db6dc59f50 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 a2e1b9169dec8e5eb20d49694b6bbcf0 xorg-x11-6.8.0-r1.ebuild 41338
-MD5 e1fed86aed8f5f0f7c46e6ce208ad95d ChangeLog 43001
-MD5 f1d7449e9e8407e603024c00daa0594f xorg-x11-6.8.0-r2.ebuild 47448
+MD5 8c87c201a635f310d1c62f4ee406b146 ChangeLog 43261
+MD5 fd9695c004a141602f995cd4b7e8aed9 xorg-x11-6.8.0-r2.ebuild 47622
MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
MD5 b7a56cbcde55a013564f056f87e59867 files/digest-xorg-x11-6.8.0-r2 908
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 09b4042f0998..448b801946ed 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.51 2004/11/04 03:00:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.52 2004/11/04 04:25:49 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -1139,6 +1139,10 @@ update_config_files() {
sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \
${IMAGE}${FILE}
+ # This moved in the /usr/X11R6/libdir -> /usr/libdir change
+ sed -i 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/lib/X11/rgb"~\1"/usr/lib/rgb"~' \
+ ${IMAGE}${FILE}
+
# Work around upgrade problem where people have
# Option "XkbRules" "xfree86" in their config file
sed -i "s:^.*Option.*\"XkbRules\".*$::g" \