diff options
22 files changed, 576 insertions, 129 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz Binary files differindex 6b00c82646da..aa7003604568 100644 --- a/mail-client/Manifest.gz +++ b/mail-client/Manifest.gz diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest index 1a6ab79fdf25..e4eec92db213 100644 --- a/mail-client/balsa/Manifest +++ b/mail-client/balsa/Manifest @@ -1,5 +1,7 @@ -DIST balsa-2.5.2.tar.bz2 4049163 BLAKE2B 7435c7831d528b3ab6d2783211023e3686e94b266ed0804ecb2d9605add6c3826b029c679d137bb3e176b112b11bc68a7e9fd828bc18c2e5c5636b8ef8ec85e4 SHA512 f7a9127d87869d57acebaf33f9e3e4b82c5a5ba90aa5304ce40ba48a1a7f01eaf602555f8e97bce70b0baeb2ac8b5ac12941eaa8b85be1886bf22f7767dd75ba +AUX balsa-2.5.6-fix-older-webkit1.patch 5887 BLAKE2B 50f168661e61ceebefebf75eb710575747835d4000bb6d3a699408842833aa34778a6f4686f2f84b9dcbf46355b74c1148b58e4bf4655656f0db6080e1ade0b5 SHA512 b70824443d91aaeba035de9615c7699d73e78e4f5293ad9b9e8d62e1ba3488f355071e519c2c988b5ed944debbd978f3e7ea74f286b4225761bc9c54cb5545af +AUX balsa-2.5.6-fix-older-webkit2.patch 1601 BLAKE2B a07266737af3a755e9b2113be0d3d5352b548ef73a41d4af62ca8298c2e86540e34686c7c45a683c6152e89c41655cd5e134209803c9601f1ba4d26b2da07a07 SHA512 45c47ca20818dd46a916c57135a5617006bbc055c343705b5596845b31a7df02ee30a21ee83edb73b85a12f5c0705541fd77c45c30ab64c4c1a07102ac0fe722 DIST balsa-2.5.3.tar.bz2 4333815 BLAKE2B ba8715108cf1122152c069130911275175d5c45ca12e85f1165cb7e86680015d6effd1ea5aaaebd5b154f67fc13002bd26ad0f0d7942253b2483896dd28a50fd SHA512 34e69be050f6c502fa6651029b7d93bf9b7842bbe8489669924563c086def4dbe72109ba5244e0cacf3ef69d3d9d8c5679f870acf564b5551920fa77012e1ff8 -EBUILD balsa-2.5.2-r1.ebuild 2573 BLAKE2B ee91a813897fb5865eb2407f131a6b193c78dd368bdc249fa471f0639d5022e7918da30a6db0da73b16e69ee9f4a48139c0c2972dfd50304ddde9c0610a08b77 SHA512 87414906f0a40d7ccf62ff76cefa2583bb99ea9f07a366f8964f4305424ae5f7034bc2c046a3181b11f4342cfac7eac6ffb9358b030ddb7dd8395bbccb37182b +DIST balsa-2.5.6.tar.bz2 4468877 BLAKE2B 1e7f678c69121fe3472bbba8dc3d2a62680e1969934580a8a85725e84676531f1efb8432380c2d537ca584001c5cecd5c76cd033a1c1e68a292fc765bbc15f8d SHA512 a9c8094ac48b9b1a0971fe45a4658b728f93ad170ad7884c9554420a4696a7b6f5b3661bde8ab070f6a5c14a80f67551745e1d40905881429ae1d8e5874e9a68 EBUILD balsa-2.5.3-r1.ebuild 2115 BLAKE2B 26c3bf7c82b1e28142592b0be6804e56ccd89efa7cf30614e80778bd776cc8d996162bd6ae984f3757e1849b02d25a61d6f1183495f2cf80588c22b6c1c43496 SHA512 c5001e1bb1ab9809d3f7dfcafecb0ba713bcb034744bd691f227149179996e8b935b61b23881497d0cd355be32c14b7e3d8a33bfe7aef18c46ea6af73d1b01ea -MISC metadata.xml 525 BLAKE2B 3afe2cdc67ef1373e7f1db8421db62d12dab1288b8c46787e1adfdd8a6cf4cf3df7514222dd2a17c2ffcef88c6be10a77f35981c2a95c81d9ffc6631f62b9acb SHA512 2cff8f1968d1d1656b2eb01b1a373483a2168a4cdf2556c8cd7a4558f3e0821b816fc7cc2e1476ee8a8fe90622835c6b10e392b6ea7e64eba592c6f50922d4fe +EBUILD balsa-2.5.6-r1.ebuild 1967 BLAKE2B f228287f032aff01d0f6755459a474ab84d0fc5c80d7fea79f70ed747cf51e71e77d38a2551e87a395a5b16c5a66e28b4c99d45ab267cd60df2439ed72b2b8fe SHA512 0694ed959126fec8e94212c79b68a1a1ad9c1696d8102591954696612d0f75f6ea62e99fc920b319604855964c950709bddc874bde771b537634c23ad65eca83 +MISC metadata.xml 397 BLAKE2B a3e92ebea646f1e37ad27a49e5550d95a0182109ecc3d7c3f448382c28281fbbb8fe71d74789544035b249f663b4803cd711c91635e5f8e4aee616c64a0868cd SHA512 4516e80231827cefbd4f6bdeac5fb7d1281c2c630bc5929cdf016d4887bfb80aec610addad886224dfd229189daa515c9d259176ed69cef62e97e799b9ceda4c diff --git a/mail-client/balsa/balsa-2.5.2-r1.ebuild b/mail-client/balsa/balsa-2.5.2-r1.ebuild deleted file mode 100644 index 7cfc68bf4b5c..000000000000 --- a/mail-client/balsa/balsa-2.5.2-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" - -inherit eutils 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 gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify libressl rubrica sqlite ssl webkit xface" -REQUIRED_USE="gtkhtml? ( !webkit )" - -# TODO: esmtp can be optional, do we want it? -RDEPEND=" - >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3.4.0:3 - dev-libs/gmime:2.6 - >=net-libs/libesmtp-1.0.3:= - net-mail/mailbase - media-libs/libcanberra:=[gtk3] - x11-themes/hicolor-icon-theme - x11-themes/adwaita-icon-theme - crypt? ( >=app-crypt/gpgme-1.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:= ) - gtkspell? ( >=app-text/gtkspell-3.0.3:3 ) - !gtkspell? ( app-text/enchant ) - kerberos? ( app-crypt/mit-krb5 ) - ldap? ( net-nds/openldap ) - rubrica? ( dev-libs/libxml2:2 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - webkit? ( net-libs/webkit-gtk:4 ) - xface? ( >=media-libs/compface-1.5.1:= ) -" -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext -" - -src_prepare() { - DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*" - - # https://bugzilla.gnome.org/show_bug.cgi?id=750516 - sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die - - # https://bugzilla.gnome.org/show_bug.cgi?id=750515 - echo "src/balsa-print-object.c" >> po/POTFILES.in || die - - gnome2_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 \ - --disable-pcre \ - --enable-gregex \ - --enable-threads \ - --with-gmime=2.6 \ - --with-canberra \ - $(use_with gnome) \ - $(use_with gnome gtksourceview) \ - $(use_with gnome-keyring libsecret) \ - $(use_with gtkspell) \ - $(use_with kerberos gss) \ - $(use_with ldap) \ - $(use_with libnotify) \ - $(use_with rubrica) \ - $(use_with sqlite) \ - $(use_with ssl) \ - $(use_with xface compface) \ - ${myconf} -} diff --git a/mail-client/balsa/balsa-2.5.6-r1.ebuild b/mail-client/balsa/balsa-2.5.6-r1.ebuild new file mode 100644 index 000000000000..0a890dc87df1 --- /dev/null +++ b/mail-client/balsa/balsa-2.5.6-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 new file mode 100644 index 000000000000..227e2ac04b4f --- /dev/null +++ b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch @@ -0,0 +1,156 @@ +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 g_debug() instead of + conditionally compiled printing. +--- + libbalsa/html.c | 52 ++++++++++++++++++++++++------------------------- + 2 files changed, 25 insertions(+), 27 deletions(-) + +diff --git a/libbalsa/html.c b/libbalsa/html.c +index 17f62789e..1e5e2f500 100644 +--- a/libbalsa/html.c ++++ b/libbalsa/html.c +@@ -44,6 +44,11 @@ + #include <string.h> + #include <glib/gi18n.h> + ++#ifdef G_LOG_DOMAIN ++# undef G_LOG_DOMAIN ++#endif ++#define G_LOG_DOMAIN "html" ++ + #ifdef HAVE_HTML_WIDGET + + /* +@@ -141,13 +146,6 @@ html2text(gchar ** text, gsize len) + * Experimental support for WebKit2. + */ + +-#define DEBUG_WEBKIT2 FALSE +-#if DEBUG_WEBKIT2 +-#define d(x) x +-#else +-#define d(x) +-#endif +- + /* WebKitContextMenuItem uses GtkAction, which is deprecated. + * We don't use it, but it breaks the git-tree build, so we just mangle + * it: */ +@@ -280,10 +278,10 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision, + + switch (navigation_type) { + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: +- d(g_print("%s clicked %s\n", __func__, uri)); ++ g_debug("%s clicked %s", __func__, uri); + (*info->clicked_cb) (uri); + default: +- d(g_print("%s uri %s, type %d, ignored\n", __func__, uri, navigation_type)); ++ g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type); + webkit_policy_decision_ignore(decision); + } + } +@@ -305,13 +303,13 @@ lbh_new_window_policy_decision(WebKitPolicyDecision * decision, + (navigation_action)) { + case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: + request = webkit_navigation_action_get_request(navigation_action); +- d(g_print("%s clicked %s\n", __func__, +- webkit_uri_request_get_uri(request))); ++ g_debug("%s clicked %s", __func__, ++ webkit_uri_request_get_uri(request)); + (*info->clicked_cb) (webkit_uri_request_get_uri(request)); + default: +- d(g_print("%s type %d, ignored\n", __func__, +- webkit_navigation_action_get_navigation_type +- (navigation_action))); ++ g_debug("%s type %d, ignored", __func__, ++ webkit_navigation_action_get_navigation_type ++ (navigation_action)); + + webkit_policy_decision_ignore(decision); + } +@@ -321,10 +319,10 @@ static void + lbh_response_policy_decision(WebKitPolicyDecision * decision, + gpointer data) + { +- d(g_print("%s uri %s, ignored\n", __func__, +- webkit_uri_request_get_uri +- (webkit_response_policy_decision_get_request +- (WEBKIT_RESPONSE_POLICY_DECISION(decision))))); ++ g_debug("%s uri %s, ignored", __func__, ++ webkit_uri_request_get_uri ++ (webkit_response_policy_decision_get_request ++ (WEBKIT_RESPONSE_POLICY_DECISION(decision)))); + webkit_policy_decision_ignore(decision); + } + +@@ -453,20 +451,20 @@ lbh_resource_notify_response_cb(WebKitWebResource * resource, + + response = webkit_web_resource_get_response(resource); + mime_type = webkit_uri_response_get_mime_type(response); +- d(g_print("%s mime-type %s\n", __func__, mime_type)); ++ g_debug("%s mime-type %s", __func__, mime_type); + if (g_ascii_strncasecmp(mime_type, "image/", 6) != 0) + return; + + if (info->info_bar) { +- d(g_print("%s %s destroy info_bar\n", __func__, +- webkit_web_resource_get_uri(resource))); ++ g_debug("%s %s destroy info_bar", __func__, ++ webkit_web_resource_get_uri(resource)); + /* web_view is loading an image from its cache, so we do not + * need to ask the user for permission to download */ + gtk_widget_destroy(info->info_bar); + info->info_bar = NULL; + } else { +- d(g_print("%s %s null info_bar\n", __func__, +- webkit_web_resource_get_uri(resource))); ++ g_debug("%s %s null info_bar", __func__, ++ webkit_web_resource_get_uri(resource)); + } + } + +@@ -493,7 +491,7 @@ static gboolean + lbh_web_process_crashed_cb(WebKitWebView * web_view, + gpointer data) + { +- d(g_print("%s\n", __func__)); ++ g_debug("%s", __func__); + return FALSE; + } + +@@ -509,7 +507,7 @@ lbh_cid_cb(WebKitURISchemeRequest * request, + LibBalsaMessageBody *body; + + path = webkit_uri_scheme_request_get_path(request); +- d(g_print("%s path %s\n", __func__, path)); ++ g_debug("%s path %s", __func__, path); + + if ((body = + libbalsa_message_get_part_by_id(info->body->message, path))) { +@@ -616,7 +614,7 @@ libbalsa_html_new(LibBalsaMessageBody * body, + webkit_web_context_register_uri_scheme(context, "cid", lbh_cid_cb, + &info, NULL); + have_registered_cid = TRUE; +- d(g_print("%s registered cid: scheme\n", __func__)); ++ g_debug("%s registered cid: scheme", __func__); + } + + settings = webkit_web_view_get_settings(web_view); +@@ -647,7 +645,7 @@ libbalsa_html_new(LibBalsaMessageBody * body, + if (g_regex_match_simple(src_regex, text, G_REGEX_CASELESS, 0)) { + info->info_bar = lbh_info_bar(info); + gtk_box_pack_start(GTK_BOX(vbox), info->info_bar, FALSE, FALSE, 0); +- d(g_print("%s shows info_bar\n", __func__)); ++ g_debug("%s shows info_bar", __func__); + } + + webkit_web_view_load_html(web_view, text, NULL); +-- +2.17.1 + diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch new file mode 100644 index 000000000000..d7b5eb74ba1c --- /dev/null +++ b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch @@ -0,0 +1,53 @@ +From 3423ca9bf48e675007b7fb1bd61b50aa97d14890 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Albrecht=20Dre=C3=9F?= +Date: Sat, 7 Jul 2018 16:36:49 -0400 +Subject: [PATCH] html: Fix HTML rendering with webkit2gtk-4.0 < 2.20 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* README: document use of G_MESSAGES_DEBUG=… +* libbalsa/html.c (lbh_navigation_policy_decision): + allow the rendering of “about:blank”. +--- + libbalsa/html.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +leio: trimmed out the G_MESSAGES_DEBUG doc changes +diff --git a/libbalsa/html.c b/libbalsa/html.c +index 1e5e2f500..307194e0a 100644 +--- a/libbalsa/html.c ++++ b/libbalsa/html.c +@@ -44,13 +44,13 @@ + #include <string.h> + #include <glib/gi18n.h> + ++#ifdef HAVE_HTML_WIDGET ++ + #ifdef G_LOG_DOMAIN + # undef G_LOG_DOMAIN + #endif + #define G_LOG_DOMAIN "html" + +-#ifdef HAVE_HTML_WIDGET +- + /* + * Used by all HTML widgets + * +@@ -281,8 +281,12 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision, + g_debug("%s clicked %s", __func__, uri); + (*info->clicked_cb) (uri); + default: +- g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type); +- webkit_policy_decision_ignore(decision); ++ if (g_ascii_strcasecmp(uri, "about:blank") != 0) { ++ g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type); ++ webkit_policy_decision_ignore(decision); ++ } else { ++ g_debug("%s uri %s, type %d loaded", __func__, uri, navigation_type); ++ } + } + } + +-- +2.17.1 diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml index 4c043cdb299a..3f5668996d9a 100644 --- a/mail-client/balsa/metadata.xml +++ b/mail-client/balsa/metadata.xml @@ -7,8 +7,6 @@ </maintainer> <use> <flag name="crypt">Adds support for GnuPG encryption</flag> - <flag name="gtkhtml">Use gtkhtml for HTML rendering</flag> - <flag name="gtkspell">Use gtkspell for dictionary support</flag> <flag name="rubrica">Adds support for rubrica addressbook</flag> </use> </pkgmetadata> diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest index 903490ee20b0..786a1297fb01 100644 --- a/mail-client/geary/Manifest +++ b/mail-client/geary/Manifest @@ -1,3 +1,5 @@ DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52 +DIST geary-0.12.3.tar.xz 1069444 BLAKE2B 73f4382cd97813fcb3921daeab4338f4797bef2b5dcb1f7df1afeb75be48877109dcb15317f9bbe595326ee38f9ea3359a7d062c39ea3d83e1d36c34b680e707 SHA512 0e22b7ad8b79d17e55f6ab75a13883db04b21b1be9c2b06b08009e48fe433de323e23414ae8e47543bcb7785d6aa90bea582a2e20eaed1ce7bcb02687a69b9b6 EBUILD geary-0.12.0.ebuild 1696 BLAKE2B e09db7ec9f677f5cd287be3a5a14852e443db1679c29e32c88cd72efefa911978e22fd4fd23c2c09dad6947746b4e2799eb2ec0d1b41094ec3cd091dd9c775cd SHA512 c70ced94dd34b205bf1ecd86b642856582cb4c44a14bfb83d316e1c816f520e5fdd4929afc14a23a1e08d982b2e6f52286f8be1c1da8b53a78372377adb17011 +EBUILD geary-0.12.3.ebuild 1971 BLAKE2B 70f8d301bc48a2a448cd32a1e0cfd8b7f260f22d0f559ce9d8dd9f76fe6799aed1b78a87d25dce3f47d68b5ecf0f2e6cd88e0ba121181d9789d38791ffcc275e SHA512 d67227a25b5b9c67bb2ca2f3508efc0a2f1cb1e74c7919fde37702b60898a4b895438c68d6d1e17d43adf4ef4244864c3c319448cff314b2f017fce1020ddf1a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/mail-client/geary/geary-0.12.3.ebuild b/mail-client/geary/geary-0.12.3.ebuild new file mode 100644 index 000000000000..6ed3152f6cc8 --- /dev/null +++ b/mail-client/geary/geary-0.12.3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +# Keep cmake-utils at the end +inherit gnome2 vala cmake-utils + +DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" +HOMEPAGE="https://wiki.gnome.org/Apps/Geary" + +LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=dev-libs/glib-2.42:2 + >=x11-libs/gtk+-3.14.0:3[introspection] + >=net-libs/webkit-gtk-2.10.0:4=[introspection] + app-text/iso-codes + >=dev-db/sqlite-3.12:3 + + >=net-libs/libsoup-2.48:2.4[introspection] + >=dev-libs/libgee-0.8.5:0.8=[introspection] + >=x11-libs/libnotify-0.7.5[introspection] + >=media-libs/libcanberra-0.28 + >=dev-libs/gmime-2.6.17:2.6 + >=app-crypt/libsecret-0.11[introspection,vala] + >=dev-libs/libxml2-2.7.8:2 + >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] + >=app-text/enchant-1.6:0 +" +RDEPEND="${DEPEND} + gnome-base/dconf + gnome-base/gsettings-desktop-schemas +" # org.gnome.desktop.interface clock-format global setting usage +# gnome-doc-utils for xml2po for TRANSLATE_HELP option +DEPEND="${DEPEND} + sys-devel/gettext + app-text/gnome-doc-utils + dev-util/desktop-file-utils + virtual/pkgconfig + $(vala_depend) +" + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=751557 + sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die + + local i + if [[ -n "${LINGUAS+x}" ]] ; then + for i in $(cd po ; echo *.po) ; do + if ! has ${i%.po} ${LINGUAS} ; then + sed -i -e "/^${i%.po}$/d" po/LINGUAS || die + fi + done + fi + + cmake-utils_src_prepare + gnome2_src_prepare + vala_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DICON_UPDATE=OFF + -DDESKTOP_UPDATE=OFF + -DDESKTOP_VALIDATE=OFF + -DTRANSLATE_HELP=ON + + -DNO_FATAL_WARNINGS=ON + -DGSETTINGS_COMPILE=OFF + -DVALA_EXECUTABLE="${VALAC}" + -DVAPIGEN="${VAPIGEN}" + ) + + cmake-utils_src_configure +} diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 300bd00cd82b..7443aa1ef81c 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,14 +1,14 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 -DIST mutt-1.10.0.tar.gz 4249980 BLAKE2B eed788b0d0105d232cd0fbc50320fe4a3ef36635131e03cc477f0cf003c299b5d78994cb6467fcb6d45ca46a073c8997fdc42a669a3fa7662ac21ae70ae082c2 SHA512 4cade7f17e157c8c2184c96d596d9dbfab704d300074eca66c567f2dab055caa9b828080cce92e2616176000219288630c33542ab83a98db0160cd085b937530 +DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726 DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b -DIST mutt-gentoo-1.10.0-patches-r0.tar.xz 108556 BLAKE2B 9e8176816525c26922a6a8c0aa6efe9ce818e5a1fec8955ad5ac055fa7300d17401b41e56aa9b1366405c5ad13d2aa2e958bd48e9c6d0fc5ced40c162ae14818 SHA512 52d58aa50b289711487655cbf691b15f76e03d69fcfc655202126d94c57b574d643a3293408e930989a42c3b1e56ef398a32049e10a9ffc0331cffb57fde98e3 +DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3 DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f -EBUILD mutt-1.10.0.ebuild 9194 BLAKE2B 28db1a529867bccf2493aa8f9290df78abc25697553caaf0a5759e44fb51eea7c9a4a04e1d339f23c4c2df61e01bac29ad977cfeb3dd6f74eab753dfadc80a16 SHA512 74a21faabf171916386c8e1862e6478848304290b39d47032f180e4ac9501ab4034b182330d5d853961c7edb98abc208439a6ae1edd494ece44ea44e5316f9b6 +EBUILD mutt-1.10.1.ebuild 9189 BLAKE2B b6294603e9e91df2c57b58ee984017027c8288e9eb6dfec8ba10ba73dad7c0e076ffa18345151f527737c771394207684b03739bc481ec6549ab507982e6df0e SHA512 a12d6a5f5b38e188952a88c5b53acf01e78c957e097683f4cd19efad4c983c621ba34b6f7d31e1364ff8ceca29df98762207c58ae1ab8a9061f28b4ee1ae2994 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef EBUILD mutt-1.9.4-r1.ebuild 9167 BLAKE2B 6a4d5caea9682471e41f4fc66d63486b5110e1677048b7e6db8e0c622ba76f9f9d85de2aecb7d60c0fb0633b70937a20938e9531537e23ca9b311a6944c7f155 SHA512 d4699a67185750447df9fd1d3b02abba60abf5a41323c27bd056020237c567fc729e4b65ad10a4cc7c4461b127d9eb2360f87b9a84c7e0fdee640856f352a92f EBUILD mutt-1.9.5.ebuild 9187 BLAKE2B 87fb00b9b056b6bc4d36f243221468d3e70867cc7e41bd29ad18d7597f166ba78dcc51b958fe1a66c24127f7f564e72f6496f8fda16b893c3e93e4637d020c8c SHA512 496b3a025566ea72335baead232f1af785797389937e79d3cf4b3b4325ca1b65e48b060b5ca2828ce22ab9858be63eb24b3622d23cf03323abd0e2f6b6ebbc64 diff --git a/mail-client/mutt/mutt-1.10.0.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild index ad7fa6ac20cf..9aaba6d4d0fe 100644 --- a/mail-client/mutt/mutt-1.10.0.ebuild +++ b/mail-client/mutt/mutt-1.10.1.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE=" kerberos? ( || ( imap pop smtp nntp ) )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # yes, we overdepend on the backend impls here, hopefully one day we can # have REQUIRED_USE do what it is made for again. bug #607360 CDEPEND=" diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex 04fccf8c5c2a..a4208ad59974 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest index c5401a4b8d9e..eb1a0c41e8fe 100644 --- a/mail-filter/bogofilter/Manifest +++ b/mail-filter/bogofilter/Manifest @@ -2,4 +2,5 @@ AUX bogofilter-1.2.2-gcc34.patch 1393 BLAKE2B e5f1c3fca416ab76114aeaa2da700b4c8c AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db EBUILD bogofilter-1.2.4-r1.ebuild 3739 BLAKE2B 8bdc42c8080fad6a9043a078d418c732f4a2029613ee2dc3ed75e3ac60da9ea1141352022c9d2852bc6b2473b8a1419c85600e001c7e9b7c571ce634a7fff68b SHA512 f82ea953c36071d6b5f25ce645d585712906f7bfe688400ce0e45cb561cdb7cb774243216bd9af090308744c9d6cd8c4f70fd00b69fe85a28c3331a0cc580021 +EBUILD bogofilter-1.2.4-r2.ebuild 3784 BLAKE2B 3523d28e8d929393a27bbbffeb8062e674538af3e13f3796b99b1b566ba41e14d5742a5f69d324fe2ed959ede637dab278af9c0fcbcdb7447ed2670a3317f4fb SHA512 dbc7dc698e83762e5beeb70a3b00a327ea6f898630b5f4c3e454e7a5dfcdcf524edc33102ac4335fb63f8039d6d32864e0071fc03fd73072875dcc7d531479da MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277 diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild new file mode 100644 index 000000000000..0be07cf8a7bf --- /dev/null +++ b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools db-use flag-o-matic toolchain-funcs + +DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed" +HOMEPAGE="http://bogofilter.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="berkdb sqlite tokyocabinet" + +# pax needed for bf_tar +DEPEND=" + app-arch/pax + sci-libs/gsl:= + virtual/libiconv + berkdb? ( >=sys-libs/db-3.2:* ) + !berkdb? ( + sqlite? ( >=dev-db/sqlite-3.6.22 ) + !sqlite? ( + tokyocabinet? ( dev-db/tokyocabinet ) + !tokyocabinet? ( >=sys-libs/db-3.2:* ) + ) + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-test-env.patch" ) + +pkg_setup() { + has_version mail-filter/bogofilter || return 0 + if ( use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \ + ( ! use berkdb && has_version 'mail-filter/bogofilter[berkdb]' ) || \ + ( use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \ + ( ! use sqlite && has_version 'mail-filter/bogofilter[sqlite]' ) || \ + ( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \ + ( use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \ + ( ! use tokyocabinet && has_version 'mail-filter/bogofilter[tokyocabinet]' ) + ) ; then + ewarn + ewarn "If you want to switch the database backend, you must dump the wordlist" + ewarn "with the current version (old use flags) and load it with the new version!" + ewarn + fi +} + +src_prepare() { + default + + # bug 445918 + sed -i -e 's/ -ggdb//' configure.ac || die + + # bug 421747 + chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id} + + # bug 654990 + sed -i -e 's/t.bulkmode//' \ + -e 's/t.dump.load//' \ + -e 's/t.nonascii.replace//' \ + src/tests/Makefile.am || die + + eautoreconf +} + +src_configure() { + local myconf="" berkdb=true + myconf="--without-included-gsl" + + # determine backend: berkdb *is* default + if use berkdb && use sqlite ; then + elog "Both useflags berkdb and sqlite are in USE:" + elog "Using berkdb as database backend." + elif use berkdb && use tokyocabinet ; then + elog "Both useflags berkdb and tokyocabinet are in USE:" + elog "Using berkdb as database backend." + elif use sqlite && use tokyocabinet ; then + elog "Both useflags sqlite and tokyocabinet are in USE:" + elog "Using sqlite as database backend." + myconf="${myconf} --with-database=sqlite" + berkdb=false + elif use sqlite ; then + myconf="${myconf} --with-database=sqlite" + berkdb=false + elif use tokyocabinet ; then + myconf="${myconf} --with-database=tokyocabinet" + berkdb=false + elif ! use berkdb ; then + elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:" + elog "Using berkdb as database backend." + fi + + # Include the right berkdb headers for FreeBSD + if ${berkdb} ; then + append-cppflags "-I$(db_includedir)" + fi + + econf ${myconf} +} + +src_test() { + emake -C src/ check +} + +src_install() { + emake DESTDIR="${D}" install + + exeinto /usr/share/${PN}/contrib + doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \ + contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \ + contrib/{spamitarium,stripsearch}.pl + + insinto /usr/share/${PN}/contrib + doins contrib/{README.*,dot-qmail-bogofilter-default} \ + contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \ + contrib/vm-bogofilter.el \ + contrib/{trainbogo,scramble}.sh + + dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \ + doc/integrating-with-* doc/README.{db,sqlite} + + dodoc -r doc/*.html + + dodir /usr/share/doc/${PF}/samples + mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die + rmdir "${D}"/etc || die +} diff --git a/mail-filter/scmail/Manifest b/mail-filter/scmail/Manifest index 9d56ddcd25f6..506c0465f8ad 100644 --- a/mail-filter/scmail/Manifest +++ b/mail-filter/scmail/Manifest @@ -1,5 +1,6 @@ -AUX scmail-doc-encoding.diff 1294 BLAKE2B 12513733645550843ca1161cb201506a0fcb22eb1730ebe13cc5550c68822d20b97dc9c8f320d9d84c18313baa7d577ac91495ae7be9ce51b802886e17969cbc SHA512 22bd822c7d153380776c845c31efa0d16a93f4fe809c40a2d75107a60ffa4aa484e9f36ef13194855516059534b944646ed5e6db6992d66c6e146c5dc4cdd01a -AUX scmail-gauche-0.9.diff 1318 BLAKE2B 9ad569c02208ff4e2415a3ff757828b75b9cd037f21c37740e2316a820397c5df5fb1fdc9cffb6754ec510f32eaee433f2a25cab494e8a33b46da16cfc331bcc SHA512 137c1dfbcd548a28e315bc0df6aac01e2ee89aaf74433297b0173c91da9216e464f9044e8584a3fd543f3cbcf28d47d6bcd539b8bd0830cf1cdd768c055792b6 +AUX scmail-doc-encoding.patch 1271 BLAKE2B c554ebfed8350a10939364b9d4b50d446d839ad2ea171ec88a0929f25c8f76bd0a213c7bfc82ab0863320c921fb43d52706145012b47745e0f2e4505802d974a SHA512 fb38ddca2bb938d7397d6edcfb49ff0fd971a0079f2b1571db9efa1ac8fed49ed27cb4d6a32b911d7135b6e58c5c61b12db64c47ad5422a86cb4701b79c40cf5 +AUX scmail-gauche-0.9.patch 1295 BLAKE2B 2bf2ee2aa2c99ef72d6fbd25c65448a99d1c3a16be20373db867c3ec07604b94ea2fb7a6fac76f1bca4aa8be378140dc6eb6718ead1f61844cba9127a0bd2ea8 SHA512 4aee907271c20254a41035160418429fcd7e35890a0d7a6251d4adefcaafe8581dc5e3df4bc70b27b541eb6a888acc7811231a183d62f2c267b1d2ccf652dc69 +AUX scmail-undefined-reference.patch 1351 BLAKE2B b0758cf2a1de5be0bd32d16bbc44d28d7e3b4e3a65f9a9151e76245c4f5473e8c82a682324544018e7aecf53f2534cc5e2fa2d27451947ff285684221b091e55 SHA512 2b8acf57f55a3367157bf20da796f2529258e48877b049f2928ff06c3365c24c41c6a8824f32b0fbf14fb193f94a2f147afa97c9c03a13227b62b13bd0b550d0 DIST scmail-1.3.tar.gz 52744 BLAKE2B 2e2848472bb6f9ce913fea381c905ec28a1cac5201fe3a8c89e25c96a0fd646e7f96ddcf6cdfd1e0d88f34b5d51ea754faa5c3574635715ed1dc92cfd9d2980c SHA512 ae94de7f34f9279e892533137d76f07642ade63f9d179bbc96202003f49cf8ae6dd6cc5b9d53fa1d2f8be2bebcbe071635910d48593c9e57fb6609cc7ec6e95d -EBUILD scmail-1.3.ebuild 715 BLAKE2B 587d9bf9559e5e5cda85673d385aa1b0a791ece7d70384c861661b4f61bf4e142e6988bea0d5bc316a98f77208b8f2a161f177493cfaee1b919ca0aeea0344f2 SHA512 22102918a9ac9d5d99a465dfbae42d1bce6db9c94687ce214e26a66d9304bd789c9c7edff67a4de06ee0c3ce5b1246e959801b11aae4a3eb66a5cc3911749d64 +EBUILD scmail-1.3.ebuild 865 BLAKE2B 00cc7be560ab91dcb7ef79c667cf87b3eeb1b06c9bc052bab1620106ff2580e8b8b7873672b0bc861d43c877f605f50ac8821de9a3fb08b0adf96877bacd89f1 SHA512 3c489c5e8c86c032925f313086e1ec876738ac312f053c8cb1d92dae9bbdf4e1d6e9fdc4ddfcd27031a01068591c42d7fb78234848910dcd27af0277003e38bf MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0 diff --git a/mail-filter/scmail/files/scmail-doc-encoding.diff b/mail-filter/scmail/files/scmail-doc-encoding.patch index 5ed00a62d02d..8740774379f9 100644 --- a/mail-filter/scmail/files/scmail-doc-encoding.diff +++ b/mail-filter/scmail/files/scmail-doc-encoding.patch @@ -1,5 +1,5 @@ ---- scmail-1.3.orig/doc/embed.scm -+++ scmail-1.3/doc/embed.scm +--- a/doc/embed.scm ++++ b/doc/embed.scm @@ -1,3 +1,4 @@ +(use gauche.charconv) (use gauche.regexp) diff --git a/mail-filter/scmail/files/scmail-gauche-0.9.diff b/mail-filter/scmail/files/scmail-gauche-0.9.patch index 36fc3b3daa77..9062df4eb71d 100644 --- a/mail-filter/scmail/files/scmail-gauche-0.9.diff +++ b/mail-filter/scmail/files/scmail-gauche-0.9.patch @@ -1,5 +1,5 @@ ---- scmail-1.3.orig/scbayes.in -+++ scmail-1.3/scbayes.in +--- a/scbayes.in ++++ b/scbayes.in @@ -16,6 +16,7 @@ (use gauche.parseopt) diff --git a/mail-filter/scmail/files/scmail-undefined-reference.patch b/mail-filter/scmail/files/scmail-undefined-reference.patch new file mode 100644 index 000000000000..5059ef4b1fd2 --- /dev/null +++ b/mail-filter/scmail/files/scmail-undefined-reference.patch @@ -0,0 +1,51 @@ +--- a/scmail/config.scm ++++ b/scmail/config.scm +@@ -30,6 +30,8 @@ + )) + (select-module scmail.config) + ++(autoload scmail.util scmail-eformat) ++ + (define scmail-config-directory (make-parameter (expand-path "~/.scmail"))) + + (define (scmail-config-set-directory! directory) +--- a/scmail/mailbox.scm ++++ b/scmail/mailbox.scm +@@ -19,6 +19,7 @@ + (use srfi-1) + (use file.util) + (use gauche.parameter) ++ (use scmail.util) + (export <mailbox> + make-scmail-mailbox + scmail-mailbox-mail-list +--- a/scmail/util.scm ++++ b/scmail/util.scm +@@ -19,7 +19,6 @@ + (use file.util) + (use srfi-13) + (use gauche.parameter) +- (use scmail.config) + (use scmail.progress) + (use gauche.version) + (export filter safe-rxmatch +@@ -31,6 +30,8 @@ + + (select-module scmail.util) + ++(autoload scmail.config scmail-config-verbose-mode?) ++ + ;; + ;; FIXME: Reinvent it because filter in srfi-1 module is too + ;; slow in old Gauche implementations. +--- a/scmail.scm ++++ b/scmail.scm +@@ -264,7 +264,7 @@ + (unless (eq? status :last) + (scmail-filter-iter mail (cdr filter-rules)))))) + (unless (is-a? mail <mail>) +- (scmail-eprintf "<mail> required but got ~a" (class-of mail))) ++ (scmail-eformat "<mail> required but got ~a" (class-of mail))) + (scmail-filter-iter mail (filter-rules))) + + diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild index 2b3e44ca9c5b..de13bf90310e 100644 --- a/mail-filter/scmail/scmail-1.3.ebuild +++ b/mail-filter/scmail/scmail-1.3.ebuild @@ -1,24 +1,32 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI="6" -inherit eutils fixheadtails +inherit fixheadtails DESCRIPTION="a mail filter written in Scheme" HOMEPAGE="http://0xcc.net/scmail/" -SRC_URI="http://0xcc.net/scmail/${P}.tar.gz" +SRC_URI="http://0xcc.net/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ia64 ~ppc x86" IUSE="" RDEPEND="dev-scheme/gauche" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-doc-encoding.patch + "${FILESDIR}"/${PN}-gauche-0.9.patch + "${FILESDIR}"/${PN}-undefined-reference.patch +) +HTML_DOCS=( doc/{${PN},scbayes}{,-ja}.html ) + src_prepare() { - epatch "${FILESDIR}"/${PN}-*.diff + default + ht_fix_file tests/scmail-commands # replace make -> $(MAKE) sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile @@ -30,5 +38,5 @@ src_install() { SITELIBDIR="${ED}$(gauche-config --sitelibdir)" \ DATADIR="${ED}/usr/share/doc/${P}" \ install - dohtml doc/*.html + einstalldocs } diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz Binary files differindex a3a087f998da..70bd83055426 100644 --- a/mail-mta/Manifest.gz +++ b/mail-mta/Manifest.gz diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index fa105a4ff902..180620fc8d76 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -11,7 +11,7 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af SHA512 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276 -DIST postfix-3.4-20180701.tar.gz 4457032 BLAKE2B 8e413da72318a149611e055d3c540b028de732d4de6962b7e47489d8dad7f39a0ed71b9f1b11ec8a3efa69f09dc44730ade8dcb860fcb6ef1190d20daf322da0 SHA512 ecc99f52c27c7e3fb2126237b8d77663423d74f9223575a95082c7d0068c658f3bc31f9bc7f715af67f22273da788a6545478442352aeeb6b59cc1ea0b40085e +DIST postfix-3.4-20180708.tar.gz 4472969 BLAKE2B 96bdbe2eefb1968a4dac84d721d75ec300a0864bea1fa9e8fda1590f4df5f229739dd901abedf5b10ad567b22fd683bfb87012d2268d6d178d7719230f70871e SHA512 bc27193a3f8e0652f39842bec08dc7d653a4c34be38e7d6109cfc6257ce486b759364da78187f251d03db00210e0d73e5e563629696bb403dc2295c8e6bd89ce DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 EBUILD postfix-2.10.9.ebuild 8730 BLAKE2B d10ef4dc24141ad4fd6acc2bffa201d4925260a02710fd9281e237bcbe88ba1612e666cdda248f1519b1d8dbb1a0304ffc2028e8df1a8779dd3557e3bfe90e3c SHA512 ce0cbaea68ca10358370f58f65fe1cdacaa5ab63d644c930c13b2187398790c1249a2e9256adc1c73df3a971fc8cd15473426578c7414cef15b27739d19260b8 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d @@ -19,5 +19,5 @@ EBUILD postfix-3.2.4.ebuild 8659 BLAKE2B d35c9cf049e257ac3c0fb713fc0059001c545e5 EBUILD postfix-3.2.6.ebuild 8418 BLAKE2B 57b1fb8ab09cac0c4279e395433020080e5e5eea8e5cfc8f3a0ecdfdfc2cc25cb149d6de18e93d0ee3fa5d515283d1c7762a6a7ac514dd7a170955b26ab7d0df SHA512 c00559620978de33368e4241b25e6ebe096a651d3052b7f9a25fa09060c7df8634dc95b6fffda6a983da3ed47190f78c2dd5dd40ae0fdfaaedf10f427b32f459 EBUILD postfix-3.3.1-r1.ebuild 8464 BLAKE2B c8588cd50f9d9bfed962265f2c3829e76644c55fe41e65e6df1f241fb0ba8c486948f57ca6c17564ac247bd692403b9df4de36d7e7c243717b77c19956a9bfff SHA512 8b58d4f4df698d086c210e953f89a5672193c543c500df2ed49f03bc8475122d3928944a4428e5ddadc70a08506a5478ca7a44542b1e6dd94f4db5bfdd16e3ff EBUILD postfix-3.3.1.ebuild 8425 BLAKE2B f3d19606dfc65e1cc50ca2c7fd15bb036194fd7e8076a10b1568249da34b8a5c3332a4ca401d7922d7a54a461d74102cdc75c5f32eee6db36dd6cacca78403f2 SHA512 997e9b1a332b686fe51d5ffca62af4c797a7741f2a4e36e2149e55ccd17a4e2a40640ddea00ebc253e8017933ff36626ab20175b2a5006461577e75987572b80 -EBUILD postfix-3.4_pre20180701.ebuild 8428 BLAKE2B 5dce6823ea07c5236a90319d8ccd7c6f623802d529668ab75dbb3cba631baf1906fcc3afc148ed64dcfe8de89104931c7419061c7c385dd964d9ee81d9d7cb1e SHA512 4d07e6c905fea18f981a59607a32d14f6e2cac82d7a317bbcc37ddc829ed804222cd987803268c73e5820249479bfddf1b448a76883758b16ccfde82b7c72f57 +EBUILD postfix-3.4_pre20180708.ebuild 8428 BLAKE2B 5dce6823ea07c5236a90319d8ccd7c6f623802d529668ab75dbb3cba631baf1906fcc3afc148ed64dcfe8de89104931c7419061c7c385dd964d9ee81d9d7cb1e SHA512 4d07e6c905fea18f981a59607a32d14f6e2cac82d7a317bbcc37ddc829ed804222cd987803268c73e5820249479bfddf1b448a76883758b16ccfde82b7c72f57 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d diff --git a/mail-mta/postfix/postfix-3.4_pre20180701.ebuild b/mail-mta/postfix/postfix-3.4_pre20180708.ebuild index 3d763629f824..3d763629f824 100644 --- a/mail-mta/postfix/postfix-3.4_pre20180701.ebuild +++ b/mail-mta/postfix/postfix-3.4_pre20180708.ebuild |