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 C6C48138359 for ; Fri, 14 Aug 2020 18:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B921E0826; Fri, 14 Aug 2020 18:31:56 +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 E5FC7E0826 for ; Fri, 14 Aug 2020 18:31:55 +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 E593934F03A for ; Fri, 14 Aug 2020 18:31:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94B20310 for ; Fri, 14 Aug 2020 18:31:53 +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: <1597429910.97a9ebee14662e1625865b25213674a9d7508943.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: 97a9ebee14662e1625865b25213674a9d7508943 X-VCS-Branch: master Date: Fri, 14 Aug 2020 18:31:53 +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: 6871146b-a35c-43ba-9a14-549cd187905e X-Archives-Hash: b1a90ff932cf8765644c5b1c852b400f commit: 97a9ebee14662e1625865b25213674a9d7508943 Author: Lars Wendler gentoo org> AuthorDate: Fri Aug 14 18:31:21 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Aug 14 18:31:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a9ebee media-libs/harfbuzz: Synced live ebuild Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> media-libs/harfbuzz/harfbuzz-9999.ebuild | 63 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index 8bb87bd9b55..774a139ec6a 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic libtool meson multilib-minimal python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -54,15 +54,6 @@ src_prepare() { xdg_environment_reset - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - fi - sed -i \ -e 's:tests/macos.tests::' \ test/shaping/data/in-house/Makefile.sources \ @@ -73,38 +64,46 @@ src_prepare() { echo "EXTRA_DIST = " > gtk-doc.make fi - eautoreconf - elibtoolize # for Solaris - # bug 618772 append-cxxflags -std=c++14 } +meson_multilib_native_feature() { + if multilib_is_native_abi && use "$1" ; then + echo "enabled" + else + echo "disabled" + fi +} + multilib_src_configure() { # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable doc gtk-doc-html) - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) + local emesonargs=( + -Dcairo="$(meson_multilib_native_feature cairo)" + -Dcoretext="disabled" + -Ddocs="$(meson_multilib_native_feature doc)" + -Dfontconfig="disabled" #609300 + #-Dgobject="$(meson_multilib_native_feature introspection)" + -Dintrospection="$(meson_multilib_native_feature introspection)" + -Dstatic="$(usex static-libs true false)" + $(meson_feature glib) + $(meson_feature graphite) + $(meson_feature icu) + $(meson_feature introspection gobject) + $(meson_feature test tests) + $(meson_feature truetype freetype) ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + meson_src_configure +} - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install } multilib_src_install_all() { einstalldocs - find "${ED}" -type f -name "*.la" -delete || die }