summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-09-30 22:16:26 -0700
committerMatt Turner <mattst88@gentoo.org>2020-10-02 18:31:50 -0700
commitcccad072a5d9305f493edffb3963fa0a212b34da (patch)
tree401264a0732b5134076fce98e563a0a1f83d9da0 /eclass/xorg-3.eclass
parentxorg-3.eclass: Drop font IUSE=nls handling (diff)
downloadgentoo-cccad072a5d9305f493edffb3963fa0a212b34da.tar.gz
gentoo-cccad072a5d9305f493edffb3963fa0a212b34da.tar.bz2
gentoo-cccad072a5d9305f493edffb3963fa0a212b34da.zip
xorg-3.eclass: Require --disable-all-encodings for fonts
Presumably in the distant past all font packages did not support this option. They do today, so we can simplify our logic. Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'eclass/xorg-3.eclass')
-rw-r--r--eclass/xorg-3.eclass28
1 files changed, 5 insertions, 23 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index af28f6fa30d5..7b4c7f97deb5 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -330,30 +330,12 @@ xorg-3_font_configure() {
debug-print-function ${FUNCNAME} "$@"
if has nls ${IUSE//+} && ! use nls; then
- if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
- FONT_OPTIONS+="
- --disable-all-encodings
- --enable-iso8859-1"
- else
- FONT_OPTIONS+="
- --disable-iso8859-2
- --disable-iso8859-3
- --disable-iso8859-4
- --disable-iso8859-5
- --disable-iso8859-6
- --disable-iso8859-7
- --disable-iso8859-8
- --disable-iso8859-9
- --disable-iso8859-10
- --disable-iso8859-11
- --disable-iso8859-12
- --disable-iso8859-13
- --disable-iso8859-14
- --disable-iso8859-15
- --disable-iso8859-16
- --disable-jisx0201
- --disable-koi8-r"
+ if ! grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
+ die "--disable-all-encodings option not available in configure"
fi
+ FONT_OPTIONS+="
+ --disable-all-encodings
+ --enable-iso8859-1"
fi
}