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.

Instead, we'll simply have IUSE="nls" in the packages' ebuilds that need
it.

Closes: https://bugs.gentoo.org/745756
Signed-off-by: Matt Turner <matts...@gentoo.org>
---
 eclass/xorg-3.eclass | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 78c843401cc..af28f6fa30d 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -168,8 +168,6 @@ if [[ ${FONT} == yes ]]; then
        FONT_DIR=${FONT_DIR/otf/OTF}
        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"
 fi
 
 # @ECLASS-VARIABLE: XORG_STATIC
-- 
2.26.2


Reply via email to