gentoo Easter resync : 12.04.2020

3 files changed, 26 insertions, 22 deletions

diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 45215478bb82..8ae1d76e6bbb 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,5 +1,5 @@
-EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
-EBUILD gnome-light-3.26.2.ebuild 1692 BLAKE2B 559111105e792c0f3af9dc66ba6ed8560845e9d8c4dd41af29b39fea2f38c3dd5b0f6552f46ecc9ca6f6c8b0262ecea07620101b2a7bd0426a5de9679244445f SHA512 f9bb9fc468fe5c73a508286c69468888897d449958bc06cd8e4a46730a362cc5f738d7212c0fa7ea9e81aadfef245b71271eba0587119809068876d217bb3e16
+EBUILD gnome-light-3.26.2.ebuild 1699 BLAKE2B 5524fb6b994de1d5fe9421b8a455f846723c04a84894ef7308b976190917579c0726da8863ad616e678297bde6a86dc5291c4475a6605b008eb7dc74d88bab94 SHA512 0a5dfecdcbe0012580f2f892b688d697e64a6371814999da87f11c7a3ad089232bf5f5af78b8f8b901de1a0fafe12cb51f8f70ab6de35ddf7caab47d7dbb5289
 EBUILD gnome-light-3.30.2.ebuild 1805 BLAKE2B 4c1838ffb4e0d820328d74699fd38bdd63341d29df9f2d163aa268dec57c6027a518a1a79e1e5e29440b15e2eb90b6f1a325039b60a3f330e7a5a085c08c4bea SHA512 d02216e925d09e40bb04d9eb3007a3d64377e0496aec4ecaea3f0e2d768f2170705a79058b7ec2286034ca46113a22919ed41acc158e39f5d8428c0ee4f407cd
 EBUILD gnome-light-3.32.2.ebuild 1807 BLAKE2B 7dc337abb97898a74c633c0abd0031a8531650533ff1b3f726bddf4b7edae168025f74f7b165bced43929664b25d31161b160dec183ec5b34eb892c0cd391c7f SHA512 afafedc5973de843d62e0b4421a60d2b2cedf4c9984968ce1fbcfde5b8a202cafbcf027bad199458e49bbdb0debb9c59a0341f9fb2ea160debbf5d453ad77546
+EBUILD gnome-light-3.34.4.ebuild 2051 BLAKE2B 0436692ab8975a9ea8a7a1305f6af16afe2d64beb37086806c6d89e7989820482544bf32d87b08fbf023978b1b71ddddb2627469c1567bca252958235fa8c551 SHA512 c22b2ab33d0460c23a10d2231093eacabc7578984a6cf6122e4cd18b0a430fdd9f8cf7e7f5b3788e93d9152419a26ecad1a18927bcb44e9960748f41d56e4d48
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.26.2.ebuild b/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
index 6bc63a15e87b..a76055ff37ca 100644
--- a/gnome-base/gnome-light/gnome-light-3.26.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.26.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
@@ -15,7 +15,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
index ad70f051b6c9..ccfad03686ee 100644
--- a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
-
-P_RELEASE="$(get_version_components 2)"
+P_RELEASE="$(ver_cut 1-2)"
 
 DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
 HOMEPAGE="https://www.gnome.org/"
@@ -15,40 +13,46 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
 # the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
 # any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
+# cantarell minimum version is ensured here as gnome-shell depends on it.
+RDEPEND="
 	>=gnome-base/gnome-core-libs-${PV}[cups?]
 
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.10.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
+	>=gnome-base/gnome-session-3.34.2
+	>=gnome-base/gnome-settings-daemon-3.34.2[cups?]
 	>=gnome-base/gnome-control-center-${PV}[cups?]
 
-	>=gnome-base/nautilus-3.20.0
+	>=gnome-base/nautilus-3.34.2
 
 	gnome-shell? (
 		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
+		>=dev-libs/gjs-1.58.5
+		>=gnome-base/gnome-shell-${PV}
+		>=media-fonts/cantarell-0.111 )
 
-	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
-	>=x11-themes/gnome-themes-standard-${PV}
+	>=x11-themes/adwaita-icon-theme-3.32.0
+	>=x11-themes/gnome-themes-standard-3.28
 	>=x11-themes/gnome-backgrounds-${P_RELEASE}
 
-	>=x11-terms/gnome-terminal-${PV}
+	>=x11-terms/gnome-terminal-3.34.2
 "
+# adwaita-icon-theme kept back on purpose due to brokenness without rust librsvg,
+# in the hope that the old icon package version is good enough for everything too
+# until librsvg gets updated. This dep should be raised to 3.34 with 3.34.5 meta.
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.28.0"
+PDEPEND=">=gnome-base/gvfs-1.42.2"
+BDEPEND=""
 S="${WORKDIR}"
 
 pkg_pretend() {
 	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're installing neither GNOME Shell"
+		# Users probably want to use gnome-flashback, e16, sawfish, etc
+		ewarn "You're not installing GNOME Shell"
 		ewarn "You will have to install and manage a window manager by yourself"
 	fi
 }