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 D58381382C5 for ; Thu, 26 Apr 2018 14:52:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06B68E08E0; Thu, 26 Apr 2018 14:52:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C065FE08E0 for ; Thu, 26 Apr 2018 14:52:43 +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 12025335C43 for ; Thu, 26 Apr 2018 14:52:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C39FE261 for ; Thu, 26 Apr 2018 14:52:39 +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: <1524754355.525a5ca6f6bed2a67a79e376342dc6ccfd838c1d.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: 525a5ca6f6bed2a67a79e376342dc6ccfd838c1d X-VCS-Branch: master Date: Thu, 26 Apr 2018 14:52:39 +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: 41c6f684-3312-4c7a-a98a-f499b80c59bb X-Archives-Hash: 57ffddaf1df064eea71802dadd190853 commit: 525a5ca6f6bed2a67a79e376342dc6ccfd838c1d Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 26 14:49:20 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 26 14:52:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525a5ca6 media-libs/freetype: Ebuild adjustments. Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-libs/freetype/freetype-9999.ebuild | 59 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 4fa091f6769..ba2ddfe1a61 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -3,17 +3,11 @@ EAPI=6 -SCM= -[[ "${PV}" = 9999 ]] && SCM="autotools git-r3" -inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs ${SCM} -unset SCM - -INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch" +inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs DESCRIPTION="A high-quality and portable font engine" HOMEPAGE="https://www.freetype.org/" -IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz - infinality png static-libs utils" +IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils" if [[ "${PV}" != 9999 ]] ; then SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 @@ -23,7 +17,9 @@ if [[ "${PV}" != 9999 ]] ; then doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - IUSE+="doc" + IUSE+=" doc" +else + inherit autotools git-r3 fi LICENSE="|| ( FTL GPL-2+ )" @@ -52,33 +48,37 @@ PATCHES=( "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 ) -src_fetch() { +_egit_repo_handler() { if [[ "${PV}" = 9999 ]] ; then + local phase="${1}" + case ${phase} in + fetch|unpack) + :; + ;; + *) + die "Please use this function with either \"fetch\" or \"unpack\"" + ;; + esac + local EGIT_REPO_URI EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git" - git-r3_src_fetch + git-r3_src_${phase} if use utils ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git" - git-r3_src_fetch + local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" + git-r3_src_${phase} fi else default fi } +src_fetch() { + _egit_repo_handler fetch +} + src_unpack() { - if [[ "${PV}" = 9999 ]] ; then - local EGIT_REPO_URI - EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2.git" - git-r3_src_unpack - if use utils ; then - EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2-demos.git" - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_unpack - fi - else - default - fi + _egit_repo_handler unpack } src_prepare() { @@ -174,8 +174,7 @@ multilib_src_configure() { LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" ) - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_compile() { @@ -199,7 +198,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 } @@ -211,8 +210,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 @@ -222,5 +221,5 @@ multilib_src_install_all() { dodoc -r docs/* fi - prune_libtool_files --all + find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die }