diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-30 05:57:41 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-30 05:57:41 +0000 |
| commit | 5e8f467ba8074acb489c88448ba47ae770dea7b5 (patch) | |
| tree | 9f148d6a9cbab0f7c7daac988235715ddc185b57 /eclass/x-modular.eclass | |
| parent | Some initial changes so x-modular.eclass can start using this: Allow for DOCS... (diff) | |
| download | gentoo-2-5e8f467ba8074acb489c88448ba47ae770dea7b5.tar.gz gentoo-2-5e8f467ba8074acb489c88448ba47ae770dea7b5.tar.bz2 gentoo-2-5e8f467ba8074acb489c88448ba47ae770dea7b5.zip | |
Start using font.eclass: Replace create_font_cache() code with a call to font_pkg_postinst(), and call font_pkg_postrm() in x-modular_pkg_postrm(). Also move EXPORT_FUNCTIONS down to the bottom so font.eclass functions don't override x-modular.eclass ones.
Diffstat (limited to 'eclass/x-modular.eclass')
| -rw-r--r-- | eclass/x-modular.eclass | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index ff153baf6a21..1cc3575ba26e 100644 --- a/eclass/x-modular.eclass +++ b/eclass/x-modular.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.77 2006/10/30 05:44:33 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.78 2006/10/30 05:57:41 dberkholz Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -25,9 +25,7 @@ # # Pretty much everything else should be automatic. -EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm - -inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools +inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools font # Directory prefix to use for everything XDIR="/usr" @@ -379,6 +377,7 @@ x-modular_pkg_postinst() { x-modular_pkg_postrm() { if [[ -n "${FONT}" ]]; then cleanup_fonts + font_pkg_postrm fi } @@ -533,12 +532,7 @@ fix_font_permissions() { } create_font_cache() { - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then - ebegin "Creating FC font cache" - HOME="/root" ${ROOT}/usr/bin/fc-cache - eend 0 - fi + font_pkg_postinst } + +EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm |