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 4F383139694 for ; Fri, 10 Feb 2017 19:08:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A710E0C37; Fri, 10 Feb 2017 19:08:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1652BE0C37 for ; Fri, 10 Feb 2017 19:08:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCF60341398 for ; Fri, 10 Feb 2017 19:08:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5236E3FF2 for ; Fri, 10 Feb 2017 19:08:43 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1486753679.c2f2443402778d698dd2b3173a6003a524158961.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/balsa/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/balsa/balsa-2.5.3.ebuild X-VCS-Directories: mail-client/balsa/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: c2f2443402778d698dd2b3173a6003a524158961 X-VCS-Branch: master Date: Fri, 10 Feb 2017 19:08:43 +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-Archives-Salt: 5d84e489-4e65-4e7f-851f-e16d8dddb9bd X-Archives-Hash: b4d45e463ad173fef0ad1aaf82d43742 commit: c2f2443402778d698dd2b3173a6003a524158961 Author: Pacho Ramos gentoo org> AuthorDate: Fri Feb 10 19:07:59 2017 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Fri Feb 10 19:07:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f24434 mail-client/balsa: Disable optional gtkhtml support as gtkhtml is dead and unmaintained for ages (https://bugzilla.gnome.org/show_bug.cgi?id=608225#c5) Package-Manager: Portage-2.3.3, Repoman-2.3.1 mail-client/balsa/balsa-2.5.3.ebuild | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/mail-client/balsa/balsa-2.5.3.ebuild b/mail-client/balsa/balsa-2.5.3.ebuild index 73686addcb..901d051a0d 100644 --- a/mail-client/balsa/balsa-2.5.3.ebuild +++ b/mail-client/balsa/balsa-2.5.3.ebuild @@ -13,9 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crypt gnome gtkhtml gnome-keyring kerberos ldap libnotify libressl rubrica -spell sqlite webkit xface" -REQUIRED_USE="gtkhtml? ( !webkit )" +IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica spell sqlite webkit xface" # TODO: esmtp can be optional, do we want it? RDEPEND=" @@ -30,7 +28,6 @@ RDEPEND=" crypt? ( >=app-crypt/gpgme-1.2.0:= ) gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 ) gnome-keyring? ( app-crypt/libsecret ) - gtkhtml? ( gnome-extra/gtkhtml:4.0 ) sqlite? ( >=dev-db/sqlite-2.8:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !libressl? ( dev-libs/openssl:0= ) @@ -63,26 +60,9 @@ src_prepare() { } src_configure() { - local myconf - - if use crypt ; then - myconf+=" --with-gpgme=gpgme-config" - else - myconf+=" --without-gpgme" - fi - - if use webkit || use gtkhtml; then - if use gtkhtml ; then - myconf+=" --with-html-widget=gtkhtml4" - else - myconf+=" --with-html-widget=webkit2" - fi - else - myconf+=" --with-html-widget=no" - fi - gnome2_src_configure \ --with-canberra \ + $(usex crypt --with-gpgme=gpgme-config --without-gpgme) \ $(use_with gnome) \ $(use_with gnome gtksourceview) \ $(use_with gnome-keyring libsecret) \ @@ -93,5 +73,5 @@ src_configure() { $(usex spell --with-spell-checker=gspell --with-spell-checker=no) \ $(use_with sqlite) \ $(use_with xface compface) \ - ${myconf} + $(usex webkit --with-html-widget=webkit2 --with-html-widget=no) }