| 1 |
Presumably in the distant past all font packages did not support this |
| 2 |
option. They do today, so we can simplify our logic. |
| 3 |
|
| 4 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 5 |
--- |
| 6 |
eclass/xorg-3.eclass | 28 +++++----------------------- |
| 7 |
1 file changed, 5 insertions(+), 23 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass |
| 10 |
index 515c1aeea2e..543021af46e 100644 |
| 11 |
--- a/eclass/xorg-3.eclass |
| 12 |
+++ b/eclass/xorg-3.eclass |
| 13 |
@@ -338,30 +338,12 @@ xorg-3_font_configure() { |
| 14 |
debug-print-function ${FUNCNAME} "$@" |
| 15 |
|
| 16 |
if has nls ${IUSE//+} && ! use nls; then |
| 17 |
- if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then |
| 18 |
- FONT_OPTIONS+=" |
| 19 |
- --disable-all-encodings |
| 20 |
- --enable-iso8859-1" |
| 21 |
- else |
| 22 |
- FONT_OPTIONS+=" |
| 23 |
- --disable-iso8859-2 |
| 24 |
- --disable-iso8859-3 |
| 25 |
- --disable-iso8859-4 |
| 26 |
- --disable-iso8859-5 |
| 27 |
- --disable-iso8859-6 |
| 28 |
- --disable-iso8859-7 |
| 29 |
- --disable-iso8859-8 |
| 30 |
- --disable-iso8859-9 |
| 31 |
- --disable-iso8859-10 |
| 32 |
- --disable-iso8859-11 |
| 33 |
- --disable-iso8859-12 |
| 34 |
- --disable-iso8859-13 |
| 35 |
- --disable-iso8859-14 |
| 36 |
- --disable-iso8859-15 |
| 37 |
- --disable-iso8859-16 |
| 38 |
- --disable-jisx0201 |
| 39 |
- --disable-koi8-r" |
| 40 |
+ if ! grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then |
| 41 |
+ die "--disable-all-encodings option not available in configure" |
| 42 |
fi |
| 43 |
+ FONT_OPTIONS+=" |
| 44 |
+ --disable-all-encodings |
| 45 |
+ --enable-iso8859-1" |
| 46 |
fi |
| 47 |
} |
| 48 |
|
| 49 |
-- |
| 50 |
2.26.2 |
Archives