13 files changed, 1 insertions, 579 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9cefa9ad6528..cd702d9ab2e0 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 d19301285aeb..3360afbd49ea 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,13 +1,8 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
-AUX 3.48.4-aliasing-fix.patch 1235 BLAKE2B 9bf57c58895057183692756afa0774f1d09d6e5ac3151a1c4d475834ed8763594265d336ec8b237c16476aafe29bdd5920d598d2990279a667586c87fec2fe90 SHA512 79e204b9bbe193281f4878f71895ff4741874b1746458897ece5e4eef5fdd71fc93523d814ba118aa8b17601aa494c71d0f4913591f116b0d38106e484783928
 AUX 3.50.2-c99.patch 960 BLAKE2B 32275ec4f28e06965951bfcf7d9dd0393e213d043187974ed8f7e5f8f77952e8123c24b781cd18739700ec3c014ff22aa3943ad5996b0d68dc54e3509f8d292f SHA512 0524fe875ab87ad8c0725aa6f30cfeacfc03e70a4468e7fdc72fd0cdc5a00c3d273d22756e756f04f40916bc761fd7fd8d5d6c874f5b4369230f0c1cb4edfa9c
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.48.4.tar.xz 4906356 BLAKE2B 13cbd21d8f6829d052227d3d328439d5f00a2cda2384ffeace791a563ed8acdcd707729ae032dbdbe16e530b2e6205c006412f1cbaa03e8fb6d669c2c75d67bd SHA512 35bc6653efdb70a110f39499945516408090f101319a3080c87f6e14f886e0f9283225c4c5b6a4c2af418b9928c5eb7fba2d319481c81af1fa87f7dd930f7215
 DIST evolution-data-server-3.50.2.tar.xz 4964152 BLAKE2B 7279a5bcb0399fdcce723336a052dca13efa6f0af6ef7371b7cb8e76fbd7e1b0313e7f677cea530de62a93770c35887fd70bac551338f9a89860e2529b1f1519 SHA512 9e2a34e06a446ae142535072a3d6916e31b7be987b114c111fb0687fa32a3fe4085ba5a09ccd77fb395d107e5c673130dc770bae74a50fdb566c91cd9de85610
-DIST evolution-data-server-3.50.3.tar.xz 4964556 BLAKE2B ddc37e2f1bfbcfbb1150a4fa89d5ffe1000c1f3e3b3f588f3f66d855986082c06034e87c2c4326bd4a8636eb22f078268883373235b816d55516fe83f999f623 SHA512 7c7142bd56846610a63b447a20dd6001bbebe146fed815230fa51ceb10d166975b1c9e49967ee87c90d5e70b598a76363885acadc6da0d314453a86546eb3064
 DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed
-EBUILD evolution-data-server-3.48.4-r1.ebuild 4242 BLAKE2B 0580edc90c0b1f1a82364a1b202d9045ce3bcafe45b4f819171f4029052b31899dfb17cbe0519d03c0d91c6fde97cfdbc68c810c7df030794ead05f98aafdcec SHA512 4e0fc3e3c2f01df64c38f7575b16e1ae7ec75d2ec5344b947a4a9c095c23428b07e19c28362ef04eb7f23af87b1ab448d2067e0f3eabd306de7043fd58fe4467
 EBUILD evolution-data-server-3.50.2-r1.ebuild 4799 BLAKE2B 7935ddb9a071216bd83fa08c0cee0aadf576e97b43cd065a2f79ce49c304d90d3e5ff82a544d300fe02d3b9dc50a9c243ad29c5d58a25ed927146dad33bb6797 SHA512 6c50ed1e2f36ef7eb267a14621cffd7256a5d99cbe2a3b1229f55680feef178bfceb2385fae9e3d8b0ae7448b8870f7548a211c7d5a9969a102fc1d32e2dcfc9
-EBUILD evolution-data-server-3.50.3.ebuild 4802 BLAKE2B fe2a72404990178bd3606b8254f1d9751f819b59baf5d163c8f8f690a396f23c74d36bccbdf313035fe034c6d595c030f4e96d84148e3aa6fca0aef5d6420ac6 SHA512 723121ae083ed8dd21943366f706ffa2c222b0260a4b985c154f7640cd58a7d5a77c8194e98bdd62a39293155b2e28d93531c560ebd6977f0f41cd6fcdf4908c
 EBUILD evolution-data-server-3.50.4.ebuild 4802 BLAKE2B fe2a72404990178bd3606b8254f1d9751f819b59baf5d163c8f8f690a396f23c74d36bccbdf313035fe034c6d595c030f4e96d84148e3aa6fca0aef5d6420ac6 SHA512 723121ae083ed8dd21943366f706ffa2c222b0260a4b985c154f7640cd58a7d5a77c8194e98bdd62a39293155b2e28d93531c560ebd6977f0f41cd6fcdf4908c
