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 A6D2A15802E for ; Tue, 25 Jun 2024 04:10:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9E11E2A1E; Tue, 25 Jun 2024 04:10:20 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B948E2A1E for ; Tue, 25 Jun 2024 04:10:20 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2EC37335D64 for ; Tue, 25 Jun 2024 04:10:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 885E61D31 for ; Tue, 25 Jun 2024 04:10:17 +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: <1719288537.00134303fd6b8946bcfae64b4da24ecd9ac3e348.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: 00134303fd6b8946bcfae64b4da24ecd9ac3e348 X-VCS-Branch: master Date: Tue, 25 Jun 2024 04:10:17 +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: 3f23d645-320c-4df4-861d-c861b8f13812 X-Archives-Hash: abbe80d15bca09034fb3b6f4466de3f3 commit: 00134303fd6b8946bcfae64b4da24ecd9ac3e348 Author: Sam James gentoo org> AuthorDate: Tue Jun 25 04:08:38 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 25 04:08:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00134303 sys-apps/gentoo-functions: update live Incorporate changes from kerframil for prefix required for latest git changes. Signed-off-by: Sam James gentoo.org> .../gentoo-functions/gentoo-functions-9999.ebuild | 28 +++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild index 54a24d65f0a1..864663a97757 100644 --- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild +++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild @@ -1,8 +1,13 @@ -# Copyright 2014-2023 Gentoo Authors +# Copyright 2014-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit meson + +DESCRIPTION="Base functions required by all Gentoo systems" +HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git" + if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git" @@ -11,11 +16,6 @@ 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 meson - -DESCRIPTION="Base functions required by all Gentoo systems" -HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git" - LICENSE="GPL-2 public-domain" SLOT="0" IUSE="test" @@ -34,3 +34,19 @@ src_configure() { meson_src_configure } + +src_install() { + meson_src_install + + if [[ ${EPREFIX} ]]; then + while read -r; do + if [[ ${REPLY} == $'\t'genfun_prefix= ]]; then + printf 'genfun_prefix=%q\n' "${EPREFIX}" + else + printf '%s\n' "${REPLY}" + fi || ! break + done < "${ED}/lib/gentoo/functions.sh" > "${T}/functions.sh" \ + && mv -- "${T}/functions.sh" "${ED}/lib/gentoo/functions.sh" \ + || die + fi +}