commit:     2c473cc94ce9db4342c1fd72085f0debde3bfe2f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 08:52:19 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 08:53:28 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c473cc9

dev-libs/gnulib: adapt gnulib-tool for later versions

install the .sh version so we don't have to go through the dynamic
selector code

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-libs/gnulib/gnulib-2025.08.27.16.03.17.ebuild | 8 ++++++--
 dev-libs/gnulib/gnulib-9999-r1.ebuild             | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-libs/gnulib/gnulib-2025.08.27.16.03.17.ebuild 
b/dev-libs/gnulib/gnulib-2025.08.27.16.03.17.ebuild
index 2e465acb7d0d..e7f744aeb1c7 100644
--- a/dev-libs/gnulib/gnulib-2025.08.27.16.03.17.ebuild
+++ b/dev-libs/gnulib/gnulib-2025.08.27.16.03.17.ebuild
@@ -36,8 +36,12 @@ src_install() {
 
        # install the real script
        exeinto /usr/share/${PN}
-       doexe gnulib-tool
+       doexe gnulib-tool.sh
+
+       # we cannot use the .py impl because it python-exec badly interacts,
+       # so we drop it, and force the .sh version; it's not that it matters
+       # a whole lot, since this is supposed to be run occasionally
 
        # create and install the wrapper
-       dosym ../share/${PN}/gnulib-tool /usr/bin/gnulib-tool
+       dosym ../share/${PN}/gnulib-tool.sh /usr/bin/gnulib-tool
 }

diff --git a/dev-libs/gnulib/gnulib-9999-r1.ebuild 
b/dev-libs/gnulib/gnulib-9999-r1.ebuild
index 10bc9a526f5a..595807bd9e71 100644
--- a/dev-libs/gnulib/gnulib-9999-r1.ebuild
+++ b/dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -34,8 +34,12 @@ src_install() {
 
        # install the real script
        exeinto /usr/share/${PN}
-       doexe gnulib-tool
+       doexe gnulib-tool.sh
+
+       # we cannot use the .py impl because it python-exec badly interacts,
+       # so we drop it, and force the .sh version; it's not that it matters
+       # a whole lot, since this is supposed to be run occasionally
 
        # create and install the wrapper
-       dosym ../share/${PN}/gnulib-tool /usr/bin/gnulib-tool
+       dosym ../share/${PN}/gnulib-tool.sh /usr/bin/gnulib-tool
 }

Reply via email to