commit:     058ee954aa9cf758dbcb0b28c868948de90da8ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 10:10:09 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <sam <AT> gentoo.org>

commit 23aab902cc8d2a0ff07d86061af8e3401e990d5f
Author: Sam James <sam <AT> 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 <sam <AT> gentoo.org>

commit c18f677d742830eef7f88ec5edc3babf25ba803c
Author: Sam James <sam <AT> 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 <sam <AT> gentoo.org>

Signed-off-by: Sam James <sam <AT> 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

Reply via email to