dev-libs/gjs: synchronize live ebuild

And drop unneeded files and comments.

Package-Manager: Portage-2.3.49, Repoman-2.3.10
Manifest-Sign-Key: 0x5A56C8CD0C13248A

4 files changed, 12 insertions, 99 deletions

diff --git a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
deleted file mode 100644
index c6d740ad..00000000
--- a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 115c97bb07f71ac91e20b84f9da6389434d31999 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.3.6
-
diff --git a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
deleted file mode 100644
index fe21f92d..00000000
--- a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c9d63c7531a29418c64dc44556519d7bd1664ce4 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.3.6
-
diff --git a/dev-libs/gjs/gjs-1.50.4.ebuild b/dev-libs/gjs/gjs-1.50.4.ebuild
index a1fd35d7..e8b36619 100644
--- a/dev-libs/gjs/gjs-1.50.4.ebuild
+++ b/dev-libs/gjs/gjs-1.50.4.ebuild
@@ -29,11 +29,6 @@ DEPEND="${RDEPEND}
 	test? ( sys-apps/dbus )
 "
 
-#PATCHES=(
-	# Disable unittest failing without pt_BR locale, upstream bug #????
-#	"${FILESDIR}"/1.48.6-disable-unittest.patch
-#)
-
 src_configure() {
 	# FIXME: add systemtap/dtrace support, like in glib:2
 	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 3fb95483..23f95c28 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -1,10 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
 
+EAPI=6
 inherit gnome2 pax-utils virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
@@ -23,24 +20,22 @@ else
 fi
 
 RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/gobject-introspection-1.41.4
+	>=dev-libs/glib-2.52.1
+	>=dev-libs/gobject-introspection-1.53.4.1:=
 
 	sys-libs/readline:0
-	dev-lang/spidermonkey:24
+	dev-lang/spidermonkey:52
 	virtual/libffi
 	cairo? ( x11-libs/cairo[X] )
-	gtk? ( x11-libs/gtk+:3 )
+	gtk? ( >=x11-libs/gtk+-3.20:3 )
 "
 DEPEND="${RDEPEND}
+	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 "
 
-# Large amount of tests are broken even in master.
-#RESTRICT="test"
-
 src_configure() {
 	# FIXME: add systemtap/dtrace support, like in glib:2
 	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
@@ -48,17 +43,15 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-systemtap \
 		--disable-dtrace \
-		--disable-coverage \
+		--disable-code-coverage \
 		$(use_with cairo cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	Xemake check
+		$(use_with gtk) \
+		$(use_with test dbus-tests) \
+		$(use_with test xvfb-tests)
 }
 
 src_install() {
-	# installation sometimes fails in parallel
+	# installation sometimes fails in parallel, bug #???
 	gnome2_src_install -j1
 
 	if use examples; then