Updated

gnome-extra/evolution-data-server/evolution-data-server-3.46.0.ebuild

@@ -6,31 +6,29 @@ EAPI=8
 inherit cmake db-use flag-o-matic gnome2 vala virtualx
 
 DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+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/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
 
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather phonenumber"
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather phonenumber"
 REQUIRED_USE="vala? ( introspection )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
 # glib-2.70 for build-time optional GPowerProfileMonitor
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
 RDEPEND="
-	>=app-crypt/gcr-3.4
 	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
+	>=dev-db/sqlite-3.7.17
 	>=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/nspr-4.4
-	>=dev-libs/nss-3.9:=
+	>=dev-libs/nss-3.9
-	>=net-libs/libsoup-2.58:2.4
+	>=net-libs/libsoup-3.1.1:3.0
+	>=dev-libs/json-glib-1.0.4
 
 	dev-libs/icu:=
 	sys-libs/zlib:=
@@ -38,32 +36,25 @@ RDEPEND="
 
 	berkdb? ( >=sys-libs/db-4:= )
 	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.20:3
-		>=x11-libs/gtk+-3.16:3
 		>=media-libs/libcanberra-0.25[gtk3]
 	)
 	oauth? (
-		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.34.0:4.1
-		>=net-libs/webkit-gtk-2.28.0:4
-		${gdata_depend}
 	)
-	gnome-online-accounts? (
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	kerberos? ( virtual/krb5:= )
 	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.91.0:4= )
+	weather? ( >=dev-libs/libgweather-4.2.0:4= )
 	phonenumber? (
 		>=dev-libs/libphonenumber-8.12.39
 	)
 "
 DEPEND="${RDEPEND}
 	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
+		>=net-libs/libsoup-3.1.1:3.0[vala]
 		dev-libs/libical[vala]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[vala] )
 	)
 "
 BDEPEND="
@@ -101,13 +92,6 @@ src_configure() {
 	# so include the right dir in CPPFLAGS
 	use berkdb && append-cppflags "-I$(db_includedir)"
 
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
 	# phonenumber does not exist in tree
 	local mycmakeargs=(
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
@@ -123,17 +107,17 @@ src_configure() {
 		-DENABLE_SMIME=ON
 		-DENABLE_GTK=$(usex gtk)
 		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
 		-DENABLE_EXAMPLES=OFF
 		-DENABLE_GOA=$(usex gnome-online-accounts)
 		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
 		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_IPV6=ON
 		-DENABLE_WEATHER=$(usex weather)
-		-DWITH_GWEATHER4=ON
-		-DENABLE_GOOGLE=${google_enable}
 		-DENABLE_LARGEFILE=ON
 		-DENABLE_VALA_BINDINGS=$(usex vala)
+		# Explicitly turn gtk4 off because gtk4webkit is not available yet
+		-DENABLE_GTK4=off
 	)
 
 	cmake_src_configure