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 28FEC138334 for ; Fri, 15 Mar 2019 17:14:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20EFEE0A0B; Fri, 15 Mar 2019 17:14:14 +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 DBF1AE0A0B for ; Fri, 15 Mar 2019 17:14:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 71496335CF7 for ; Fri, 15 Mar 2019 17:14:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2C79560 for ; Fri, 15 Mar 2019 17:14:10 +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: <1552670044.8908efb62371e75c7e5d82450d22913d624addc2.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freetype/freetype-9999.ebuild X-VCS-Directories: media-libs/freetype/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8908efb62371e75c7e5d82450d22913d624addc2 X-VCS-Branch: master Date: Fri, 15 Mar 2019 17:14:10 +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: 0e80c9d3-3233-4213-a3f5-1fd33c12e95c X-Archives-Hash: 8f78f8aad2b3b108e1ef1861820f0c02 commit: 8908efb62371e75c7e5d82450d22913d624addc2 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 15 17:11:56 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 15 17:14:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8908efb6 media-libs/freetype: Bumped live ebuild to EAPI-7 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> media-libs/freetype/freetype-9999.ebuild | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index e9f895c9ce0..2563974f72b 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs +inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs DESCRIPTION="A high-quality and portable font engine" HOMEPAGE="https://www.freetype.org/" @@ -26,7 +26,8 @@ LICENSE="|| ( FTL GPL-2+ )" SLOT="2" RESTRICT="!bindist? ( bindist )" # bug 541408 -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) @@ -37,8 +38,10 @@ RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( @@ -71,11 +74,11 @@ _egit_repo_handler() { } src_fetch() { - _egit_repo_handler fetch + _egit_repo_handler ${EBUILD_PHASE} } src_unpack() { - _egit_repo_handler unpack + _egit_repo_handler ${EBUILD_PHASE} } src_prepare() { @@ -207,7 +210,7 @@ multilib_src_install() { local ft2demo for ft2demo in ../ft2demos-${PV}/bin/*; do ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ - "${ED%/}"/usr/bin || die + "${ED}"/usr/bin || die done fi } @@ -219,8 +222,8 @@ multilib_src_install_all() { local header find src/truetype include/freetype/internal -name '*.h' | \ while read header; do - mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die done fi