gui-libs/libdecor: Add multilib support

Needed by x11-apps/mesa-progs. Bug: https://bugs.gentoo.org/894156 Signed-off-by: Matt Turner <[email protected]>
hlein · Apr 18, 2024 · ee10f04 · ee10f04
1 parent 8158197
commit ee10f04
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/gui-libs/libdecor/libdecor-0.2.2.ebuild → gui-libs/libdecor/libdecor-0.2.2-r1.ebuild b/gui-libs/libdecor/libdecor-0.2.2.ebuild → 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
@@ -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
 	)