gentoo auto-resync : 21:09:2024 - 12:11:53

9 files changed, 7 insertions, 391 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 827e90e16ac6..e04c0497363e 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d5762ba4d828..30f961580e98 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,10 +3,8 @@ AUX 3.50.2-c99.patch 960 BLAKE2B 32275ec4f28e06965951bfcf7d9dd0393e213d043187974
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.50.2.tar.xz 4964152 BLAKE2B 7279a5bcb0399fdcce723336a052dca13efa6f0af6ef7371b7cb8e76fbd7e1b0313e7f677cea530de62a93770c35887fd70bac551338f9a89860e2529b1f1519 SHA512 9e2a34e06a446ae142535072a3d6916e31b7be987b114c111fb0687fa32a3fe4085ba5a09ccd77fb395d107e5c673130dc770bae74a50fdb566c91cd9de85610
 DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed
-DIST evolution-data-server-3.52.2.tar.xz 5051576 BLAKE2B f4c897fe533e5d8bf13f21e1964b4a300b55e2422b00a2e02e87a1e7a73e82012b7f7719f92a3a7d6e133de9270a776c4ce09ccf8d9cc55e27ee1cb298fa94d6 SHA512 31c0ae52bcf6a96b4d128e39c85a1f1f3cb29f1d7e2ffca3aa0dac95431830e38f2fb1dd3323e77e9e353d260f6681c7f8a55fff421336e152e0902f0085cd34
 DIST evolution-data-server-3.52.4.tar.xz 5055252 BLAKE2B e493f16700533e97440a13dead51bb4654fbbb0345718eeb91e1e052f9599ededacb6e6693fa9de3d68288a6472503ab3a01cab4ac27be8cfc2d693389021aa0 SHA512 2847a15f7cb5b41cce94565a06f7baa02d8dd40241d59029ccebeb21215500ca6f1ac978f1142bde9348917f0534e181e2f7011ed245b6e7a6b1afda9975cfef
 EBUILD evolution-data-server-3.50.2-r1.ebuild 4871 BLAKE2B 8dd806bf662906cf00b0b4df4a6f2290155d260c56681704fdcf94476ae1d3582148128222e18bf9a8b0cb76bba1829030362a7768eb49761aa0fa2ebecc36e0 SHA512 dedf5e76480239e551e54c79b3d7f691ad376b15026ee834de768f1be6dd115455782f3985e44ae06f90aaa11f658f39907e8711c2820dbe5d84b52ac5bbaf90
 EBUILD evolution-data-server-3.50.4.ebuild 4873 BLAKE2B 4637a18c9f45ceb1239d774eaec265fa7dea726118d02e5a378c29b1b8e20509278056acbe196c15f6c02ce46aff6ebf00048de76d56a80b426d0449bdc5d8be SHA512 0ed1fa6b9c55f519d7b838bb64804178d97bcd423ff2296e37265e5f925dcefbf4871a41b51f5b4c6c0de621334fc1e4d679c4d6eb39892eb9e715d81a917e2e
