Version bump for Cinnamon 2.4. Drop old revision.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

6 files changed, 160 insertions, 24 deletions

diff --git a/gnome-extra/cjs/ChangeLog b/gnome-extra/cjs/ChangeLog
index e8f32e7053e2..36eb29c13ce5 100644
--- a/gnome-extra/cjs/ChangeLog
+++ b/gnome-extra/cjs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/cjs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/ChangeLog,v 1.7 2014/12/19 13:38:08 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/ChangeLog,v 1.8 2015/01/11 15:58:34 eva Exp $
+
+*cjs-2.4.0 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org> -cjs-2.2.1.ebuild,
+  +cjs-2.4.0.ebuild, +files/cjs-2.4.0-disable-unittest-1.patch,
+  +files/cjs-2.4.0-disable-unittest-2.patch,
+  +files/cjs-2.4.0-disable-unittest-3.patch:
+  Version bump for Cinnamon 2.4. Drop old revision.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> cjs-2.2.2.ebuild:
   amd64 stable, bug 529964
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 22bccb672692..8349c48c4071 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cjs-2.2.1.tar.gz 355553 SHA256 dbd6b2f3e1103d9ab5df81c3ab549b86dc1c5fe4014bf1780cf743a0132733eb SHA512 6bf9ac56788da2bde3c4ace75f147289d46fc89608b8f3c917941102dcba266136506c1a13723653c41b9bc44eafc0a23aa71687a0492a36a1ea4f63e736d942 WHIRLPOOL b00552274388bbebb84d9f5c6af18f6bd06dbc73620ef88a20931db1ec40b31cd70f50eca74c9720d885d8b4a1789df17cd491770a845f376da5698e04393290
+AUX cjs-2.4.0-disable-unittest-1.patch 1702 SHA256 9e24eb201ed8dc4aae9d5a3178321c38af47b47b493ed8a233822db97609fff3 SHA512 c19b4738a1b99a916ed8a1be5817c39b3436718655d38b748c00b68d94a033f0eac2a91f4c1b3604272d23175f93839aead446ae594789b5b7938e3f27411078 WHIRLPOOL 3fd6d4cfe4cf0b458413f2994480819f59d06eb752c6e95e32d773061ff10b4a14247ddb718d6500f308f278f803ee825c438fa392b71d4d9597a15241b9dc8f
+AUX cjs-2.4.0-disable-unittest-2.patch 2128 SHA256 e0635d70b826154ba8cbf90b689aa6fc2647d64d5bce6f95f7270600aab5a837 SHA512 69c40eae62f9bb5a4944d8e8d63b0ba43346d0c0547df58c4693eddf149d735d7288b2857cb1c0a652be92e8c74142f15415ff1afe17445fdc63074d5335638a WHIRLPOOL 66ee22c0fd9ac19917ed9542011da55d921676ae145a3c8f509530b7479a7520b428b26b8d780269f72459c1b9df83ba53c471e139492dce295db1b2b5bb54b0
+AUX cjs-2.4.0-disable-unittest-3.patch 1119 SHA256 4f4eefee8e623bfd1a9fe38f790b6481b2abaae1fa5e3eb12716941b4ae27002 SHA512 c94e7248c5d9623a15fa8ff4c629029a2ca976300381ae03462ae53ce9c55dcb7ec2ce9b669dfc3ab9ccc03a56f58114c9eb43cbfb22fb40b937a4e08b3569a0 WHIRLPOOL 8be04902c0b5900ed088c26fccbfd226564c014d862d9ccb62a01b486551ef0b009b3489441dcf806eff7ffcf316dc118f9757646f2fd3bc53987a2a19674026
 DIST cjs-2.2.2.tar.gz 355632 SHA256 870709463709a92b9d19c351211952bdec5a5e660d8f4a5d2ec4411885e00fca SHA512 358675d8295586e9b6e45f903b5de3c95788084d09aa67385a4c9662b3a07d15fd3befd7a7c1884f1ced8718a5aa8177714212d81af24cfd4cf3b0b857c6542f WHIRLPOOL c42d153c7b0de1a261c63f752431ae690a47afd373654b280ce347af9c6e3b755ca751d55cb1dc57fbbadd3cfda4c11c28d7b10b50b22c7cfc80db627278147e
