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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C0E6158043 for ; Thu, 18 Apr 2024 17:58:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EC812BC014; Thu, 18 Apr 2024 17:58:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13E8F2BC014 for ; Thu, 18 Apr 2024 17:58:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DCF13434A0 for ; Thu, 18 Apr 2024 17:58:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91311171E for ; Thu, 18 Apr 2024 17:58:30 +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: <1713463089.ee10f04c52f6035be1f878cc99cf20633ca7d588.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/libdecor/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-libs/libdecor/libdecor-0.2.2-r1.ebuild gui-libs/libdecor/libdecor-0.2.2.ebuild gui-libs/libdecor/libdecor-9999.ebuild X-VCS-Directories: gui-libs/libdecor/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: ee10f04c52f6035be1f878cc99cf20633ca7d588 X-VCS-Branch: master Date: Thu, 18 Apr 2024 17:58:30 +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: b3d9b54a-611e-4837-978d-90095bd7c3b6 X-Archives-Hash: 49f43e3a8fdabae714c08770b79462e3 commit: ee10f04c52f6035be1f878cc99cf20633ca7d588 Author: Matt Turner gentoo org> AuthorDate: Thu Apr 18 17:03:58 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Apr 18 17:58:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee10f04c gui-libs/libdecor: Add multilib support Needed by x11-apps/mesa-progs. Bug: https://bugs.gentoo.org/894156 Signed-off-by: Matt Turner gentoo.org> .../{libdecor-0.2.2.ebuild => libdecor-0.2.2-r1.ebuild} | 16 ++++++++-------- gui-libs/libdecor/libdecor-9999.ebuild | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gui-libs/libdecor/libdecor-0.2.2.ebuild b/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild similarity index 75% rename from gui-libs/libdecor/libdecor-0.2.2.ebuild rename to gui-libs/libdecor/libdecor-0.2.2-r1.ebuild index 2d21ad63368e..c868676829a1 100644 --- a/gui-libs/libdecor/libdecor-0.2.2.ebuild +++ b/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson +inherit meson-multilib DESCRIPTION="A client-side decorations library for Wayland clients" HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor" @@ -19,11 +19,11 @@ SLOT="0" IUSE="+dbus +gtk examples" RDEPEND=" - >=dev-libs/wayland-1.18 - x11-libs/pango - x11-libs/cairo - dbus? ( sys-apps/dbus ) - gtk? ( x11-libs/gtk+:3 ) + >=dev-libs/wayland-1.18[${MULTILIB_USEDEP}] + x11-libs/pango[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) examples? ( media-libs/libglvnd x11-libs/libxkbcommon @@ -40,13 +40,13 @@ BDEPEND=" virtual/pkgconfig " -src_configure() { +multilib_src_configure() { local emesonargs=( # Avoid auto-magic, built-in feature of meson -Dauto_features=disabled $(meson_feature gtk) $(meson_feature dbus) - $(meson_use examples demo) + $(meson_native_use_bool examples demo) -Dinstall_demo=true ) diff --git a/gui-libs/libdecor/libdecor-9999.ebuild b/gui-libs/libdecor/libdecor-9999.ebuild index 2d21ad63368e..c868676829a1 100644 --- a/gui-libs/libdecor/libdecor-9999.ebuild +++ b/gui-libs/libdecor/libdecor-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson +inherit meson-multilib DESCRIPTION="A client-side decorations library for Wayland clients" HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor" @@ -19,11 +19,11 @@ SLOT="0" IUSE="+dbus +gtk examples" RDEPEND=" - >=dev-libs/wayland-1.18 - x11-libs/pango - x11-libs/cairo - dbus? ( sys-apps/dbus ) - gtk? ( x11-libs/gtk+:3 ) + >=dev-libs/wayland-1.18[${MULTILIB_USEDEP}] + x11-libs/pango[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) examples? ( media-libs/libglvnd x11-libs/libxkbcommon @@ -40,13 +40,13 @@ BDEPEND=" virtual/pkgconfig " -src_configure() { +multilib_src_configure() { local emesonargs=( # Avoid auto-magic, built-in feature of meson -Dauto_features=disabled $(meson_feature gtk) $(meson_feature dbus) - $(meson_use examples demo) + $(meson_native_use_bool examples demo) -Dinstall_demo=true )