Gentoo Archives: gentoo-commits

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