Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
Date: Mon, 24 Sep 2018 00:55:52
Message-Id: 1537750524.3888afb7c7c4197294a77b12002334dd67908d10.whissi@gentoo
1 commit: 3888afb7c7c4197294a77b12002334dd67908d10
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 23 23:56:51 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 24 00:55:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3888afb7
7
8 www-client/firefox: install geckodriver when USE=geckodriver is set
9
10 Mozilla's build system doesn't install geckodriver when enabled,
11 must be installed manually.
12
13 Closes: https://bugs.gentoo.org/666902
14 Package-Manager: Portage-2.3.49, Repoman-2.3.10
15
16 www-client/firefox/firefox-60.2.1.ebuild | 7 +++++++
17 www-client/firefox/firefox-62.0.2.ebuild | 7 +++++++
18 2 files changed, 14 insertions(+)
19
20 diff --git a/www-client/firefox/firefox-60.2.1.ebuild b/www-client/firefox/firefox-60.2.1.ebuild
21 index 94ea29cb744..51a218b24b4 100644
22 --- a/www-client/firefox/firefox-60.2.1.ebuild
23 +++ b/www-client/firefox/firefox-60.2.1.ebuild
24 @@ -300,6 +300,13 @@ src_install() {
25 MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
26 DESTDIR="${D}" ./mach install
27
28 + if use geckodriver ; then
29 + cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
30 + pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
31 +
32 + dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
33 + fi
34 +
35 # Install language packs
36 mozlinguas_src_install
37
38
39 diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
40 index 398628a49d7..efa2aff5083 100644
41 --- a/www-client/firefox/firefox-62.0.2.ebuild
42 +++ b/www-client/firefox/firefox-62.0.2.ebuild
43 @@ -488,6 +488,13 @@ src_install() {
44 MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
45 DESTDIR="${D}" ./mach install
46
47 + if use geckodriver ; then
48 + cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
49 + pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
50 +
51 + dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
52 + fi
53 +
54 # Install language packs
55 MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install