gentoo resync : 14.05.2020

5 files changed, 53 insertions, 70 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index d5a30532fb60..a181c72ddcf7 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,9 @@
-DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
-DIST gjs-1.58.5.tar.xz 637996 BLAKE2B a6c96ee4be81e36d4675d24d9b66b9aab83fe7e4c4cac042122f095b477b551234785417f796144c6755e5faf4afeee446f00a5914a9d63d0619f74fbb2a5694 SHA512 18ef3afc4403ed281e1e70a379fd68ffa537ffc20ab66d7faaefe51e03bb6a66e359e5ca2c0511e1c5f8c6adfce93601d011cfb9e9e6b0a18f8aa1f2398297c3
 DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74
-EBUILD gjs-1.48.7.ebuild 1578 BLAKE2B 24e94013e5c8f31fb187e4b8a975da97b91f37cbbba3951c8ba82296cf0ad30c38a1a4f17ccc24b043088e48384647373b3e589d36eeb6dfad7a38c2009f33e3 SHA512 312834bf29f8f944b937582670639bdd0955525f32b5d1fe5af5ddec9b2c96e868d496f7ae4ce6cf97f67d5493e9cd6076b5f94817fd143dc2989123cd10932c
+DIST gjs-1.58.7.tar.xz 638804 BLAKE2B eb9bb1ea0cd9b52b58a0c4497d5bb930ccb0c8451a94cf9e5e97a6cf1e7bd4dfa5f7a15c2c68fbba3c36a5d71e71df88f086b528e7c2e86d2a8374bfdeac8aa4 SHA512 0790cffd2f2230717b78266b356e88133b5fb816380bf96fc2bea0a039d96979796ad6455a4270dcde62ff2a023fbd73e2edc98428aa2a8b2fdf2cc6c8f8ecce
+DIST gjs-1.64.2.tar.xz 419704 BLAKE2B f4b8ab32530f1d24663f5f63e3fa327d2eaa7607cd7e70bd78448039edf2b3338b05edd7dd8e62d52fbe57b60361ffd46f36a61ae5d4620507ae4c70dc98be92 SHA512 e2196d5c581ee0b9c47b5648e6005f336900a71b4844bdf0142127783b4ab96b8ecca0efdeab0878c28ae674bb67f289a8898b1473b8bd080c7cb2c5c103a6f5
 EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2ce098c4264ff6e1da801f8cc2280760ba40fcc81919e3cf8097aa6a3cb51375e5e4b9b3282b8c399d03aeb52c27de23ab567ee3ba3ab294ed01129479e1eb89 SHA512 5fdcb266f181e8c29f33c3360b484a1d99635e336290896188760ef253a08e838ebd553643c02ae4bb348413d7bc19a689f8ae60e943b25dc7b7d20c434d7189
-EBUILD gjs-1.58.5.ebuild 1598 BLAKE2B cbf660c8001737e30d93b0a55e42aa94501e39013bf91e2714a77e866e1f9776276da8fe8c644829c7137f8bed29c277fce7fc173b3f9d07db7502000eec3940 SHA512 84b731d5b37d2b0060b136a5b86a665b9c786fae5d9435c5a745e274346009cdbcead494ca79033b7edc83a4cd42c57061d430e1c330bc14abde4a3bb2559af4
-EBUILD gjs-1.58.6.ebuild 1593 BLAKE2B a0cd6301b5881ef0d8b0e9495d66b57bffdb0a9b4521893e6b34c6aed3b2ec22fe3dd283784edee9073c92ef8755156818e0eb2aada34567660448f768d3e7c4 SHA512 84648467cd6ba87457726f70768f198c84eb8015b370853315a20569d07709c784776715b07f60dd2887fe37ef045e84cb1c3d8effe11effc416e4ce8216f5f7
+EBUILD gjs-1.58.6.ebuild 1608 BLAKE2B d4b1bec5098b8c8175fc94c130acbaf0c74497578cf22ebb2eaf02a0386639c9d28baa1ea13e227bd1a85118612c9924e75b4f2270afb18983de3a03dee7d989 SHA512 4f0a732f0a4eeb31c2226ba83d8c1c2f3dd686f2aea986e5896ee480721212194039efb59dc706a6743de1c10e2a1f4e0c30e5d4faaa7f02d908bab18f5e1015
+EBUILD gjs-1.58.7.ebuild 1613 BLAKE2B 3857ae2f6b7f9fc589a9abb4b3dbff4042cd7ee7cd543630d7eeab4ab0b55e18c408bb84ffe1e6ed7de552d2d64580d0b1f966f259f5c465f59ed3042c04ece2 SHA512 eb4ef64e73ca226340352e5e5426cde2b95ec3bf4034b5a43a1c9ec98515aa3148ec25e2259a28d524a290bf9bbeddda55d7e81e8358e61098f4813fa3cb7e23
+EBUILD gjs-1.64.2.ebuild 1041 BLAKE2B 711d626dacf32d9a896d23d0998103dcb2aac96bc7216b8edbce016233c42f9f26b11809690f9a62938bb0700ae0a3b415be02b676d8dc3c90973970558f81fe SHA512 17bdd21a6489b139c4fe1fd10f580fab3553250e825745e499050aa07ac00b8fa110eee88deb17f1a36c42f0ee109f55f7d3a3da26911aa74f556c72dacc7a3e
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
deleted file mode 100644
index 43f2a955bcb6..000000000000
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 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"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52.1
-	>=dev-libs/gobject-introspection-1.52.1:=
-
-	sys-libs/readline:0=
-	dev-lang/spidermonkey:38
-	virtual/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	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
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-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.58.6.ebuild b/dev-libs/gjs/gjs-1.58.6.ebuild
index 383704357bdf..6d21c25506c8 100644
--- a/dev-libs/gjs/gjs-1.58.6.ebuild
+++ b/dev-libs/gjs/gjs-1.58.6.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
 	virtual/pkgconfig
 	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3 )
+		>=x11-libs/gtk+-3.20:3[introspection] )
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/gjs/gjs-1.58.5.ebuild b/dev-libs/gjs/gjs-1.58.7.ebuild
index ee4c6cf3c607..c0859f6c9be3 100644
--- a/dev-libs/gjs/gjs-1.58.5.ebuild
+++ b/dev-libs/gjs/gjs-1.58.7.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
 	virtual/pkgconfig
 	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3 )
+		>=x11-libs/gtk+-3.20:3[introspection] )
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/gjs/gjs-1.64.2.ebuild b/dev-libs/gjs/gjs-1.64.2.ebuild
new file mode 100644
index 000000000000..6ef823d0a818
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.64.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson 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 readline +sysprof test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0
+	>=dev-libs/gobject-introspection-1.61.2:=
+
+	readline? ( sys-libs/readline:0= )
+	dev-lang/spidermonkey:68
+	dev-libs/libffi:=
+	cairo? ( x11-libs/cairo[X] )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
+	virtual/pkgconfig
+	test? ( sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3 )
+"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature sysprof profiler)
+		$(meson_feature readline)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}