From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12F9D1382C5 for ; Fri, 26 Mar 2021 21:32:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FD69E070D; Fri, 26 Mar 2021 21:32:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38398E070D for ; Fri, 26 Mar 2021 21:32:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E4C2335D51 for ; Fri, 26 Mar 2021 21:32:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 020305D2 for ; Fri, 26 Mar 2021 21:32:21 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1616794256.9e2e8a5ce45df35952895c01ace0cf743f1ea025.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/font.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9e2e8a5ce45df35952895c01ace0cf743f1ea025 X-VCS-Branch: master Date: Fri, 26 Mar 2021 21:32:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d02409ee-4783-4223-a145-b8e787ca3494 X-Archives-Hash: 9cd8bebe38d0914e3e3f5f9f6718db8c commit: 9e2e8a5ce45df35952895c01ace0cf743f1ea025 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 21 10:28:55 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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: # 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