gentoo resync : 02.02.2022

4 files changed, 113 insertions, 1 deletions

diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 9a7c7ca4c33a..e4c8ad9e1d51 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,6 @@
+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
-EBUILD gnome-music-40.1.1.ebuild 1922 BLAKE2B c04d24a55391de91bcabc80c0e091a5eccf82bed86c31dfd842d329fe243abaa2576a14397b8d93ad0a6f07e924cbac28e68907a0c1d66dbddb858ccbadd103c SHA512 aa38a8403b3be4da9cdea0e91b2467afc37fd49d022e8dbd5eb2704a88b93557cd627cbf3e7fc379d0d94e9a58d787ac28e92369d892ba1eaf6e7b9b081bc52f
+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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch b/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..4ae460ac99d7
--- /dev/null
+++ b/media-sound/gnome-music/files/40.1.1-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,24 @@
+https://gitlab.gnome.org/GNOME/gnome-music/-/commit/d9f35b542adbf6b0e1114c7c077df04212a98fc7
+https://bugs.gentoo.org/831936
+
+From: Jean Felder <jfelder@src.gnome.org>
+Date: Thu, 18 Nov 2021 12:09:26 +0100
+Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0
+where it returns a deprecation message:
+"DEPRECATION: i18n.merge_file does not take any positional
+arguments. This will become a hard error in the next Meson release."
+
+See: https://github.com/mesonbuild/meson/issues/9441
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
+ appdata_conf.set('package_url', PACKAGE_URL)
+ appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
+ i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     output: PROJECT_RDNN_NAME + '.appdata.xml.in',
+     input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
+GitLab
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
index 261d35742d1c..ff9dc73cd09e 100644
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -53,6 +53,10 @@ BDEPEND="
 	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() {
diff --git a/media-sound/gnome-music/gnome-music-41.0.ebuild b/media-sound/gnome-music/gnome-music-41.0.ebuild
new file mode 100644
index 000000000000..dc330de8c9a2
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-41.0.ebuild
@@ -0,0 +1,81 @@
+# 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.67.1:2
+	>=net-libs/gnome-online-accounts-3.35.90[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.24.14:3[introspection]
+	>=gui-libs/libhandy-1.2.0:1=[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}"/40.1.1-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
+}