gentoo auto-resync : 14:11:2024 - 03:02:32

4 files changed, 15 insertions, 7 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 40ddf1ad5af6..e3675ea0218b 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 eac060744831..9713636b37dc 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -6,5 +6,5 @@ DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b
 DIST evolution-data-server-3.52.4.tar.xz 5055252 BLAKE2B e493f16700533e97440a13dead51bb4654fbbb0345718eeb91e1e052f9599ededacb6e6693fa9de3d68288a6472503ab3a01cab4ac27be8cfc2d693389021aa0 SHA512 2847a15f7cb5b41cce94565a06f7baa02d8dd40241d59029ccebeb21215500ca6f1ac978f1142bde9348917f0534e181e2f7011ed245b6e7a6b1afda9975cfef
 EBUILD evolution-data-server-3.50.2-r2.ebuild 4917 BLAKE2B 3aa62f780d5cc9258670433156b1424a92f6fd9921ee94a7fdfb4028a4452256ae1b328902e37ae442d1b3ee7a80cf3c4e7fec256a7f5a31eea149523787d2b3 SHA512 866a553959da72a57dbadb5e773e48b6b25b8c323e83caa7f3d63a3ad28fb50092253d19bdf18ee75b3cf902cbe3075c9b8beb98c84d7d863f4bc12a3ac090f8
 EBUILD evolution-data-server-3.50.4-r1.ebuild 4919 BLAKE2B b165c712deca6e07a0584a4097023ab7127d7b96d2ee568ae5c132f0245ff6cca2a649d0d31a23c81bc3885c8b4b23b0d2ca822a049fa8d8da64999075a79f9f SHA512 b94d6bf7aee68a1bde90713bef0b075e7b4abcf07fda1808d49515029fcd475578e0bdf784f7d75e340d0964b2cedc535090e01480b25ebc33800ecd8ba7ca9a
-EBUILD evolution-data-server-3.52.4-r1.ebuild 4897 BLAKE2B 47585d3173ea33b96c57e3036e9d4c96892428235b9c2b83758233c6159ac42b5496b85940c6a0aedaba8460e606f731f2496b097652740c9aa732fc3c1c0abf SHA512 b5199255589c2aebd7e6a9b58f964768725a4275e4f42f440295c30287b64e45fe410de429fc0f6c3ba6bd4d5cd1b5ac25c7f459ac571c29ab7f08c45677ec36
-MISC metadata.xml 1315 BLAKE2B 8d9fbe5cab469c2fb34467c7917dcf732b0b3f23869c513d2bce7cfb536912e496d1a42773dd0f64898d476b29e513574087f13411e8e7a310a3f049a7a34efc SHA512 30496793fcb68206bffc475f7b0cefb5f673bcc58e5994c1648dcb6c88696dfd6eda0a62a022a16effcfde829dcce565572b03705426fcd774acde6ad0b940bf
+EBUILD evolution-data-server-3.52.4-r2.ebuild 5013 BLAKE2B a1840781b7128c1c56b26a19a1fac8541dac42f5b91612374775c307c49c04c580007f7a2085ee2cb9bfa467294a4cbf92414bf1b6bf4ccbdeb1d50c9da4dc91 SHA512 73aa5a075e8efa5bb81277272dfc4d804ab10a80e43ffc29cc182d811baeec5d7bbcf93ca60cb26c4f4ba63c5a80976f5dcba0a48c1be8fcc15d594395f648f9
+MISC metadata.xml 1450 BLAKE2B 3f34062ee06dfc126f4f5afb1a2fd93c7170927032d78ce80b11b7080b54cdc9bcbdf694bef2e5b2494133fe632c644f07bfc78b1b7c4e0c5cbe10b772af1a96 SHA512 7ad9c66eab962373e0776d131216c964bedb67174ecd090c834a0cea0951ebb381465ff8575353b62661da3d0ce0152a7dedf371803713a40c775bf21ad6dced
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.52.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.52.4-r2.ebuild
index 56a0d678f6fd..9ddadc5e8348 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.52.4-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.52.4-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="0/64-11-21-4-3-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libeb
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 vala +weather"
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 sound vala +weather"
 REQUIRED_USE="
 	oauth-gtk3? ( gtk )
 	oauth-gtk4? ( gtk )
@@ -42,9 +42,11 @@ RDEPEND="
 	gtk? (
 		>=x11-libs/gtk+-3.20:3
 		>=gui-libs/gtk-4.4:4
-		|| (
-			media-libs/libcanberra-gtk3
-			>=media-libs/libcanberra-0.25[gtk3(-)]
+		sound? (
+			|| (
+				media-libs/libcanberra-gtk3
+				>=media-libs/libcanberra-0.25[gtk3(-)]
+			)
 		)
 
 		oauth-gtk3? ( >=net-libs/webkit-gtk-2.34.0:4.1 )
@@ -127,7 +129,6 @@ src_configure() {
 		-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
@@ -140,6 +141,12 @@ src_configure() {
 		-DENABLE_VALA_BINDINGS=$(usex vala)
 		-DENABLE_TESTS=$(usex test)
 	)
+	if use gtk && use sound; then
+		mycmakeargs+=( -DENABLE_CANBERRA=ON )
+	else
+		mycmakeargs+=( -DENABLE_CANBERRA=OFF )
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index d705ce69fe9e..06224757e5a5 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -10,6 +10,7 @@
     <flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> based Google authentication support</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="sound">Sound notification support through <pkg>media-libs/libcanberra-gtk3</pkg> (does nothing without USE=gtk)</flag>
     <flag name="weather">Enable optional weather calendar support</flag>
   </use>
   <upstream>