Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 03 Mar 2019 21:56:25
Message-Id: 1551650155.8be275f708c9bfdc96919446d6fa3e0e1c1ba7b2.mattst88@gentoo
1 commit: 8be275f708c9bfdc96919446d6fa3e0e1c1ba7b2
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 3 21:34:14 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 3 21:55:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be275f7
7
8 xorg-2.eclass: Allow for only >=x11-apps/mkfontscale-1.2.0
9
10 mkfontdir is now part of mkfontscale-1.2.0.
11
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 eclass/xorg-2.eclass | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-)
16
17 diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
18 index 416a3ae30ec..9ec458e27bb 100644
19 --- a/eclass/xorg-2.eclass
20 +++ b/eclass/xorg-2.eclass
21 @@ -136,8 +136,7 @@ unset EAUTORECONF_DEPEND
22
23 if [[ ${FONT} == yes ]]; then
24 RDEPEND+=" media-fonts/encodings
25 - x11-apps/mkfontscale
26 - x11-apps/mkfontdir"
27 + || ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )"
28 PDEPEND+=" media-fonts/font-alias"
29 DEPEND+=" >=media-fonts/font-util-1.2.0"