-MISC metadata.xml 1564 BLAKE2B d79ded98c993bf742359631b96c98d119ab777968cc57f0e8f455521ab1d4c59de3f05869abc8abe0476b2be24a1e98b9462969c6d6571f872942c059dc26728 SHA512 7ad29524094d811c5194c6f43e5af130830afb02633cc527db361c66b3edf3890599cbc03734e4c3db57429d1a4fa5072395097d5846402ab7f6ab999107a48c
+MISC metadata.xml 1315 BLAKE2B 8d9fbe5cab469c2fb34467c7917dcf732b0b3f23869c513d2bce7cfb536912e496d1a42773dd0f64898d476b29e513574087f13411e8e7a310a3f049a7a34efc SHA512 30496793fcb68206bffc475f7b0cefb5f673bcc58e5994c1648dcb6c88696dfd6eda0a62a022a16effcfde829dcce565572b03705426fcd774acde6ad0b940bf
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild
deleted file mode 100644
index 5a6c3d1c0a73..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 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://wiki.gnome.org/Apps/Evolution 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-2-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 vala +weather"
-REQUIRED_USE="
-	oauth? ( gtk )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~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? (
-			>=net-libs/webkit-gtk-2.34.0:4.1
-			>=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
-		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 )"
-
-# 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
-	eapply "${FILESDIR}"/3.48.4-aliasing-fix.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_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)
-		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
-		-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)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-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-data-server/evolution-data-server-3.50.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.50.3.ebuild
deleted file mode 100644
index b28a6b0606eb..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.50.3.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://wiki.gnome.org/Apps/Evolution 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-2-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 ~ia64 ~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
-	eapply "${FILESDIR}"/3.50.2-c99.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() {
-	virtx cmake_src_test
-}
-
-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-data-server/files/3.48.4-aliasing-fix.patch b/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch
deleted file mode 100644
index a451c6f5bc7c..000000000000
--- a/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/912720
-https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/484
-https://gitlab.gnome.org/GNOME/evolution/-/issues/2485
-https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/126
-
-From 087226d29de3ef9070fb7436ca3dcc476cd9a9a5 Mon Sep 17 00:00:00 2001
-From: Enrik Berkhan <enrik.berkhan@inka.de>
-Date: Thu, 6 Jul 2023 15:44:53 +0000
-Subject: [PATCH] Camel MIME utils: fix aliasing issue in datetok
-
-Due to an aliasing issue, datetok() always returned NULL.
-
-With this change, the C aliasing rules will be respected. Further, next is no longer required to be the first element in struct _date_token.
---- a/src/camel/camel-mime-utils.c
-+++ b/src/camel/camel-mime-utils.c
-@@ -4160,7 +4160,7 @@ struct _date_token {
- static struct _date_token *
- datetok (const gchar *date)
- {
--	struct _date_token *tokens = NULL, *token, *tail = (struct _date_token *) &tokens;
-+	struct _date_token *tokens = NULL, *token, **tail = &tokens;
- 	const gchar *start, *end;
- 	guchar mask;
- 
-@@ -4187,8 +4187,8 @@ datetok (const gchar *date)
- 			token->len = end - start;
- 			token->mask = mask;
- 
--			tail->next = token;
--			tail = token;
-+			*tail = token;
-+			tail = &token->next;
- 		}
- 
- 		if (*end)
--- 
-GitLab
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index 0ba0e87a180c..d705ce69fe9e 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -8,8 +8,6 @@
   <use>
     <flag name="berkdb"><pkg>sys-libs/db</pkg> support needed to migrate old (pre-3.13 evolution versions) addressbook data</flag>
     <flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> based Google authentication support</flag>
-    <flag name="oauth">Enable internal OAuth2 authentication support for Google and Outlook.com. If gnome-online-accounts is enabled a
-nd used, this is not necessary, but both can be supported at the same time with different setup at runtime</flag>
     <flag name="oauth-gtk3">Enable internal OAuth2 authentication for GTK+3 applications (libedataserverui-*.so) support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime</flag>
     <flag name="oauth-gtk4">Enable internal OAuth2 authentication for GTK 4 applications (libedataserverui4-*.so) support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime</flag>
     <flag name="weather">Enable optional weather calendar support</flag>
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index bc1b2b311adf..546dec898945 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,7 +1,5 @@
-DIST evolution-ews-3.48.2.tar.xz 701356 BLAKE2B 8c941302f383870bacf0dd3f02b28be34105ec7f612b027a505b98be0f66099d65671808e26e86ce756fc47116d012aa1c82fff74c5a501d3778dc7aba6b2498 SHA512 deccc3b442718b03809a7c49297a3f5d7c0bd2873fddfd9f90861a102208759cb95db9bfec1b04cff6932678f58aa81467c48fd4b1e32bb49ed43b9d8c9f4f77
 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
-EBUILD evolution-ews-3.48.2.ebuild 1574 BLAKE2B 83c02cb79285e854bc78ba63627baf9b3790bed6d23c5c0fe7eab0eb320046d7c5a1d3c5fd0a7c276264af3f4be34545d8c87eff86f3efa1f46a56c2a43463e1 SHA512 5d639deb515d9468ae5c97c406b8ab58e129d652c6e51b0ab92e6e45f6fcc1f014f4d103ae81a3bf5a09715d8b27026fa21658d2410dbda8d553210c1b625051
 EBUILD evolution-ews-3.50.2.ebuild 1581 BLAKE2B 8ab2d02d0d858bcee178981fbf2c969f410d833250d07c0cdd6fccac98402bee1a4036737d4f72db3acace354b8d8253876d15738b500d7252eaae24c8babd6f SHA512 4a22b094baf8b0093e5792b81dccc787771e009a00b9c2c82c0e86bdc7bb9cfad4201dd9fc153160f3890eb09a09e96603c4b0e498ef8b33af53c9b5e8688e3f
 EBUILD evolution-ews-3.50.3.ebuild 1583 BLAKE2B fa2d2002b23a07908577ddb2b9d2c5661f8c20971cdc236b2382df4fd44ab77509837f6cefab92be1ccdab45f868d49381ce2699fc8809a7a68e82e484ca1eeb SHA512 5f038f91b8edc5c294304be749ffce8ccdc10814ce81d3a8580502cf1f89f1d6f2ecb9ffa95ce098855a362f2acc7044c9388884dba0b44f20f3d9d03d6664d7
 MISC metadata.xml 354 BLAKE2B a6cf76e87956f2418a25c83542af3e5efe415943426b03750b2572129b06f977f900207a1eef805b7ae463a84204d12bf286ef9ed0a5b6990cbac2c77783260f SHA512 9f06dce58e2dfdba0a22f8a711d5fc98aba9ae1d130173bd7ef8effd0bb3c1cf046eef712f7ea7bd55c4382ca01e78d7028419ce41812d33ef38a1329978af56
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.48.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.48.2.ebuild
deleted file mode 100644
index d7386da63cd5..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.48.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 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 ~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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
-}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 8735a0f7e840..45d695073336 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-contacts-44.0.tar.xz 395540 BLAKE2B 479353667217d0f78d61cbc1dff5ec67c13cf14254fbd258cf34d5b084d65c515426b2ce418bf74350f727a2b1cb6b9a0e4ade150eeabd01b06cecf7792f7a7e SHA512 f25a368317923c46f5700359e3fed86f85a155c58adb275ba7d884975debe78594e1da58a95633a33a281cbc78f41824f4ab38b50ae01f4f9f8e38f3f1906849
 DIST gnome-contacts-45.0.tar.xz 401156 BLAKE2B cce302b780717963083b4b0725d9f5e0fd2ec0eeafabdf247fb2e3a099cde84441563a70b7bdf22efa8f20358baf10be015f1e7524139beb8e6074bd12c28e6d SHA512 691cbd9fc1ff0e9e7a2549f522ea7ef5b73eee976fb48b2b250b8be9775737938d9fd0ffa66374dc20028d764e96605caae1be7c32689371a58ee5e78bd7c28b
