gentoo resync : 31.05.2021

4 files changed, 2 insertions, 130 deletions

diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 759e56eddd2f..21cf1e427fd0 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,4 +1,2 @@
-EBUILD gnome-light-3.34.4.ebuild 2060 BLAKE2B 1b60f2198f285e4c5bf9682aec0cf2bffcd95e349c0e24cc82b1b3f16be506c4322c1acf1d5d63c53b6256f5f4bb256da67133f53ce0affbb49ed30b97b2cbbb SHA512 5593d45f556ad1761cc8039c0b2a412485f1bd5eeec4df6bbd69afe11e3215a7d6adc52aad0757f4c6fdab49568ebf1a7d882f48cf4191f7dbe2f46b443bf7fa
-EBUILD gnome-light-3.36.5.ebuild 1970 BLAKE2B 3628cecef747f82e43c8ff4c2628713b805fcaa7f6ce25c6550cadb77cbd67536e3007e5bf5ddf40144a6d762601c3bceb34c857f8a57e84d7399ff3ddc00cb3 SHA512 6b5480767373b839c74d4374f3c421e00fc6c01195b81bdf0e6ab4cbd6bfc8ac89118f09f7b01c11836abed9ba7baf9b9f7c99ac4767d701f108d981923cef51
-EBUILD gnome-light-40.0.ebuild 1717 BLAKE2B d4d0fab84f0a956b6e5b40cdb1ae985ecf1932dd817d872316ef1e795a5994d1cb541ae80f829791a29ba8f16a8712d057e1d224df36ce10da21cee91ef984df SHA512 b9e0eb6d3b53b93fc40bb9f457e78e8100fdec06d98ad12cd491a3a7957fdd08d0e80ede64337060ce144c44cac9bf3e41f3a47f4111c8e00ef591d147d7ec58
+EBUILD gnome-light-40.0.ebuild 1715 BLAKE2B af4325be2540b4967315522dd75e0269404d62643d4fa855562d741544c2439399a4160c82cf0156d20051035a4370f17f439a8cac6be0966056ba9c392df5c7 SHA512 2b10405f256fcbb8d7e62056396ae3466d5fd9f47a067234b167277ac84388da0cb41ac61f88380be91de1fee0f554f7b131715395cd85cbfc119d1b7e72d85d
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.34.4.ebuild b/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
deleted file mode 100644
index 71ed235e22cd..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.34.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-P_RELEASE="$(ver_cut 1-2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-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"
-
-# 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.
-# cantarell minimum version is ensured here as gnome-shell depends on it.
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${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.34.2
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=dev-libs/gjs-1.58.5
-		>=gnome-base/gnome-shell-${PV}
-		>=media-fonts/cantarell-0.111 )
-
-	>=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-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.42.2"
-BDEPEND=""
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# 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
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.36.5.ebuild b/gnome-base/gnome-light/gnome-light-3.36.5.ebuild
deleted file mode 100644
index 8b7b24d21611..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.36.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-P_RELEASE="$(ver_cut 1-2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-KEYWORDS="amd64 ~arm ~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.
-# cantarell minimum version is ensured here as gnome-shell depends on it.
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-3.36.0
-	>=gnome-base/gnome-settings-daemon-3.36.1[cups?]
-	>=gnome-base/gnome-control-center-3.36.4[cups?]
-
-	>=gnome-base/nautilus-3.36.3
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=dev-libs/gjs-1.64.4
-		>=gnome-base/gnome-shell-${PV}
-		>=media-fonts/cantarell-0.201 )
-
-	>=x11-themes/adwaita-icon-theme-3.36.1
-	>=x11-themes/gnome-themes-standard-3.28
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-3.36.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.44.1"
-BDEPEND=""
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# 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
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/gnome-light-40.0.ebuild b/gnome-base/gnome-light/gnome-light-40.0.ebuild
index 62b434ecb70d..80b1472485d0 100644
--- a/gnome-base/gnome-light/gnome-light-40.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-40.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="metapackage"
 SLOT="2.0"
 IUSE="cups +gnome-shell"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of