summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2004-05-31 14:59:26 +0000
committerMarinus Schraal <foser@gentoo.org>2004-05-31 14:59:26 +0000
commite8f0239037672500a7f81df5caaaad3604c98811 (patch)
tree5537f391d7e6c25b33dec9f71c90682cc6b45cc4 /eclass
parentStable on x86. (Manifest recommit) (diff)
downloadgentoo-2-e8f0239037672500a7f81df5caaaad3604c98811.tar.gz
gentoo-2-e8f0239037672500a7f81df5caaaad3604c98811.tar.bz2
gentoo-2-e8f0239037672500a7f81df5caaaad3604c98811.zip
some fixes
Diffstat (limited to 'eclass')
-rw-r--r--eclass/font.eclass53
1 files changed, 37 insertions, 16 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 8c9ddbbce597..bf6261b808f8 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.1 2004/05/31 14:21:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.2 2004/05/31 14:59:26 foser Exp $
# Author: foser <foser@gentoo.org>
@@ -17,6 +17,8 @@ INHERITED="$INHERITED $ECLASS"
FONT_SUFFIX="" # Space delimited list of font suffixes to install
+FONT_S="${S}" # Dir containing the fonts
+
DOCS="" # Docs to install
IUSE="${IUSE} X"
@@ -25,21 +27,11 @@ DEPEND="${DEPEND} \
X? ( virtual/x11 ) \
media-libs/fontconfig"
+#
+# Public functions
#
-# Public inheritable functions
-#
-
-font_src_install() {
-
- local suffix, doc
-
- insinto /usr/share/fonts/${PN}
- for suffix in ${FONT_SUFFIX}; do
- doins ${S}/*.${suffix}
- done
-
- rm -f fonts.{dir,scale} encodings.dir
+font_xfont_config() {
# create Xfont files
if [ -n "`use X`" ] ;
@@ -49,14 +41,43 @@ font_src_install() {
mkfontdir \
-e /usr/share/fonts/encodings \
-e /usr/share/fonts/encodings/large \
- -e /usr/X11R6/lib/X11/fonts/encodings ${D}/usr/share/fonts/${PN}
- doins fonts.alias
+ -e /usr/X11R6/lib/X11/fonts/encodings \
+ ${D}/usr/share/fonts/${PN}
+ doins ${FONT_S}/fonts.alias
fi
+}
+
+font_xft_config() {
+
# create fontconfig cache
einfo "Creating fontconfig cache..."
HOME="/root" /usr/bin/fc-cache -f ${D}/usr/share/fonts/${PN}
+}
+
+#
+# Public inheritable functions
+#
+
+font_src_install() {
+
+ local suffix doc
+
+ cd ${FONT_S}
+
+ insinto /usr/share/fonts/${PN}
+
+ for suffix in ${FONT_SUFFIX}; do
+ doins *.${suffix}
+ done
+
+ rm -f fonts.{dir,scale} encodings.dir
+
+ font_xfont_config
+ font_xft_config
+
+ cd ${S}
# try to install some common docs
DOCS="${DOCS} COPYRIGHT README NEWS"
for doc in ${DOCS}; do