From bfd1656fb5f4d4644f3e15cdbbbce4df8044b6ec Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 27 May 2021 18:03:47 -0700 Subject: [PATCH] dev-libs/libevdev: Switch to meson-multilib Signed-off-by: Matt Turner --- dev-libs/libevdev/libevdev-1.11.0.ebuild | 12 ++---------- dev-libs/libevdev/libevdev-9999.ebuild | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild index bdb10dff9669b..01acbddf9775a 100644 --- a/dev-libs/libevdev/libevdev-1.11.0.ebuild +++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson multilib-minimal python-any-r1 +inherit meson-multilib python-any-r1 DESCRIPTION="Handler library for evdev events" HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev" @@ -38,16 +38,8 @@ multilib_src_configure() { meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" -} - -multilib_src_install() { - meson_src_install + meson_src_test -t 100 } multilib_src_install_all() { diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild index 11acafcb22949..7a92403df4306 100644 --- a/dev-libs/libevdev/libevdev-9999.ebuild +++ b/dev-libs/libevdev/libevdev-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson multilib-minimal python-any-r1 +inherit meson-multilib python-any-r1 DESCRIPTION="Handler library for evdev events" HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev" @@ -38,16 +38,8 @@ multilib_src_configure() { meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" -} - -multilib_src_install() { - meson_src_install + meson_src_test -t 100 } multilib_src_install_all() {