gentoo resync : 29.12.2022

4 files changed, 11 insertions, 54 deletions

diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 1ef795688f31..e3a090feab8a 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,6 +1,5 @@
-AUX 41.3-fix-build-with-meson-0.61.1.patch 1237 BLAKE2B 4f010d12654cbc7d67ddfaa4980f1ed04a46e4161e96d66700b7c341350b1e22122b26a544e7c699f0e8e14ec7612dd800b1ae90922659ad946b4ec396ef5c2e SHA512 79fd82c6edf250384ef4ad73021b3dd77b088fcc7972fedb9beaaeaadcb103e07f53e3e388683ef992e45407f2685284a75a51b5c4ca51bcac3c041f155ab33b
-DIST gnome-boxes-41.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
 DIST gnome-boxes-42.0.1.tar.xz 1231252 BLAKE2B e80503c1a2dbc4a4990ff8fb477f7e72fe1a880412a91d42fffd93c68226c91d254daf28301d816e3555f8a88c9b3f27b35df406bde7483a4a8e98dd3e83e756 SHA512 74968525943ff1a695f2d0cbcd3b9066f2b8c87d6b3b7dea5dab2911600fb09c961ee547a759eed2a23636c7b242a86b56e5ee579dc01e9e9c9caac67a845b03
-EBUILD gnome-boxes-41.3.ebuild 3949 BLAKE2B 56bad55abc79cfb709f4a6bd595353a6022bbbe47da9b67981aba7e58d67209ad1233f1c1e4eaece23c7d435ce824839a7d891b4613603ae769a0af1035d54cd SHA512 3620a1f56bd98e51bd7e67a1f90dc7372af0218bf284f9bff3bd7fe331c5d1e32879b7c6d375ee285d824ebb17c088747b84a4116db756a3cdd0979c9b434fdb
-EBUILD gnome-boxes-42.0.1.ebuild 3853 BLAKE2B 9d3dab4e21c33ecdb5ef733afa2614b31bb89117a777fc3ea89bfec730ac046d4ef2c2216bbddcd71844bcfe2a19a270f8bc75286aa5748772479b7c7a26d064 SHA512 ef898a44103bcc5219833dd786702e72aa49aaf40d69a2f5a00981f22065a3a93f4f300a0416eab67150d1a0127e8685979c63c5198ac74bda61ecd61cad9227
+DIST gnome-boxes-42.1.tar.xz 1235760 BLAKE2B 4de67e369d2135acc2407789c06441840da32c2d13eb329ab874021a56685f64c66fcf47a00a9ddc287a5eeccc2fae799a26147a9ade6ab8b1877a3865407ac7 SHA512 8233c06abe7c6a3e816d599fd2f2729e19b356f130d0ec0cc9d3c47cab0d10ffcc9e8e3f263999ac50c17a7ea63bb417213465cca641fff60ea4bf1c79caaaa7
+EBUILD gnome-boxes-42.0.1.ebuild 3852 BLAKE2B f077a6d89ead04038dce83f85f0c7ee1d363fc26a0a2e07db5748d65f140cde0d55d2f89e57bd566dbdaefbac9e9dda8fba3173dbd918444d9d05c30b3db01d8 SHA512 6f1ebb0dd036865f817d0c3651b4d6739967814778aecfa7039a1f7e5eb04c9258f030d94924ec2ebb56ad14c42c774b29ea17396fed4d7d68cb3262fec0364c
+EBUILD gnome-boxes-42.1.ebuild 3853 BLAKE2B 9d3dab4e21c33ecdb5ef733afa2614b31bb89117a777fc3ea89bfec730ac046d4ef2c2216bbddcd71844bcfe2a19a270f8bc75286aa5748772479b7c7a26d064 SHA512 ef898a44103bcc5219833dd786702e72aa49aaf40d69a2f5a00981f22065a3a93f4f300a0416eab67150d1a0127e8685979c63c5198ac74bda61ecd61cad9227
 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
deleted file mode 100644
index d777e414f9f7..000000000000
--- a/gnome-extra/gnome-boxes/files/41.3-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-42.0.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
index 52f6b07c7db3..4d6d803a385d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="~amd64"
+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
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
index 771dda8dc471..52f6b07c7db3 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-VALA_USE_DEPEND="vapigen"
+EAPI=8
 VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
@@ -14,7 +13,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="amd64"
+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
@@ -25,7 +24,7 @@ DEPEND="
 	>=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
+	>=gui-libs/libhandy-1.5.0:1=
 	>=sys-libs/libosinfo-1.7.0
 	app-crypt/libsecret
 	>=net-libs/libsoup-2.44:2.4
@@ -35,7 +34,6 @@ DEPEND="
 	>=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:=
@@ -76,10 +74,6 @@ 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:
@@ -100,8 +94,9 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
+	default
+	vala_setup
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -112,6 +107,7 @@ src_configure() {
 		-Dinstalled_tests=false
 		-Dflatpak=false
 		-Dprofile=default
+		-Duefi=true
 	)
 	meson_src_configure
 }