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 8645E138336 for ; Tue, 18 Sep 2018 07:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53636E0E09; Tue, 18 Sep 2018 07:16:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0FAACE0E09 for ; Tue, 18 Sep 2018 07:16:11 +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 7E4EC335CDC for ; Tue, 18 Sep 2018 07:16:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3FF03D9 for ; Tue, 18 Sep 2018 07:16:08 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1537254953.c99288edb7c658dafa1cd8056ab44f4569ad5075.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/fontconfig/fontconfig-2.13.1.ebuild X-VCS-Directories: media-libs/fontconfig/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c99288edb7c658dafa1cd8056ab44f4569ad5075 X-VCS-Branch: master Date: Tue, 18 Sep 2018 07:16:08 +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-Archives-Salt: d667f42a-d786-4f2c-a3f2-9d34afd748c7 X-Archives-Hash: 350974746418feda80b216acba1a751a commit: c99288edb7c658dafa1cd8056ab44f4569ad5075 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Tue Sep 18 04:13:11 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Sep 18 07:15:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99288ed media-libs/fontconfig: Various fixes mostly related to EAPI="7". Move CBUILD-side tools from DEPEND to BDEPEND. Add [${MULTILIB_USEDEP}] to dependency on virtual/pkgconfig. Fix usage of ${ED}, ${ROOT}, ${EROOT}. Closes: https://bugs.gentoo.org/666418 media-libs/fontconfig/fontconfig-2.13.1.ebuild | 36 ++++++++++++++------------ 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/media-libs/fontconfig/fontconfig-2.13.1.ebuild b/media-libs/fontconfig/fontconfig-2.13.1.ebuild index 3b995391a94..6d02affef22 100644 --- a/media-libs/fontconfig/fontconfig-2.13.1.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.1.ebuild @@ -15,6 +15,13 @@ SLOT="1.0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc static-libs" +BDEPEND="dev-util/gperf + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig[${MULTILIB_USEDEP}] + doc? ( + =app-text/docbook-sgml-dtd-3.1* + app-text/docbook-sgml-utils[jadetex] + )" # Purposefully dropped the xml USE flag and libxml2 support. Expat is the # default and used by every distro. See bug #283191. RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] @@ -22,12 +29,7 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] !elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) elibc_Darwin? ( sys-libs/native-uuid ) virtual/libintl[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/gperf - >=sys-devel/gettext-0.19.8 - doc? ( =app-text/docbook-sgml-dtd-3.1* - app-text/docbook-sgml-utils[jadetex] )" +DEPEND="${RDEPEND}" PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts" @@ -46,7 +48,7 @@ pkg_setup() { DOC_CONTENTS="Please make fontconfig configuration changes using \`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be overwritten. If you need to reset your configuration to upstream defaults, - delete the directory ${EROOT%/}/etc/fonts/conf.d/ and re-emerge fontconfig." + delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig." } src_prepare() { @@ -116,9 +118,9 @@ multilib_src_install_all() { dodoc doc/fontconfig-user.{txt,pdf} - if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then - mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die - rm -rf "${ED}"usr/share/doc/fontconfig + if [[ -e ${ED}/usr/share/doc/fontconfig/ ]]; then + mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die + rm -rf "${ED}"/usr/share/doc/fontconfig fi # Changes should be made to /etc/fonts/local.conf, and as we had @@ -144,11 +146,11 @@ pkg_preinst() { for file in "${EROOT}"/etc/fonts/conf.avail/*; do f=${file##*/} if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ - && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null + [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \ + && ln -sf ../conf.avail/"${f}" "${ED}"/etc/fonts/conf.d/ &>/dev/null else - [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ - && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null + [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \ + && rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null fi done fi @@ -156,12 +158,12 @@ pkg_preinst() { } pkg_postinst() { - einfo "Cleaning broken symlinks in ${EROOT%/}/etc/fonts/conf.d/" - find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete + einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/" + find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete readme.gentoo_print_elog - if [[ ${ROOT} = / ]]; then + if [[ ${ROOT} == "" ]]; then multilib_pkg_postinst() { ebegin "Creating global font cache for ${ABI}" "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf