This way, user won't end up with invalid fonts in the listings (and thus segfaulting xfontsel).
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=384649 --- xorg-2.eclass | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xorg-2.eclass b/xorg-2.eclass index 173f7bf..f7dee80 100644 --- a/xorg-2.eclass +++ b/xorg-2.eclass @@ -478,7 +478,11 @@ xorg-2_src_install() { xorg-2_pkg_postinst() { debug-print-function ${FUNCNAME} "$@" - [[ -n ${FONT} ]] && setup_fonts "$@" + if [[ -n ${FONT} ]]; then + create_fonts_scale + create_fonts_dir + font_pkg_postinst "$@" + fi } # @FUNCTION: xorg-2_pkg_postrm @@ -488,18 +492,14 @@ xorg-2_pkg_postinst() { xorg-2_pkg_postrm() { debug-print-function ${FUNCNAME} "$@" - [[ -n ${FONT} ]] && font_pkg_postrm "$@" -} - -# @FUNCTION: setup_fonts -# @DESCRIPTION: -# Generates needed files for fonts and fixes font permissions -setup_fonts() { - debug-print-function ${FUNCNAME} "$@" - - create_fonts_scale - create_fonts_dir - font_pkg_postinst + if [[ -n ${FONT} ]]; then + # if we're doing an upgrade, postinst will do + if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then + create_fonts_scale + create_fonts_dir + font_pkg_postrm "$@" + fi + fi } # @FUNCTION: remove_font_metadata -- 1.7.7
