gentoo resync : 02.02.2022

4 files changed, 35 insertions, 67 deletions

diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4f76d9d14909..65af73df78a0 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,7 +1,6 @@
-DIST gnome-disk-utility-40.1.tar.xz 1387480 BLAKE2B ef3650cadd2f5e264abbf805fa0af1c7e9e30e067c946d91dd879600e2db5b9af83cc8f7990954cd8d859a7456d4054ddb9bcad0ed716a08b848f78dddda98d8 SHA512 be7a298f6ca9afad5dfd420a5ff5386a1e096f7d956339d5528702b2bd2b657dad4b9017b0ae519d13480fe0806fa64fd1c94e2c1136ee00a6b17c7f21a0acf1
+AUX gnome-disk-utility-41.0-meson-0.61-build.patch 763 BLAKE2B e4e2732bd634635c43db1e8fb17cb7b74a9540c90b686f5d0573be452a80a4ee1fa8c7bd6adee3a1f5709c4914fc418072b74ad00f3aaccdafc02460317b3fc8 SHA512 188aa575f186e46b17f5614737f51de6a5ecce1484610b64001cc12f3dbabef041222055844f8017a9baf1b58a0931c37b1bf2f2ecabc352b6355928edee1dd3
 DIST gnome-disk-utility-40.2.tar.xz 1387320 BLAKE2B fa5df2f3c18a6635e41fdbab7382b036771028b86bff6adf94241aa2919d2a489f1829299e6efb46ab25daccba01919d372269250a3456319f4057a0dcec76cd SHA512 a674968270fa00874f69e1d3db7afea9cab7d5a0cbedbc1aae02282941d5e92f4816b27f35b6775e758148fa27750460adbe4c6f591a68caab0c6c9d709fa50c
 DIST gnome-disk-utility-41.0.tar.xz 1401088 BLAKE2B 78769a714a8e5ee5596da3502562a7a136f54c7b832f44b8b70bae60de42af9dda433c4acd3b74ca31f71e53a633f2888c4e21d6ce9d9ccf2a03485903b3985f SHA512 a78dd281c078046abef5c0986777c6a87bc27d9b1bd6e798b5be058a3352b33dead8f5fea6e8f30e8c61bdd21996ee7d784838d953a33973243faabd7b713895
-EBUILD gnome-disk-utility-40.1.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34
 EBUILD gnome-disk-utility-40.2.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34
-EBUILD gnome-disk-utility-41.0.ebuild 1424 BLAKE2B bdcfdf7aaf11bd82fdd0804bda715c845743997e5723aaa1dc3e689db141dbe5fc337c6918eb81e33d2b5fa01dd4ba4970f729f295230bda1102b4534312f7eb SHA512 c0ace5b55f944b654ad0f3d7f4ce5f802f49e5b1e7ce02c97cc5fe78191cecf0eb52a6f17532394206f4c7eb020980069b7eaa7661b9058366edc66968ddaf6f
+EBUILD gnome-disk-utility-41.0.ebuild 1480 BLAKE2B d2fb8fd0d1aac29340705abe1f1030ff47c00a18443d527a903212259be5ba72f3315da2769e0a11a0ff2491607a3e7f468e719598f265c3c1aa60cf92681b29 SHA512 1954cee069d16c8ed411b5e429668addf72e3ef43ebce227c8a377705b67666c1582ddb8896fd9b243bd8b03a19298ad5e2cdd9a57bf40dcf7d950972f53de6e
 MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
new file mode 100644
index 000000000000..c28b9002575e
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/commit/46ed7d26873b9741dff61f9df8e7778a8dc6f5cc
+https://bugs.gentoo.org/831552
+
+From: rvalue <i@rvalue.moe>
+Date: Fri, 17 Dec 2021 12:29:30 +0000
+Subject: [PATCH] build: fix arguments of i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ desktops = [
+ 
+ foreach desktop: desktops
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -38,7 +37,6 @@ install_data(
+ info = 'org.gnome.DiskUtility.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+GitLab
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild
deleted file mode 100644
index 5879c632cfb8..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat elogind gnome systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	>=media-libs/libdvdread-4.2.0:0=
-	>=dev-libs/glib-2.31:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=gui-libs/libhandy-1.1.90:1=
-	>=app-arch/xz-utils-5.0.5
-	>=x11-libs/libnotify-0.7:=
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/libpwquality-1.0.0
-	>=sys-fs/udisks-2.7.6:2
-	elogind? ( >=sys-auth/elogind-209 )
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-# libxml2 for xml-stripblanks in gresource
-BDEPEND="
-	dev-libs/libxml2:2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
-		$(meson_use gnome gsd_plugin)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
index 8a105cdcc510..29b765c1c98d 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))