gentoo resync : 02.02.2022

4 files changed, 11 insertions, 76 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 6e6ce17d7fd3..12c512c61bff 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,5 @@
-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 1564 BLAKE2B 8292114e5681b8de5226bf7a212f99392e71e82aec35fd8a7ab7ce977652e70137fdc93ab39bd9064b5a2509cc5ec78c621a623bf1bb5946a3a4039db83457e9 SHA512 fd16ccdc02ba6ef4d8c033cbc2ab5c98217aeb5c1c373c4bc094771cbaacc99d7078d59c1f86c63b22b0928dfdf70b996aa77b53e6547e4f80c40c715c952900
+DIST cjs-5.2.0.tar.gz 601982 BLAKE2B 99fe183add425e5178863aa6b0af6aa0579de0dabee72ad9bcc86e2edf0ad13093ce659ac60ed365edb33ff1eb54d54766a7e0df1a65aa64b7da34e5559297c7 SHA512 0ce5cc07be036fa9af93c7d98a179881789f883578a2034c3c28255ef9da96d32b4203fc39311eaea0bdbe5148f13920d72dd24acb717c4e60302b390097a825
+EBUILD cjs-5.0.1.ebuild 1493 BLAKE2B da585af0e9f2aa1ac2f85c289429446e4d64d56e01bddf9c445fe256a33ea60d4fccb123f3d4559861c178ab3ebf75dd7150ede71d61d50b0ebc73a3b4f94a0d SHA512 b816b83e782d770067b8d2f994e615eb03c566ade69be43ad1988953885be31f57be11fad3cd1cd31c4d43d3cce331cab379b0fd79d6dd00f6bd914847f1af2c
+EBUILD cjs-5.2.0.ebuild 1498 BLAKE2B 5129b3878c0e02f0c706ba315a2aa916bda4708dca6a1b07e9d72d1ddadc4c6e4debffd39cdf20a234bb6625937b456c6c57b6225da4a9974f6d9aeb9d3c73a3 SHA512 b035f955c4f66df8f416a82fc0aa5f8a22aefa5bc5f9a30a9e588ba43ac7dc920118c54a1c0b0e83acd7f36526c7ff039b64edae64902bfe052a26b768ce7238
 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 6252c94cb33f..cc39b0d608f5 100644
--- a/gnome-extra/cjs/cjs-5.0.1.ebuild
+++ b/gnome-extra/cjs/cjs-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,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"
+IUSE="+cairo examples readline sysprof test"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
@@ -30,8 +30,7 @@ DEPEND="
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? (
 		sys-apps/dbus
-
-		gtk? ( x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
 	)
 "
 BDEPEND="
@@ -39,10 +38,6 @@ 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/cjs-4.8.2-r1.ebuild b/gnome-extra/cjs/cjs-5.2.0.ebuild
index 921184eaa289..bf8e76b942a0 100644
--- a/gnome-extra/cjs/cjs-4.8.2-r1.ebuild
+++ b/gnome-extra/cjs/cjs-5.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit meson pax-utils python-any-r1 virtualx
 
@@ -13,8 +13,8 @@ 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"
+IUSE="+cairo examples readline sysprof test"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:78
@@ -30,8 +30,7 @@ DEPEND="
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? (
 		sys-apps/dbus
-
-		gtk? ( x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
 	)
 "
 BDEPEND="
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
deleted file mode 100644
index 1ce4eef2abb2..000000000000
--- a/gnome-extra/cjs/files/cjs-5.0.1-meson-0.60.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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 ##############################################