gentoo resync : 05.04.2018

3 files changed, 44 insertions, 2 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 073ad8f1ac62..9ffc14b83b4c 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,7 @@
 AUX cjs-2.4.0-disable-unittest-1.patch 1702 BLAKE2B fc1235ff92b72fa6f1abb86879e08073a9274829c00b6020ce4410e29ff433442d488de124ea8809e1c1e4ccc50996fd954840a780dc21b069bd47b6eaf6fb2e SHA512 c19b4738a1b99a916ed8a1be5817c39b3436718655d38b748c00b68d94a033f0eac2a91f4c1b3604272d23175f93839aead446ae594789b5b7938e3f27411078
 AUX cjs-2.4.0-disable-unittest-2.patch 2128 BLAKE2B f5e162bbeda9bdbcddbdccd5bb8186e9a7b8927fcb46521198f2ac7ac0eaff594382df1b016be50ac145df8961cb22e99cdfa761efc7c6555a3e079a6a04dd02 SHA512 69c40eae62f9bb5a4944d8e8d63b0ba43346d0c0547df58c4693eddf149d735d7288b2857cb1c0a652be92e8c74142f15415ff1afe17445fdc63074d5335638a
 AUX cjs-2.4.0-disable-unittest-3.patch 1119 BLAKE2B ce37d0d0d9d223411de31c21be827f14b0158e07fc75b26639b3662b2e50a7b6d593d3897f4129340ea23b49fb99e7fb8f340fac3760db925762cc697dbd4151 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0
+AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
 DIST cjs-3.0.1.tar.gz 325349 BLAKE2B 084713cb4b8b32fdcc21284af798016e6ad58bdb06b3960913c1721807d89bf55ff90e1a523fbc5cc9d456a176365770d5c75d3c25fddd38abc383f9bb9dcb3f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538
 DIST cjs-3.4.1.tar.gz 425003 BLAKE2B 6910c6658ffeaf88e671a6fa6863aa7edc48c6f053170ca735faf4ce843146e3a2d593c37828a81e33a5ec332bdbf47167b5346e5aa06f4003993efd9e2e6b3f SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690
 DIST cjs-3.4.4.tar.gz 426665 BLAKE2B 18e232b446945ae296d1dcf4b4624ff10b733f023da99315ba9aeee72228e115a634eb7a31a7c6192c3d1bfb8af1cd89488a9e7fe81edfa3a729bd62061e3581 SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33
@@ -8,5 +9,5 @@ DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f282775
 EBUILD cjs-3.0.1.ebuild 1664 BLAKE2B ee654aebaec13f1e43f5ca10e493b18af368ce6f67cb7b20bcf59c0da29aef93d3e6c8752f34f708cff632e6a0d4b167e2eafb6729656406bb6daaa659a45349 SHA512 59de06e7315032403e0a831168ae45e5cd0da3026bd8ff583dc48d325ee4faa47951f30aa18eeb15cbcae501ab51faa7b4df81f263ad2fbb3f44ac159418fa7c
 EBUILD cjs-3.4.1.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
 EBUILD cjs-3.4.4.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
-EBUILD cjs-3.6.1.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
+EBUILD cjs-3.6.1.ebuild 2101 BLAKE2B 5f5b963bc5fc4bb683aa4035bfbef54c06d8abbac24d819baf6e1a58abd0ffb88c7c685c3d7ba9e9fc7cdbec872ce622b76b6de6888d925a61c1db375b5454b4 SHA512 58e91ffe429778b8b5990473cc47df5fcea0b433f95d996bc00efe45bfb21124eb8214e36feec0b9fe6ef1cad2cdfec6023f21e5a7204739d7c689a2fa240269
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index 23afc9055f7d..399708932f15 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,9 +34,25 @@ RDEPEND="${RDEPEND}
 	!<gnome-extra/cinnamon-2.4
 "
 
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch" )
+
 src_prepare() {
 	eautoreconf
 	gnome2_src_prepare
+	sed -ie "s/gjs-console/cjs-console/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh \
+		"${S}"/installed-tests/scripts/testWarnings.sh || die
+
+	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh || die
+
+	sed -ie "s/'Gjs'/'Cjs'/g" \
+		"${S}"/installed-tests/js/testExceptions.js \
+		"${S}"/installed-tests/js/testSignals.js \
+		"${S}"/installed-tests/js/testGDBus.js \
+		"${S}"/installed-tests/js/testEverythingBasic.js || die
 }
 
 src_configure() {
diff --git a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
new file mode 100644
index 000000000000..40be11981ede
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
@@ -0,0 +1,25 @@
+From 2d3e093bac41474c2adf433c2948fdc97495f4dc Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 2 Apr 2018 19:27:35 +0200
+Subject: [PATCH] No reason for System.version to be this restrictive
+
+---
+ installed-tests/js/testSystem.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
+index 1211de4..d205595 100644
+--- a/installed-tests/js/testSystem.js
++++ b/installed-tests/js/testSystem.js
+@@ -12,7 +12,7 @@ describe('System.addressOf()', function () {
+ describe('System.version', function () {
+     it('gives a plausible number', function () {
+         expect(System.version).not.toBeLessThan(14700);
+-        expect(System.version).toBeLessThan(20000);
++        expect(System.version).toBeLessThan(32000);
+     });
+ });
+ 
+-- 
+2.16.1
+