commit: 9e2e8a5ce45df35952895c01ace0cf743f1ea025 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 21 10:28:55 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 26 21:30:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e2e8a5c
font.eclass: Drop EAPI-5 support Assign inherit guard right on top. Quote some vars. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/font.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/font.eclass b/eclass/font.eclass index e9e448a8155..5766664cca8 100644 --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -1,19 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: font.eclass # @MAINTAINER: # [email protected] -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Eclass to make font installation uniform case ${EAPI:-0} in - [56]) inherit eutils ;; + 6) inherit eutils ;; 7) ;; *) die "EAPI ${EAPI} is not supported by font.eclass." ;; esac if [[ ! ${_FONT_ECLASS} ]]; then +_FONT_ECLASS=1 EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm @@ -75,8 +76,8 @@ font_xfont_config() { einfo "Creating fonts.scale & fonts.dir in ${dir_name##*/}" mkfontscale "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.scale" mkfontdir \ - -e ${EPREFIX}/usr/share/fonts/encodings \ - -e ${EPREFIX}/usr/share/fonts/encodings/large \ + -e "${EPREFIX}"/usr/share/fonts/encodings \ + -e "${EPREFIX}"/usr/share/fonts/encodings/large \ "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir" [[ -e fonts.alias ]] && doins fonts.alias fi @@ -254,5 +255,4 @@ font_pkg_postrm() { _update_fontcache } -_FONT_ECLASS=1 fi
