From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 0F0CA1581EE for ; Thu, 10 Apr 2025 10:11:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id ECCAE341E1C for ; Thu, 10 Apr 2025 10:11:33 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E89141102B2; Thu, 10 Apr 2025 10:11:32 +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 bobolink.gentoo.org (Postfix) with ESMTPS id E00FB1102B2 for ; Thu, 10 Apr 2025 10:11:32 +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 70209341E1C for ; Thu, 10 Apr 2025 10:11:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C33E71436 for ; Thu, 10 Apr 2025 10:11:30 +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: <1744279841.058ee954aa9cf758dbcb0b28c868948de90da8ba.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/crossdev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/crossdev/crossdev-20250410.ebuild sys-devel/crossdev/crossdev-99999999.ebuild X-VCS-Directories: sys-devel/crossdev/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 058ee954aa9cf758dbcb0b28c868948de90da8ba X-VCS-Branch: master Date: Thu, 10 Apr 2025 10:11:30 +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: a020b5e2-24fe-4db4-86af-6e91df86997e X-Archives-Hash: 8614e78fec817e2742c9ace321701a72 commit: 058ee954aa9cf758dbcb0b28c868948de90da8ba Author: Sam James gentoo org> AuthorDate: Thu Apr 10 10:10:09 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 10 10:10:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=058ee954 sys-devel/crossdev: always sed PV Workaround. See these commits in crossdev.git: commit 301d1bb0c55e2e848a13decae8201e674e1600f7 Author: Sam James gentoo.org> Date: Sat Nov 30 05:12:20 2024 +0000 Makefile: use git describe Lets us handle .1 and so on. Signed-off-by: Sam James gentoo.org> commit 23aab902cc8d2a0ff07d86061af8e3401e990d5f Author: Sam James gentoo.org> Date: Sun Dec 15 18:53:39 2024 +0000 crossdev, Makefile: fix version handling again `git archive` was using HEAD so it wouldn't include the sed performed in the `dist` target. Signed-off-by: Sam James gentoo.org> commit c18f677d742830eef7f88ec5edc3babf25ba803c Author: Sam James gentoo.org> Date: Sun Dec 15 19:00:46 2024 +0000 Revert "crossdev, Makefile: fix version handling again" This reverts commit 681c5fb86714d8e2c585c8e5ae423b6f9364ccfb. Signed-off-by: Sam James gentoo.org> Signed-off-by: Sam James gentoo.org> sys-devel/crossdev/crossdev-20250410.ebuild | 2 ++ sys-devel/crossdev/crossdev-99999999.ebuild | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-devel/crossdev/crossdev-20250410.ebuild b/sys-devel/crossdev/crossdev-20250410.ebuild index 8c7f0315b59a..7c9eb35f4b8f 100644 --- a/sys-devel/crossdev/crossdev-20250410.ebuild +++ b/sys-devel/crossdev/crossdev-20250410.ebuild @@ -33,6 +33,8 @@ src_install() { if [[ ${PV} == "99999999" ]] ; then sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + else + sed -i "s:@CDEVPV@:${PV}:" "${ED}"/usr/bin/crossdev || die fi dodir /usr/share/config.site.d diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild index e90b93fce00b..7c9eb35f4b8f 100644 --- a/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sys-devel/crossdev/crossdev-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -33,6 +33,8 @@ src_install() { if [[ ${PV} == "99999999" ]] ; then sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + else + sed -i "s:@CDEVPV@:${PV}:" "${ED}"/usr/bin/crossdev || die fi dodir /usr/share/config.site.d