gentoo auto-resync : 12:10:2023 - 18:15:24

7 files changed, 169 insertions, 6 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 87ae6ce38b8a..a9498b1c5a7a 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 b2fc572199ea..43b619950e15 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -4,5 +4,6 @@ AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020
 DIST evolution-data-server-3.48.4.tar.xz 4906356 BLAKE2B 13cbd21d8f6829d052227d3d328439d5f00a2cda2384ffeace791a563ed8acdcd707729ae032dbdbe16e530b2e6205c006412f1cbaa03e8fb6d669c2c75d67bd SHA512 35bc6653efdb70a110f39499945516408090f101319a3080c87f6e14f886e0f9283225c4c5b6a4c2af418b9928c5eb7fba2d319481c81af1fa87f7dd930f7215
 DIST evolution-data-server-3.50.0.tar.xz 4964568 BLAKE2B 1239bab5563e645ebf3999d1977f5b13fdbb155f70fef85904c0cbc06abba64bf79a1c9417749df1ee2f381a757f06d43e0eea1eb064ef5d6250058d9d66c823 SHA512 30a04721304e4447fbe5dccc6992ca38fd7e4ed4a6f8c846def34ee8097d31db3139b0f3b89a64c59af71b9dcd6108bfcdd60b36098b85ad96aee63f9ed5bba5
 EBUILD evolution-data-server-3.48.4-r1.ebuild 4242 BLAKE2B 0580edc90c0b1f1a82364a1b202d9045ce3bcafe45b4f819171f4029052b31899dfb17cbe0519d03c0d91c6fde97cfdbc68c810c7df030794ead05f98aafdcec SHA512 4e0fc3e3c2f01df64c38f7575b16e1ae7ec75d2ec5344b947a4a9c095c23428b07e19c28362ef04eb7f23af87b1ab448d2067e0f3eabd306de7043fd58fe4467
+EBUILD evolution-data-server-3.50.0-r1.ebuild 4763 BLAKE2B 715942f74bd09ab7228656f6eb009e64900a768b679f4868d877d7396f5dd195625833dcdec7513c05972d488774cd6cb50cac359ae80e222c81d56c614e0158 SHA512 9b020043774bd760765b91d94403f3309c9d8cf0bd00f459046f40a2d6aa4063a404d24340aac0f11b9200a956de26772dae59dd436287b9102b05752eea3c1a
 EBUILD evolution-data-server-3.50.0.ebuild 4289 BLAKE2B db8cf2a8d0e6a96e6d8d72743cd1de0d3928c4e1c9a8b507d135c8308489839a725971c59726f6425654411e974bc96e5f9819f3ecc907da76122e7e13170fce SHA512 6d75489b4e3b92dab6bc1049d181b1e646e2b4bf07807ed098377b04665b785c98c735a1e113c3c82fd2e00d8f0e7c0ee0bfc0078e518db718789c582ec7c64c
