From: Matt Turner <mattst88@gentoo.org>
Date: Mon, 17 Jun 2019 16:31:14 +0000 (-0400)
Subject: xorg-2.eclass: Rewrite font code as a case statement
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f63afe9ec4120f88614a9dff14168744ab88f6fa;p=gentoo.git

xorg-2.eclass: Rewrite font code as a case statement

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

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index b5563616bbd5..95345042a998 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -28,13 +28,16 @@ fi
 
 # If we're a font package, but not the font.alias one
 FONT_ECLASS=""
-if [[ ${PN} == font* \
-	&& ${CATEGORY} = media-fonts \
-	&& ${PN} != font-alias \
-	&& ${PN} != font-util ]]; then
-	# Activate font code in the rest of the eclass
-	FONT="yes"
-	FONT_ECLASS="font"
+if [[ ${CATEGORY} = media-fonts ]]; then
+	case ${PN} in
+	font-alias|font-util)
+		;;
+	font*)
+		# Activate font code in the rest of the eclass
+		FONT="yes"
+		FONT_ECLASS="font"
+		;;
+	esac
 fi
 
 # @ECLASS-VARIABLE: XORG_MULTILIB