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

2024-02-02 Thread Bernard Cafarelli
commit: 42779f2ce4cc4bd17641865034e5b19ddd931c20
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Feb  2 15:18:44 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Feb  2 15:23:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42779f2c

mail-client/claws-mail: backport upstream fix for gtk+ without X11

This avoids the recently introduced dependency on gtk+[X] for 4.2.0 and
live ebuild

Closes: https://bugs.gentoo.org/922657
Signed-off-by: Bernard Cafarelli  gentoo.org>

 ...-4.2.0-r1.ebuild => claws-mail-4.2.0-r2.ebuild} |   4 +-
 mail-client/claws-mail/claws-mail-.ebuild  |   2 +-
 .../files/claws-mail-4.2.0-gtksocket.patch | 214 +
 3 files changed, 218 insertions(+), 2 deletions(-)

diff --git a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild 
b/mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild
similarity index 99%
rename from mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
rename to mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild
index 5851aa86830f..7c2196034cc0 100644
--- a/mail-client/claws-mail/claws-mail-4.2.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.2.0-r2.ebuild
@@ -38,7 +38,7 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2[jpeg]
-   x11-libs/gtk+:3[X]
+   x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango
archive? (
@@ -114,6 +114,8 @@ RDEPEND="${COMMONDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
"${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
+   "${FILESDIR}/${P}-gtksocket.patch"
+
 )
 
 src_prepare() {

diff --git a/mail-client/claws-mail/claws-mail-.ebuild 
b/mail-client/claws-mail/claws-mail-.ebuild
index 4490774ed8e4..ced89451d1f2 100644
--- a/mail-client/claws-mail/claws-mail-.ebuild
+++ b/mail-client/claws-mail/claws-mail-.ebuild
@@ -38,7 +38,7 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2[jpeg]
-   x11-libs/gtk+:3[X]
+   x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango
archive? (

diff --git a/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch 
b/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch
new file mode 100644
index ..db28228cc3a9
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-4.2.0-gtksocket.patch
@@ -0,0 +1,214 @@
+From dd4c4e5152235f9f4f319cc9fdad9227ebf688c9 Mon Sep 17 00:00:00 2001
+From: Jonathan Boeing 
+Date: Sat, 18 Nov 2023 18:51:30 -0700
+Subject: [PATCH] Fix building on non-X11 systems
+
+Gtk Sockets and the GDK_IS_X11_DISPLAY() macro are only available when
+GDK_WINDOWING_X11 is defined
+---
+ src/action.c |  3 ++
+ src/compose.c| 78 ++--
+ src/plugins/dillo/dillo_viewer.c |  5 ++
+ 3 files changed, 53 insertions(+), 33 deletions(-)
+
+diff --git a/src/action.c b/src/action.c
+index d86294fbc..0c459aab6 100644
+--- a/src/action.c
 b/src/action.c
+@@ -30,6 +30,9 @@
+ #ifdef GDK_WINDOWING_X11
+ #  include 
+ #endif /* GDK_WINDOWING_X11 */
++#ifdef GDK_WINDOWING_QUARTZ
++#  include 
++#endif /* GDK_WINDOWING_QUARTZ */
+ #include 
+ #include 
+ #include 
+diff --git a/src/compose.c b/src/compose.c
+index 574d89be1..b32fa6bc7 100644
+--- a/src/compose.c
 b/src/compose.c
+@@ -375,11 +375,11 @@ static void compose_set_ext_editor_sensitive 
(Compose*compose,
+gbooleansensitive);
+ static gboolean compose_get_ext_editor_cmd_valid();
+ static gboolean compose_get_ext_editor_uses_socket();
+-#ifndef G_OS_WIN32
++#ifdef GDK_WINDOWING_X11
+ static gboolean compose_ext_editor_plug_removed_cb
+   (GtkSocket  *socket,
+Compose*compose);
+-#endif /* G_OS_WIN32 */
++#endif /* GDK_WINDOWING_X11 */
+ 
+ static void compose_undo_state_changed(UndoMain   
*undostruct,
+gintundo_state,
+@@ -9623,11 +9623,11 @@ static gboolean compose_can_autosave(Compose *compose)
+ static void compose_exec_ext_editor(Compose *compose)
+ {
+   gchar *tmp;
+-#ifndef G_OS_WIN32
++#ifdef GDK_WINDOWING_X11
+   GtkWidget *socket;
+   Window socket_wid = 0;
+   gchar *p, *s;
+-#endif /* G_OS_WIN32 */
++#endif /* GDK_WINDOWING_X11 */
+   GPid pid;
+   GError *error = NULL;
+   gchar *cmd = NULL;
+@@ -9643,39 +9643,43 @@ static void compose_exec_ext_editor(Compose *compose)
+   return;
+   }
+ 
+-  if (compose_get_ext_editor_uses_socket() && 
GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+-#ifndef G_OS_WIN32
+-  /* Only allow one socket */
+-  if (compose->exteditor_socket != NULL) {
+-  if 

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

2024-01-28 Thread Bernard Cafarelli
commit: e044e81c7698453a7df7359f21fbf42b0998eefb
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Jan 28 09:54:41 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Jan 28 10:00:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e044e81c

mail-client/claws-mail: drop 4.1.0-r2, 4.1.1-r3

Signed-off-by: Bernard Cafarelli  gentoo.org>

 mail-client/claws-mail/Manifest|   1 -
 mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild  | 217 ---
 mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild  | 216 ---
 .../files/claws-mail-4.1.0-disable_gnutls.patch| 641 -
 4 files changed, 1075 deletions(-)

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 10afbbca8ea9..1d802f06ad7f 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,4 @@
 DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B 
eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d
 SHA512 
88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20
 DIST claws-mail-3.20.0.tar.xz 6687376 BLAKE2B 
9a72e77ea922271fdb947e4f76229c89cb0fb2589921fca6fd161714a3093a137165b84b84db5cece5cb6b06998e237d524104d87078dcba36a94f02e0eb
 SHA512 
66d0087493452cf43357fbfb2338b3716ec45d202f51cce033aa3aec4dac2d6eb9e652efb22bcfcab1e6c00ff650a9926114fb4647f753e44013e607d923
-DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 
30d1725c2679e8a0b44edd6c30b15f28633c0a017935980d1412dabffdfb1f33e1c36bee3506e90af54410db222b64422155be821ba18f5e315ed411d477ed63
 SHA512 
83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b
 DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 
7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30
 SHA512 
4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
 DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B 
b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf
 SHA512 
2415f246fc88b76263e1c43860c0638e08c58149a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1

diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild 
b/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild
deleted file mode 100644
index 0e559de511fe..
--- a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit autotools desktop python-any-r1 xdg
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/;
-
-if [[ "${PV}" == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git;
-else
-   
SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="+appindicator archive bogofilter calendar clamav dbus debug doc gdata 
+gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls 
nntp +notification pdf perl +pgp rss session sieve smime spamassassin 
spam-report spell startup-notification svg valgrind webkit xface"
-REQUIRED_USE="
-   appindicator? ( notification )
-   libcanberra? ( notification )
-   libnotify? ( notification )
-   networkmanager? ( dbus )
-   smime? ( pgp )
-"
-
-COMMONDEPEND="
-   dev-libs/nettle:=
-   net-mail/ytnef
-   sys-libs/zlib:=
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2[jpeg]
-   x11-libs/gtk+:3
-   x11-libs/libX11
-   x11-libs/pango
-   archive? (
-   app-arch/libarchive
-   >=net-misc/curl-7.9.7
-   )
-   bogofilter? ( mail-filter/bogofilter )
-   calendar? (
-   >=dev-libs/libical-2.0.0:=
-   >=net-misc/curl-7.9.7
-   )
-   dbus? (
-   >=dev-libs/dbus-glib-0.60
-   sys-apps/dbus
-   )
-   gdata? ( >=dev-libs/libgdata-0.17.2 )
-   gnutls? ( >=net-libs/gnutls-3.0 )
-   imap? ( >=net-libs/libetpan-0.57 )
-   ldap? ( >=net-nds/openldap-2.0.7:= )
-   litehtml? (
-   >=dev-libs/glib-2.36:2
-   >=dev-libs/gumbo-0.10:=
-   net-misc/curl
-   media-libs/fontconfig
-   )
-   nls? ( >=sys-devel/gettext-0.18 )
-   nntp? ( >=net-libs/libetpan-0.57 )
-   notification? (
-   dev-libs/glib:2
-   appindicator? ( dev-libs/libindicate:3[gtk] 

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

2023-04-02 Thread Bernard Cafarelli
commit: 33a5145d1abab8b81e5b3545c04356beb1b5d6f6
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr  2 20:27:21 2023 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr  2 20:47:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a5145d

mail-client/claws-mail: migrate to net-libs/webkit-gtk:4.1

Closes: https://bugs.gentoo.org/893698
Signed-off-by: Bernard Cafarelli  gentoo.org>

 mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild  | 216 ++
 .../files/claws-mail-4.1.1-webkitgtk4.1.patch  | 317 +
 2 files changed, 533 insertions(+)

diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild 
b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
new file mode 100644
index ..7f85e4917eb5
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools desktop python-any-r1 xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git;
+else
+   
SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+SLOT="0"
+QA_PKGCONFIG_VERSION="${PV}.0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls 
+imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp 
+notification +oauth pdf perl +pgp rss session sieve smime spamassassin 
spam-report spell startup-notification svg valgrind webkit xface"
+REQUIRED_USE="
+   libcanberra? ( notification )
+   libnotify? ( notification )
+   networkmanager? ( dbus )
+   oauth? ( gnutls )
+   smime? ( pgp )
+"
+
+COMMONDEPEND="
+   >=dev-libs/glib-2.36:2
+   dev-libs/nettle:=
+   net-mail/ytnef
+   sys-libs/zlib:=
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2[jpeg]
+   x11-libs/gtk+:3
+   x11-libs/libX11
+   x11-libs/pango
+   archive? (
+   app-arch/libarchive
+   >=net-misc/curl-7.9.7
+   )
+   bogofilter? ( mail-filter/bogofilter )
+   calendar? (
+   dev-lang/perl:=
+   >=dev-libs/libical-2.0.0:=
+   >=net-misc/curl-7.9.7
+   )
+   dbus? (
+   >=dev-libs/dbus-glib-0.60
+   sys-apps/dbus
+   )
+   gdata? ( >=dev-libs/libgdata-0.17.2 )
+   dillo? ( www-client/dillo )
+   gnutls? ( >=net-libs/gnutls-3.0 )
+   imap? ( >=net-libs/libetpan-0.57 )
+   ldap? ( >=net-nds/openldap-2.0.7:= )
+   litehtml? (
+   >=dev-libs/gumbo-0.10
+   net-misc/curl
+   media-libs/fontconfig
+   )
+   nls? ( >=sys-devel/gettext-0.18 )
+   nntp? ( >=net-libs/libetpan-0.57 )
+   notification? (
+   libcanberra? (  media-libs/libcanberra[gtk3] )
+   libnotify? ( x11-libs/libnotify )
+   )
+   perl? ( dev-lang/perl:= )
+   pdf? ( app-text/poppler[cairo] )
+   pgp? ( >=app-crypt/gpgme-1.0.0:= )
+   rss? (
+   dev-libs/libxml2
+   net-misc/curl
+   )
+   session? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   smime? ( >=app-crypt/gpgme-1.0.0:= )
+   spam-report? ( >=net-misc/curl-7.9.7 )
+   spell? ( >=app-text/enchant-2.0.0:2= )
+   startup-notification? ( x11-libs/startup-notification )
+   svg? ( >=gnome-base/librsvg-2.40.5 )
+   valgrind? ( dev-util/valgrind )
+   webkit? ( net-libs/webkit-gtk:4.1 )
+"
+
+DEPEND="${COMMONDEPEND}
+   xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   app-arch/xz-utils
+   virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+   app-misc/mime-types
+   x11-misc/shared-mime-info
+   clamav? ( app-antivirus/clamav )
+   networkmanager? ( net-misc/networkmanager )
+   pdf? ( app-text/ghostscript-gpl )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+   "${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
+   "${FILESDIR}/${P}-webkitgtk4.1.patch"
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   --disable-bsfilter-plugin
+   --disable-generic-umpc
+   --disable-jpilot #735118
+   --disable-python-plugin
+   --enable-acpi_notifier-plugin
+   --enable-address_keeper-plugin
+   --enable-alternate-addressbook
+   --enable-att_remover-plugin
+   --enable-attachwarner-plugin
+   --enable-fetchinfo-plugin
+   

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

2022-11-18 Thread Bernard Cafarelli
commit: 83ef67cc4e6bfca98f8ab2b5194d0259d49a9b27
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Nov 18 15:09:18 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Nov 18 15:09:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ef67cc

mail-client/claws-mail: clean LTO patch (vim swp file got in)

Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../claws-mail/files/claws-mail-4.1.1-fix_lto.patch   | Bin 17076 -> 368 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch 
b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch
index 0fd4bfd58a27..10fc79868dcc 100644
Binary files a/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch and 
b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch differ



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

2022-11-18 Thread Bernard Cafarelli
commit: ffe685b85f4db113a0298b6bf37155c0f02bf036
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Nov 18 14:57:13 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Nov 18 14:57:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe685b8

mail-client/claws-mail: fix build with LTO

Closes: https://bugs.gentoo.org/859490
Signed-off-by: Bernard Cafarelli  gentoo.org>

 mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild   |   1 +
 .../claws-mail/files/claws-mail-4.1.1-fix_lto.patch | Bin 0 -> 17076 bytes
 2 files changed, 1 insertion(+)

diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild 
b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
index ebf3c59858ec..50df7b803ec3 100644
--- a/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.1-r1.ebuild
@@ -109,6 +109,7 @@ RDEPEND="${COMMONDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+   "${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
 )
 
 src_prepare() {

diff --git a/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch 
b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch
new file mode 100644
index ..0fd4bfd58a27
Binary files /dev/null and 
b/mail-client/claws-mail/files/claws-mail-4.1.1-fix_lto.patch differ



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

2022-06-26 Thread Sam James
commit: c42e9678728f4b6f00a5113cfe29bb04e1687b88
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 26 06:53:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 26 07:02:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42e9678

mail-client/claws-mail: backport Perl 5.36 patch

Maintainer timeout. This one is particularly important as failed
builds during Perl upgrade rebuilds are a major pain.

Closes: https://bugs.gentoo.org/849569
Signed-off-by: Sam James  gentoo.org>

 mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild | 216 ++
 mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild  | 217 ++
 .../files/claws-mail-3.19.0-perl-5.36.patch| 455 +
 .../files/claws-mail-4.1.0-perl-5.36.patch | 454 
 4 files changed, 1342 insertions(+)

diff --git a/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild 
b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
new file mode 100644
index ..371f4514fc76
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.19.0-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools desktop python-any-r1 xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/;
+
+if [[ "${PV}" == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git;
+else
+   
SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc 
gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager 
nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin 
spam-report spell startup-notification svg valgrind xface"
+REQUIRED_USE="
+   appindicator? ( notification )
+   libcanberra? ( notification )
+   libnotify? ( notification )
+   networkmanager? ( dbus )
+   smime? ( pgp )
+"
+
+COMMONDEPEND="
+   dev-libs/nettle:=
+   net-mail/ytnef
+   sys-libs/zlib:=
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2[jpeg]
+   x11-libs/gtk+:2
+   x11-libs/libX11
+   x11-libs/pango
+   archive? (
+   app-arch/libarchive
+   >=net-misc/curl-7.9.7
+   )
+   bogofilter? ( mail-filter/bogofilter )
+   calendar? (
+   >=dev-libs/libical-2.0.0:=
+   >=net-misc/curl-7.9.7
+   )
+   dbus? (
+   >=dev-libs/dbus-glib-0.60
+   sys-apps/dbus
+   )
+   gdata? ( >=dev-libs/libgdata-0.17.2 )
+   dillo? ( www-client/dillo )
+   gnutls? ( >=net-libs/gnutls-3.0 )
+   imap? ( >=net-libs/libetpan-0.57 )
+   ldap? ( >=net-nds/openldap-2.0.7:= )
+   litehtml? (
+   >=dev-libs/glib-2.36:2
+   >=dev-libs/gumbo-0.10
+   net-misc/curl
+   media-libs/fontconfig
+   )
+   nls? ( >=sys-devel/gettext-0.18 )
+   nntp? ( >=net-libs/libetpan-0.57 )
+   notification? (
+   dev-libs/glib:2
+   appindicator? ( dev-libs/libindicate:3[gtk] )
+   libcanberra? (  media-libs/libcanberra[gtk2] )
+   libnotify? ( x11-libs/libnotify )
+   )
+   pdf? ( app-text/poppler[cairo] )
+   pgp? ( >=app-crypt/gpgme-1.0.0:= )
+   session? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   smime? ( >=app-crypt/gpgme-1.0.0:= )
+   spam-report? ( >=net-misc/curl-7.9.7 )
+   spell? ( >=app-text/enchant-2.0.0:2= )
+   startup-notification? ( x11-libs/startup-notification )
+   svg? ( >=gnome-base/librsvg-2.40.5 )
+   valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+   xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   app-arch/xz-utils
+   virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+   app-misc/mime-types
+   x11-misc/shared-mime-info
+   clamav? ( app-antivirus/clamav )
+   networkmanager? ( net-misc/networkmanager )
+   pdf? ( app-text/ghostscript-gpl )
+   perl? ( dev-lang/perl:= )
+   rss? (
+   dev-libs/libxml2
+   net-misc/curl
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+   "${FILESDIR}/${PN}-3.19.0-perl-5.36.patch"
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   # Don't use libsoup-gnome (bug #565924)
+   export HAVE_LIBSOUP_GNOME=no
+
+   local myeconfargs=(
+   --disable-bsfilter-plugin
+   --disable-fancy-plugin
+   --disable-generic-umpc
+   --disable-jpilot 

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

2019-02-09 Thread Lars Wendler
commit: 1dff9ad1d920a5f8b657735f23d00e06e2021c96
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb 10 00:34:56 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb 10 00:35:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dff9ad1

mail-client/claws-mail: Removed old.

Closes: https://bugs.gentoo.org/676174
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 mail-client/claws-mail/Manifest|   4 -
 mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild | 209 
 mail-client/claws-mail/claws-mail-3.15.1.ebuild| 205 
 mail-client/claws-mail/claws-mail-3.16.0.ebuild| 205 
 mail-client/claws-mail/claws-mail-3.17.2.ebuild| 211 -
 .../claws-mail-3.15.0-old_profile_segfault.patch   |  80 
 6 files changed, 914 deletions(-)

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index a65169e..3e24b02faca 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1 @@
-DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B 
f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823
 SHA512 
667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8
-DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B 
c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25
 SHA512 
3ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c
-DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 
6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f
 SHA512 
5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e
-DIST claws-mail-3.17.2.tar.xz 6166160 BLAKE2B 
d31feb49cbeddbf4f95540f984c76a4d91edb95fccf2a7d97933ddaacfa9a5fedb464e602cb85a97bc75dc341bc7004cef9bea27d8dfb51d42a62d3f2f46fa1d
 SHA512 
c68d31f7097f1b5fd5c768f4d97fd9edfbe54794e06ad6980e092743ff5ac96efbc2354021040315ef355d9a272fb71065e4c02bd8ac1804e7db7953a8cff615
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B 
ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066
 SHA512 
b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8

diff --git a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild 
b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
deleted file mode 100644
index 7e7feaa001c..000
--- a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/;
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz;
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 
+imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp 
+notification pda 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 )
-   networkmanager? ( dbus )
-   python? ( ${PYTHON_REQUIRED_USE} )
-   smime? ( pgp )"
-
-COMMONDEPEND="
-   net-mail/ytnef
-   archive? (
-   app-arch/libarchive
-   >=net-misc/curl-7.9.7
-   )
-   bogofilter? ( mail-filter/bogofilter )
-   calendar? (
-   >=dev-libs/libical-2.0.0:=
-   >=net-misc/curl-7.9.7
-   )
-   dbus? ( >=dev-libs/dbus-glib-0.60 )
-   gdata? ( >=dev-libs/libgdata-0.17.2 )
-   gnutls? ( >=net-libs/gnutls-3.0 )
-   gtk3? ( x11-libs/gtk+:3 )
-   !gtk3? ( >=x11-libs/gtk+-2.20:2 )
-   imap? ( >=net-libs/libetpan-0.57 )
-   ldap? ( >=net-nds/openldap-2.0.7 )
-   nls? ( >=sys-devel/gettext-0.18 )
-   nntp? ( >=net-libs/libetpan-0.57 )
-   notification? (
-   dev-libs/glib:2
-   libcanberra? (  media-libs/libcanberra[gtk] )
-   libindicate? ( dev-libs/libindicate:3[gtk] )
-   libnotify? ( x11-libs/libnotify )
-   )
-   pda? ( >=app-pda/jpilot-0.99 )
-   pdf? ( app-text/poppler[cairo] )
-   pgp? (