diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
| commit | d4bd6695641f6d2ec7ff8681913d304e995902f5 (patch) | |
| tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /eclass/xorg-2.eclass | |
| parent | 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (diff) | |
gentoo resync : 29.05.2018
Diffstat (limited to 'eclass/xorg-2.eclass')
| -rw-r--r-- | eclass/xorg-2.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 9322e1aebce2..75167988eedd 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -60,7 +60,7 @@ esac EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} IUSE="" -HOMEPAGE="https://www.x.org/wiki/" +HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/" # @ECLASS-VARIABLE: XORG_EAUTORECONF # @DESCRIPTION: @@ -156,7 +156,7 @@ if [[ ${FONT} == yes ]]; then # Set up configure options, wrapped so ebuilds can override if need be [[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\"" - [[ ${PN##*-} = misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" + [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" fi # If we're a driver package, then enable DRIVER case @@ -364,7 +364,8 @@ xorg-2_font_configure() { if has nls ${IUSE//+} && ! use nls; then if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then FONT_OPTIONS+=" - --disable-all-encodings" + --disable-all-encodings + --enable-iso8859-1" else FONT_OPTIONS+=" --disable-iso8859-2 @@ -514,6 +515,8 @@ xorg-2_pkg_postinst() { create_fonts_scale create_fonts_dir font_pkg_postinst "$@" + + ewarn "Installed fonts changed. Run 'xset fp rehash' if you are using non-fontconfig applications." fi } |