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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7842315810F for ; Fri, 9 Jun 2023 11:18:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC83FE07DB; Fri, 9 Jun 2023 11:18:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0DEBE07DB for ; Fri, 9 Jun 2023 11:18:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8530C340C98 for ; Fri, 9 Jun 2023 11:18:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20DE0A82 for ; Fri, 9 Jun 2023 11:18:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1686309500.cd5b335d325a481ebab4893805cf4b1f0f99e28c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-functions/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/gentoo-functions/gentoo-functions-9999.ebuild X-VCS-Directories: sys-apps/gentoo-functions/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cd5b335d325a481ebab4893805cf4b1f0f99e28c X-VCS-Branch: master Date: Fri, 9 Jun 2023 11:18:28 +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: 6cffc3f3-0f2d-485d-bb42-b586304ef326 X-Archives-Hash: 529f6630dc2a27a21be9cb3ddf1b913f commit: cd5b335d325a481ebab4893805cf4b1f0f99e28c Author: Sam James gentoo org> AuthorDate: Fri Jun 9 11:12:37 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 9 11:18:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5b335d sys-apps/gentoo-functions: update for meson Signed-off-by: Sam James gentoo.org> sys-apps/gentoo-functions/gentoo-functions-9999.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild index d704dea16611..b43489741598 100644 --- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild +++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild @@ -11,20 +11,26 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi -inherit toolchain-funcs flag-o-matic +inherit meson DESCRIPTION="Base functions required by all Gentoo systems" HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git" LICENSE="GPL-2" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" # Specifically needs GNU find, as well. RDEPEND=">=sys-apps/findutils-4.9" src_configure() { - tc-export CC - append-lfs-flags - export ROOTPREFIX="${EPREFIX}" - export PREFIX="${EPREFIX}/usr" + local emesonargs=( + # Deliberately avoid /usr as consumers assume we're at /lib/gentoo. + --prefix="${EPREFIX:-/}" + --mandir="${EPREFIX}/usr/share/man" + $(meson_use test tests) + ) + + meson_src_configure }