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 5F128159C9B for ; Mon, 5 Aug 2024 02:16:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1BC2E2B27; Mon, 5 Aug 2024 02:16:27 +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 80ACDE2B27 for ; Mon, 5 Aug 2024 02:16:27 +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 817FD335D6B for ; Mon, 5 Aug 2024 02:16:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E25171E80 for ; Mon, 5 Aug 2024 02:16:24 +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: <1722824161.57bb72792b70a1fed1dcdea4f3345c7e049d51e1.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-1.7-r1.ebuild sys-apps/gentoo-functions/gentoo-functions-1.7.ebuild X-VCS-Directories: sys-apps/gentoo-functions/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 57bb72792b70a1fed1dcdea4f3345c7e049d51e1 X-VCS-Branch: master Date: Mon, 5 Aug 2024 02:16:24 +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: 15064b5d-b104-4262-a9a4-a7c0be39e458 X-Archives-Hash: bf71606cb7b90682f60124a5c1f71f70 commit: 57bb72792b70a1fed1dcdea4f3345c7e049d51e1 Author: Sam James gentoo org> AuthorDate: Mon Aug 5 02:14:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 5 02:16:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57bb7279 sys-apps/gentoo-functions: fix 1.7 ebuild to be based upon 9999 Kerin rightly points out I used the wrong template. I never normally get that wrong :( Signed-off-by: Sam James gentoo.org> ...s-1.7.ebuild => gentoo-functions-1.7-r1.ebuild} | 26 +++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.7.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.7-r1.ebuild similarity index 73% rename from sys-apps/gentoo-functions/gentoo-functions-1.7.ebuild rename to sys-apps/gentoo-functions/gentoo-functions-1.7-r1.ebuild index 8df3a1e88bad..864663a97757 100644 --- a/sys-apps/gentoo-functions/gentoo-functions-1.7.ebuild +++ b/sys-apps/gentoo-functions/gentoo-functions-1.7-r1.ebuild @@ -3,6 +3,11 @@ 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 +}