-EBUILD gnome-contacts-44.0.ebuild 1583 BLAKE2B 82eda2903c5ff9a79f6e6ace656f606801cb060edaac4c32af6afcd1459adc4ad76ff6540494f923caac9651c79809ed99cf403a6b54c9fe3855edb4dbeadecb SHA512 a17305416adc3ddd42d63c44acd1c7abdad3eb5f55caf332ae95da63471a17004d02745546cf62a7efeb651aed7826309f8f1c8133bde54fc6cf86915421c00f
 EBUILD gnome-contacts-45.0.ebuild 1591 BLAKE2B 515299d34261050b2ff9f8d4eb3501630afd8758d97fdd06031e69bd77521022a13c8cfdf713aca5078d7281719aa2d74e6a3357e94227e49d46538265818b9a SHA512 f05b6ffefec4637a33ec1a68b4da99468f5ca551b9b9ba948a05fb6acda05624c7016344ff8b8f09201f10c7e86fea6ccb1913f7a07c124e32a3c59854389cef
 MISC metadata.xml 504 BLAKE2B 876846abc81450936c89143571a1b26cd48f095c22aa76632e3aa8d860fc77fd8cf5f9aa6f39ecc37f02d53964aa2cbc35f74acc1ecf7a947cef4568b8b5a1dd SHA512 2241ed2d7e0c42276ac709c76085ec62c743cafde605494a5ffd5314a7c1d555d2463104c6487bb3ae4a0360d3f68220b910dfd0c40ea4f52c748a727b1aa0f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-44.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-44.0.ebuild
