[gentoo-commits] repo/gentoo:master commit in: app-arch/gzip/

[Sam James]

commit:     75180a96ea6c34e3f37b5c623ceeae66119d5bd7
Author:     Patrick Williams <patrick <AT> stwcx <DOT> xyz>
AuthorDate: Sat Jan 14 15:57:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 17:10:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75180a96

app-arch/gzip: remove gzip-reference exec fixups

`gunzip` and `zcat` are shellscripts provided by gzip that redirect to
the `gzip` executable (with flags added for the desired behavior).
Some development tools, such as bitbake from Yocto Linux, sanitize the
PATH to remove `/usr/bin` and `/bin`, but create symlinks for specific
tools into a directory that is in the path ('hosttools' for
Yocto/bitbake).  This means that the original executables (gzip, gunzip
zcat) are in the PATH but the new `*-reference` files are not.

Remove the fixups from `gunzip` and `zcat` that exec to `gzip-reference`
directly and instead let them use the `gzip` (which is likely symlinked
to the real `gzip-reference`) directly.

Signed-off-by: Patrick Williams <patrick <AT> stwcx.xyz>
Closes: https://github.com/gentoo/gentoo/pull/29104
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/gzip/{gzip-1.12-r3.ebuild => gzip-1.12-r4.ebuild}              | 2 --
 .../gzip/{gzip-1.12_p20221228.ebuild => gzip-1.12_p20221228-r1.ebuild}  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app-arch/gzip/gzip-1.12-r3.ebuild 
b/app-arch/gzip/gzip-1.12-r4.ebuild
similarity index 96%
rename from app-arch/gzip/gzip-1.12-r3.ebuild
rename to app-arch/gzip/gzip-1.12-r4.ebuild
index 652ddbb3151e..acc085235bb1 100644
--- a/app-arch/gzip/gzip-1.12-r3.ebuild
+++ b/app-arch/gzip/gzip-1.12-r4.ebuild
@@ -56,8 +56,6 @@ src_install() {
        for x in gunzip gzip zcat; do
                mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
        done
-       sed -i -e 's:exec gzip:&-reference:' \
-               "${ED}"/bin/{gunzip,zcat}-reference || die
        mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
        rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
 }

diff --git a/app-arch/gzip/gzip-1.12_p20221228.ebuild 
b/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
similarity index 96%
rename from app-arch/gzip/gzip-1.12_p20221228.ebuild
rename to app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
index 5e5dd9d96e0a..23e799f74e59 100644
--- a/app-arch/gzip/gzip-1.12_p20221228.ebuild
+++ b/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
@@ -71,8 +71,6 @@ src_install() {
        for x in gunzip gzip zcat; do
                mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
        done
-       sed -i -e 's:exec gzip:&-reference:' \
-               "${ED}"/bin/{gunzip,zcat}-reference || die
        mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
        rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
 }