gentoo resync : 31.05.2021

3 files changed, 2 insertions, 54 deletions

diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 6b6fe72be3eb..eeb9266f2f7c 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-3.36.5.ebuild 1397 BLAKE2B c5f4dcad2f22798ad5b4714064577ceb332a6f7f45a0ab57e45972e33a7648a60be90ef2dadaa66e301236d10001b3e4b1c11bac4eb178e890533d22a724ae75 SHA512 d3ca311bd1161f2346425d1c6699863a50a177168f8f2e1725d3d84e24960ed5023a4f11ee15bbb94d3b4730e3553281597b4e1df08e4eb7568c7ae172aaa66d
-EBUILD gnome-40.0.ebuild 1392 BLAKE2B 4bb2b68c0a6160e8363ab14fc95af158f1414289b8c8ae3f682f6fe743069eb43a74ce68dbd4bda60f591b1cb2a0016d44f71bab62cac43350e8c1cd8c3465a2 SHA512 17d98fa9d380584cc2e34d12d59c81c3b68405d83e00633af23ff4be79f218b1ecdd326c007346822629d6cb4d76c3501f3d6d7ef8d5b23f042fcb9d9e7f7a3f
+EBUILD gnome-40.0.ebuild 1390 BLAKE2B ecdc3b016168e0eaaadc1d906337d72d9cab4b1470d53aa7216b1e86a54707fa2d4ba2416e5131b64459519cc5402fc5ef669bbb9b0292d40a3bf2035a83f3a9 SHA512 e690cf9b3abc062c167c3b2f3bd93f793e16ba9bfc0c11ffffccd226643de54f28bee23d0c0c5df97a09fbf0a5bc40e026cdaa0748cbf01f8550e3b83bbeaee1
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.36.5.ebuild b/gnome-base/gnome/gnome-3.36.5.ebuild
deleted file mode 100644
index ed66315b499c..000000000000
--- a/gnome-base/gnome/gnome-3.36.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-IUSE="accessibility +bluetooth +classic cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?]
-
-	>=gnome-base/gdm-3.36.3
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-	>=media-fonts/cantarell-0.201
-
-	>=x11-themes/gnome-backgrounds-3.36.0
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.34.2
-		>=app-accessibility/at-spi2-core-2.36.0
-		>=app-accessibility/orca-3.36.4
-		>=gnome-extra/mousetweaks-3.32.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-3.36.2 )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-PDEPEND=">=gnome-base/gvfs-1.44.1[udisks]"
-
-DEPEND=""
-BDEPEND=""
-
-pkg_postinst() {
-	# Remind 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/gnome-40.0.ebuild b/gnome-base/gnome/gnome-40.0.ebuild
index 8f2ee6a0416d..dc90a56b5c56 100644
--- a/gnome-base/gnome/gnome-40.0.ebuild
+++ b/gnome-base/gnome/gnome-40.0.ebuild
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 IUSE="accessibility +bluetooth +classic cups +extras"