diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2013-06-09 02:08:23 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-06-09 02:08:23 +0000 |
| commit | 13da1534afa7d34096cbdb3a75d3de50942f0a34 (patch) | |
| tree | 80ba4944b7adb51e9a33850c1fd320f91438650d /eclass | |
| parent | updating horizon-9999 deps (diff) | |
| download | gentoo-2-13da1534afa7d34096cbdb3a75d3de50942f0a34.tar.gz gentoo-2-13da1534afa7d34096cbdb3a75d3de50942f0a34.tar.bz2 gentoo-2-13da1534afa7d34096cbdb3a75d3de50942f0a34.zip | |
Do not require fontconfig at runtime, it isn't necessary for many purposes, thanks to Nikoli for the original patch
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/font.eclass | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 31eb2855578a..9c9e4d83f405 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.851 2013/06/07 20:59:13 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.852 2013/06/09 02:08:23 lu_zero Exp $ + + 09 Jun 2013; Luca Barbato <lu_zero@gentoo.org> font.eclass: + Do not require fontconfig at runtime, it isn't necessary for many purposes, + thanks to Nikoli for the original patch 07 Jun 2013; Mike Gilbert <floppym@gentoo.org> autotools-utils.eclass: Convert econfargs from an ECLASS-VARIABLE to a function-specifc VARIABLE for diff --git a/eclass/font.eclass b/eclass/font.eclass index 98d6af9309a1..c3642a2b20ef 100644 --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.55 2013/04/05 13:25:25 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.56 2013/06/09 02:08:23 lu_zero Exp $ # @ECLASS: font.eclass # @MAINTAINER: @@ -56,7 +56,7 @@ DEPEND="X? ( media-fonts/encodings ) >=media-libs/fontconfig-2.4.0" -RDEPEND="${DEPEND}" +RDEPEND="" # @FUNCTION: font_xfont_config # @DESCRIPTION: @@ -211,7 +211,7 @@ font_pkg_postinst() { echo fi - if [[ ${ROOT} == / ]]; then + if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then ebegin "Updating global fontcache" fc-cache -fs eend $? @@ -228,7 +228,7 @@ font_pkg_postrm() { find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ | xargs -0 chmod -v 0644 2>/dev/null - if [[ ${ROOT} == / ]]; then + if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then ebegin "Updating global fontcache" fc-cache -fs eend $? |