gentoo resync : 31.05.2021

3 files changed, 2 insertions, 85 deletions

diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 0e88c7837647..77376906bab6 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
 DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
-EBUILD gnome-music-3.36.7-r1.ebuild 2048 BLAKE2B deffac9822c4e1e1cbd7763c1232e2ead11e75f85be8eb83ba47d64908f94c0a12ba39124c55ebab873d8aa36f946d249895aa9d32a7649e8755ed5ccbb49de2 SHA512 e35d55d9ebdffd199e1cb33e4e939ff6d086bf681db5de8a6f411ba0f23967c23a66bf045a270ad0ac962c1b47709566c66666aa6c168debb523531f7511d03c
-EBUILD gnome-music-40.0.ebuild 1924 BLAKE2B 773b2de156bd6f7ba259474f5238a75f512eb71e6a12c5f4cc46e81d6a8ef36c7b97e60e4052048e5710a7d5c18130f2b527c17408b714e537c45b7c53eca2a1 SHA512 2df4ac444137043ed57c452c4f7b15ebf2d7f6a4026d6ece952b4743eecb35c5654a00487e531885a821e2d7339e3ca1dfe33332f5f5ca7688634439ab3c7c99
+EBUILD gnome-music-40.0.ebuild 1922 BLAKE2B cb18d9568e0fb13bceecff8b94618c268f9afd415ab3e9a7a89d4c91888673b6e559ad7f078f4aee1fd00d18526e30d9c6cb2d26da022c72f3d27e2ec1ebb483 SHA512 9b12ea406f65353ad45eb719999fad8b45ff79fee26dff65b5cfd3e07b082fb138e845b1f0f90c64be18be3ad914f33e73cff0f94a18280bcbd3d2816359dafb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild b/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild
deleted file mode 100644
index 53a0cd867dfc..000000000000
--- a/media-sound/gnome-music/gnome-music-3.36.7-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-2.3.0:0=[introspection(+)]
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.12:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.10:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-2.2.0:0[gstreamer]
-		>=app-misc/tracker-miners-2.2.0:0[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index 2a208528839d..b9e291603ed2 100644
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2