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, 26 May 2018 20:30:55
Message-Id: 1527366586.a5dc6c8c29e7de309f921841e8eb4d2741c80563.mattst88@gentoo
1 commit: a5dc6c8c29e7de309f921841e8eb4d2741c80563
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 26 20:25:07 2018 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat May 26 20:29:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5dc6c8c
7
8 xorg-2.eclass: Limit adding IUSE=nls to packages without support
9
10 Of media-fonts/font-*-misc only font-misc-misc and font-schumacher-misc
11 have nls support. Adding IUSE=nls to the others just causes warnings.
12
13 Closes: https://bugs.gentoo.org/499800
14
15 eclass/xorg-2.eclass | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
19 index f321d69bcbe..08051fe1fa7 100644
20 --- a/eclass/xorg-2.eclass
21 +++ b/eclass/xorg-2.eclass
22 @@ -156,7 +156,7 @@ if [[ ${FONT} == yes ]]; then
23 # Set up configure options, wrapped so ebuilds can override if need be
24 [[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\""
25
26 - [[ ${PN##*-} = misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls"
27 + [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls"
28 fi
29
30 # If we're a driver package, then enable DRIVER case