From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 834881382C5 for ; Fri, 4 Jun 2021 01:14:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29E98E0894; Fri, 4 Jun 2021 01:14:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CC3DE0894 for ; Fri, 4 Jun 2021 01:14:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21302340EF9 for ; Fri, 4 Jun 2021 01:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99E277B5 for ; Fri, 4 Jun 2021 01:14:35 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1622769256.e9e83e797b43d263c2f92fe40be366b403a9c282.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pixman/pixman-0.40.0.ebuild x11-libs/pixman/pixman-9999.ebuild X-VCS-Directories: x11-libs/pixman/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e9e83e797b43d263c2f92fe40be366b403a9c282 X-VCS-Branch: master Date: Fri, 4 Jun 2021 01:14:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b8425b8-1a22-445b-af39-d72f2a27161e X-Archives-Hash: 1c91af5df4a8f9983a9f55624c02fe64 commit: e9e83e797b43d263c2f92fe40be366b403a9c282 Author: Matt Turner gentoo org> AuthorDate: Fri May 28 01:33:40 2021 +0000 Commit: Matt Turner gentoo 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 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 }