gentoo resync : 05.12.2021

3 files changed, 65 insertions, 2 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 3dde8c01498e..7c1bde2c2a47 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,6 @@
+AUX cjs-5.0.1-meson-0.60.2.patch 3157 BLAKE2B 94732f1365b4d6bb103ebe61d58e2503693ed50d36be20977cafb426c2c564812cb58ae17dfc0f38eddcc4eb6f14a146c4df287acda48643e49136597d7b5baf SHA512 8bccc41dda24c86efb9e01bb4370d7387f415c3a809049cd5788410b1ca93b1c887ad5f9b71c1628c2c2e80028445df58b3d999117b35b58c94241970ae21f21
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
 DIST cjs-5.0.1.tar.gz 602005 BLAKE2B 7592b5b0be8fed1efc9fe1c7baca081515b8010935e24ba0cb1e30ce78890941f5c3b2384ee3846a02c3ba5a50c6d6ce5df232f02507743cf15ac089e29d7f23 SHA512 a341e8deae33baf51ed21ea0b03484ba459d83be8689f3928acbd286ebe878719cdd6b4c576907b08b117b3c5738a11f95d0e37ae21f94ae6b88631fad5d3375
 EBUILD cjs-4.8.2-r1.ebuild 1500 BLAKE2B 98ddb93f7a2821d36c85711294e7c5980a93e5acbfcb85e664a40cd612c692306c5c49b145c77c264015383671340b53a1a6ad3ef7fb052a2f985ca567539c2e SHA512 a0f6e4494134d72a9f04d291c4d79557c9fee193c3fb07aa757724e6df6bcaef04e43837bad39c2c8e273ae9e9bf158d365b381a82369f707e8f129efd266fa7
-EBUILD cjs-5.0.1.ebuild 1502 BLAKE2B 35c813d361cb0a6ab7b008f82a9ea38096e7a379f4edc845f2504a14896012edb8cbed09d046a75c020f0b12029d272390fabd0362796db2ba2582eeed65263c SHA512 364ab7f279c5766e3343cf9cf49e8ef9b9510467b68dab38af842c2eb07003d8fec3a36fa49bd0786f7a121a7b2ca07f342c70de3a016d65a231d7ca9e68767d
+EBUILD cjs-5.0.1.ebuild 1566 BLAKE2B 05c1165fb250217f84522e590bd74c660e019af0ac0e32522369009d914bbd0481d03ffafdda4038bfaf9bd6b5771626d4c93d4d01ea39628e8245568a2af322 SHA512 2f40540815c1cd4ecb058abb3aa338469968bb3915b93e0147c39302643c5fe73742828a70c39008fa346aacc05ec04b84d7e34dd92cd35bf4f96c367a6b93fe
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild
index eb80b3ccf840..e5de6fa9f569 100644
--- a/gnome-extra/cjs/cjs-5.0.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:78
@@ -39,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/cjs-5.0.1-meson-0.60.2.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang build
diff --git a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
new file mode 100644
index 000000000000..1ce4eef2abb2
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
@@ -0,0 +1,58 @@
+From 61823ced59db5ce7a4223ce2759f3da52d83a0de Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 27 Nov 2021 23:21:56 +0000
+Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2
+
+meson.build:541:0: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/meson.build:47:0: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/meson.build:66:0: ERROR: "install_dir" must be specified when installing a target
+installed-tests/js/meson.build:81:0: ERROR: "install_dir" must be specified when installing a target
+---
+ installed-tests/js/meson.build | 6 +++---
+ meson.build                    | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index d3125a7c..564124f2 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -48,7 +48,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
+     sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
+     identifier_prefix: 'Regress', symbol_prefix: 'regress_',
+     extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
+-    install: get_option('installed_tests'), install_dir_gir: false,
++    install: get_option('installed_tests'), install_dir_gir: [false],
+     install_dir_typelib: installed_tests_execdir)
+ regress_typelib = regress_gir[1]
+ 
+@@ -66,7 +66,7 @@ libwarnlib = library('warnlib', warnlib_sources,
+ warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
+     sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
+     symbol_prefix: 'warnlib_', header: 'warnlib.h',
+-    install: get_option('installed_tests'), install_dir_gir: false,
++    install: get_option('installed_tests'), install_dir_gir: [false],
+     install_dir_typelib: installed_tests_execdir)
+ warnlib_typelib = warnlib_gir[1]
+ 
+@@ -82,7 +82,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
+     includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
+     namespace: 'GIMarshallingTests', nsversion: '1.0',
+     symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
+-    install: get_option('installed_tests'), install_dir_gir: false,
++    install: get_option('installed_tests'), install_dir_gir: [false],
+     install_dir_typelib: installed_tests_execdir)
+ gimarshallingtests_typelib = gimarshallingtests_gir[1]
+ 
+diff --git a/meson.build b/meson.build
+index aa55addc..43ba4af1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -542,7 +542,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
+     includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
+     namespace: 'CjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
+     symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
+-    install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
++    install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
+ gjs_private_typelib = gjs_private_gir[1]
+ 
+ ### Build gjs-console interpreter ##############################################