[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     da3156b09574679cf1fcb885dd5e441e21800905
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 19:21:35 2018 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 19:21:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3156b0

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

 .../{firefox-bin-52.5.3.ebuild => firefox-bin-52.5.3-r1.ebuild}         | 2 +-
 .../{firefox-bin-57.0.4.ebuild => firefox-bin-57.0.4-r1.ebuild}         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 76afcebbc27..fe974f2962a 100644
--- 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 67998ff7ceb..e3d638ecc9d 100644
--- 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}