deleted file mode 100644
index 840dc92462a6..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-44.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+gnome-online-accounts"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] )
-	gnome-extra/evolution-data-server[gtk,vala]
-	>=dev-libs/libportal-0.6:=[vala]
-"
-RDEPEND="
-	>=dev-libs/folks-0.14.0:=[eds]
-	>=dev-libs/libgee-0.10:0.8=
-	>=dev-libs/glib-2.64:2
-	>=gui-libs/gtk-4.6:4
-	>=gui-libs/libadwaita-1.2:1
-	>=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?]
-	>=dev-libs/libportal-0.6:=
-	>=media-gfx/qrencode-4.1.1:=
-	gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcamera=true # Ignored
-		-Dmanpage=true
-		-Ddocs=false
-		$(meson_use gnome-online-accounts goa)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 5aa6e8402574..24d0fa5644b4 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-user-docs-44.3.tar.xz 13364796 BLAKE2B 2a8d23154d08c18a699691451f5c37fd6729a6da8ed53b40478f929260fac2c77c01388edbb12edef7e142a322acb163466166aceaa35594143b214e87dabb4c SHA512 c61967958e3d0447d69cc89381896697489e144c3bc3090e1d62cc385a6a7d94501172a11536ba591912a1f8c37c2ef5f8cb299b105f3ac2eabd637fdaa38fdd
-DIST gnome-user-docs-45.0.tar.xz 12655292 BLAKE2B 37b49ec1fadaf8d757be9794598c84cce15ea94cfb1c026dcd2bb874581739384c387cbf83d534f7ac167580214e48985ed70beca10af7eadc86924628c59713 SHA512 9ab39dd408a8c718e4a6629bda1d7a0c917a2d67d84780fcfd29936e577cab8ac4c80654c2404689779d7e4ce4e9e95d217a4244c39f8f653ee8e97533a07a90
 DIST gnome-user-docs-45.1.tar.xz 13113588 BLAKE2B 4e0bedf3f0741c3c9dd48e8a018cfa061e8bc21fecb59829b2262ab3a44721d75e71913438f903622a1e37fc5cc6ca3c364fca5e5c6446faab4ad2173df1c640 SHA512 2d87b4a58a780eee90ac1b13810a0e9a36b7e4308802117df918c9c43c1014f1067d9a524ba904d679e337d2127e1f8e92ff472e52a3b13fd64c5e52cfdd006a
-EBUILD gnome-user-docs-44.3.ebuild 949 BLAKE2B 49d58b3d6b0d111d7c167c05091edb0631bf305411e6556b2bb2f4fffcc43e4a06486d72f1fe3a55023c2f3497609d3768ec25111a7823c2721d2c642e533a07 SHA512 d8a9ae52767dc02883cf0fb9e0b11e1ccda62dc1d8196c8894d93b20283ad84a0fbb2745da724a9f62fe82b671f5f9f6cd112c0337d96e8172d5ac841f52fd90
-EBUILD gnome-user-docs-45.0.ebuild 952 BLAKE2B c8cc384762d8581f2cd26800f30932917980cba5cbe9800eddb40eb158fdf4702aaa14dd209b39d2fb877ab19f21046c91e799009a80a5bf97344cfbc371a6a6 SHA512 da43f92fa298321e7c13823c748c314c47e4c95b70e84d4ba6f8700a4b98b3323c01a94e53c2a80daca88f749c8d9cb6c73ce9fbb91a014a4009144f7e562135
 EBUILD gnome-user-docs-45.1.ebuild 949 BLAKE2B ac45cbffbdf57a313a89a7a8d970858b1a2efeea9cbebe40cf7db8fe95643ee72f3d9861c89d2de49b26cc22b64b13f3eda9da062a01c6f00f49e5f4a2e37aba SHA512 627ac2f4371532d0a9cebcef4fd6fae0a90785b27bb0f991ac95d30026c59bb44ec08e98ad85fab7d00ea1284f655c9d3873c20854a6baea9d9f302ed0f2dd64
 MISC metadata.xml 381 BLAKE2B 5ad6997cd88c98b872eab92083b52e12dd98a5024ff64dd4176b83007281ce71f92db1cfd4eee54dffe2b5ec1187da6cc39b14d4639ff5a6c480740fe171adcf SHA512 4e06e861e0807c835149caf9b5db58c11e365559207c8414c979bfa2f0a6d332cea3305456eff886fb2caa926384e306bc7e5bd8f7142c4c8a4fc4cf97c438ae
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-44.3.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-44.3.ebuild
deleted file mode 100644
index ba929affd812..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-44.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-45.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-45.0.ebuild
deleted file mode 100644
index 90276892b101..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-45.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}