/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.47 Revision 1.48
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.47 2006/03/09 20:39:30 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.48 2006/03/21 00:31:11 spyderous Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
316 316
317 # Don't install libtool archives for server modules 317 # Don't install libtool archives for server modules
318 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 318 if [[ -e ${D}/usr/lib/xorg/modules ]]; then
319 find ${D}/usr/lib/xorg/modules -name '*.la' \ 319 find ${D}/usr/lib/xorg/modules -name '*.la' \
320 | xargs rm -f 320 | xargs rm -f
321 fi
322
323 # Don't install overlapping fonts.* files
324 # Generate them instead when possible
325 if [[ -n "${FONT}" ]]; then
326 remove_font_metadata
321 fi 327 fi
322} 328}
323 329
324x-modular_pkg_preinst() { 330x-modular_pkg_preinst() {
325 if [[ -n "${FONT}" ]]; then 331 if [[ -n "${FONT}" ]]; then
383 389
384 create_fonts_scale 390 create_fonts_scale
385 create_fonts_dir 391 create_fonts_dir
386 fix_font_permissions 392 fix_font_permissions
387 create_font_cache 393 create_font_cache
394}
395
396remove_font_metadata() {
397 local DIR
398 for DIR in ${FONT_DIR}; do
399 if [[ "${DIR}" != "Speedo" ]] && \
400 [[ "${DIR}" != "CID" ]] ; then
401 # Delete font metadata files
402 # fonts.scale, fonts.dir, fonts.cache-1
403 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
404 fi
405 done
388} 406}
389 407
390discover_font_dirs() { 408discover_font_dirs() {
391 pushd ${IMAGE}/usr/share/fonts 409 pushd ${IMAGE}/usr/share/fonts
392 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 410 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.48

  ViewVC Help
Powered by ViewVC 1.1.20