From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-996432-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 867E3138330 for <garchives@archives.gentoo.org>; Tue, 9 Jan 2018 02:02:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BB1CE09BB; Tue, 9 Jan 2018 02:00:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B5A4E097D for <gentoo-commits@lists.gentoo.org>; Tue, 9 Jan 2018 02:00:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58C35341261 for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2018 19:22:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 990EB151 for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2018 19:22:03 +0000 (UTC) From: "Ian Stakenvicius" <axs@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" <axs@gentoo.org> Message-ID: <1515439315.da3156b09574679cf1fcb885dd5e441e21800905.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox-bin/firefox-bin-52.5.3-r1.ebuild www-client/firefox-bin/firefox-bin-52.5.3.ebuild www-client/firefox-bin/firefox-bin-57.0.4-r1.ebuild www-client/firefox-bin/firefox-bin-57.0.4.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: da3156b09574679cf1fcb885dd5e441e21800905 X-VCS-Branch: master Date: Mon, 8 Jan 2018 19:22:03 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7ee2372b-d415-4075-a8c9-261faed9c100 X-Archives-Hash: e17e035faa7e800187c87db323e8b120 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}