For USE=minimal, remove all unnecessary fonts. This saves ~5.5MB. Unfortunately,...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 8f095883b7a27389919bec53106a043ff8435b6a..6182f2429481556a275989059e1e63731fa3a763 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,14 @@
 # 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.218 2004/11/21 07:43:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.219 2004/11/21 22:42:56 spyderous Exp $
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  For USE=minimal, remove all unnecessary fonts. This saves ~5.5MB.
+  Unfortunately, this is a temporary hack -- we should really patch
+  xc/fonts/bdf/misc/Imakefile to never build them in the first place. Also
+  only add CID to G_FONTDIRS for USE=cjk, so other people don't have a symlink
+  pointing to nothing.
 
   20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index ee704f316c0f94f6947c62ced7098e03eb0ca5ef..d0017c1193db93c2404aeea1b0b86c4b504f81ed 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,11 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340
-MD5 b32583289f52cea942dcec10858606f6 ChangeLog 49712
+MD5 b59503416aecce7a888004b930733eca ChangeLog 50109
 MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246
 MD5 223a7a19eeeceddfe21fc50e9de60db1 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789
-MD5 0256675322fc312777f5299a22ff9ca5 xorg-x11-6.8.0-r4.ebuild 51713
+MD5 a4ee7d92a5c199926ecb6453ff9274a5 xorg-x11-6.8.0-r4.ebuild 52108
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908

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 68bcb9cf06ac692c001e7dd057b4b025d14d96f5..02d93dc2e9e848a62cbf4811b24478c425a55aad 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,10 +1,13 @@
 # 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.9 2004/11/21 07:43:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.10 2004/11/21 22:42:56 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
 
+# Removing any unnecessary fonts: find /usr/share/fonts/misc/ -name '*.pcf.gz' \
+# -not -name '*6x13*' -not -name 'cursor.pcf.gz' -exec rm {} \;
+
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
 # libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so,
@@ -359,6 +362,12 @@ src_install() {
                install_extra_cursors
        fi
 
+       # Get rid of all unnecessary fonts (saves ~5.5 MB)
+       if use minimal; then
+               find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \
+                       -not -name '*6x13*' -not -name 'cursor.pcf.gz' -exec rm {} \;
+       fi
+
        # Remove xterm app-defaults, since we don't install xterm
 #      rm ${D}/etc/X11/app-defaults/{UXTerm,XTerm,XTerm-color}
 
@@ -997,7 +1006,10 @@ install_everything() {
 
 backward_compat_setup() {
        # Backwards compatibility for /usr/share move
-       G_FONTDIRS="CID Speedo TTF Type1 encodings local misc util"
+       G_FONTDIRS="Speedo TTF Type1 encodings local misc util"
+       if use cjk; then
+               G_FONTDIRS="${G_FONTDIRS} CID"
+       fi
        if use bitmap-fonts; then
                G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi"
        fi