commit: f63afe9ec4120f88614a9dff14168744ab88f6fa
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 16:31:14 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 17:13:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63afe9e
xorg-2.eclass: Rewrite font code as a case statement
Signed-off-by: Matt Turner <mattst88 <AT> 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 b5563616bbd..95345042a99 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
