From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD2B513835A for ; Tue, 11 Aug 2020 16:43:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C15D2E0809; Tue, 11 Aug 2020 16:43:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A84B6E0809 for ; Tue, 11 Aug 2020 16:43:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 204E834EDB7 for ; Tue, 11 Aug 2020 16:43:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C4C3313 for ; Tue, 11 Aug 2020 16:43:24 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1597164198.f0eb50f088d36a41a269bf26db702dcefc7303b8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/claws-mail/claws-mail-9999.ebuild mail-client/claws-mail/metadata.xml X-VCS-Directories: mail-client/claws-mail/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: f0eb50f088d36a41a269bf26db702dcefc7303b8 X-VCS-Branch: master Date: Tue, 11 Aug 2020 16:43:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 175f9585-fcfc-4893-8107-6890004350df X-Archives-Hash: 6f5d251b8dbf54f3c364ddde04f932a2 commit: f0eb50f088d36a41a269bf26db702dcefc7303b8 Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 11 16:38:53 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 11 16:43:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0eb50f0 mail-client/claws-mail: Make live ebuild finally use gtk+:3 again Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> mail-client/claws-mail/claws-mail-9999.ebuild | 11 +++++++---- mail-client/claws-mail/metadata.xml | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild index f3986612859..7956bc9f6f7 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -20,7 +20,7 @@ fi SLOT="0" LICENSE="GPL-3" -IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" +IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk2 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface" REQUIRED_USE="libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) @@ -52,8 +52,8 @@ COMMONDEPEND=" gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( >=x11-libs/gtk+-2.24:2 ) + !gtk2? ( x11-libs/gtk+:3 ) + gtk2? ( >=x11-libs/gtk+-2.24:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( @@ -114,6 +114,10 @@ PATCHES=( pkg_setup() { use python && python-single-r1_pkg_setup + + if ! use gtk2 ; then + EGIT_BRANCH="gtk3" + fi } src_prepare() { @@ -150,7 +154,6 @@ src_configure() { $(use_enable doc manual) $(use_enable gdata gdata-plugin) $(use_enable gnutls) - $(use_enable gtk3) $(use_enable ipv6) $(use_enable ldap) $(use_enable litehtml litehtml_viewer-plugin) diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml index 215b58ddd53..a6bb23809b1 100644 --- a/mail-client/claws-mail/metadata.xml +++ b/mail-client/claws-mail/metadata.xml @@ -10,7 +10,7 @@ Build mail-filter/bogofilter plugin Enable dillo html viewer plugin Enable plugin for access to Google data providers - Build support for GTK+3 + Build support for GTK+-2 instead of GTK+-3 (live ebuild only) Enable sound notification in connection with USE=notification Enable notification through DBUS in connection with USE=notification Enable notification on the desktop in connection with USE=notification