commit: e9e83e797b43d263c2f92fe40be366b403a9c282 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri May 28 01:33:40 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Jun 4 01:14:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e83e79
x11-libs/pixman: Switch to meson-multilib Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/pixman/pixman-0.40.0.ebuild | 12 ++---------- x11-libs/pixman/pixman-9999.ebuild | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild index daac7421675..65d7123b398 100644 --- a/x11-libs/pixman/pixman-0.40.0.ebuild +++ b/x11-libs/pixman/pixman-0.40.0.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs +inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -45,15 +45,7 @@ multilib_src_configure() { meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { export OMP_NUM_THREADS=$(makeopts_jobs) - meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" -} - -multilib_src_install() { - meson_src_install + meson_src_test -t 100 } diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index 316d0b79f70..d79304a2d1a 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs +inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" @@ -45,15 +45,7 @@ multilib_src_configure() { meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { export OMP_NUM_THREADS=$(makeopts_jobs) - meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" -} - -multilib_src_install() { - meson_src_install + meson_src_test -t 100 }