From: Matt Turner <mattst88@gentoo.org>
Date: Sun, 3 Mar 2019 21:34:14 +0000 (-0800)
Subject: xorg-2.eclass: Allow for only >=x11-apps/mkfontscale-1.2.0
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8be275f708c9bfdc96919446d6fa3e0e1c1ba7b2;p=gentoo.git

xorg-2.eclass: Allow for only >=x11-apps/mkfontscale-1.2.0

mkfontdir is now part of mkfontscale-1.2.0.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 416a3ae30ec0..9ec458e27bb8 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -136,8 +136,7 @@ unset EAUTORECONF_DEPEND
 
 if [[ ${FONT} == yes ]]; then
 	RDEPEND+=" media-fonts/encodings
-		x11-apps/mkfontscale
-		x11-apps/mkfontdir"
+		|| ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )"
 	PDEPEND+=" media-fonts/font-alias"
 	DEPEND+=" >=media-fonts/font-util-1.2.0"