diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-03-21 11:28:55 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-03-26 22:30:56 +0100 |
| commit | 9e2e8a5ce45df35952895c01ace0cf743f1ea025 (patch) | |
| tree | 41522803eb00f63c76b498b3766f8b7526379e29 | |
| parent | media-libs/tg_owt: Add missing libXtst dependency (diff) | |
| download | gentoo-9e2e8a5ce45df35952895c01ace0cf743f1ea025.tar.gz gentoo-9e2e8a5ce45df35952895c01ace0cf743f1ea025.tar.bz2 gentoo-9e2e8a5ce45df35952895c01ace0cf743f1ea025.zip | |
font.eclass: Drop EAPI-5 support
Assign inherit guard right on top.
Quote some vars.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/font.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass index e9e448a8155b..5766664cca89 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: # fonts@gentoo.org -# @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 |