Gentoo Archives: gentoo-dev

From: Matt Turner <mattst88@g.o>
To: gentoo-dev@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-dev] [PATCH 1/2] xorg-3.eclass: Drop font IUSE=nls handling
Date: Thu, 01 Oct 2020 22:32:34
Message-Id: 20201001223225.1178905-1-mattst88@gentoo.org
1 The previous logic incorrectly added IUSE=nls for font-bitstream-100dpi,
2 font-bitstream-75dpi, font-cronyx-cyrillic, font-misc-cyrillic,
3 font-screen-cyrillic, and font-winitzki-cyrillic. This caused
4 "QA Notice: Unrecognized configure options: ..." with USE=-nls.
5
6 Instead, we'll simply have IUSE="nls" in the packages' ebuilds that need
7 it.
8
9 Closes: https://bugs.gentoo.org/745756
10 Signed-off-by: Matt Turner <mattst88@g.o>
11 ---
12 eclass/xorg-3.eclass | 2 --
13 1 file changed, 2 deletions(-)
14
15 diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
16 index 78c843401cc..af28f6fa30d 100644
17 --- a/eclass/xorg-3.eclass
18 +++ b/eclass/xorg-3.eclass
19 @@ -168,8 +168,6 @@ if [[ ${FONT} == yes ]]; then
20 FONT_DIR=${FONT_DIR/otf/OTF}
21 FONT_DIR=${FONT_DIR/type1/Type1}
22 FONT_DIR=${FONT_DIR/speedo/Speedo}
23 -
24 - [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls"
25 fi
26
27 # @ECLASS-VARIABLE: XORG_STATIC
28 --
29 2.26.2