On Wednesday, 10 April 2019 15:21:35 CEST Michał Górny wrote: > On Tue, 2019-04-09 at 21:41 +0200, Andreas Sturmlechner wrote: > > On Sonntag, 24. März 2019 19:41:24 CEST Michał Górny wrote: > > > -U9999, please. This is a huge eclass and probably requires more work > > > than you're showing us ;-). > > > > As requested, without any changes to v2 - and if this does not receive > > a reply I'll assume silent ack by fonts proj.
One more time - happy testing, and if anyone answers, font proj is invited as well. --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -4,16 +4,15 @@ # @ECLASS: font.eclass # @MAINTAINER: # [email protected] -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 +# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 # @BLURB: Eclass to make font installation uniform case ${EAPI:-0} in - 0|1|2|3|4|5|6) ;; - *) die "EAPI ${EAPI} is not supported by font.eclass." ;; + 0|1|2|3|4|5|6) inherit eutils ;; + 7) ;; + *) die "EAPI ${EAPI} is not supported by font.eclass." ;; esac -inherit eutils - EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm # @ECLASS-VARIABLE: FONT_SUFFIX @@ -67,18 +66,18 @@ fi # Generate Xorg font files (mkfontscale/mkfontdir). font_xfont_config() { local dir_name - if has X ${IUSE//+} && use X ; then + if in_iuse X && use X ; then dir_name="${1:-${FONT_PN}}" - ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}" - rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts. {dir,scale},encodings.dir} - mkfontscale "${ED}${FONTDIR}/${1//${S}/}" + rm -f "${ED%/}/${FONTDIR}/${1//${S}/}"/{fonts. {dir,scale},encodings.dir} \ + || die "failed to prepare ${FONTDIR}/${1//${S}/}" + 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 \ - "${ED}${FONTDIR}/${1//${S}/}" - eend $? - if [[ -e fonts.alias ]] ; then - doins fonts.alias + "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir" + if [[ -e fonts.alias ]]; then + doins fonts.alias || die "failed to install fonts.alias" # TODO old EAPI cleanup fi fi } @@ -91,7 +90,9 @@ font_fontconfig() { if [[ -n ${FONT_CONF[@]} ]]; then insinto /etc/fonts/conf.avail/ for conffile in "${FONT_CONF[@]}"; do - [[ -e ${conffile} ]] && doins ${conffile} + if [[ -e ${conffile} ]]; then + doins ${conffile} || die "failed to install conf file" # TODO old EAPI cleanup + fi done fi } @@ -105,20 +106,18 @@ font_cleanup_dirs() { local d f g generated candidate otherfile