-EBUILD cjs-2.2.1.ebuild 1687 SHA256 98535ee980acbae3f413cca449b894afc43b32eae189635a454221df56ed208b SHA512 6dc1127c0e91fdb2956a397f4dd0358c2853fc9c0e3e011aac9320213b1eeaecc464a0a448d22a798b808a72cfc8a56c5a4071864836702fe78789e94bdd8983 WHIRLPOOL a0fb191353b630067047c0bf3d0cbf852c27b6afd1df6906255cf726586de2578b75142b9ef2498569e6abd77e2813d5557d6f8d929fc2cc409325308eb6545a
+DIST cjs-2.4.0.tar.gz 323188 SHA256 b4118a1b6c10e6f16feb60295dc8d120b85e6388180f6203e80f9ea002b9f8a3 SHA512 9e0927e442a056da73ae8a67bfd4709edf52221ff546b0599c611991ffb3c1202441362eecbc78e2930c50ad937ff12dc47207a895ae5b9e51a0bdd5ea368496 WHIRLPOOL bc9581a88a15ef97223012c1be5c710082df7006ac8c1c6e0bbd3ebfbac66f486bfdfc7582d2ec1679d886cee2d1b3cedd5227ad60a7715b0cde27bdf2ab72ea
 EBUILD cjs-2.2.2.ebuild 1689 SHA256 ad2d1d27fb1853ce5c5dc54b28d8c3eede6565c74c432566d68a556e7be8a682 SHA512 92f46dc5e3f5580a762674fbf1c46c6766d79b88a7d249db9a49573f543c52ce7aaad0f0cbbabe4ce7f0f12409fcb953a0577d01cbd54fc80ce2767849b11a49 WHIRLPOOL bd31495173e1597b83a1139b9d7a2ee98a576ada76571c1246e85fd47beceb51395a4aaf252d189c1dd864af059066ee29f695ece78638e4a868a966d154b4ac
-MISC ChangeLog 1026 SHA256 722ff7cb08009288be166ae4d7d52e1741f2baf63054671bd51367bed8219d4a SHA512 fc616742b7a2822495bfd409cd1c32eff97808e837c74f6c1fa0e1563deb269cac5ac3837da23e7adde9b77b5375a3726f52d1d93a5ca4b8e95a653460f0ce9e WHIRLPOOL 6fe4a47e98bf58c44c19dee23535f6ebe9faf80aeb2cc55cc01091a0ab337b49202d3d1da743bf1e370fd354c9d884e430d9febcb0b8fed99bbf11e820555c2d
+EBUILD cjs-2.4.0.ebuild 1774 SHA256 09c5f5b3f0620145079f3207ce6676b65d2f90d7bedb60526d8c988dc9f9a11c SHA512 9460635c7bb1a6c2c92f4e8ada9256f987544edb27283cfb08f1ea8f61e59d7ae7b3c2bec789be790a0cb5c00adb7e77d209221209e92153898a4e8b7be19c76 WHIRLPOOL 72275dc6b435f320b527ddb433cedb40536e3afbf61741548d9f5c02f0ffb253760d86d4954f2471a1bf6d66f8d53541e160a180620592b3e15a79bd7425505d
+MISC ChangeLog 1330 SHA256 7b077f22218b6dcb8428809850ed9a5dbda8f24d98453834445657b3780f4367 SHA512 00d2b601c3f3204d998d148d06fe4b02140da8d08f6177cf7a467dd126b208580b01def3f9db10014e95b0f27f0bd4ee8a5db80af870d574da58be9ebc289258 WHIRLPOOL 4de09d1aed576142d168c9f6c4bdd7e002babe84ae666ab7d641a86e09a43ae0a2b68a161904d162360c76dafcd167a54be40c557ed66e24d5ef2f204fa87d3d
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUKkEACgkQCaWpQKGI+9SE8wCdHk7KOPTCyKJnseAo2NNl1Bdz
-pXEAn0w3YaG9eW2Xbbc2M3tbQJRkpbDl
-=aWG6
+iEYEAREIAAYFAlSynasACgkQ1fmVwcYIWAbVEgCgk0MuIlcZSQlBYD5hMr7wqE7j
+U+QAoJZg2o3SYJPPDJV8puMgca3F4iAT
+=oWeT
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cjs/cjs-2.2.1.ebuild b/gnome-extra/cjs/cjs-2.4.0.ebuild
index 65e7db240d27..353aee492c77 100644
--- a/gnome-extra/cjs/cjs-2.2.1.ebuild
+++ b/gnome-extra/cjs/cjs-2.4.0.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/cjs-2.2.1.ebuild,v 1.3 2014/07/23 15:17:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cjs/cjs-2.4.0.ebuild,v 1.1 2015/01/11 15:58:34 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit autotools gnome2 pax-utils python-any-r1 virtualx
+inherit autotools eutils gnome2 pax-utils virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -15,30 +13,32 @@ 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="examples test"
-KEYWORDS="amd64 x86"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=dev-lang/spidermonkey-1.8.5:0
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.32
-	sys-libs/ncurses
+	dev-lang/spidermonkey:24
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.39.3
 	sys-libs/readline:0