-EBUILD evolution-data-server-3.52.2.ebuild 4851 BLAKE2B 939d0b52c8919bbe86b1faa6140511cd899c00a02a7981c8dfce6da91cb8754a2f148c14d7a84f6f2d1ea2549b9c5b7865039e89aa5cd10c4a84cceb6e4ef542 SHA512 dc81fd98def2eb5e44d4ea0f5a52a278345c95116dabfc28c0502a000d0aa8c0e98c06ed4b93daf97135cf5542d9e9f6943ae204b8f544663dac504f1077c501
 EBUILD evolution-data-server-3.52.4.ebuild 4851 BLAKE2B 35ee5654d215de59ec8de70b1c08df3f048cd289599e8a47753c93bda6fd759f62c9e7b5e0a07423bb7fd2909497a35fff1909a2b3be4f8f0a9d1ca116026f65 SHA512 0966096a4819b912e2b7f181f792725f9c5595ca0b777f0321a6b811fa7e3db90855599f7527cf59553dd85f03aee0ce110b241b83dd89de7ba0d389fb5cb24b
 MISC metadata.xml 1315 BLAKE2B 8d9fbe5cab469c2fb34467c7917dcf732b0b3f23869c513d2bce7cfb536912e496d1a42773dd0f64898d476b29e513574087f13411e8e7a310a3f049a7a34efc SHA512 30496793fcb68206bffc475f7b0cefb5f673bcc58e5994c1648dcb6c88696dfd6eda0a62a022a16effcfde829dcce565572b03705426fcd774acde6ad0b940bf
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.52.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.52.2.ebuild
deleted file mode 100644
index f77aac0a3a6c..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.52.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake db-use flag-o-matic gnome2 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.gnome.org/GNOME/evolution-data-server"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/64-11-21-4-3-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 vala +weather"
-REQUIRED_USE="
-	oauth-gtk3? ( gtk )
-	oauth-gtk4? ( gtk )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-# glib-2.70 for build-time optional GPowerProfileMonitor
-RDEPEND="
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:3
-	>=dev-libs/glib-2.70:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	>=net-libs/libsoup-3.1.1:3.0
-	>=dev-libs/json-glib-1.0.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=x11-libs/gtk+-3.20:3
-		>=gui-libs/gtk-4.4:4
-		>=media-libs/libcanberra-0.25[gtk3]
-
-		oauth-gtk3? ( >=net-libs/webkit-gtk-2.34.0:4.1 )
-		oauth-gtk4? ( >=net-libs/webkit-gtk-2.39.90:6 )
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-4.2.0:4= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		>=net-libs/libsoup-3.1.1:3.0[vala]
-		dev-libs/libical[vala]
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.14
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if has_version "gnome-extra/evolution-data-server[oauth(-)]" &&
-		! use oauth-gtk3 && ! use oauth-gtk4
-	then
-		ewarn "The previous installed version of gnome-extra/evolution-data-server"
-		ewarn "had USE=oauth enabled that is now split into USE=oauth-gtk3"
-		ewarn "and USE=oauth-gtk4.  Please consider enabling either (or both)"
-		ewarn "of these flags to preserve OAuth2 support."
-	fi
-}
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_setup
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-	  -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-	  -i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-#		-DENABLE_GI_DOCGEN=$(usex gtk-doc)
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_GTK4=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth-gtk3)
-		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth-gtk4)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=ON
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	virtx cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index a7f81f23f99c..369e72266d70 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,10 +1,5 @@
-AUX 3.50.3-fix-overlinking.patch 2595 BLAKE2B 05c0004e13a304a8643af033094087f5888c8f0b8309f83863c13d1feb3d148ac2776734ab39adcd343c9f57cbd7384aca8df58ce9f6d14af94c250ba29c27da SHA512 5737ab4dbb08e708137caa2089a41eac9ff2d7386fa93a52a43878fb2cb82ccf7d10fb4642988143140e6a33471364431490dcfc0ec696fa6e5d676f8a87f133
 DIST evolution-ews-3.50.2.tar.xz 707800 BLAKE2B 18241eff067658af2f4620af87dea1c9c7c62476bbf9bf259addf15868a3b7e3f156dc952f21af2cad7ba6c2da9fd348b8733e5887f4276ad7eeeca8f9088476 SHA512 9aa4bb023922e39132a0ac3171d95f8362116960aa14dcb961b31ad242e6d7bcf2e946f19aea2c6f9a5324ca0954731264594a27fbb2b0e2cc38eca0cf441108
