gentoo resync : 02.02.2022

4 files changed, 44 insertions, 132 deletions

diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index e1531e31c2d2..294ab8837d99 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,6 @@
+AUX 41.3-fix-build-with-meson-0.61.1.patch 1237 BLAKE2B 4f010d12654cbc7d67ddfaa4980f1ed04a46e4161e96d66700b7c341350b1e22122b26a544e7c699f0e8e14ec7612dd800b1ae90922659ad946b4ec396ef5c2e SHA512 79fd82c6edf250384ef4ad73021b3dd77b088fcc7972fedb9beaaeaadcb103e07f53e3e388683ef992e45407f2685284a75a51b5c4ca51bcac3c041f155ab33b
 DIST gnome-boxes-40.3.tar.xz 1697444 BLAKE2B a7c1677224dde80142abdeeff8b99929c7b86ce38a3432bf0368ec93146df0a813cbeae033fc8cbcd2fb8cd5b28170e0385224f36a9517ed54244e94a3453b6c SHA512 1944414feb6fab054f46e32b5f245042c882cf0a1ecde0eafced81adda16af1018203139177d3f9fa1d2eaf1565ee9e3b3fdff63c4a4b06b0802e20a2f064890
-DIST gnome-boxes-41.2.tar.xz 1614708 BLAKE2B 9896d558951d36d60843e8e4bc237007b7917fe6cd672e6af0d801de1b8a44cefe5098666b5bce95b8aebf4c4cd4ebbbe5ec6c94d88dfeff54216f524554ba66 SHA512 ef14d4bfeb3202664bb96047de5656295f0186121599bf7a82184f4815e956e18f5ce60d0a45ec6e405ec4d22134cc4138018f0d3f86b8372303c0c639751803
 DIST gnome-boxes-41.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
 EBUILD gnome-boxes-40.3.ebuild 3881 BLAKE2B 91ab277097e6aa0ae96d2f0b9be598f170794005b6a4d6168ab8790cc0d3a06d5d6ab57424a1013ff009bacc4e86f4ead3f184bb0513afcd7c6f049ca89ccea8 SHA512 e8ede58a1bcaa336b74aff627613c6623c1ef25d09bf6c5364cdafef600c2799a2a133548579843af01a89617508af1aff290f22fc3ce0abc384f3b26c198051
-EBUILD gnome-boxes-41.2.ebuild 3882 BLAKE2B b8f7183fa7be203d31014a7eba873c206d68988c47b42843df5805212fb8efe98ca0f5207a7619a71daed4dca08605ea9eb55493ccb2787232a5db36e0acf601 SHA512 67d1d4b8539b5542426e556258e6718b2a6da6d0d950af457156fd87200410ad3d754bcce6da8575a19d8582d75397c50d5a7661698b0d6cd5f7b423e821c312
-EBUILD gnome-boxes-41.3.ebuild 3882 BLAKE2B b8f7183fa7be203d31014a7eba873c206d68988c47b42843df5805212fb8efe98ca0f5207a7619a71daed4dca08605ea9eb55493ccb2787232a5db36e0acf601 SHA512 67d1d4b8539b5542426e556258e6718b2a6da6d0d950af457156fd87200410ad3d754bcce6da8575a19d8582d75397c50d5a7661698b0d6cd5f7b423e821c312
+EBUILD gnome-boxes-41.3.ebuild 3950 BLAKE2B 3f48ea962b2365ad16f97f4cc371b282b027588e91db7c87deb711621208b3f26d03e18366b448f675f7bc5c3400924deb38cbf4b22baf2c39290bc7c2f31df5 SHA512 0637ecee8f366bb11521a8479d7dc9d3c9e9d6568863eec9e12f81d8e3be5489d036d73a22e54ab0d39d906c55ef4eb83687f5c6705b15f725da0d3006a60e74
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..d777e414f9f7
--- /dev/null
+++ b/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-boxes/-/commit/fd0acfbe79444687c73dea182c2d1a5fa1c77324
+https://bugs.gentoo.org/831934
+
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 15 Jan 2022 00:07:31 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+    ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d32638a8..2dc1798b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
+ desktop_conf = configuration_data ()
+ desktop_conf.set ('icon', application_id)
+ desktop = i18n.merge_file (
+-  'desktop',
+   input: configure_file (
+     input: files ('org.gnome.Boxes.desktop.in'),
+     output: 'org.gnome.Boxes.desktop.in',
+@@ -65,7 +64,7 @@ configure_file (
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file (
+     input: files ('org.gnome.Boxes.appdata.xml.in'),
+     output: 'org.gnome.Boxes.appdata.xml.in',
+-- 
+GitLab
+
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-41.2.ebuild
deleted file mode 100644
index a2108ec7a02c..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="~amd64"
-
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	x11-libs/gtksourceview:4
-	>=sys-libs/libosinfo-1.7.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-4.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:3
-	>=net-libs/webkit-gtk-2.26.0:4
-	>=gui-libs/libhandy-1.0.0:1=
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-	rdp? ( >=net-misc/freerdp-2.0.0:= )
-" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	app-cdr/cdrtools
-	app-misc/tracker-miners:3[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	sys-auth/polkit
-"
-# gtk-frdp generates gir and needs gtk+ introspection for it
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	rdp? ( x11-libs/gtk+:3[introspection] )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
index a2108ec7a02c..1c25fa6b9c26 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
@@ -76,6 +76,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
 If you have an Intel Processor, run: