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

3 files changed, 19 insertions, 10 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 283a34146c19..ce9719f989b7 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -4,5 +4,5 @@ DIST evolution-3.50.4.tar.xz 13512624 BLAKE2B 3288bf3286a7c28476e5e95b9ded6d1004
 DIST evolution-3.52.4.tar.xz 13616760 BLAKE2B f44c93725264129ecf0fede23b1ab6b502a4fc054b02e8494417797ea5148442b3c3028cccc76d236d49b5ec02f294b06fb7742d14b0ff82fa10060f3ffeb6ef SHA512 6b6112032b8f531043a1ac95916b0a2190853d037fb92a93aeda4aa3023fdb267382f9e81ce28dc8dadc76e0907f3d0e540ff8499aae12560bec6a75d5247ec5
 EBUILD evolution-3.50.2-r1.ebuild 4240 BLAKE2B 94a8676511f36c08f3825700b00095d236e9f81b64fac4f57b5aa938b81101e936ba210557c0de3970335a721635a11c4444a20b77b2ab08efaa28aa0541ac78 SHA512 b84abf21c1f92bc84da22942d7538ce153aab33ba0a500fe8f1631f85ae9519c2cfd42b67c74785157b13ec2ce5651b98e3df4b0e2f6266229dc8c7096e61ae8
 EBUILD evolution-3.50.4-r2.ebuild 4382 BLAKE2B 5046a97a691fbfe86c63e76fa67386a04256c1b8d996cc9d4b2d9699783e5db93dea08d2f0bbfef48a3217721f239f87febf107b1ed9d20a1060d7b1bc6f63bb SHA512 40d4b95e1899c22f13e12f0596cf7a7b82ddc241bb35f47a0135d4e402e98e45d58c12205fad3011b0cacb04edfb9cf8e000c69130592196500d0d33bfab2296
-EBUILD evolution-3.52.4-r1.ebuild 4225 BLAKE2B fdba6844a17bfc33b50107f5d8663748443d1fe6b6c0d1b54030333b06db8d3077199d176d7794af6a377aa41416851177699908a2108bdfe9ca77179f5bd6bf SHA512 4ad9d6259d40301087bfad9bceebca6ca2bae62966842ed6e2fce1d2c07c2712fd89ea454f9cbbad92a2577ac226a7fc1ec1c67fdf0e1c89ebfc1400535165cd
-MISC metadata.xml 1174 BLAKE2B 745a372088a3891dee71c205ef8d512df56e338ca41cd91d861938447e1cf42f0305fe27e385b7e4f391dd26cbd5173bdba9e158b65cec1260fe9c45382465c4 SHA512 d19c6775d576c35458674c301bfc5502e1f8f62cee76fe46aa749507fd9c2a1494a21a6c9a5886f8ca7e3b2e107b3e28dee448c8ecbd999cf3c3bb800c03f405
+EBUILD evolution-3.52.4-r2.ebuild 4514 BLAKE2B 534417e42b24cb79c338eb31399c532a17643217d40776a89dbda4d51fc832203738a79d93910a174e84594c0d48363b4075acdb944cbd040076e8558f59bf32 SHA512 1966a3db4476bb8ffc7401da3aeeb2a452fc9bef909011693f0e3d77e618637e0ba9d08d7dbee96beb56ff17452c1a3352e3f23ac458fe898c561022e1206f60
+MISC metadata.xml 1377 BLAKE2B 4af5bb3ba80603757248b0c5eee78b9e47594499b92cc6b7ec463c31f070c7085e69d567d1631e49dd9d48b178b10217ebfe0bcecf97235b382be08cd53063d5 SHA512 554e7cd05e59584a01ee77bd74006fb1e246e91fd9b1280692f8d61784d0fd556b3cf6ad150a37c87344b568ffbd6e5659be04a7bd39d734f6cba37656cf2357
diff --git a/mail-client/evolution/evolution-3.52.4-r1.ebuild b/mail-client/evolution/evolution-3.52.4-r2.ebuild
index 9001bd0738fe..bc6df73eda76 100644
--- a/mail-client/evolution/evolution-3.52.4-r1.ebuild
+++ b/mail-client/evolution/evolution-3.52.4-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap selinux spamassassin spell ssl +weather ytnef"
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap libnotify selinux sound spamassassin spell ssl +weather ytnef"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
@@ -30,17 +30,12 @@ DEPEND="
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	|| (
-		media-libs/libcanberra-gtk3
-		>=media-libs/libcanberra-0.25[gtk3(-)]
-	)
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,sound?,weather?]
 	>=net-libs/libsoup-3.0:3.0
 	>=net-libs/webkit-gtk-2.38.0:4.1[spell?]
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gdk-pixbuf-2.24:2
 	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7
 	>=x11-misc/shared-mime-info-0.22
 
 	app-text/cmark:=
@@ -57,6 +52,13 @@ DEPEND="
 		>=media-libs/clutter-gtk-0.90:1.0
 		>=sci-geosciences/geocode-glib-3.26.3:2 )
 	ldap? ( >=net-nds/openldap-2:= )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	sound? (
+		|| (
+			media-libs/libcanberra-gtk3
+			>=media-libs/libcanberra-0.25[gtk3(-)]
+		)
+	)
 	spamassassin? ( mail-filter/spamassassin )
 	spell? ( >=app-text/gspell-1.8:= )
 	ssl? (
@@ -101,6 +103,11 @@ file from /usr/share/applications if you use a different browser)."
 # call; if needed, set them after cmake_src_prepare call, if that works
 
 src_prepare() {
+	# libnotify is automagically detected, but a quick and easy way to
+	# force-disable it is to delete the "yes it's there" variable from
+	# CMakeLists.txt.
+	use libnotify || sed '/HAVE_LIBNOTIFY/d' -i CMakeLists.txt || die
+
 	cmake_src_prepare
 	gnome2_src_prepare
 }
@@ -115,7 +122,7 @@ src_configure() {
 		-DENABLE_SMIME=$(usex ssl)
 		-DENABLE_GNOME_DESKTOP=ON
 		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
+		-DENABLE_CANBERRA=$(usex sound)
 		-DENABLE_AUTOAR=$(usex archive)
 		-DWITH_HELP=ON
 		-DENABLE_YTNEF=OFF
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 20e4d6c9bbdb..37cce728c33e 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -11,7 +11,9 @@
     <flag name="geolocation">Enable support for displaying contacts on a map inside evolution using <pkg>media-libs/libchamplain</pkg></flag>
     <flag name="highlight">Enable text highlighting plugin</flag>
     <flag name="ldap">Enable support for fetching contacts from an LDAP or Active Directory server using <pkg>net-nds/openldap</pkg></flag>
+    <flag name="libnotify">Enable desktop notifications through <pkg>x11-libs/libnotify</pkg></flag>
     <flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg> plugin</flag>
+    <flag name="sound">Enable sound notifications using <pkg>media-libs/libcanberra-gtk3</pkg></flag>
     <flag name="weather">Enable optional weather calendar support</flag>
     <flag name="ytnef">Enable optional TNEF attachments parser support using <pkg>net-mail/ytnef</pkg></flag>
   </use>