-DIST evolution-ews-3.50.3.tar.xz 708336 BLAKE2B e8fe4e2a6539142847d6610a61e2f57a83d604946270cd7b23d7e34fa89a38f644a05e452bbc03a6d96553936a38719afb7296eed03c7134735f937943d57114 SHA512 12c7fbe72f375837f185d4c8dbcb2167d327a0ad4b2ca822e4e5349d561e996e7a7405c6f8d36ceeddff0015286117db66a65d2756003aa8ca96948d7826e51f
-DIST evolution-ews-3.52.2.tar.xz 721964 BLAKE2B 53962e66f12e660f15c6fb300f30545d2380d5d12a1bce59ba64a44c7cefbdfaee2e1fa319e31e4c4c21cfd462e2c02aa96ee8efe78d4771bd8429aa18e89136 SHA512 b92db18b347c19fab15097aa7cedef876ca13364ece0ff2836cf6160bb2eb2ceb8d7eeaf9bada0369776ea32edca6938952a0dea04b229afd9690c744e16616c
 DIST evolution-ews-3.52.4.tar.xz 724244 BLAKE2B 35b78fa600e06c18cecee8c43941e77b3645a7d4487d72d989da62a0c7acab83f2adf4363c761d7e313f42175f341d63ec7709003599bf5b37e80424cc76d67c SHA512 017dbe28ba6524cdad1582cebd00fb675c75f52cac5875c756be0f402d4a0dd4a83e60b7ee0a2f71211eac49c04bba924e3d71775dce1e55fdcd372b1ac3747d
 EBUILD evolution-ews-3.50.2.ebuild 1659 BLAKE2B 9766a56edcc7ae57172023c21cf9a1656b6ca9d3f51264a4483459a1ea3b7040137d9d7f94d12bd55ec85a0ab18ae78d439fd2268c8f21fa13352210b2220c96 SHA512 a0c2ee563b18c8772e31d1a43ca0cd2745af3e8a5717ed55830da16713249a3f97b50488aa2dfca98a836f5e6d4f3d254679d83cac1adeb169b5336a8636cfa1
