summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-11-21 22:42:56 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-11-21 22:42:56 +0000
commit7815f98c8912b3eaabbc1d2c1f6e56ac5d9c738c (patch)
tree5bfd5b6155b3378706e9f226eab745fb85adb6ea /x11-base
parentwork in progress (Manifest recommit) (diff)
downloadgentoo-2-7815f98c8912b3eaabbc1d2c1f6e56ac5d9c738c.tar.gz
gentoo-2-7815f98c8912b3eaabbc1d2c1f6e56ac5d9c738c.tar.bz2
gentoo-2-7815f98c8912b3eaabbc1d2c1f6e56ac5d9c738c.zip
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.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog10
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild16
2 files changed, 23 insertions, 3 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 8f095883b7a2..6182f2429481 100644
--- 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/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 68bcb9cf06ac..02d93dc2e9e8 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,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