| 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 |
Closes: https://bugs.gentoo.org/745756 |
| 7 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 8 |
--- |
| 9 |
eclass/xorg-3.eclass | 8 +++++++- |
| 10 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 11 |
|
| 12 |
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass |
| 13 |
index 78c843401cc..515c1aeea2e 100644 |
| 14 |
--- a/eclass/xorg-3.eclass |
| 15 |
+++ b/eclass/xorg-3.eclass |
| 16 |
@@ -169,7 +169,13 @@ if [[ ${FONT} == yes ]]; then |
| 17 |
FONT_DIR=${FONT_DIR/type1/Type1} |
| 18 |
FONT_DIR=${FONT_DIR/speedo/Speedo} |
| 19 |
|
| 20 |
- [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" |
| 21 |
+ case ${PN#font-} in |
| 22 |
+ adobe-100dpi|adobe-utopia-100dpi|bh-100dpi|bh-lucidatypewriter-100dpi|\ |
| 23 |
+ adobe-75dpi |adobe-utopia-75dpi |bh-75dpi |bh-lucidatypewriter-75dpi|\ |
| 24 |
+ misc-misc|schumacher-misc) |
| 25 |
+ IUSE+=" nls" |
| 26 |
+ ;; |
| 27 |
+ esac |
| 28 |
fi |
| 29 |
|
| 30 |
# @ECLASS-VARIABLE: XORG_STATIC |
| 31 |
-- |
| 32 |
2.26.2 |
Archives