Wrap font-server USE around things affecting /etc/X11/fs/config.

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 1d3a2cab93c1da9c77e2bcc9daa9f7a6880938fb..6a8a0bb76c2568209e48e52ea41000d7e59be566 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # 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.188 2004/11/03 09:13:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.189 2004/11/03 09:37:54 spyderous Exp $
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Wrap font-server USE around things affecting /etc/X11/fs/config.
 
   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 920841be7fdb84a428958030dad9335489f575dc..d0cf6344adae2db11c921b45158149673f5c91ba 100644 (file)
--- 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 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332
-MD5 1205c1bdcc7c3a59f256240e862a6870 ChangeLog 41532
-MD5 c804b9f466f3c33b2b335682b2a0a14a xorg-x11-6.8.0-r2.ebuild 45614
+MD5 b9f69c1c5848461b86e57cabf2ebd416 ChangeLog 41683
+MD5 89ca6f7a431d853f4c76756fc41d1a75 xorg-x11-6.8.0-r2.ebuild 45695
 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 d43255e1ee43960a02a020a68c32540398fe10e6..6a81ebbd469382f3bdffdba388cd5c7c132d0a7d 100644 (file)
--- 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.43 2004/11/03 09:13:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.44 2004/11/03 09:37:55 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -846,8 +846,10 @@ setup_config_files() {
        # Fix default config files after installing fonts to /usr/share/fonts
        sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
                ${D}/etc/X11/xorg.conf.example
-       sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-               ${D}/etc/X11/fs/config
+       if use font-server; then
+               sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
+                       ${D}/etc/X11/fs/config
+       fi
 
        # Work around upgrade problem where people have
        # Option "XkbRules" "xfree86" in their config file
@@ -1074,8 +1076,10 @@ update_config_files() {
                einfo "Preparing any installed configuration files for font move..."
                FILES="/etc/X11/xorg.conf
                        /etc/X11/XF86Config-4
-                       /etc/X11/XF86Config
-                       /etc/X11/fs/config"
+                       /etc/X11/XF86Config"
+               if use font-server; then
+                       FILES="${FILES} /etc/X11/fs/config"
+               fi
                #       /etc/fonts/fonts.conf
                #       /etc/fonts/local.conf