gentoo resync : 28.04.2021

3 files changed, 19 insertions, 11 deletions

diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index d70f151e7c31..a157c752d3d1 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4
 DIST gnome-screenshot-3.38.0.tar.xz 356716 BLAKE2B 31f2a0cdf16a9f967c789ec1f698140f78a5c4d66489bc8a47b8b61b5e536e6b67fd60b9cb241221262eef5b3117ce3e1a59fa162a7f193de440f7de9db0afc3 SHA512 183f81b9b481d1afb4a3c8e37b25a78652e599d4c5a4f1a2cc9449cd1efdf3b613018c17de9ab61304ba19ad7152d696aeed475c0184a4728ea1359ca2be2ecf
-EBUILD gnome-screenshot-3.36.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a
-EBUILD gnome-screenshot-3.38.0.ebuild 1333 BLAKE2B 9f34d3dbfa01a050d45966f97b1133bb70482753d04479a9156f48aeb5c90bf9e7dde6bba2310758fbab2900acbfe6b598015c40b512d64d42fc856087f3d888 SHA512 bdc7f9f585b362b3ad8676bd5cc1f4e849af8b6958fea2a131ff66923d109fabedcdb28772efe39c49e4adfe54b10820c7c2e83c1bc6de89b32e8b0ae71069e6
+DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0
+EBUILD gnome-screenshot-3.38.0.ebuild 1332 BLAKE2B 781c43ba1a3f6d0365500eef7da33ed2ba3d610702cf1be844333f02ca5a8e26a5dd7f673c5fdaaeb710f931a285bd489c72a169b0a3c894f909cee9658a424d SHA512 66126fef44e6d6b6a6c060e4bd8ab92d6943678554a0dc264e6141cacc0d688746b12c10f482b6fd728014a503db7dce0c145cb1cd222fca0787908f7edda880
+EBUILD gnome-screenshot-40.0.ebuild 1245 BLAKE2B dbed2f6b436bc243e18fb44155ceea506e9dc455ad0b75bca9456950ed180af0b3ecc8360a6fd27d3f2c657cbab085b91421e4fe206255e9d3b86c69f1ea35bf SHA512 44f9a2bef1f17809313368c185a13117b28b577ad135ea43dfb2aa7cbdc85b0c941724e2209264d27f5129241a32af41717b9e5c479747dd95388c066a6b28a6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
index 540ff2319e52..882eeb1a8d81 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 DEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
index 521236d8c9cd..56de65187634 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,16 +9,17 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
 DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
 	>=dev-libs/glib-2.35.1:2[dbus]
 	>=x11-libs/gtk+-3.12.0:3
-	>=media-libs/libcanberra-0.26-r2[gtk3]
+	>=gui-libs/libhandy-1:1=
 "
 RDEPEND="${DEPEND}
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -35,6 +36,13 @@ DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
 	non-interactive mode when launched from a terminal. If you want to choose
 	where to save the screenshot, run 'gnome-screenshot --interactive'"
 
+src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
+
 src_install() {
 	meson_src_install
 	readme.gentoo_create_doc