gentoo resync : 15.01.2020

3 files changed, 3 insertions, 70 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 22e66cb75208..dab421cc8853 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,5 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
-DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
 EBUILD gjs-1.48.7.ebuild 1575 BLAKE2B 9575ca81c0f54cef94269398582a432584989999fa11266e7c7ba76a4429132d2b02993d6c23f3906f3bce08e0fbe040cfda63759ff163c4a36ff94a784293ee SHA512 b3322a094c9c1c10c2ee1693dc0e6532a58f34ac44c41b3ee12247490ada15ffeb4b21888712968f8fc6a38fa779020fc43f4dae65fae9ae5b652332e9f7a4d3
-EBUILD gjs-1.54.3.ebuild 1556 BLAKE2B 9fd9e8b7ae9511995a83a99a916c7c5afaf45b9a65a27aa4dc2f75c7f0ed77c794daa9bb7a541b36d3c8a230b628c4eb4705053120a08ff504ff1588e46c67cd SHA512 6ed337d8f79d3848159cb5ee234e6482e22b2cad42244e29b2ea3257dd1aca2fc9b6385bc8532703e109e576e609b95bba4474951335fbb51de755971a4a5ad7
-EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2d84c8877630973c34d759580e59af1b1616c17bb75248f18ed7d7383b39972e994dae7148e0083e8243bdcd555d022a79016e06d2f0b82f21340b230116906e SHA512 1827f6ddca0a590e275160110d630300519c8be48ae6eb0dfd8a912e4cd40ada8ad2b7c57a33bf2b2dfa9d266e5fd2e56714510834f805264e10bc083d90af1e
+EBUILD gjs-1.56.2.ebuild 1715 BLAKE2B 84fae82355e32da4da69fcc4a495851b5b8ff29750e00cc565485c3dd01c9e5b56e87c0878fa3640b75c13af02deae814433d03beb78fa243fb49227874c2d16 SHA512 083bc1d5e24cfaec246322bd5fbe5a33b99f489b0e21e724006f44e3bf587f06b3cdb4d2a45d20f1d85a9a2c57d0c628fc59153eaf07733fae87d88ee4ec6976
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild
deleted file mode 100644
index b23457717dd4..000000000000
--- a/dev-libs/gjs/gjs-1.54.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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 test"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0
-	>=dev-libs/gobject-introspection-1.53.4:=
-
-	readline? ( sys-libs/readline:0= )
-	dev-lang/spidermonkey:60
-	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 )
-"
-
-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 \
-		--enable-profiler \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_enable readline) \
-		$(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"
-}
-
-src_test() {
-	virtx default
-}
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
index f747eb708a79..42e995523e17 100644
--- a/dev-libs/gjs/gjs-1.56.2.ebuild
+++ b/dev-libs/gjs/gjs-1.56.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 readline test"
-KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.54.0