[gentoo-commits] repo/gentoo:master commit in: mail-client/balsa/, mail-client/balsa/files/

2022-10-05 Thread Matt Turner
commit: 656e61c2af69889d3aa2f74c000990a3ee181b49
Author: Pascal Jaeger  leimstift  de>
AuthorDate: Mon Sep 26 14:14:21 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Oct  5 16:29:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656e61c2

mail-client/balsa: version bump to 2.6.4

Closes: https://github.com/gentoo/gentoo/pull/27476
Signed-off-by: Pascal Jaeger  leimstift.de>
Signed-off-by: Matt Turner  gentoo.org>

 mail-client/balsa/Manifest |   1 +
 mail-client/balsa/balsa-2.6.4.ebuild   | 111 +
 ...6.4-depend-on-webkit2gtk-4.1-if-available.patch |  35 +++
 ...x-build-error-if-html-support-is-disabled.patch |  71 +
 mail-client/balsa/metadata.xml |   1 +
 5 files changed, 219 insertions(+)

diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 1a2cc9bdec84..0f10923de5eb 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1 +1,2 @@
 DIST balsa-2.6.3.tar.xz 3761940 BLAKE2B 
8bcd93453a74d2b7ffaeca3131828044a9fc399db8e0e695a31dcdb5b50a400e10b3a49d9484609b59e4348758cbeff6fde30243714693e98ab046f7910d1abf
 SHA512 
7e64f75423dd37536812854e56db1af97c00bc35f640d82c22d86e5212c766926430f1c99423f1a972daf6f20d084d4cf16d89e13deb2f1ce550c016cd132f8d
+DIST balsa-2.6.4.tar.xz 3710272 BLAKE2B 
67a3462ca6bc75431a6a3f6a54feb53577111355d749e777a328b881d431856a8090e9c7beea128ee466a9b7aee01a4178b5a273541f0ffdd776a144546fc48e
 SHA512 
7c1526e03de29e19448f0a13847dcd7138d3292221ea16f20d09bf169cf18e69df24dd76726e710470d4507e5cc4e236e1889d4c421610ecd1589a9e2338d264

diff --git a/mail-client/balsa/balsa-2.6.4.ebuild 
b/mail-client/balsa/balsa-2.6.4.ebuild
new file mode 100644
index ..f50208203354
--- /dev/null
+++ b/mail-client/balsa/balsa-2.6.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/;
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+IUSE="gnome +gnome-keyring kerberos ldap rubrica sqlite systray webkit xface"
+
+# TODO: internal spell checking via enchant-2 instead of gtkspell/gspell?
+DEPEND="
+   >=dev-libs/glib-2.48.0:2
+   >=x11-libs/gtk+-3.24.0:3
+   >=dev-libs/gmime-3.2.6:3.0
+   >=net-libs/gnutls-3.0:=
+   dev-libs/fribidi
+   >=dev-libs/libical-2.0.0:=
+   webkit? (
+   >=net-libs/webkit-gtk-2.38.0:4.1
+   >=dev-db/sqlite-3.24
+   app-text/html2text
+   )
+   >=app-crypt/gpgme-1.13.0:=
+   sqlite? ( >=dev-db/sqlite-3.24:= )
+   ldap? ( net-nds/openldap:= )
+   rubrica? ( dev-libs/libxml2:2 )
+   kerberos? ( app-crypt/mit-krb5 )
+   xface? ( >=media-libs/compface-1.5.1:= )
+   gnome? ( x11-libs/gtksourceview:4 )
+   media-libs/libcanberra[gtk3]
+   gnome-keyring? ( app-crypt/libsecret )
+   >=app-text/gspell-1.6:0=
+
+   net-mail/mailbase
+   x11-themes/hicolor-icon-theme
+   x11-themes/adwaita-icon-theme
+   dev-libs/openssl:0=
+   systray? ( x11-libs/xapp )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+   dev-util/gtk-update-icon-cache
+   dev-util/intltool
+   dev-util/itstool
+   virtual/pkgconfig
+   sys-devel/gettext
+   dev-libs/libxml2:2
+"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS TODO docs/*"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-build-error-if-html-support-is-disabled.patch
+   "${FILESDIR}"/${P}-depend-on-webkit2gtk-4.1-if-available.patch
+)
+
+src_prepare() {
+   default
+   # we don't need the package to update the icon cache. We do it 
ourselves in xdg_pkg_postinst
+   sed -i 's/if gtk_update_icon_cache_program.found()/if false/' 
images/meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use gnome gnome-desktop)
+   -Dflock=false
+   -Dfcntl=true
+   $(meson_use sqlite autocrypt)
+   $(meson_use systray)
+   -Dcanberra=true
+   $(meson_use xface compface)
+   $(meson_use kerberos gss)
+   $(meson_use gnome gtksourceview)
+   -Dspell-checker=gspell
+   $(meson_use ldap)
+   -Dmacosx-desktop=false
+   $(meson_use rubrica)
+   -Dosmo=false
+   $(meson_use sqlite)
+   $(meson_use gnome-keyring libsecret)
+   -Dgcr=false
+   -Dmore-warnings=true
+   -Dhelp-files=false
+   -Dlibnetclient-docs=false
+   -Dlibnetclient-test=false
+   )
+   if use webkit; then
+   emesonargs+=(-Dhtml-widget=webkit2)
+   else
+   emesonargs+=(-Dhtml-widget=no)
+   fi
+  

