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 B587B138334 for ; Tue, 9 Apr 2019 19:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 215E9E08F6; Tue, 9 Apr 2019 19:42:04 +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 AE9AEE08E5 for ; Tue, 9 Apr 2019 19:42:03 +0000 (UTC) Received: from tuxbrain.localnet (188-22-101-193.adsl.highway.telekom.at [188.22.101.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: asturm) by smtp.gentoo.org (Postfix) with ESMTPSA id A190A335CDE for ; Tue, 9 Apr 2019 19:42:01 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH] font.eclass: Port to EAPI-7 Date: Tue, 09 Apr 2019 21:41:41 +0200 Message-ID: <4600891.LxcutymfD9@tuxbrain> In-Reply-To: <5ccc85650ff65a817046f5d81dd3ba20b3968158.camel@gentoo.org> References: <9898161.uzqcMZjEFU@tuxk10> <5ccc85650ff65a817046f5d81dd3ba20b3968158.camel@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: ec492808-fb67-466e-89be-885b9c189a92 X-Archives-Hash: f4267299592cb32b6b74a43aa4d3a6ae On Sonntag, 24. M=C3=A4rz 2019 19:41:24 CEST Micha=C5=82 G=C3=B3rny 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. =2D-- a/eclass/font.eclass 2019-04-04 08:28:12.336171811 +0200 +++ b/eclass/font.eclass 2019-03-25 20:34:15.306062926 +0100 @@ -1,254 +1,257 @@ =2D# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 # @ECLASS: font.eclass # @MAINTAINER: # fonts@gentoo.org # @BLURB: Eclass to make font installation uniform =20 case ${EAPI:-0} in =2D 0|1|2|3|4|5|6) ;; =2D *) 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 =20 =2Dinherit eutils =2D EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm =20 # @ECLASS-VARIABLE: FONT_SUFFIX # @DEFAULT_UNSET # @REQUIRED # @DESCRIPTION: # Space delimited list of font suffixes to install. FONT_SUFFIX=3D${FONT_SUFFIX:-} =20 # @ECLASS-VARIABLE: FONT_S # @REQUIRED # @DESCRIPTION: # Space delimited list of directories containing the fonts. FONT_S=3D${FONT_S:-${S}} =20 # @ECLASS-VARIABLE: FONT_PN # @DESCRIPTION: # Font name (ie. last part of FONTDIR). FONT_PN=3D${FONT_PN:-${PN}} =20 # @ECLASS-VARIABLE: FONTDIR # @DESCRIPTION: # Full path to installation directory. FONTDIR=3D${FONTDIR:-/usr/share/fonts/${FONT_PN}} =20 # @ECLASS-VARIABLE: FONT_CONF # @DEFAULT_UNSET # @DESCRIPTION: # Array containing fontconfig conf files to install. FONT_CONF=3D( "" ) =20 # @ECLASS-VARIABLE: DOCS # @DEFAULT_UNSET # @DESCRIPTION: # Space delimited list of docs to install. # We always install these: # COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt DOCS=3D${DOCS:-} =20 IUSE=3D"X" =20 DEPEND=3D"X? ( || ( >=3Dx11-apps/mkfontscale-1.2.0 x11-apps/mkfontdir ) media-fonts/encodings )" RDEPEND=3D"" =20 # @FUNCTION: font_xfont_config # @DESCRIPTION: # Generate Xorg font files (mkfontscale/mkfontdir). font_xfont_config() { local dir_name if has X ${IUSE//+} && use X ; then dir_name=3D"${1:-${FONT_PN}}" + rm -f "${ED%/}/${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir}= \ + || die "failed to prepare ${FONTDIR}/${1//${S}/}" ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}" =2D rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} =2D mkfontscale "${ED}${FONTDIR}/${1//${S}/}" + 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 \ =2D "${ED}${FONTDIR}/${1//${S}/}" =2D eend $? =2D if [[ -e fonts.alias ]] ; then =2D doins fonts.alias + "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir" + if ! eend $? ; then + die "failed to run mkfontscale or mkfontdir" fi + [[ -e fonts.alias ]] && doins fonts.alias fi } =20 # @FUNCTION: font_fontconfig # @DESCRIPTION: # Install fontconfig conf files given in FONT_CONF. font_fontconfig() { local conffile if [[ -n ${FONT_CONF[@]} ]]; then insinto /etc/fonts/conf.avail/ for conffile in "${FONT_CONF[@]}"; do [[ -e ${conffile} ]] && doins ${conffile} done fi } =20 # @FUNCTION: font_cleanup_dirs # @DESCRIPTION: # Remove font directories containing only generated files. font_cleanup_dirs() { local genfiles=3D"encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts= =2Escale" # fonts.alias isn't generated but it's a special case (see below). local d f g generated candidate otherfile =20 ebegin "Cleaning up font directories" =2D find -L "${EROOT}"usr/share/fonts/ -type d -print0 | while read -d $'\0= ' d; do + while read d; do candidate=3Dfalse otherfile=3Dfalse for f in "${d}"/*; do generated=3Dfalse # make sure this is a file and not a subdir [[ -e ${f} || -L ${f} ]] || continue for g in ${genfiles}; do if [[ ${f##*/} =3D=3D ${g} ]]; then # this is a generated file generated=3Dtrue break fi done # if the file is a generated file then we know this is a font dir (as # opposed to something like encodings or util) and a candidate for # removal. if it's not generated then it's an "otherfile". ${generated} && candidate=3Dtrue || otherfile=3Dtrue # if the directory is both a candidate for removal and contains at # least one "otherfile" then don't remove it. [[ ${candidate} =3D=3D ${otherfile} ]] && break done # if in the end we only have generated files, purge the directory. if [[ ${candidate} =3D=3D true && ${otherfile} =3D=3D false ]]; then # we don't want to remove fonts.alias files that were installed by # media-fonts/font-alias. any other fonts.alias files will have # already been unmerged with their packages. for g in ${genfiles}; do =2D [[ ${g} !=3D fonts.alias && ( -e ${d}/${g} || -L ${d}/${g} ) ]] \ =2D && rm "${d}"/${g} + if [[ ${g} !=3D fonts.alias && ( -e ${d}/${g} || -L ${d}/${g} ) ]] ; t= hen + rm "${d}"/${g} || eerror "failed to remove ${d}/${g}" + fi done # if there's nothing left remove the directory =2D find "${d}" -maxdepth 0 -type d -empty -exec rmdir '{}' \; + find "${d}" -maxdepth 0 -type d -empty -delete || eerror "failed to pur= ge ${d}" fi =2D done + done < <(find -L "${EROOT%/}"/usr/share/fonts/ -type d -print0) eend 0 } =20 # @FUNCTION: font_pkg_setup # @DESCRIPTION: # The font pkg_setup function. # Collision protection and Prefix compat for eapi < 3. font_pkg_setup() { # Prefix compat case ${EAPI:-0} in 0|1|2) if ! use prefix; then EPREFIX=3D ED=3D${D} EROOT=3D${ROOT} [[ ${EROOT} =3D */ ]] || EROOT+=3D"/" fi ;; esac =20 # make sure we get no collisions # setup is not the nicest place, but preinst doesn't cut it =2D [[ -e "${EROOT}/${FONTDIR}/fonts.cache-1" ]] && rm -f "${EROOT}/${FONTD= IR}/fonts.cache-1" + if [[ -e "${EROOT%/}/${FONTDIR}/fonts.cache-1" ]] ; then + rm "${EROOT%/}/${FONTDIR}/fonts.cache-1" || die "failed to remove fonts.= cache-1" + fi } =20 # @FUNCTION: font_src_install # @DESCRIPTION: # The font src_install function. font_src_install() { local dir suffix commondoc =20 set -- ${FONT_S:-${S}} if [[ $# -gt 1 ]]; then # if we have multiple FONT_S elements then we want to recreate the dir # structure for dir in ${FONT_S}; do pushd "${dir}" > /dev/null insinto "${FONTDIR}/${dir//${S}/}" for suffix in ${FONT_SUFFIX}; do doins *.${suffix} done font_xfont_config "${dir}" popd > /dev/null done else pushd "${FONT_S}" > /dev/null insinto "${FONTDIR}" for suffix in ${FONT_SUFFIX}; do doins *.${suffix} done font_xfont_config popd > /dev/null fi =20 font_fontconfig =20 =2D [[ -n ${DOCS} ]] && { dodoc ${DOCS} || die "docs installation failed" ;= } + [[ -n ${DOCS} ]] && dodoc ${DOCS} =20 # install common docs for commondoc in COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONT= LOG.txt; do [[ -s ${commondoc} ]] && dodoc ${commondoc} done } =20 +# @FUNCTION: _update_fontcache +# @DESCRIPTION: +# Updates fontcache if !prefix and media-libs/fontconfig installed +_update_fontcache() { + # unreadable font files =3D fontconfig segfaults + find "${EROOT%/}"/usr/share/fonts/ -type f '!' -perm 0644 \ + -exec chmod -v 0644 2>/dev/null {} + || die "failed to fix font files pe= rms" + + if [[ -z ${ROOT%/} ]] ; then + if has_version media-libs/fontconfig ; then + ebegin "Updating global fontcache" + fc-cache -fs + if ! eend $? ; then + die "failed to update global fontcache" + fi + else + einfo "Skipping fontcache update (media-libs/fontconfig not installed)" + fi + else + einfo "Skipping fontcache update (ROOT !=3D /)" + fi +} + # @FUNCTION: font_pkg_postinst # @DESCRIPTION: # The font pkg_postinst function. font_pkg_postinst() { =2D # unreadable font files =3D fontconfig segfaults =2D find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ =2D | xargs -0 chmod -v 0644 2>/dev/null =2D if [[ -n ${FONT_CONF[@]} ]]; then local conffile =2D echo elog "The following fontconfig configuration files have been installed:" elog for conffile in "${FONT_CONF[@]}"; do =2D if [[ -e ${EROOT}etc/fonts/conf.avail/$(basename ${conffile}) ]]; then =2D elog " $(basename ${conffile})" + if [[ -e "${EROOT%/}"/etc/fonts/conf.avail/${conffile##*/} ]]; then + elog " ${conffile##*/}" fi done elog elog "Use \`eselect fontconfig\` to enable/disable them." =2D echo fi =20 =2D if has_version media-libs/fontconfig && [[ ${ROOT} =3D=3D / ]]; then =2D ebegin "Updating global fontcache" =2D fc-cache -fs =2D eend $? =2D else =2D einfo "Skipping fontcache update (media-libs/fontconfig is not install= ed or ROOT !=3D /)" =2D fi + _update_fontcache } =20 # @FUNCTION: font_pkg_postrm # @DESCRIPTION: # The font pkg_postrm function. font_pkg_postrm() { font_cleanup_dirs =2D =2D # unreadable font files =3D fontconfig segfaults =2D find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \ =2D | xargs -0 chmod -v 0644 2>/dev/null =2D =2D if has_version media-libs/fontconfig && [[ ${ROOT} =3D=3D / ]]; then =2D ebegin "Updating global fontcache" =2D fc-cache -fs =2D eend $? =2D else =2D einfo "Skipping fontcache update (media-libs/fontconfig is not install= ed or ROOT !=3D /)" =2D fi + _update_fontcache }