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 5A78515802E for ; Tue, 25 Jun 2024 04:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D54AE2A56; Tue, 25 Jun 2024 04:48:49 +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 2FF07E2A56 for ; Tue, 25 Jun 2024 04:48:49 +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 3DFFD341E1C for ; Tue, 25 Jun 2024 04:48:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2B25126B for ; Tue, 25 Jun 2024 04:48:46 +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: <1719290884.adeacceebb6a1ac395c69be6d3b3eac55e0fc316.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-build/meson/meson-1.5.0_rc1.ebuild dev-build/meson/meson-9999.ebuild X-VCS-Directories: dev-build/meson/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: adeacceebb6a1ac395c69be6d3b3eac55e0fc316 X-VCS-Branch: master Date: Tue, 25 Jun 2024 04:48:46 +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: 79712ee1-ab07-4524-aef8-6c7d974d1766 X-Archives-Hash: 7eeaf37428b19e8b6e68c9f3fb193bb6 commit: adeacceebb6a1ac395c69be6d3b3eac55e0fc316 Author: Eli Schwartz gmail com> AuthorDate: Tue Jun 25 04:42:32 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 25 04:48:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adeaccee dev-build/meson: actually commit the change to support release candidates The manpage needs to be installed via the correct name as downloaded. This was normally correct but for release candidates we need to map a gentoo version to an upstream version. We did this at download time, just not in src_install. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> dev-build/meson/meson-1.5.0_rc1.ebuild | 2 +- dev-build/meson/meson-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-build/meson/meson-1.5.0_rc1.ebuild b/dev-build/meson/meson-1.5.0_rc1.ebuild index b65657a09c33..2a1d8a788dbb 100644 --- a/dev-build/meson/meson-1.5.0_rc1.ebuild +++ b/dev-build/meson/meson-1.5.0_rc1.ebuild @@ -175,6 +175,6 @@ python_install_all() { if [[ ${PV} = *9999* ]]; then DESTDIR="${ED}" eninja -C docs/builddir install else - newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3 + newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 fi } diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild index b65657a09c33..2a1d8a788dbb 100644 --- a/dev-build/meson/meson-9999.ebuild +++ b/dev-build/meson/meson-9999.ebuild @@ -175,6 +175,6 @@ python_install_all() { if [[ ${PV} = *9999* ]]; then DESTDIR="${ED}" eninja -C docs/builddir install else - newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3 + newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 fi }