The previous logic incorrectly added IUSE=nls for font-bitstream-100dpi, font-bitstream-75dpi, font-cronyx-cyrillic, font-misc-cyrillic, font-screen-cyrillic, and font-winitzki-cyrillic. This caused "QA Notice: Unrecognized configure options: ..." with USE=-nls.
Closes: https://bugs.gentoo.org/745756 Signed-off-by: Matt Turner <matts...@gentoo.org> --- eclass/xorg-3.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 78c843401cc..515c1aeea2e 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -169,7 +169,13 @@ if [[ ${FONT} == yes ]]; then FONT_DIR=${FONT_DIR/type1/Type1} FONT_DIR=${FONT_DIR/speedo/Speedo} - [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" + case ${PN#font-} in + adobe-100dpi|adobe-utopia-100dpi|bh-100dpi|bh-lucidatypewriter-100dpi|\ + adobe-75dpi |adobe-utopia-75dpi |bh-75dpi |bh-lucidatypewriter-75dpi|\ + misc-misc|schumacher-misc) + IUSE+=" nls" + ;; + esac fi # @ECLASS-VARIABLE: XORG_STATIC -- 2.26.2
