gentoo resync : 31.05.2021

3 files changed, 2 insertions, 78 deletions

diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 082e6423d171..5046e2ee83b1 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-extra-apps-3.36.5.ebuild 2553 BLAKE2B 183df2f88696323dcd316fac7e2cfffff1fa84349eba83a454865c777ae0b64effe01fcde98f07a450d378a57c079d60223c555f702a90a3a9534565a2d06dd7 SHA512 e69151df382331a3cee869ee72477d8767aa43a0896e4badaf999162593bda82f8d7677191ec0bdfdf854f48888198c5ae4b272380818e05d574981547320af8
-EBUILD gnome-extra-apps-40.0.ebuild 2505 BLAKE2B 5a84851ecd0a6805e7e7d6666aa176aeef74a42560102dd7b4383187d400d7b0de213168bfac3542359d8938841248239d1e7c2ae07aa758420a33de242480c1 SHA512 6c72898f23042db0bea1cddb254ae7a6bb9fe0a2a62f170f764a0242a2f95fd50a017b2b3b6c01f7a7bde612fdde2259ca520f57f76b254fe0bbb1efc8d29bb4
+EBUILD gnome-extra-apps-40.0.ebuild 2503 BLAKE2B 6109b188c736226dd89eb0aa90e013edba3685b35d7f1b0b1480415c3008b605061ab1b518dc0fdae41008751fe89bed76d2c0a8d8ece31ed65ecee278d6aa85 SHA512 b4c823d0c81c3de925ba1f2b5fd1a6ecf55c08077b5da9688ef8b8aaea63dc8b22b81eea7f6311d2da1f10b1c6a61481be77db451deb48c1e74a876f778d7624
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild
deleted file mode 100644
index ce080dd492df..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild
+++ /dev/null
@@ -1,75 +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 applications of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters?
-# TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36?
-# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time)
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=sys-apps/baobab-3.34.1
-	>=media-video/cheese-3.34.0
-	>=www-client/epiphany-3.36.4
-	>=app-arch/file-roller-3.36.3
-	>=gnome-extra/gnome-calculator-3.36.0
-	>=gnome-extra/gnome-calendar-3.36.2
-	>=gnome-extra/gnome-characters-3.34.0
-	>=sys-apps/gnome-disk-utility-3.36.3
-	>=media-gfx/gnome-font-viewer-3.34.0
-	>=media-gfx/gnome-screenshot-3.36.0
-	>=gnome-extra/gnome-system-monitor-3.36.1
-	>=gnome-extra/gnome-weather-3.36.1
-	>=gnome-extra/gucharmap-12.0.1:2.90
-	>=gnome-extra/sushi-3.34.0
-	>=media-sound/sound-juicer-3.24.0
-
-	>=gnome-base/dconf-editor-3.34.4
-	>=app-dicts/gnome-dictionary-3.26.1
-	>=mail-client/evolution-${PV}
-	>=gnome-extra/gnome-tweaks-3.34.0
-	>=gnome-extra/nautilus-sendto-3.8.6
-	>=net-misc/vinagre-3.22.0
-
-	games? (
-		>=games-puzzle/five-or-more-3.32.2
-		>=games-board/four-in-a-row-3.36.4
-		>=games-board/gnome-chess-3.36.1
-		>=games-puzzle/gnome-klotski-3.36.3
-		>=games-board/gnome-mahjongg-3.36.2
-		>=games-board/gnome-mines-3.36.1
-		>=games-arcade/gnome-nibbles-3.36.1
-		>=games-arcade/gnome-robots-3.36.1
-		>=games-puzzle/gnome-sudoku-3.36.0
-		>=games-puzzle/gnome-taquin-3.36.4
-		>=games-puzzle/gnome-tetravex-3.36.4
-		>=games-puzzle/hitori-3.36.0
-		>=games-board/iagno-3.36.4
-		>=games-puzzle/lightsoff-3.36.0
-		>=games-puzzle/quadrapassel-3.36.05
-		>=games-puzzle/swell-foop-3.34.1
-		>=games-board/tali-3.36.4
-	)
-	share? ( >=gnome-extra/gnome-user-share-3.34.0 )
-	shotwell? ( >=media-gfx/shotwell-0.30.10 )
-	tracker? (
-		>=app-misc/tracker-2.3.4
-		>=app-misc/tracker-miners-2.3.3
-		>=media-gfx/gnome-photos-3.34.2
-		>=media-sound/gnome-music-3.36.4.1 )
-"
-DEPEND=""
-BDEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
index 4c3b07cd0a2f..080f0126dc1c 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
@@ -9,7 +9,7 @@ LICENSE="metapackage"
 SLOT="3.0"
 IUSE="+games share +shotwell +tracker"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3