-EBUILD evolution-ews-3.50.3-r1.ebuild 1836 BLAKE2B ccd1c7f521adf49610ffb2bb95021a286e9e4cf709df12f3bd87f83ef2650444e66e074180b411eabe07435cf557d6062321f5bb2bab119c9f0d28fa9e594ebd SHA512 29ea16b0972f6c043f442d3750e58bd90527896d67f35d1031a636264b5b18982a7090d222f293c1d47a800551ac75a9070a11df2439138b2fd78e9bae8f4c92
-EBUILD evolution-ews-3.52.2.ebuild 1596 BLAKE2B 08e07580f81872b94fb99b7047bc0c9c5590e2371ebc422e97b5e00434f9402532f23b14bf0d59025a099dab07afbc04b6ae15283d23cec25e14e709289f4d15 SHA512 5c86b22bb88ace1014b45c1aa90de4bf135ac1995a5cb2704f71698c1da599900b06267e91e2a64aee4150b7a5c2e666eaac14ae69772a184dc13ffc3299dd9f
 EBUILD evolution-ews-3.52.4.ebuild 1596 BLAKE2B 08e07580f81872b94fb99b7047bc0c9c5590e2371ebc422e97b5e00434f9402532f23b14bf0d59025a099dab07afbc04b6ae15283d23cec25e14e709289f4d15 SHA512 5c86b22bb88ace1014b45c1aa90de4bf135ac1995a5cb2704f71698c1da599900b06267e91e2a64aee4150b7a5c2e666eaac14ae69772a184dc13ffc3299dd9f
 MISC metadata.xml 354 BLAKE2B a6cf76e87956f2418a25c83542af3e5efe415943426b03750b2572129b06f977f900207a1eef805b7ae463a84204d12bf286ef9ed0a5b6990cbac2c77783260f SHA512 9f06dce58e2dfdba0a22f8a711d5fc98aba9ae1d130173bd7ef8effd0bb3c1cf046eef712f7ea7bd55c4382ca01e78d7028419ce41812d33ef38a1329978af56
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild
deleted file mode 100644
index 3fee01d4d062..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-3.0:3.0
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( >=net-libs/uhttpmock-0.9:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix wrongly linking in GTK3 webkit without --as-needed, which breaks GTK4 evolution-data-server apps like gnome-contacts
-	eapply "${FILESDIR}"/${PV}-fix-overlinking.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.52.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.52.2.ebuild
deleted file mode 100644
index aa6c1306dab2..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.52.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libical-3.0.5:0=[glib]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-3.0:3.0
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( >=net-libs/uhttpmock-0.9:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
-}
diff --git a/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch b/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch
deleted file mode 100644
index 7628390f27f8..000000000000
--- a/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c9e8707d024048ea595d825ed08833c9aa6bff37 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 4 Mar 2024 18:02:54 +0100
-Subject: [PATCH] build: Correct overlinking on the m365 part
-
-This can bring in gtk3 and other UI-specific libs into the background processes,
-when the compiler does not filter them out, which can happen with clang.
-
-Related to https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/222
----
- src/Microsoft365/calendar/CMakeLists.txt | 3 ---
- src/Microsoft365/common/CMakeLists.txt   | 3 ---
- 2 files changed, 6 deletions(-)
-
-diff --git a/src/Microsoft365/calendar/CMakeLists.txt b/src/Microsoft365/calendar/CMakeLists.txt
-index 676e2d7f..60801886 100644
---- a/src/Microsoft365/calendar/CMakeLists.txt
-+++ b/src/Microsoft365/calendar/CMakeLists.txt
-@@ -27,7 +27,6 @@ target_compile_definitions(ecalbackendmicrosoft365 PRIVATE
- 
- target_compile_options(ecalbackendmicrosoft365 PUBLIC
- 	${CAMEL_CFLAGS}
--	${EVOLUTION_CALENDAR_CFLAGS}
- 	${LIBEBACKEND_CFLAGS}
- 	${LIBECAL_CFLAGS}
- 	${LIBEDATACAL_CFLAGS}
-@@ -41,7 +40,6 @@ target_include_directories(ecalbackendmicrosoft365 PUBLIC
- 	${CMAKE_SOURCE_DIR}/src/Microsoft365
- 	${CMAKE_CURRENT_BINARY_DIR}
- 	${CAMEL_INCLUDE_DIRS}
--	${EVOLUTION_CALENDAR_INCLUDE_DIRS}
- 	${LIBEBACKEND_INCLUDE_DIRS}
- 	${LIBECAL_INCLUDE_DIRS}
- 	${LIBEDATACAL_INCLUDE_DIRS}
-@@ -51,7 +49,6 @@ target_include_directories(ecalbackendmicrosoft365 PUBLIC
- target_link_libraries(ecalbackendmicrosoft365
- 	${DEPENDENCIES}
- 	${CAMEL_LDFLAGS}
--	${EVOLUTION_CALENDAR_LDFLAGS}
- 	${LIBEBACKEND_LDFLAGS}
- 	${LIBECAL_LDFLAGS}
- 	${LIBEDATACAL_LDFLAGS}
-diff --git a/src/Microsoft365/common/CMakeLists.txt b/src/Microsoft365/common/CMakeLists.txt
-index 1b81e6ea..def3d020 100644
---- a/src/Microsoft365/common/CMakeLists.txt
-+++ b/src/Microsoft365/common/CMakeLists.txt
-@@ -31,7 +31,6 @@ target_compile_definitions(evolution-microsoft365 PRIVATE
- 
- target_compile_options(evolution-microsoft365 PUBLIC
- 	${CAMEL_CFLAGS}
--	${EVOLUTION_CALENDAR_CFLAGS}
- 	${JSON_GLIB_CFLAGS}
- 	${LIBEBACKEND_CFLAGS}
- 	${LIBECAL_CFLAGS}
-@@ -48,7 +47,6 @@ target_include_directories(evolution-microsoft365 PUBLIC
- 	${CMAKE_CURRENT_BINARY_DIR}
- 	${CMAKE_CURRENT_SOURCE_DIR}
- 	${CAMEL_INCLUDE_DIRS}
--	${EVOLUTION_CALENDAR_INCLUDE_DIRS}
- 	${JSON_GLIB_INCLUDE_DIRS}
- 	${LIBEBACKEND_INCLUDE_DIRS}
- 	${LIBECAL_INCLUDE_DIRS}
-@@ -59,7 +57,6 @@ target_include_directories(evolution-microsoft365 PUBLIC
- 
- target_link_libraries(evolution-microsoft365
- 	${CAMEL_LDFLAGS}
--	${EVOLUTION_CALENDAR_LDFLAGS}
- 	${JSON_GLIB_LDFLAGS}
- 	${LIBEBACKEND_LDFLAGS}
- 	${LIBECAL_LDFLAGS}
--- 
-2.43.0
-
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index f1c42b38468c..ce8993ced180 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -3,5 +3,5 @@ DIST gnome-commander-1.16.2.tar.xz 6239476 BLAKE2B 56f44428b89ef765bfb976dc3e808
 DIST gnome-commander-1.18.1.tar.xz 6244688 BLAKE2B a903a82c76a064e33320ffdd52563df5e05d42d9aa1dd42f97ba36b2569e6bff68a5581dae9c819d6f1b93f544b5f543e7859c7c4a8f0639f2d3175961503bb3 SHA512 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e
 EBUILD gnome-commander-1.16.1.ebuild 1274 BLAKE2B c56a7bf65a871cc45bd8cec9ef5df05e766e640d641811c8dafead35fd5f8a246726ea94af18e26c22c321ab3ef64b85f3843a7a00227b66443206b7f21d9b55 SHA512 477757d113f59dbf04a1d8c495166ddf0bd2e8805c3e3871207c44d45feb37295ffa6e5a9ac47950b054a0518779510db76855ab94453727e5e0c12af2adbdcd
 EBUILD gnome-commander-1.16.2.ebuild 1283 BLAKE2B ee87ddfdbb0b73877eb1145d57b11868fe2a54d652334b0e5221b19d6172ac9ebee1a967cadd2b54c5cd44865e142a79e6b1a4e541e1edc34bb5da601f424cf5 SHA512 246ea3bca76d617b140b35dff683e55236841ef567e5dceb51ee11573840538869def9ed81d3b7d427cafb84dab0bb45f02ed6b9a474ff18bb8cbd353d1ae56f
-EBUILD gnome-commander-1.18.1.ebuild 1263 BLAKE2B 60e5cbc2efe2855470fb6e0bdccfc2b3c9a08071f5b4faace759a0f88f1c33b84e8711811e5987feb129982744244a691ac33f770bf2ddb37a5c9b48d3777f10 SHA512 b220e6b475b8a945924cec8588ee2b2088adee17efe10b4865dc1a87bfa239f2607b17250849f15358f2bf2761ee640dfe9916ea1ba89ee2d58ebbfb898efc77
+EBUILD gnome-commander-1.18.1.ebuild 1308 BLAKE2B 3d7c89601dcf3f3aecc37a02e1a88213407e2c6e0be93f856adffe4a16958dec7a3eda27d61ed08493dba62970f0919bf3d166e2bbe3eb497ebce58b9767fc43 SHA512 d65f3ccb3d3b37c2758e912e7cf871fb2bfad4141d383f2a6b1f579fea4ae727249b2aa097450fadb7b088a76237d14d6970cd1e20d513c52b0eadec49348d2b
 MISC metadata.xml 948 BLAKE2B 2ea88ff9c2531e373cf0dc514c0e27fc48abe4617ed8ee0cf7ffc9970959908a65be67aa6910528f5dd41636e32db4d3ded7cad46d34f86cd9fd350970eed3c1 SHA512 7058510cec87b1ba608fecc1cd748b2caf5f7802a13288d631634a3b0ea6c5daa7ab3b3b17987140aec779f58436924bb19765471a0a3b1ea9afba1b5a2b3ea6
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild
index 0bf6498899f3..382cbe79e6ad 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.18.1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-inherit gnome2 meson optfeature
+inherit gnome2 meson optfeature virtualx
 
 DESCRIPTION="A graphical, full featured, twin-panel file manager"
 HOMEPAGE="https://gcmd.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc exif gsf pdf samba taglib test"
 RESTRICT="!test? ( test )"
 
@@ -50,6 +50,10 @@ src_configure() {
 	meson_src_configure
 }
 
+src_test() {
+	virtx meson_src_test
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	optfeature "synchronizing files and directories" dev-util/meld