commit: ee10f04c52f6035be1f878cc99cf20633ca7d588 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Apr 18 17:03:58 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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 )
