[gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/, profiles/arch/riscv/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/, profiles/arch/riscv/

[Marek Szuba]

commit:     7cc3fd1e855d1f5a01788268d6254cad6bf0933f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 22:48:50 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 22:57:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc3fd1e

dev-lang/spidermonkey: keyword 68.12.0 for -riscv

src_configure dies due to riscv being an unsupported architecture.
Could be made to work by backporting
0041-bmo-1318905-Make-SpiderMonkey-build-on-Linux-RISC-V.patch
from firefox-68 patch sets (it applies without errors to 68.12.0
and allows it to compile) - but given there is literally ONE package in
the tree (net-libs/libproxy) requiring this particular Spidermonkey slot
and it seems that it will be trivial to update to slot 78, it's probably
not worth the trouble.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild | 7 ++++---
 profiles/arch/riscv/package.use.mask              | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild b/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
index 138f64d66a4..17fed702c27 100644
--- a/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-68.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 WANT_AUTOCONF="2.1"
 
@@ -49,7 +49,8 @@ SRC_URI="${MOZ_SRC_URI}
 DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+# riscv support requires a patch currently only available in firefox-78 patch sets
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86"
 
 SLOT="68"
 LICENSE="MPL-2.0"

diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 8a7a5bbbff8..f4c58340918 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -6,6 +6,9 @@
 # (Bug #807727). That said, with httpclient-2.8.3 installed manually
 # (and without testing) all webmock-3.13.0 tests passed.
 dev-ruby/webmock test
+# Currently requires dev-lang/spidermonkey:68, which explicitly
+# does not support riscv. Hopefully temporary, see Bug #807772.
+net-libs/libproxy spidermonkey
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-09)
 # ipython[qt5] depends on qtconsole, which depends on QtPy.
@@ -140,6 +143,7 @@ sys-libs/libblockdev dmraid escrow
 gnome-base/gvfs bluray cdda mtp ios
 sys-power/upower ios
 net-libs/gnome-online-accounts gnome
+net-libs/libproxy kde
 xfce-base/xfce4-settings libcanberra
 xfce-extra/tumbler epub ffmpeg odf pdf raw
 xfce-base/xfce4-meta pulseaudio
@@ -169,10 +173,6 @@ dev-qt/qtnetwork networkmanager
 net-libs/libproxy networkmanager
 xfce-extra/xfce4-power-manager networkmanager
 
-# Yixun Lan <dlan@gentoo.org> (2021-05-19)
-# Dependencies not keyworded, not tested
-net-libs/libproxy spidermonkey kde
-
 # Joonas Niilola <juippis@gentoo.org> (2021-01-15)
 # Dependency not keyworded on this arch.
 app-text/enchant voikko