gentoo resync : 28.04.2021

4 files changed, 4 insertions, 55 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index b7a843e7161a..350d93d16e30 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,7 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-DIST gjs-1.66.1.tar.xz 439992 BLAKE2B 2b6d25b50fd48ed8b9bb0c594321bd00525e7d6db8b348d7da5c1e10cfd588fccf5030edc93fc31da094da5a0327d4a7b26c26d18ee4284dc1ae767f7721a7b4 SHA512 601d0c645ab1586e7d770f753bf68653816dc631faf89b5e70216320f6b7707e4aaa3507111fb6ff3331f76656050e32e8b1441720bf080de957e03e4565a43f
 DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
 DIST gjs-1.68.0.tar.xz 553044 BLAKE2B 6103299bb9ec67589393b0a863219b1bb08ebf141229574f07bb4984a2fb226f4daf4324038e9143f98048d0a2997805b93f7f408bae5ef727435c787e3b98f0 SHA512 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.66.1.ebuild 1114 BLAKE2B b2324eeaa60bb5a885e782fd5cf7b84534565d7470b153b30e972a5c624b1a83fd71d4eaafd72d01807a2035fb667d6c205c24f0db591c56df6cc043d1542f76 SHA512 9aaa7806c10fb4e27d23bf0c21575054d309dd2ccafdc88023e1543b083b61a53f4a1dd56395e0e53a90be552c51b0da64fdba21ec36a522844b78d4eff764db
-EBUILD gjs-1.66.2.ebuild 1113 BLAKE2B 4e1047bb670c2a98558699f476a8c99d784978ae531c42713b20a37aa67616df6ae4c51c140095f3cf387094e476504a8cc99cf4ca32ea1be4635abae0c45c99 SHA512 f4268bb5ab845fcabad639291c1a92f27f90900a57dc7a035d70ac642ef3f21d13e1c2b1d166ad424f36abdf3cb1ae70ca9de507df459894d1bc9c18b4fc9c58
-EBUILD gjs-1.68.0.ebuild 1114 BLAKE2B b491b84d6c4d291452f05d9ba8dc7b1066b7ccc4902f2eec42ccb2e4657468bfbfed1e3cdac021738279a75266293daac5689849e7de5da4e39e87b333438f43 SHA512 cd017ab7fa37b91149201287fcf7b3e5e262b6b5168fecba8522dffd02f6767bfff185cb5bfc50978542a5b65b47e5291ad020b587dbf5310981db25ed09888c
+EBUILD gjs-1.66.2.ebuild 1109 BLAKE2B ed052e7b9398fefedf71ee2cacff2e00702f1e6c7444ea37a218bf047c07f91d8c52002f12cbab4c2a322bf85eece5377686ec44273e6bb59eeae4de093172fa SHA512 b7418593774f5712eaef63a66beb01a15cab894b535b8ee91596dbf6b10351b5b23fb52175977ad641c11949320bff14d0fbd9439889de3b955e23c9160d33ff
+EBUILD gjs-1.68.0.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.66.1.ebuild b/dev-libs/gjs/gjs-1.66.1.ebuild
deleted file mode 100644
index 857e675b110c..000000000000
--- a/dev-libs/gjs/gjs-1.66.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.61.2:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
-	test? ( sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/gjs/gjs-1.66.2.ebuild b/dev-libs/gjs/gjs-1.66.2.ebuild
index fbf9d3dec01a..355eb763d380 100644
--- a/dev-libs/gjs/gjs-1.66.2.ebuild
+++ b/dev-libs/gjs/gjs-1.66.2.ebuild
@@ -11,7 +11,7 @@ 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="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.68.0.ebuild b/dev-libs/gjs/gjs-1.68.0.ebuild
index 02c500d445f5..69f56003cd50 100644
--- a/dev-libs/gjs/gjs-1.68.0.ebuild
+++ b/dev-libs/gjs/gjs-1.68.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	>=dev-libs/gobject-introspection-1.66.1:=
 	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X] )
+	cairo? ( x11-libs/cairo[X,svg] )
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}