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 270C31382C5 for ; Fri, 4 Jun 2021 01:14:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CD24E0895; Fri, 4 Jun 2021 01:14:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 E602EE0894 for ; Fri, 4 Jun 2021 01:14:39 +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 100C5340EEF for ; Fri, 4 Jun 2021 01:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 875237B4 for ; Fri, 4 Jun 2021 01:14:35 +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: <1622769255.f7cfb732ef963b902f54d5a28cc047ac1a09ecc6.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pango/pango-1.48.5.ebuild X-VCS-Directories: x11-libs/pango/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f7cfb732ef963b902f54d5a28cc047ac1a09ecc6 X-VCS-Branch: master Date: Fri, 4 Jun 2021 01:14:35 +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: a5799103-7e1b-4a56-9604-aa7084a777be X-Archives-Hash: 0d36e4b6ea82f44de39eef2200bfff54 commit: f7cfb732ef963b902f54d5a28cc047ac1a09ecc6 Author: Matt Turner gentoo org> AuthorDate: Fri May 28 02:07:33 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 4 01:14:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7cfb732 x11-libs/pango: Switch to meson-multilib Signed-off-by: Matt Turner gentoo.org> x11-libs/pango/pango-1.48.5.ebuild | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/x11-libs/pango/pango-1.48.5.ebuild b/x11-libs/pango/pango-1.48.5.ebuild index e0faf298b65..9997edda080 100644 --- a/x11-libs/pango/pango-1.48.5.ebuild +++ b/x11-libs/pango/pango-1.48.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg +inherit gnome2-utils meson-multilib toolchain-funcs xdg DESCRIPTION="Internationalized text layout and rendering library" HOMEPAGE="https://www.pango.org/" @@ -62,28 +62,15 @@ multilib_src_configure() { -Dcairo=enabled -Dfontconfig=enabled -Dfreetype=enabled - -Dgtk_doc="$(multilib_native_usex gtk-doc true false)" - -Dintrospection="$(multilib_native_usex introspection enabled disabled)" + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_feature introspection) -Dinstall-tests=false -Dlibthai=disabled ) meson_src_configure } -muiltilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - multilib_src_install_all() { - einstalldocs if use gtk-doc; then mv "${ED}"/usr/share/doc/{${PN}/reference/,${PF}/html/} || die rmdir "${ED}"/usr/share/doc/${PN} || die