From 5cf7f902db2342f20458880557d2b90188d36a49 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 27 May 2021 18:44:04 -0700 Subject: [PATCH] dev-cpp/glibmm: Switch to meson-multilib Signed-off-by: Matt Turner --- dev-cpp/glibmm/glibmm-2.66.1.ebuild | 18 +++--------------- dev-cpp/glibmm/glibmm-2.68.1.ebuild | 18 +++--------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/dev-cpp/glibmm/glibmm-2.66.1.ebuild b/dev-cpp/glibmm/glibmm-2.66.1.ebuild index b72aa8858b3cf..8a7bb6f7d9a9c 100644 --- a/dev-cpp/glibmm/glibmm-2.66.1.ebuild +++ b/dev-cpp/glibmm/glibmm-2.66.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit gnome.org meson multilib-minimal python-any-r1 +inherit gnome.org meson-multilib python-any-r1 DESCRIPTION="C++ interface for glib2" HOMEPAGE="https://www.gtkmm.org" @@ -46,21 +46,9 @@ multilib_src_configure() { local emesonargs=( -Dwarnings=min -Dbuild-deprecated-api=true - -Dbuild-documentation=$(usex doc true false) - -Ddebug-refcounting=$(usex debug true false) + $(meson_native_use_bool doc build-documentation) + $(meson_use debug debug-refcounting) -Dbuild-examples=false ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} diff --git a/dev-cpp/glibmm/glibmm-2.68.1.ebuild b/dev-cpp/glibmm/glibmm-2.68.1.ebuild index 2cf6d1781f546..a40dc5dd7ad12 100644 --- a/dev-cpp/glibmm/glibmm-2.68.1.ebuild +++ b/dev-cpp/glibmm/glibmm-2.68.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit gnome.org meson multilib-minimal python-any-r1 +inherit gnome.org meson-multilib python-any-r1 DESCRIPTION="C++ interface for glib2" HOMEPAGE="https://www.gtkmm.org" @@ -44,21 +44,9 @@ multilib_src_configure() { local emesonargs=( -Dwarnings=min -Dbuild-deprecated-api=true - -Dbuild-documentation=$(usex doc true false) - -Ddebug-refcounting=$(usex debug true false) + $(meson_native_use_bool doc build-documentation) + $(meson_use debug debug-refcounting) -Dbuild-examples=false ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -}