diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2021-05-22 20:53:24 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-06-03 18:14:08 -0700 |
| commit | 41fae73a2628c8b14f0d591c45d29d847f3f03ac (patch) | |
| tree | 74f75f43c9a3580e9879271555397c85ae4d94cc /dev-libs/wayland | |
| parent | dev-libs/tinyxml2: Switch to meson-multilib (diff) | |
| download | gentoo-41fae73a2628c8b14f0d591c45d29d847f3f03ac.tar.gz gentoo-41fae73a2628c8b14f0d591c45d29d847f3f03ac.tar.bz2 gentoo-41fae73a2628c8b14f0d591c45d29d847f3f03ac.zip | |
dev-libs/wayland: Switch to meson-multilib
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-libs/wayland')
| -rw-r--r-- | dev-libs/wayland/wayland-1.19.0.ebuild | 34 | ||||
| -rw-r--r-- | dev-libs/wayland/wayland-9999.ebuild | 34 |
2 files changed, 6 insertions, 62 deletions
diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild index 765bef844873..1e94dde694a5 100644 --- a/dev-libs/wayland/wayland-1.19.0.ebuild +++ b/dev-libs/wayland/wayland-1.19.0.ebuild @@ -10,7 +10,7 @@ else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -inherit meson multilib-minimal +inherit meson-multilib DESCRIPTION="Wayland protocol libraries" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" @@ -35,40 +35,16 @@ DEPEND=" " RDEPEND="${DEPEND}" -meson_multilib() { - if multilib_is_native_abi; then - echo true - else - echo false - fi -} - -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1"; then - echo true - else - echo false - fi -} - multilib_src_configure() { local emesonargs=( - -Ddocumentation=$(meson_multilib_native_use doc) - -Ddtd_validation=$(meson_multilib) + $(meson_native_use_bool doc documentation) + $(meson_native_true dtd_validation) -Dlibraries=true -Dscanner=false ) meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - src_test() { # We set it on purpose to only a short subdir name, as socket paths are # created in there, which are 108 byte limited. With this it hopefully @@ -79,7 +55,3 @@ src_test() { multilib-minimal_src_test } - -multilib_src_install() { - meson_src_install -} diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild index d069ea46340e..058e90a73824 100644 --- a/dev-libs/wayland/wayland-9999.ebuild +++ b/dev-libs/wayland/wayland-9999.ebuild @@ -10,7 +10,7 @@ else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -inherit meson multilib-minimal +inherit meson-multilib DESCRIPTION="Wayland protocol libraries" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" @@ -35,40 +35,16 @@ DEPEND=" " RDEPEND="${DEPEND}" -meson_multilib() { - if multilib_is_native_abi; then - echo true - else - echo false - fi -} - -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1"; then - echo true - else - echo false - fi -} - multilib_src_configure() { local emesonargs=( - -Ddocumentation=$(meson_multilib_native_use doc) - -Ddtd_validation=$(meson_multilib) + $(meson_native_use_bool doc documentation) + $(meson_native_true dtd_validation) -Dlibraries=true -Dscanner=false ) meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - src_test() { # We set it on purpose to only a short subdir name, as socket paths are # created in there, which are 108 byte limited. With this it hopefully @@ -79,7 +55,3 @@ src_test() { multilib-minimal_src_test } - -multilib_src_install() { - meson_src_install -} |