gentoo resync : 20.03.2022

3 files changed, 2 insertions, 84 deletions

diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index e4c8ad9e1d51..e2cc08790a66 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,6 +1,4 @@
 AUX 40.1.1-fix-build-with-meson-0.61.1.patch 941 BLAKE2B b55eeaf227b092e11855fbd00ffadb3bc63c8cecb4689ea23351b525f4c8d1452b772edb344c07b6533b2831451e3c522f76290b85314e8db8760559f8c2aaab SHA512 a0e2940c11f8513b501e9f3561e68cbee93932a8b4ef967513399267b21f307b8b7a27eb1ffe89f6edfedf9e36f15a517dbef3fd3c0c4fc8d169356a80e7bbbe
-DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
 DIST gnome-music-41.0.tar.xz 898652 BLAKE2B cc72eb7be553ccefe10620a85aa3ee75aa30c1809e810a8ebb30a2ffbccebb9dc173cc79859e098be97fea9c964f0f6969f55c7c84ea9540a93a920376746ac1 SHA512 883f8862d5216ab30c3208a316378c2ef016ba52861c9261b8fa9ceb44f935e4dc35608ea66b333c3bf61c9dcc950fa338adfadc2d5e7f67a7a84467228d28a2
-EBUILD gnome-music-40.1.1.ebuild 1990 BLAKE2B 8621499508927fd17467b03a24fb2c1d0b9e14ae43d19303437c10975779fbdc1cab2ff55ab597385d996177bd9567636a1dc59e19b04b1215bcb32f71de0aeb SHA512 94ca4e4b51b1226f67312249f7a0bf7fa6381a3e39d610e29b9a75d45f35b6035d590ade31f5592c902670cf42ef4922bd97d0aaf4fbd92de9f4f6a91fc16f4c
-EBUILD gnome-music-41.0.ebuild 2041 BLAKE2B 5532cfeb72dd94ec3bfcf64b36843c2f46fb91b28b4d4818e1398f57a6ccd861f30d98cc7ccab48d43c7dcdbff7325b703fb04e736e17cb3524f1d6600b76ac3 SHA512 00f2e51f3eb21cfbd5be7e4575a060ebf00f81a9f9dc9e2cdcc5f83b2b123b5e7e4cc0b4d19d88a371ea4416cf39b1e7fd3db70bbc4105cde206df51892b835c
+EBUILD gnome-music-41.0.ebuild 2038 BLAKE2B 320ae70e53fbf0fd10d422c9474e8ad51e9fec306d44286fbf00cb204b4b7bdfdbf1b3353e34d233e7dde1f99dda502874c3fcb4afa6c7ed59c43797b5d68275 SHA512 c39ca3701a2d60bb50c410159307ef08eda5af203e13fc1d023bc003578d15d3cfd04081d3aba6b429bc03305dd7db3a20c079c04db1623d3b69837d995a1e82
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
deleted file mode 100644
index ff9dc73cd09e..000000000000
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv 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:3=[introspection(+)]
-	>=x11-libs/pango-1.44:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.13:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.13: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:3[gstreamer]
-		app-misc/tracker-miners:3[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
-"
-
-PATCHES=(
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-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-41.0.ebuild b/media-sound/gnome-music/gnome-music-41.0.ebuild
index dc330de8c9a2..a60fd556fd2b 100644
--- a/media-sound/gnome-music/gnome-music-41.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-41.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.67.1:2