commit: 41cde8859ceb9a6a76285cdc3071ea47d2762367 Author: Henning Schild <henning <AT> hennsch <DOT> de> AuthorDate: Thu Nov 27 15:19:38 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 28 03:11:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41cde885
mail-client/claws-mail: depend on all possible libs for notification USE=notification has three possible implementations/backends, unfortunately they can not be controlled seperately and are automagically enabled when installed on the build host. In order to work around that we have to DEPEND on all three once enabling the plugin. Inttroduce NOTIFICATIONDEPEND so we can leave a note to related bugs. Closes: https://bugs.gentoo.org/952993 Signed-off-by: Henning Schild <henning <AT> hennsch.de> Part-of: https://github.com/gentoo/gentoo/pull/44797 Closes: https://github.com/gentoo/gentoo/pull/44797 Signed-off-by: Sam James <sam <AT> gentoo.org> ...mail-9999.ebuild => claws-mail-4.3.1-r2.ebuild} | 32 ++++++++++------------ mail-client/claws-mail/claws-mail-9999.ebuild | 24 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-4.3.1-r2.ebuild similarity index 89% copy from mail-client/claws-mail/claws-mail-9999.ebuild copy to mail-client/claws-mail/claws-mail-4.3.1-r2.ebuild index 4981db809b32..5542c153a058 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-4.3.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) -inherit autotools desktop python-single-r1 xdg +inherit desktop python-single-r1 xdg DESCRIPTION="An email client (and news reader) based on GTK+" HOMEPAGE="https://www.claws-mail.org/"; @@ -21,16 +21,26 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="appindicator archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" +IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" REQUIRED_USE=" - notification? ( || ( appindicator libcanberra libnotify ) ) networkmanager? ( dbus ) oauth? ( gnutls ) python? ( ${PYTHON_REQUIRED_USE} ) smime? ( pgp ) " -COMMONDEPEND=" +# the three libraries are automagic so we pull them all +# https://www.claws-mail.org/bugzilla/show_bug.cgi?id=4870 +# https://bugs.gentoo.org/952993 +NOTIFICATIONDEPEND=" + notification? ( + dev-libs/libayatana-appindicator + media-libs/libcanberra-gtk3 + x11-libs/libnotify + ) +" + +COMMONDEPEND="${NOTIFICATIONDEPEND} >=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef @@ -64,14 +74,6 @@ COMMONDEPEND=" ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - appindicator? ( dev-libs/libayatana-appindicator ) - libcanberra? ( || ( - media-libs/libcanberra-gtk3 - media-libs/libcanberra[gtk3(-)] - ) ) - libnotify? ( x11-libs/libnotify ) - ) perl? ( dev-lang/perl:= virtual/libcrypt:= @@ -121,17 +123,13 @@ RDEPEND="${COMMONDEPEND} PATCHES=( "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" "${FILESDIR}/${PN}-4.1.1-fix_lto.patch" + ) pkg_setup() { use python && python-single-r1_pkg_setup } -src_prepare() { - default - eautoreconf -} - src_configure() { local myeconfargs=( --disable-bsfilter-plugin diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild index 4981db809b32..48e52067c693 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -21,16 +21,26 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="appindicator archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" +IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" REQUIRED_USE=" - notification? ( || ( appindicator libcanberra libnotify ) ) networkmanager? ( dbus ) oauth? ( gnutls ) python? ( ${PYTHON_REQUIRED_USE} ) smime? ( pgp ) " -COMMONDEPEND=" +# the three libraries are automagic so we pull them all +# https://www.claws-mail.org/bugzilla/show_bug.cgi?id=4870 +# https://bugs.gentoo.org/952993 +NOTIFICATIONDEPEND=" + notification? ( + dev-libs/libayatana-appindicator + media-libs/libcanberra-gtk3 + x11-libs/libnotify + ) +" + +COMMONDEPEND="${NOTIFICATIONDEPEND} >=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef @@ -64,14 +74,6 @@ COMMONDEPEND=" ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - appindicator? ( dev-libs/libayatana-appindicator ) - libcanberra? ( || ( - media-libs/libcanberra-gtk3 - media-libs/libcanberra[gtk3(-)] - ) ) - libnotify? ( x11-libs/libnotify ) - ) perl? ( dev-lang/perl:= virtual/libcrypt:=
