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 0E37B1382C5 for ; Fri, 4 Jun 2021 01:14:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28B9EE0869; Fri, 4 Jun 2021 01:14:37 +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 F0C2AE0869 for ; Fri, 4 Jun 2021 01:14:36 +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 AF8C5340EEF for ; Fri, 4 Jun 2021 01:14:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E302579A for ; Fri, 4 Jun 2021 01:14:33 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1622769250.fefd85b193e5a8b51d86a63def58294831f86e61.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/harfbuzz-2.7.4.ebuild media-libs/harfbuzz/harfbuzz-2.8.0.ebuild media-libs/harfbuzz/harfbuzz-2.8.1.ebuild media-libs/harfbuzz/harfbuzz-9999.ebuild X-VCS-Directories: media-libs/harfbuzz/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: fefd85b193e5a8b51d86a63def58294831f86e61 X-VCS-Branch: master Date: Fri, 4 Jun 2021 01:14:33 +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: f5feb392-ba22-44c0-8f40-fa79ed50d7cc X-Archives-Hash: 6a8bdef1aa68831110e1c30bb9fc77c2 commit: fefd85b193e5a8b51d86a63def58294831f86e61 Author: Matt Turner gentoo org> AuthorDate: Sun May 23 03:47:55 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 4 01:14:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefd85b1 media-libs/harfbuzz: Switch to meson-multilib Signed-off-by: Matt Turner gentoo.org> media-libs/harfbuzz/harfbuzz-2.7.4.ebuild | 30 +++++------------------------- media-libs/harfbuzz/harfbuzz-2.8.0.ebuild | 30 +++++------------------------- media-libs/harfbuzz/harfbuzz-2.8.1.ebuild | 30 +++++------------------------- media-libs/harfbuzz/harfbuzz-9999.ebuild | 30 +++++------------------------- 4 files changed, 20 insertions(+), 100 deletions(-) diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild index faa0655ca20..453389b6331 100644 --- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic meson-multilib python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -73,23 +73,15 @@ src_prepare() { done } -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 emesonargs=( - -Dcairo="$(meson_multilib_native_feature cairo)" + $(meson_native_use_feature cairo) -Dcoretext="disabled" - -Ddocs="$(meson_multilib_native_feature doc)" + $(meson_native_use_feature doc) -Dfontconfig="disabled" #609300 - -Dintrospection="$(meson_multilib_native_feature introspection)" - -Dstatic="$(usex static-libs true false)" + $(meson_native_use_feature introspection) + $(meson_use static-libs static) $(meson_feature glib) $(meson_feature graphite) $(meson_feature icu) @@ -99,15 +91,3 @@ multilib_src_configure() { ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} diff --git a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild index 48efc9f4fcb..9f52c19d342 100644 --- a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic meson-multilib python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -73,23 +73,15 @@ src_prepare() { done } -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 emesonargs=( - -Dcairo="$(meson_multilib_native_feature cairo)" + $(meson_native_use_feature cairo) -Dcoretext="disabled" - -Ddocs="$(meson_multilib_native_feature doc)" + $(meson_native_use_feature doc) -Dfontconfig="disabled" #609300 - -Dintrospection="$(meson_multilib_native_feature introspection)" - -Dstatic="$(usex static-libs true false)" + $(meson_native_use_feature introspection) + $(meson_use static-libs static) $(meson_feature glib) $(meson_feature graphite) $(meson_feature icu) @@ -99,15 +91,3 @@ multilib_src_configure() { ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild index faa0655ca20..453389b6331 100644 --- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic meson-multilib python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -73,23 +73,15 @@ src_prepare() { done } -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 emesonargs=( - -Dcairo="$(meson_multilib_native_feature cairo)" + $(meson_native_use_feature cairo) -Dcoretext="disabled" - -Ddocs="$(meson_multilib_native_feature doc)" + $(meson_native_use_feature doc) -Dfontconfig="disabled" #609300 - -Dintrospection="$(meson_multilib_native_feature introspection)" - -Dstatic="$(usex static-libs true false)" + $(meson_native_use_feature introspection) + $(meson_use static-libs static) $(meson_feature glib) $(meson_feature graphite) $(meson_feature icu) @@ -99,15 +91,3 @@ multilib_src_configure() { ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index 48efc9f4fcb..9f52c19d342 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic meson-multilib python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -73,23 +73,15 @@ src_prepare() { done } -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 emesonargs=( - -Dcairo="$(meson_multilib_native_feature cairo)" + $(meson_native_use_feature cairo) -Dcoretext="disabled" - -Ddocs="$(meson_multilib_native_feature doc)" + $(meson_native_use_feature doc) -Dfontconfig="disabled" #609300 - -Dintrospection="$(meson_multilib_native_feature introspection)" - -Dstatic="$(usex static-libs true false)" + $(meson_native_use_feature introspection) + $(meson_use static-libs static) $(meson_feature glib) $(meson_feature graphite) $(meson_feature icu) @@ -99,15 +91,3 @@ multilib_src_configure() { ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -}