From: Matt Turner <mattst88@gentoo.org>
Date: Mon, 17 Jun 2019 16:23:47 +0000 (-0400)
Subject: xorg-2.eclass: Drop x11-apps/mkfontdir
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d61e1c4d44ff0401accf9aa4b596ba0a6c11c0c2;p=gentoo.git

xorg-2.eclass: Drop x11-apps/mkfontdir

Now that x11-apps/mkfontscale 1.2.0 is stable everywhere, we can drop
this.

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

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 6034da49bc32..b5563616bbd5 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -137,10 +137,10 @@ unset EAUTORECONF_DEPEND
 
 if [[ ${FONT} == yes ]]; then
 	RDEPEND+=" media-fonts/encodings
-		|| ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )"
+		>=x11-apps/mkfontscale-1.2.0"
 	PDEPEND+=" media-fonts/font-alias"
 	DEPEND+=" >=media-fonts/font-util-1.2.0
-		|| ( >=x11-apps/mkfontscale-1.2.0 ( x11-apps/mkfontscale x11-apps/mkfontdir ) )"
+		>=x11-apps/mkfontscale-1.2.0"
 
 	# @ECLASS-VARIABLE: FONT_DIR
 	# @DESCRIPTION: