gentoo resync : 31.05.2021

3 files changed, 2 insertions, 57 deletions

diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 55313ff8fd53..ada17d80ed23 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-core-apps-3.36.5.ebuild 1584 BLAKE2B 1b8d8373462487462edfbaa58f762223680662c2a2a442096a0fca951dee1beeaa26c50563051cc1b26d023c79c32d949927c2f2bf25cd2f0493766e852e4ca0 SHA512 7e9040f1b9e3afc6984b718b33b5362ab0286a14b770cc4b285e7baab681d3e0e48d20944b6b14c18a8db7a947cef7b6bbf7feb9a6823f67651262463479669d
-EBUILD gnome-core-apps-40.0.ebuild 1562 BLAKE2B 341268f162d6f0b765e0072fed79ab80bda8a3301d9f02a5f0071dbd01ad12ce5174e2a6af214c833bdee2a109895e4c60c7f6c03db219bf1e40002fee5f971e SHA512 fff02ae543560e7ba569ca3ae5b341e428b5b1d02a57a96bf7dc68d61862289f16d3596c109994d122ad289f09d840e00a49702c0992d5bb5eea993e4c8a5417
+EBUILD gnome-core-apps-40.0.ebuild 1560 BLAKE2B 3d9c0fe21a3dbc03efcdf66480c8fb2d82322232f0168307a247a7df70521b5250018083c383dd7a93ec17cbfbe40712773174f47dc8b3ff091ec977704e1ae7 SHA512 8f3ae5d58822269a8f114c3d4e7d9ecb687299f1850da87587bb8702d8d04b6ecc5c5197f82508221a7251035b6ab43a3c972b1cf4bf63e77d89d8683fa24d1b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
deleted file mode 100644
index 50b9c89a208b..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.36.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-# gnome-color-manager min version enforced here due to control-center pulling it in
-# tepl min version for gedit deptree
-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-extra/gnome-color-manager-3.36.0
-
-	>=app-crypt/gcr-3.36.0
-	>=gnome-base/nautilus-3.36.3
-	>=gnome-base/gnome-keyring-3.36.0
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-3.36.2
-	>=gui-libs/tepl-4.4.0
-	>=app-editors/gedit-3.36.2
-	>=app-text/evince-3.36.7
-	>=gnome-extra/gnome-contacts-3.36.2
-	>=media-gfx/eog-3.36.3
-	>=media-video/totem-3.34.1
-	>=x11-terms/gnome-terminal-3.36.2
-
-	>=gnome-extra/gnome-user-docs-3.36.2
-	>=gnome-extra/yelp-3.36.0
-
-	>=x11-themes/adwaita-icon-theme-3.36.1
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.1 )
-"
-DEPEND=""
-BDEPEND=""
-
-# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
-# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
index 355bf69f66cd..57bdf7fdf126 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # gnome-color-manager min version enforced here due to control-center pulling it in
 # tepl min version for gedit deptree