From ee10f04c52f6035be1f878cc99cf20633ca7d588 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 18 Apr 2024 13:03:58 -0400
Subject: gui-libs/libdecor: Add multilib support

Needed by x11-apps/mesa-progs.

Bug: https://bugs.gentoo.org/894156
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 gui-libs/libdecor/libdecor-0.2.2-r1.ebuild | 54 ++++++++++++++++++++++++++++++
 gui-libs/libdecor/libdecor-0.2.2.ebuild    | 54 ------------------------------
 gui-libs/libdecor/libdecor-9999.ebuild     | 16 ++++-----
 3 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 gui-libs/libdecor/libdecor-0.2.2-r1.ebuild
 delete mode 100644 gui-libs/libdecor/libdecor-0.2.2.ebuild

(limited to 'gui-libs/libdecor')

diff --git a/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild b/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..c868676829a1
--- /dev/null
+++ b/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="A client-side decorations library for Wayland clients"
+HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="+dbus +gtk examples"
+
+RDEPEND="
+	>=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
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/wayland-protocols-1.15
+"
+
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Avoid auto-magic, built-in feature of meson
+		-Dauto_features=disabled
+		$(meson_feature gtk)
+		$(meson_feature dbus)
+		$(meson_native_use_bool examples demo)
+		-Dinstall_demo=true
+	)
+
+	meson_src_configure
+}
diff --git a/gui-libs/libdecor/libdecor-0.2.2.ebuild b/gui-libs/libdecor/libdecor-0.2.2.ebuild
deleted file mode 100644
index 2d21ad63368e..000000000000
--- a/gui-libs/libdecor/libdecor-0.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="A client-side decorations library for Wayland clients"
-HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-LICENSE="MIT"
-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 )
-	examples? (
-		media-libs/libglvnd
-		x11-libs/libxkbcommon
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-libs/wayland-protocols-1.15
-"
-
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-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)
-		-Dinstall_demo=true
-	)
-
-	meson_src_configure
-}
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
 	)
 
-- 
cgit v1.2.3-65-gdbad