www-client/firefox-bin: don't hardcode 'lib/' in GTK_LIBS assignment

Until now, the 'firefox-bin' wrapper hard-coded the path to GTK_LIBS
to /usr/lib/gtk-3.0 ; this patch uses get_libdir to ensure the proper
value for 'lib' is assigned instead.  Required for SYMLINK_LIB=no
in the 17.1 profiles.

Bug: http://bugs.gentoo.org/643798
Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/www-client/firefox-bin/firefox-bin-52.5.3.ebuild b/www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild
similarity index 99%
rename from www-client/firefox-bin/firefox-bin-52.5.3.ebuild
rename to www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild
index 76afcebbc277eb9fe9bdee47a26ce381a96da294..fe974f2962aa3b5b164871c9daf4b343664821fa 100644 (file)
--- a/www-client/firefox-bin/firefox-bin-52.5.3.ebuild
+++ b/www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild
@@ -140,7 +140,7 @@ src_install() {
        #!/bin/sh
        unset LD_PRELOAD
        LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-       GTK_PATH=/usr/lib/gtk-3.0/ \\
+       GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
        exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
        EOF
        fperms 0755 /usr/bin/${PN}

diff --git a/www-client/firefox-bin/firefox-bin-57.0.4.ebuild b/www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild
similarity index 99%
rename from www-client/firefox-bin/firefox-bin-57.0.4.ebuild
rename to www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild
index 67998ff7ceb06a51760e30c016ec481b7621378b..e3d638ecc9df3d484d106c84cb6f183a95c7d4d3 100644 (file)
--- a/www-client/firefox-bin/firefox-bin-57.0.4.ebuild
+++ b/www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild
@@ -139,7 +139,7 @@ src_install() {
        #!/bin/sh
        unset LD_PRELOAD
        LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-       GTK_PATH=/usr/lib/gtk-3.0/ \\
+       GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
        exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
        EOF
        fperms 0755 /usr/bin/${PN}