gentoo Easter resync : 12.04.2020

5 files changed, 138 insertions, 3 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 7f6caea92476..a6247322c814 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +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
-EBUILD gjs-1.48.7.ebuild 1576 BLAKE2B 813ff01895bf5dbac68839544a07c990b4045cde046010d34da4aede1577b3890ce2bec951c63e1b5983d43f9757741de1722c4d89ce304d499afe8224ead037 SHA512 30472c4a71caf8a4e2e19cadf54d3fd3fa650df433e87a472960d3caba50e51ee683aa4814c2eed9f1ff713c9f7518038a47c6f766ae6a710936cadc6a37e4cb
+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
 EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2ce098c4264ff6e1da801f8cc2280760ba40fcc81919e3cf8097aa6a3cb51375e5e4b9b3282b8c399d03aeb52c27de23ab567ee3ba3ab294ed01129479e1eb89 SHA512 5fdcb266f181e8c29f33c3360b484a1d99635e336290896188760ef253a08e838ebd553643c02ae4bb348413d7bc19a689f8ae60e943b25dc7b7d20c434d7189
-MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
+EBUILD gjs-1.58.5.ebuild 1598 BLAKE2B cbf660c8001737e30d93b0a55e42aa94501e39013bf91e2714a77e866e1f9776276da8fe8c644829c7137f8bed29c277fce7fc173b3f9d07db7502000eec3940 SHA512 84b731d5b37d2b0060b136a5b86a665b9c786fae5d9435c5a745e274346009cdbcead494ca79033b7edc83a4cd42c57061d430e1c330bc14abde4a3bb2559af4
+EBUILD gjs-1.58.6.ebuild 1598 BLAKE2B cbf660c8001737e30d93b0a55e42aa94501e39013bf91e2714a77e866e1f9776276da8fe8c644829c7137f8bed29c277fce7fc173b3f9d07db7502000eec3940 SHA512 84b731d5b37d2b0060b136a5b86a665b9c786fae5d9435c5a745e274346009cdbcead494ca79033b7edc83a4cd42c57061d430e1c330bc14abde4a3bb2559af4
+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
index 8346cf2b9c9c..43f2a955bcb6 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/gjs/gjs-1.58.5.ebuild b/dev-libs/gjs/gjs-1.58.5.ebuild
new file mode 100644
index 000000000000..ee4c6cf3c607
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.58.5.ebuild
@@ -0,0 +1,64 @@
+# 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 readline +sysprof test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0
+	>=dev-libs/gobject-introspection-1.61.2:=
+
+	readline? ( sys-libs/readline:0= )
+	dev-lang/spidermonkey:60
+	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 )
+"
+
+RESTRICT="!test? ( test )"
+
+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_enable sysprof profiler) \
+		$(use_enable readline) \
+		$(use_with test dbus-tests) \
+		$(use_with test gtk-tests) \
+		--disable-installed-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"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/dev-libs/gjs/gjs-1.58.6.ebuild b/dev-libs/gjs/gjs-1.58.6.ebuild
new file mode 100644
index 000000000000..ee4c6cf3c607
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.58.6.ebuild
@@ -0,0 +1,64 @@
+# 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 readline +sysprof test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0
+	>=dev-libs/gobject-introspection-1.61.2:=
+
+	readline? ( sys-libs/readline:0= )
+	dev-lang/spidermonkey:60
+	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 )
+"
+
+RESTRICT="!test? ( test )"
+
+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_enable sysprof profiler) \
+		$(use_enable readline) \
+		$(use_with test dbus-tests) \
+		$(use_with test gtk-tests) \
+		--disable-installed-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"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/dev-libs/gjs/metadata.xml b/dev-libs/gjs/metadata.xml
index 4cbddcaa19ad..029c403a1ba9 100644
--- a/dev-libs/gjs/metadata.xml
+++ b/dev-libs/gjs/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <use>
+    <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+  </use>
 </pkgmetadata>