[gentoo-commits] repo/gentoo:master commit in: mail-client/balsa/, mail-client/balsa/files/

2020-08-29 Thread Mart Raudsepp
commit: 952e9a293c1a5c2e1a7887843c0969936e30f841
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Aug 29 08:10:19 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Aug 29 08:27:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952e9a29

mail-client/balsa: security cleanup

Bug: https://bugs.gentoo.org/725910
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 mail-client/balsa/Manifest |   1 -
 mail-client/balsa/balsa-2.5.6-r1.ebuild|  71 --
 .../files/balsa-2.5.6-fix-older-webkit1.patch  | 156 -
 .../files/balsa-2.5.6-fix-older-webkit2.patch  |  53 ---
 mail-client/balsa/metadata.xml |   1 -
 5 files changed, 282 deletions(-)

diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 66b4d991a68..46a34d7a4ab 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,2 +1 @@
-DIST balsa-2.5.6.tar.bz2 4468877 BLAKE2B 
1e7f678c69121fe3472bbba8dc3d2a62680e1969934580a8a85725e84676531f1efb8432380c2d537ca584001c5cecd5c76cd033a1c1e68a292fc765bbc15f8d
 SHA512 
a9c8094ac48b9b1a0971fe45a4658b728f93ad170ad7884c9554420a4696a7b6f5b3661bde8ab070f6a5c14a80f67551745e1d40905881429ae1d8e5874e9a68
 DIST balsa-2.6.1.tar.bz2 4535550 BLAKE2B 
eee4530fe9bdd0f9453178fb7a9e64584193221754dd8fc75703ec5f98214999a9d323357b415ead2fc218461adb4d0d082389f236c6f864b54a90790c889130
 SHA512 
242c93e698390647b93f7e163b547b326675a0600ff5c50c2db3f3e08cd045e32cec4bb69f8a44ef3443d4cf03cb194ac7971d2a0e55f7c84b273a2b627e2433

diff --git a/mail-client/balsa/balsa-2.5.6-r1.ebuild 
b/mail-client/balsa/balsa-2.5.6-r1.ebuild
deleted file mode 100644
index b02520128ed..000
--- a/mail-client/balsa/balsa-2.5.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Email client for GNOME"
-HOMEPAGE="http://pawsa.fedorapeople.org/balsa/;
-SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-
-IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica 
sqlite webkit xface"
-
-# TODO: internal spell checking via enchant-2 instead of gtkspell/gspell?
-RDEPEND="
-   >=app-text/gspell-1.2:0=
-   >=dev-libs/glib-2.40.0:2
-   net-libs/gnutls:=
-   >=x11-libs/gtk+-3.10.0:3
-   dev-libs/gmime:2.6
-   net-mail/mailbase
-   media-libs/libcanberra:=[gtk3]
-   x11-themes/hicolor-icon-theme
-   x11-themes/adwaita-icon-theme
-   crypt? ( >=app-crypt/gpgme-1.5.0:= )
-   gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
-   gnome-keyring? ( app-crypt/libsecret )
-   sqlite? ( >=dev-db/sqlite-2.8:= )
-   libnotify? ( >=x11-libs/libnotify-0.7:= )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   kerberos? ( app-crypt/mit-krb5 )
-   ldap? ( net-nds/openldap )
-   rubrica? ( dev-libs/libxml2:2 )
-   webkit? (
-   net-libs/webkit-gtk:4
-   app-text/html2text
-   )
-   xface? ( >=media-libs/compface-1.5.1:= )
-"
-DEPEND="${RDEPEND}
-   dev-util/gtk-update-icon-cache
-   app-text/yelp-tools
-   dev-util/intltool
-   virtual/pkgconfig
-   sys-devel/gettext
-   dev-libs/libxml2:2
-"
-
-PATCHES=( "$FILESDIR"/${P}-fix-older-webkit{1,2}.patch )
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-
-src_configure() {
-   gnome2_src_configure \
-   --with-canberra \
-   --with-spell-checker=gspell \
-   $(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
-   $(use_with gnome) \
-   $(use_with gnome gtksourceview) \
-   $(use_with gnome-keyring libsecret) \
-   $(use_with kerberos gss) \
-   $(use_with ldap) \
-   $(use_with libnotify) \
-   $(use_with rubrica) \
-   $(use_with sqlite) \
-   $(use_with xface compface) \
-   $(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
-}

diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch 
b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
deleted file mode 100644
index 227e2ac04b4..000
--- a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From ea37ea940dfbcc4e6bcf8327194857a7b306a278 Mon Sep 17 00:00:00 2001
-From: Peter Bloomfield
-Date: Sat, 7 Jul 2018 14:44:26 -0400
-Subject: [PATCH] Use g_debug() instead of conditional compilation
-
-* libbalsa/html.c (lbh_navigation_policy_decision),
-  (lbh_new_window_policy_decision), (lbh_response_policy_decision),
-  (lbh_resource_notify_response_cb), (lbh_web_process_crashed_cb),
-  (lbh_cid_cb), (libbalsa_html_new): Use