gentoo resync : 15.06.2021

5 files changed, 107 insertions, 79 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index dc9a56deecc1..a1a3bd0f1219 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,6 @@
-DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
+AUX cjs-5.0.0-fix-test.patch 903 BLAKE2B d559a60ac73aa8ca4c77ef5b96321dc95edf87c6891257220e20814a827db3a1e7e5eafa5d2217867f24cb4e9cbeaf2231de5563695814c9440fb0e59ba1fb98 SHA512 bcd207a060dbcfa9f50bfd609cc8528c8121b029c547a148c90e1a976e6b99936c88ac742cd12595243acf162d4862be9c92479d244dcbf1476d2195e3438d00
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
-EBUILD cjs-4.6.0.ebuild 1693 BLAKE2B 88f3f41dc6b2e2d10bdfdaf7c0b2ad563e8509a7fdfe93110d45aaf9b8350aa36f63414cdbb6c1d4673799eb8ad2bd644474758e8346a80f39f7c00da5ecdd68 SHA512 59a3090fb7d56a3d606c3d2c75fd78024e2bc030b9b86c125fad1e4307bd72dbc2e479b3fdbc3af075d1cda603bd73d2abf708a1b844130eba1306555608c923
-EBUILD cjs-4.8.2.ebuild 1502 BLAKE2B f16b1a4fd392e78984d8c3c73e2aa04ceaf50c422d8aad5aecd1112bea02cd85f12ee0e732862e1e4cbce10ebee7c3b6904abc1801ad70a639a619b9a118abcf SHA512 3f02401b9061c5d2161b90db5b22fa85eddf85c6ca0f60be6fba6ecb7cc1c35914bedee6c1a74a6fd7ad3ba80c308f67ab97ffb1dcad2db6c346379d8c4707f1
+DIST cjs-5.0.0.tar.gz 601928 BLAKE2B b8d4e64472eefe15678fd2ebcd270161b779e5081b1f9fdff61c4410fdef601cff9bc948b423308059aa73de0b960d430711e8741c10511f758b41da8d96892f SHA512 32524de39e17ffc3e70f83188aed5d6bcb39e9ac4d4a1aa980a1f45dfc7970c103868f270775fcd290de0a6c70035b61b04dc575c6bcc1375972aaa0abdd8e59
+EBUILD cjs-4.8.2-r1.ebuild 1500 BLAKE2B 98ddb93f7a2821d36c85711294e7c5980a93e5acbfcb85e664a40cd612c692306c5c49b145c77c264015383671340b53a1a6ad3ef7fb052a2f985ca567539c2e SHA512 a0f6e4494134d72a9f04d291c4d79557c9fee193c3fb07aa757724e6df6bcaef04e43837bad39c2c8e273ae9e9bf158d365b381a82369f707e8f129efd266fa7
+EBUILD cjs-5.0.0-r1.ebuild 1557 BLAKE2B 297b2f1e0899ed36d8457f95147883056ae0be15d63169d2a56b2e4168711657a32c248748c5320b842e90fae448d7a01833d3b37b7cd2bbfd4209966bf2b533 SHA512 13b54829b9092ab8cd5fd7646a080126ce606d823bc9b8fc54242382e296df18730a1797b486ad8900cd5dbd8bb1948e828730e9a7725011d137fee23fec1abd
 MISC metadata.xml 607 BLAKE2B c08d54529aa035fe5008bdb76cfa944ed7eb63f183e0522a48e2b79758cce23ae56db7a87e019a8ecc767846d60c8cdd9e6e43cb82c7c85720582700f73ac96b SHA512 4971937c41e167e93266d694ff5f70d4c1118c07934f7a695242c5fc702655f335eda00beef5c97bdc84a68acef02834f6a5ffdbaaec9383c6a9fcdcb96464d8
diff --git a/gnome-extra/cjs/cjs-4.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild
deleted file mode 100644
index bbdc3a6ffabe..000000000000
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools gnome2-utils pax-utils virtualx xdg-utils
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-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 test"
-KEYWORDS="amd64 ~arm64 x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/spidermonkey:52
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/gobject-introspection-1.41.4:=
-	sys-libs/readline:0=
-	dev-libs/libffi:0=
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/dbus )
-"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	eautoreconf
-	gnome2_disable_deprecation_warning
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	econf \
-		--disable-maintainer-mode \
-		--enable-compile-warnings=minimum \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	default -j1
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-4.8.2.ebuild b/gnome-extra/cjs/cjs-4.8.2-r1.ebuild
index 59ef8a7d5a6c..921184eaa289 100644
--- a/gnome-extra/cjs/cjs-4.8.2.ebuild
+++ b/gnome-extra/cjs/cjs-4.8.2-r1.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 x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:78
@@ -27,7 +27,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? (
 		sys-apps/dbus
 
diff --git a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..1cd6bfb71f44
--- /dev/null
+++ b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson pax-utils python-any-r1 virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
+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"
+
+RDEPEND="
+	dev-lang/spidermonkey:78
+	>=dev-libs/glib-2.58.0:2
+	>=dev-libs/gobject-introspection-1.58.3:=
+	>=dev-libs/libffi-3.2.1:0=
+
+	cairo? ( x11-libs/cairo[glib,X] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	test? (
+		sys-apps/dbus
+
+		gtk? ( x11-libs/gtk+:3[introspection] )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-fix-test.patch"
+)
+
+src_prepare() {
+	default
+	python_fix_shebang build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
new file mode 100644
index 000000000000..347ca090782d
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
@@ -0,0 +1,24 @@
+From ac2737f524b4d667a7700b8ff077cd603ee21c59 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Thu, 3 Jun 2021 05:21:51 -0400
+Subject: [PATCH] fix failing test checking for version number (#94)
+
+---
+ installed-tests/js/testSystem.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
+index a4c098c0..8ae8c74a 100644
+--- a/installed-tests/js/testSystem.js
++++ b/installed-tests/js/testSystem.js
+@@ -11,8 +11,8 @@ describe('System.addressOf()', function () {
+ 
+ describe('System.version', function () {
+     it('gives a plausible number', function () {
+-        expect(System.version).not.toBeLessThan(14700);
+-        expect(System.version).toBeLessThan(50000);
++        expect(System.version).not.toBeLessThan(40802);
++        expect(System.version).toBeLessThan(60000);
+     });
+ });
+