summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2013-07-25 13:13:18 +0000
committerPeter Volkov <pva@gentoo.org>2013-07-25 13:13:18 +0000
commited7a55405ede4c8267a4afcbf394e992612e479e (patch)
treec8bf73eb9277dd06fdb76cf889509437ca6772b8 /eclass
parentFix sed bogus from previous commit (diff)
downloadhistorical-ed7a55405ede4c8267a4afcbf394e992612e479e.tar.gz
historical-ed7a55405ede4c8267a4afcbf394e992612e479e.tar.bz2
historical-ed7a55405ede4c8267a4afcbf394e992612e479e.zip
Droped media-libs/fontconfig dependency, bug 446012.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/font.eclass9
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index cbacbcc52140..a61aeb20b30e 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.893 2013/07/25 07:51:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.894 2013/07/25 13:13:18 pva Exp $
+
+ 25 Jul 2013; Peter Volkov <pva@gentoo.org> font.eclass:
+ Droped media-libs/fontconfig dependency, bug 446012.
25 Jul 2013; Michał Górny <mgorny@gentoo.org> vcs-snapshot.eclass:
Add some debug.
diff --git a/eclass/font.eclass b/eclass/font.eclass
index c3642a2b20ef..1dfa75cffb81 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -1,6 +1,6 @@
# 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.56 2013/06/09 02:08:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.57 2013/07/25 13:13:18 pva Exp $
# @ECLASS: font.eclass
# @MAINTAINER:
@@ -54,8 +54,7 @@ IUSE="X"
DEPEND="X? (
x11-apps/mkfontdir
media-fonts/encodings
- )
- >=media-libs/fontconfig-2.4.0"
+ )"
RDEPEND=""
# @FUNCTION: font_xfont_config
@@ -215,6 +214,8 @@ font_pkg_postinst() {
ebegin "Updating global fontcache"
fc-cache -fs
eend $?
+ else
+ einfo "Skipping fontcache update (media-libs/fontconfig is not installed or ROOT != /)"
fi
}
@@ -232,5 +233,7 @@ font_pkg_postrm() {
ebegin "Updating global fontcache"
fc-cache -fs
eend $?
+ else
+ einfo "Skipping fontcache update (media-libs/fontconfig is not installed or ROOT != /)"
fi
}