-MISC metadata.xml 962 BLAKE2B 212d69424f3276f40cbd92843968374de95e0cf3b5263a0fe815628aa5fa9a3618c7104abbc0e4bb2f0a9ab6b36a674fffa36c6d020ae7ffb6fe34c6f3c035f0 SHA512 49350cc9ee65c76c248a99fb7adbfefcea02eb1c43673bb8e010af1fa78767dd2d99beb625a0164b2a2b8e8b366478b4dc1309c2044b77feb017f4bdeffa2d92
+MISC metadata.xml 1564 BLAKE2B d79ded98c993bf742359631b96c98d119ab777968cc57f0e8f455521ab1d4c59de3f05869abc8abe0476b2be24a1e98b9462969c6d6571f872942c059dc26728 SHA512 7ad29524094d811c5194c6f43e5af130830afb02633cc527db361c66b3edf3890599cbc03734e4c3db57429d1a4fa5072395097d5846402ab7f6ab999107a48c
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.50.0-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.50.0-r1.ebuild
new file mode 100644
index 000000000000..b819888c92af
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.50.0-r1.ebuild
@@ -0,0 +1,159 @@
+# 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-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
+
+	# 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/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index 6c56eea68cf5..0ba0e87a180c 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -8,7 +8,10 @@
   <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 and used, this is not necessary, but both can be supported at the same time with different setup at runtime</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>
   </use>
   <upstream>
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index f4d3abd6d574..5529a82f2c9d 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,5 @@
 DIST evolution-ews-3.48.2.tar.xz 701356 BLAKE2B 8c941302f383870bacf0dd3f02b28be34105ec7f612b027a505b98be0f66099d65671808e26e86ce756fc47116d012aa1c82fff74c5a501d3778dc7aba6b2498 SHA512 deccc3b442718b03809a7c49297a3f5d7c0bd2873fddfd9f90861a102208759cb95db9bfec1b04cff6932678f58aa81467c48fd4b1e32bb49ed43b9d8c9f4f77
 DIST evolution-ews-3.50.0.tar.xz 707208 BLAKE2B b2137c393e3ad6f3fdcd865d7dbba8f2830fbf3f287cb5599a23837ca5b4597714deeff08dc6e69443baf96171976476302bafeccdfb0c941c5b63e9a80f69c3 SHA512 51b90c018a5aea84e2c89785edcf69fe396d10d3fe447bc3ea5207506efa6433fe7af5e35ef6e2f5c3c2b8e3218ddff12c5be000dcad50c998c914994ce95745
-EBUILD evolution-ews-3.48.2.ebuild 1567 BLAKE2B 1f19649d2b04afdfd2bf6eafb90cdc9152de8644342597911fb15917a4641796d640cc814b272268093c19b6ece4722856bf9c866085d28f8ff97737222e930a SHA512 4edb825807ec6ab34fdf41c7419c8417609a7e26be719f9bf92b6edc8b1d8cad63b1bdfb4a9a4e7c0d43b0a56535326d653634b7312063eaff076ef042f31688
-EBUILD evolution-ews-3.50.0.ebuild 1576 BLAKE2B e16b349f4ea7c67428ccba1db0790494be217ae4ed89ddcf1f680370510d3cbfd4a922cbf6fcc59a6a790bc9abe9bb013556fa729fc85b3a9b2a2ded9f7ea110 SHA512 97b3ac8b24190bd924f16a177bc34e87b28aea62fb3dd05bee254cf0a140ec28d8071ce266ea621550c770b253b577553136df4eeb20bb17d8e509a855e21c2d
+EBUILD evolution-ews-3.48.2.ebuild 1574 BLAKE2B 83c02cb79285e854bc78ba63627baf9b3790bed6d23c5c0fe7eab0eb320046d7c5a1d3c5fd0a7c276264af3f4be34545d8c87eff86f3efa1f46a56c2a43463e1 SHA512 5d639deb515d9468ae5c97c406b8ab58e129d652c6e51b0ab92e6e45f6fcc1f014f4d103ae81a3bf5a09715d8b27026fa21658d2410dbda8d553210c1b625051
+EBUILD evolution-ews-3.50.0.ebuild 1583 BLAKE2B 7e80ce1197e8bebe2ad14a10cc16293be4d02a24083cbaee39dce4f974612142605c28277533e57182cfce091d3e72393b7785851f41366ba8a600ad08dd0f04 SHA512 ee44edf02473ea8e7ac98a1d8eefc3dbf36d9c61d8a67db0186a0fa468d0c308752e58089ee1c85df8b3f36fb11bce052ea4cabd64904df48d33ed243254e3dd
 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
index 5cfc13424a53..d7386da63cd5 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.48.2.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.48.2.ebuild
@@ -68,5 +68,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
 }
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.50.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.50.0.ebuild
index 71316caf73dc..def2f07990d7 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.50.0.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.50.0.ebuild
@@ -68,5 +68,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
 }