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 BE669138332 for ; Wed, 31 Jan 2018 09:13:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67EAFE0A8D; Wed, 31 Jan 2018 09:13:53 +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 23DB3E0A8D for ; Wed, 31 Jan 2018 09:13:52 +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 1269F335C72 for ; Wed, 31 Jan 2018 09:13:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B20C1D8 for ; Wed, 31 Jan 2018 09:13:49 +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: <1517388252.59ec8745484cfaf0e9d3e9ef41ee2b887921360a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/harfbuzz-9999.ebuild X-VCS-Directories: media-libs/harfbuzz/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 59ec8745484cfaf0e9d3e9ef41ee2b887921360a X-VCS-Branch: master Date: Wed, 31 Jan 2018 09:13:49 +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: ea8c17f1-5d8e-4b63-ac2e-aa93e8fadaf3 X-Archives-Hash: 8e469be7a9bcf31910c170551e24cd09 commit: 59ec8745484cfaf0e9d3e9ef41ee2b887921360a Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 31 08:41:56 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jan 31 08:44:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ec8745 media-libs/harfbuzz: Synced live ebuild. Package-Manager: Portage-2.3.21, Repoman-2.3.6 media-libs/harfbuzz/harfbuzz-9999.ebuild | 48 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index c785260b6c4..3ba2f34c80b 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -1,22 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" -if [[ ${PV} != 9999 ]] ; then +if [[ ${PV} = 9999 ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git" + inherit git-r3 autotools +else SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris" -else - inherit git-r3 autotools - #EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" - EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git" fi LICENSE="Old-MIT ISC icu" @@ -41,10 +40,12 @@ DEPEND="${RDEPEND} " # eautoreconf requires gobject-introspection-common # ragel needed if regenerating *.hh files from *.rl -[[ ${PV} = 9999 ]] && DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel -" +if [[ ${PV} = 9999 ]] ; then + DEPEND+=" + >=dev-libs/gobject-introspection-common-1.34 + dev-util/ragel + " +fi pkg_setup() { use test && python-any-r1_pkg_setup @@ -81,20 +82,21 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ # harfbuzz-gobject only used for instrospection, bug #535852 - econf \ - --without-coretext \ - --without-uniscribe \ - $(use_enable static-libs static) \ - $(multilib_native_use_with cairo) \ - $(use_with fontconfig) \ - $(use_with glib) \ - $(use_with introspection gobject) \ - $(use_with graphite graphite2) \ - $(use_with icu) \ - $(multilib_native_use_enable introspection) \ + local myeconfargs=( + --without-coretext + --without-uniscribe + $(use_enable static-libs static) + $(multilib_native_use_with cairo) + $(use_with fontconfig) + $(use_with glib) + $(use_with introspection gobject) + $(use_with graphite graphite2) + $(use_with icu) + $(multilib_native_use_enable introspection) $(use_with truetype freetype) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" if multilib_is_native_abi; then ln -s "${S}"/docs/html docs/html || die