-	x11-libs/cairo[glib]
 	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
+	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
 # Large amount of tests are broken even in master.
-RESTRICT="test"
+#RESTRICT="test"
 
 src_prepare() {
+	# Disable broken unittests
+	epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
 	epatch_user
 	eautoreconf
 	gnome2_src_prepare
@@ -51,7 +51,9 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-systemtap \
 		--disable-dtrace \
-		--disable-coverage
+		--disable-coverage \
+		$(use_with cairo) \
+		$(use_with gtk)
 }
 
 src_test() {
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
new file mode 100644
index 000000000000..5afd89293695
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
@@ -0,0 +1,48 @@
+From 554c220e78172213e9637f9a901009b4bc964e3a Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 15 Jan 2014 17:00:22 -0500
+Subject: [PATCH] gjs-tests: Remove dumpstack test
+
+OK, I lied. This is the most useless test ever.
+---
+ test/gjs-tests.cpp | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
+index b79b616..6cade7b 100644
+--- a/test/gs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -163,22 +163,6 @@ gjstest_test_func_gjs_jsapi_util_string_js_string_utf8(void)
+ }
+ 
+ static void
+-gjstest_test_func_gjs_stack_dump(void)
+-{
+-  GjsContext *context;
+-
+-  /* TODO this test could be better - maybe expose dumpstack as a JS API
+-   * so that we have a JS stack to dump?  At least here we're getting some
+-   * coverage.
+-   */
+-  context = gjs_context_new();
+-
+-  gjs_dumpstack();
+-  g_object_unref(context);
+-  gjs_dumpstack();
+-}
+-
+-static void
+ gjstest_test_func_gjs_jsapi_util_error_throw(void)
+ {
+     GjsUnitTestFixture fixture;
+@@ -348,7 +332,6 @@ main(int    argc,
+     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
+-    g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump);
+     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
+     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
+ 
+-- 
+2.1.2
+
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
new file mode 100644
index 000000000000..2490a63fea90
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
@@ -0,0 +1,40 @@
+From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 21:57:11 +0200
+Subject: [PATCH 1/2] Comment broken unittests
+
+---
+ test/gjs-tests.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
+index 6cade7b..4d6c61e 100644
+--- a/test/gjs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -324,18 +324,18 @@ main(int    argc,
+ 
+     g_test_init(&argc, &argv, NULL);
+ 
+-    g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy);
++    /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */
+     g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval);
+-    g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array);
+-    g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw);
+-    g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8);
++    /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */
++    /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */
++    /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */
+     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
+     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
+     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
+     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
+ 
+-    gjs_test_add_tests_for_coverage ();
++    /* gjs_test_add_tests_for_coverage (); */
+ 
+     g_test_run();
+ 
+-- 
+2.1.2
+
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
new file mode 100644
index 000000000000..7b2898b75cf5
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
@@ -0,0 +1,35 @@
+From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 21:57:45 +0200
+Subject: [PATCH 2/2] Comment broken JS unittest
+
+---
+ installed-tests/js/testLocale.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
+index b086a66..0c5abb1 100644
+--- a/installed-tests/js/testLocale.js
++++ b/installed-tests/js/testLocale.js
+@@ -1,14 +1,14 @@
+ // tests for JS_SetLocaleCallbacks().
+ const JSUnit = imports.jsUnit;
+ 
+-function testToLocaleDateString() {
+-    let date = new Date();
++//function testToLocaleDateString() {
++    //let date = new Date();
+     // %A is the weekday name, this tests locale_to_unicode
+     // we're basically just testing for a non-crash, since
+     // we'd have to run in a specific locale to have any
+     // idea about the result.
+-    date.toLocaleDateString("%A");
+-}
++    //date.toLocaleDateString("%A");
++//}
+ 
+ function testToLocaleLowerCase() {
+     JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase());
+-- 
+2.1.2
+