From f63afe9ec4120f88614a9dff14168744ab88f6fa Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Mon, 17 Jun 2019 12:31:14 -0400
Subject: [PATCH] xorg-2.eclass: Rewrite font code as a case statement

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 eclass/xorg-2.eclass | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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
-- 
2.26.2