gentoo resync : 04.05.2019

5 files changed, 2 insertions, 147 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index fe7fbe7fba89..0ae15ade9fd5 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,5 @@
-AUX gjs-1.43.3-disable-unittest-1.patch 2128 BLAKE2B 73921b6b0f8b77bb98fdbe79e3a4debbad4577e856fdfba7ef57e22630a71672e6a3e330f3aa561c6c09cc7feb1d2339de4fb136643df5faa322c09179b0e804 SHA512 6fd3134bb5c19c46ee2b1f0d87e8644bc5c7a92e32fd62963fe6051ca49f20affde5f6cfbc134aaea0b7b6a5b9833e946796c689e7ebec56951b805b96cc56f2
-AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45fce226c7e7838f85160342a15e9b283c0020de52d35b43999ddfe9c06ec190e3eab5366665734bd5abe40767510b8ed548f6eb SHA512 a6f8df3c3454a635852b83ad1c3733182f2e7a28874476d1c28fb2edf8a8c0bcd7fece723c2baa43141c0ac252c2450a6b57e73821a991cb0ddd5a49aca62251
-DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
-EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
-EBUILD gjs-1.48.7.ebuild 1549 BLAKE2B 8ee4cfb9bc4717075eb05cb5c8cb3434c927a90c780c9db4cc38b083864407284e490909dab2713c0dc8fa1ef0691bcfb733981ace846e78547012e46b978c45 SHA512 e957ed75af0c4d2fa6408a1c9e468fb32b104ce12cf061749f19673ce3103bef89630e54d9049c4b283f8fd6eb9178e9181de107382dea6d0644b5eeee78a9fd
+EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
 EBUILD gjs-1.54.3.ebuild 1557 BLAKE2B 32cc37341e3071068228ba2ed4edc3a10eb803b3fceb08ace02c9daaaf8751ce37782a13c0e15ce6b69a322e98ddf9125db722cbbf3ffd4dc9448a6dbf2857b9 SHA512 e9f6ee160f653118abdf683816a7677268db84df81315538ce6c94c3c2cfcaa03a83d4cb13c76f6b267570a8bcd8e7031f37a89459352b8a45922d7fd9f5799a
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
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 c6d740ad5537..000000000000
--- 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 fe21f92dfc2b..000000000000
--- 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.46.0.ebuild b/dev-libs/gjs/gjs-1.46.0.ebuild
deleted file mode 100644
index a0935c8510fa..000000000000
--- a/dev-libs/gjs/gjs-1.46.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/gobject-introspection-1.41.4:=
-
-	sys-libs/readline:0
-	dev-lang/spidermonkey:24
-	virtual/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-PATCHES=(
-	# Disable broken unittests, upstream bug #????
-	"${FILESDIR}"/${PN}-1.43.3-disable-unittest-{1,2}.patch
-)
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 05b6ca3ead4f..7766348989c3 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1