Change munging of config file RgbPath to match where it's currently installed, and...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index bb9a19150f9d44bd5325662ebac5a72cf2a704e2..5282a1113fe886b51076aaaebc96a9d424ff5a0b 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.240 2004/12/10 13:09:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.241 2004/12/11 02:51:42 spyderous Exp $
+
+  10 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Change munging of config file RgbPath to match where it's currently
+  installed, and use get_libdir() for it.
 
   10 Dec 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.0-r3.ebuild:
   Stable on hppa.

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index f1156c1593e73cfbfb4965e5b5a0ffd6a452e1e7..903967a18019ebc3e4f34112d68ca3dc16142c8a 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,13 +1,13 @@
-MD5 0e6734ac813c6d9f6a804154b6906ece ChangeLog 55433
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 88e62276e07e48e924930ddb651478b8 xorg-x11-6.7.0-r2.ebuild 38098
 MD5 f35b03f0334e20f9ba75a2469fc59e14 xorg-x11-6.8.0-r1.ebuild 41352
+MD5 711c35f73e80fcf325c84cffe0f0d320 ChangeLog 55632
+MD5 509b1d6faa8fce2a5d04d748dfd2b8bd xorg-x11-6.8.0-r4.ebuild 50573
 MD5 aaa26043705f4f543594d8fdfca05a9f xorg-x11-6.7.0-r3.ebuild 38116
 MD5 48ee3147d2f3c097a9d262a5473cd04c xorg-x11-6.8.0-r3.ebuild 39807
-MD5 c78d386df2aad6937ce9721f36db7fe5 xorg-x11-6.8.0-r4.ebuild 50549
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
-MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
+MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
+MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 3e98e451e65ec681fb8b2fcc65431cf3 files/digest-xorg-x11-6.8.0-r4 909
-MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674

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 ef85a8ce9b2d5a971841884c2c4488592d57f873..e9eeb8434be2d1390c78a3f133d49632e876c657 100644 (file)
--- 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-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-r4.ebuild,v 1.27 2004/12/07 03:48:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.28 2004/12/11 02:51:42 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1349,7 +1349,7 @@ update_config_files() {
                                                ${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"~' \
+                                       sed -i 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/$(get_libdir)/X11/rgb"~\1"/usr/$(get_libdir)/X11/rgb"~' \
                                                ${IMAGE}${FILE}
 
                                        # Work around upgrade problem where people have