gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 7 insertions, 50 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index cb7716b61800..baa2c4ccad2f 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,5 @@
-AUX cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch 1417 BLAKE2B 203701b5535b338283b99aad63e3577d3abb295c005d2e2ac908e2f8abdb24e8f7b9ef311bcf35889a93804583f13ac65f1d9453111b5195320aab9442237b2e SHA512 e2f7ed4c5f15cec6a6a7d3303779a217716ca3d8fa5d3128f4e7e685c47284fd95b9e416d50b28ca34bd06a9c469ebb3f317db88526cdc2ba1088381871da9a4
-DIST cjs-5.8.0.tar.gz 877668 BLAKE2B e4c031631030c2a4221937d5ca04034163f70f21e6e5ff2d0ca15f31a7455e83ecb1f977c4c4fb9a57e58d266856f817446e53b86ee87460bedf5339e33461b6 SHA512 f43bda5810b90ceab24d096d884c65503b2d9b94f5c0a9e6082215a427df97fbec4a21ee3f2d4f22d98ac24a04af1dcd9064600ec191ccec96ae0869cc803a02
 DIST cjs-6.0.0.tar.gz 877404 BLAKE2B 4290f0801f715aab1387da2ce0724376912db8ff3ad16fa8ad7eff03538dfc53ecbff2b7df0e70e52d16295b23ce51024da735d0e618b995fd3d3dfe297f9e26 SHA512 4cb359bf817d22a727683fd451ad6bde19aff4409e9033a97ef9cb204b3bd4c5e86421d7c01a267c3b4d42feb9b3bc5effb6fd970b3baf733242868c09536d95
-EBUILD cjs-5.8.0.ebuild 2393 BLAKE2B ef37c491778c8821a03ffc88dd82914ca9721f12fb9ade0641eeaf8793a9d848e83011ce02e40e7c100f96bd919dfbd4b44a8ed1d058881e9a35d07c3aadd6b8 SHA512 760f674ec14ec6eab030ee38db457386af61e3dc23a9b1aa04c799170d4f786038c0ce2cfcfdebb3b392cd67ec187bbe164bca418014b378b2d1df47c7126c2c
+DIST cjs-6.2.0.tar.gz 874457 BLAKE2B 7b1afda55bc0b5da165a20afa7be58382b8f03f1421bde960f6a3f134d7bdb2bdd44320b0b613f4f710258379da6666383a20d92556a1172971ca8340ae6d348 SHA512 5f7ce7f1ba648db834d7703e909ef65cf369d47147ca02e90b8844c31b4360dcc0fb94bbd3265632c3de8ef2b026934dd799b94a2ff3895442a2f9fc469f53db
 EBUILD cjs-6.0.0.ebuild 2308 BLAKE2B 09e1ccb3f292bf706ce59d9360225e398f96a8fd0fa0a2be2bd1334e4a4bd88903f4bbfb4163f3931c62bae46800c77d2cbfa3ebe3aaa042f4210ca24d5e55d6 SHA512 15850b794b84057e27227bb4dd95c4555a5896d2cd684308e9e331e8acaa1703892eeb5d7465d78291c11cbb88d61eb9058532265fa7bc7a75b283478815cb94
+EBUILD cjs-6.2.0.ebuild 2310 BLAKE2B b09b4b4820cdb836b9c250a0d0984e0c1662abb5e90c8e07ded5f5118e71b06cb3d51ce79ae90d75e1e0839d84dd428021e1bc816b6c914f208a6458264fb6fe SHA512 a2708073cb75af2d9e976e968536ef1465284a21e61f92abcff8d83f3ebb43303f4f09f36f1d2c5b95f822b01a1104e7dfd56f33ffdae5c42410b5d8b398bfc0
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.8.0.ebuild b/gnome-extra/cjs/cjs-6.2.0.ebuild
index 1246cf2ca035..05415690462e 100644
--- a/gnome-extra/cjs/cjs-5.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-6.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit flag-o-matic meson pax-utils python-any-r1 virtualx
 
@@ -13,11 +13,11 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD CC0-1.0 MIT MPL-2.0 || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+cairo examples readline sysprof test"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
-	dev-lang/spidermonkey:102
+	dev-lang/spidermonkey:115
 	>=dev-libs/glib-2.66.0:2
 	>=dev-libs/gobject-introspection-1.71.0:=
 	>=dev-libs/libffi-3.3:0=
@@ -41,10 +41,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
-)
-
 src_prepare() {
 	default
 	python_fix_shebang build
diff --git a/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch b/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
deleted file mode 100644
index 2bb80126507f..000000000000
--- a/gnome-extra/cjs/files/cjs-5.8.0-move_have_gtk4_to_the_appropriate_place.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# https://gitlab.gnome.org/GNOME/gjs/-/issues/532
-# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/830/diffs?commit_id=83683d093c157828cf7787e53a32c586ae4e85d3 
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index 6db887d2250face397079b03d215bbd13f455efb..1e953ceb7695356b6e854775e5db005a9c22e053 100644
---- a/installed-tests/js/meson.build
-+++ b/installed-tests/js/meson.build
-@@ -203,9 +203,13 @@ endif
- # during build should be run using dbus-run-session
- 
- dbus_tests = ['GDBus']
--if have_gtk4 and not get_option('skip_gtk_tests')
--    # FIXME: find out why GTK4 tries to acquire a message bus
--    dbus_tests += 'Gtk4'
-+if not get_option('skip_gtk_tests')
-+    have_gtk4 = dependency('gtk4', required: false).found()
-+
-+    if have_gtk4 
-+        # FIXME: find out why GTK4 tries to acquire a message bus
-+        dbus_tests += 'Gtk4'
-+    endif
- endif
- 
- bus_config = files('../../test/test-bus.conf')
-diff --git a/meson.build b/meson.build
-index 3ac372a16b0bfaa364ed7422119f3e6e4af8971e..5c7703935b68c724347692ef5bf47a3edf868c61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -679,10 +679,6 @@ endif
- 
- ### Tests and test setups ######################################################
- 
--if not get_option('skip_gtk_tests')
--    have_gtk4 = dependency('gtk4', required: false).found()
--endif
--
- subdir('installed-tests')
- 
- # Note: The test program in test/ needs to be ported