sci-geosciences/googleearth: Better fix for #578282

Thanks to Klaus Kusche

Package-Manager: portage-2.2.28

diff --git a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
index 7abcf158a0d870703d3e48cf19a04c8933ce9a87..7024eaaec9fb8eec0130c3132200ebf1fec9214e 100644 (file)
--- a/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.1.4.1529.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
                sci-libs/gdal
                sci-libs/proj
        )"
-DEPEND="~dev-util/patchelf-0.8"
+DEPEND="dev-util/patchelf"
 
 S=${WORKDIR}/opt/google/earth/free
 
@@ -88,6 +88,7 @@ src_unpack() {
 }
 
 src_prepare() {
+
        # we have no ld-lsb.so.3 symlink
        # thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
        einfo "running patchelf"
@@ -98,9 +99,12 @@ src_prepare() {
        for x in * ; do
                # Use \x7fELF header to separate ELF executables and libraries
                [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+               fperms u+w "${x}"
                patchelf --set-rpath '$ORIGIN' "${x}" ||
                        die "patchelf failed on ${x}"
        done
+       # prepare file permissions so that >patchelf-0.8 can work on the files
+       fperms u+w plugins/*.so plugins/imageformats/*.so
        for x in plugins/*.so ; do
                [[ -f ${x} ]] || continue
                patchelf --set-rpath '$ORIGIN/..' "${x}" ||