summaryrefslogtreecommitdiff
path: root/mail-client
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/Manifest.gzbin4724 -> 4734 bytes
-rw-r--r--mail-client/geary/Manifest7
-rw-r--r--mail-client/geary/files/0.12.4-fix-cancellable.patch25
-rw-r--r--mail-client/geary/files/geary-0.12-libdir.patch54
-rw-r--r--mail-client/geary/files/geary-0.12-use-upstream-jsc.patch511
-rw-r--r--mail-client/geary/geary-0.12.4.ebuild (renamed from mail-client/geary/geary-0.12.3.ebuild)9
-rw-r--r--mail-client/thunderbird-bin/Manifest57
-rw-r--r--mail-client/thunderbird-bin/thunderbird-bin-60.5.1.ebuild189
-rw-r--r--mail-client/thunderbird/Manifest60
-rw-r--r--mail-client/thunderbird/thunderbird-60.4.0.ebuild7
-rw-r--r--mail-client/thunderbird/thunderbird-60.5.0.ebuild7
-rw-r--r--mail-client/thunderbird/thunderbird-60.5.1.ebuild564
-rw-r--r--mail-client/trojita/Manifest2
-rw-r--r--mail-client/trojita/trojita-9999.ebuild48
14 files changed, 1499 insertions, 41 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e428d35ec241..bc6cc3d6a6d6 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
Binary files differ
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 85ff8322112b..65fc227f7ba0 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1,6 @@
-DIST geary-0.12.3.tar.xz 1069444 BLAKE2B 73f4382cd97813fcb3921daeab4338f4797bef2b5dcb1f7df1afeb75be48877109dcb15317f9bbe595326ee38f9ea3359a7d062c39ea3d83e1d36c34b680e707 SHA512 0e22b7ad8b79d17e55f6ab75a13883db04b21b1be9c2b06b08009e48fe433de323e23414ae8e47543bcb7785d6aa90bea582a2e20eaed1ce7bcb02687a69b9b6
-EBUILD geary-0.12.3.ebuild 1966 BLAKE2B 71ef0ad6f68c44fe8df194c8fb5caf39ace3fb9353e7e916ba8008ef6204c4d497eea8f122a2eed2667fd7562e4e558a8a3caa46ada46a880dc31d702b12294a SHA512 e362fbb121707a35e6d64c767cd11998becb7764cffb0e9a040a1402f9a5c5cef5f8e5fb8a955347dff0dd89aa1e188dc43f205d59928a52858d10ae61d1ab4a
+AUX 0.12.4-fix-cancellable.patch 1001 BLAKE2B 2c72ce0b32d92bec4e0053b54ca3e17485d64f25f4a24c29cadf47c9edd1593a6b6811328e2cdf60bca438cb808185de3be4e1554d55a3df71c2dd09ea800690 SHA512 4c3ae1076eea3b83e707fb2f74d66f32188728d3f057c67a2754c388241753d024f62a7ecafe7f557b555d328fc765e14d2729a822d26613d61966edf304199a
+AUX geary-0.12-libdir.patch 2742 BLAKE2B bd931c4577630001998a9b444226690002a81773351b81a158dafb2031c30ca000831710055d248b408e70700aa2d27195f94f384a3b25713636b8547216fa6f SHA512 8a136e702b036d976201bd67c5e5759ba4c28a5f73c04e2cdb32890d7fe0d4f6c9b6879a08bb2d2ba71fbbf60a5262dabc93928288e937ad9b1b40554bffd13b
+AUX geary-0.12-use-upstream-jsc.patch 18753 BLAKE2B 818c36ed24c7a0cfdee0679e41243c8ace7a966947c64561808587ccc7bf2a8558a48b3245a494f82553d9fd4bbf712be00efc74531cd21547f9445cb56208a8 SHA512 40fce0b4098ab13adf6f2db0f6bf4fe419f77ee159074928d7e44d103d989ac86de609df7bb8d13e47e87986fceed0e5ec92365913ae24daba148769ec82d5b5
+DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c
+EBUILD geary-0.12.4.ebuild 2167 BLAKE2B 6e4eec0507651c0f32181c7711a53e637b74806d1725e6df049108ff0be0a7e8c3ebf8bb6286a9005589ca3797f80d58c0e213e304178fbe2ebca264bc54a788 SHA512 4f22f6491d7451b3fbf3473f8393f8dde2deb35c83a15e2fadd3e0c8c2a553f44dbb707c92f9d3a1dbe6ae2d227c812ca4b67e4ed38829b03bb0324ff22044bd
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/mail-client/geary/files/0.12.4-fix-cancellable.patch b/mail-client/geary/files/0.12.4-fix-cancellable.patch
new file mode 100644
index 000000000000..6549bd0d622a
--- /dev/null
+++ b/mail-client/geary/files/0.12.4-fix-cancellable.patch
@@ -0,0 +1,25 @@
+From 088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 27 Nov 2018 14:53:56 +0100
+Subject: [PATCH] Actually use error variable to check for IOError.CANCELLED
+
+---
+ src/client/application/geary-controller.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
+index 3e6c8fcb..6bfeaab9 100644
+--- a/src/client/application/geary-controller.vala
++++ b/src/client/application/geary-controller.vala
+@@ -2599,7 +2599,7 @@ public class GearyController : Geary.BaseObject {
+ yield do_empty_folder_async(emptyable, cancellable);
+ } catch (Error err) {
+ // don't report to user if cancelled
+- if (cancellable is IOError.CANCELLED)
++ if (err is IOError.CANCELLED)
+ return;
+
+ ErrorDialog dialog = new ErrorDialog(main_window,
+--
+2.18.1
+
diff --git a/mail-client/geary/files/geary-0.12-libdir.patch b/mail-client/geary/files/geary-0.12-libdir.patch
new file mode 100644
index 000000000000..8e84ffa018b2
--- /dev/null
+++ b/mail-client/geary/files/geary-0.12-libdir.patch
@@ -0,0 +1,54 @@
+diff -up geary-0.12.0/src/client/application/geary-application.vala.orig geary-0.12.0/src/client/application/geary-application.vala
+--- geary-0.12.0/src/client/application/geary-application.vala.orig 2017-10-02 11:53:11.000000000 +0200
++++ geary-0.12.0/src/client/application/geary-application.vala 2017-10-04 09:06:00.563953050 +0200
+@@ -7,6 +7,7 @@
+ // Defined by CMake build script.
+ extern const string _INSTALL_PREFIX;
+ extern const string _GSETTINGS_DIR;
++extern const string _LIB_SUFFIX;
+ extern const string _SOURCE_ROOT_DIR;
+ extern const string _BUILD_ROOT_DIR;
+ extern const string GETTEXT_PACKAGE;
+@@ -28,6 +29,7 @@ public class GearyApplication : Gtk.Appl
+ public const string VERSION = Geary.Version.GEARY_VERSION;
+ public const string INSTALL_PREFIX = _INSTALL_PREFIX;
+ public const string GSETTINGS_DIR = _GSETTINGS_DIR;
++ public const string LIB_SUFFIX = _LIB_SUFFIX;
+ public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;
+ public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR;
+
+@@ -302,12 +304,12 @@ public class GearyApplication : Gtk.Appl
+ * Returns the directory containing the application's WebExtension libs.
+ *
+ * If the application is installed, this will be
+- * `$INSTALL_PREFIX/lib/geary/web-extension`, else it will be
++ * `$INSTALL_PREFIX/lib$LIB_SUFFIX/geary/web-extension`, else it will be
+ */
+ public File get_web_extensions_dir() {
+ File? dir = get_install_dir();
+ if (dir != null)
+- dir = dir.get_child("lib").get_child("geary").get_child("web-extensions");
++ dir = dir.get_child("lib" + LIB_SUFFIX).get_child("geary").get_child("web-extensions");
+ else
+ dir = File.new_for_path(BUILD_ROOT_DIR).get_child("src");
+ return dir;
+diff -up geary-0.12.0/src/CMakeLists.txt.orig geary-0.12.0/src/CMakeLists.txt
+--- geary-0.12.0/src/CMakeLists.txt.orig 2017-10-02 11:53:11.000000000 +0200
++++ geary-0.12.0/src/CMakeLists.txt 2017-10-04 09:06:00.565953028 +0200
+@@ -567,6 +567,7 @@ set(CFLAGS
+ ${DEPS_CFLAGS}
+ ${DEPS_CFLAGS_OTHER}
+ -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
++ -D_LIB_SUFFIX=\"${LIB_SUFFIX}\"
+ -D_BUILD_ROOT_DIR=\"${CMAKE_BINARY_DIR}\"
+ -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\"
+ -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
+@@ -745,7 +746,7 @@ OPTIONS
+
+ add_library(geary-web-process MODULE ${WEB_PROCESS_VALA_C})
+ target_link_libraries(geary-web-process PRIVATE ${DEPS_LIBRARIES} geary-engine)
+-install(TARGETS geary-web-process LIBRARY DESTINATION lib/geary/web-extensions)
++install(TARGETS geary-web-process LIBRARY DESTINATION lib${LIB_SUFFIX}/geary/web-extensions)
+
+ # Console app
+ #################################################
diff --git a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
new file mode 100644
index 000000000000..c7965ccf3159
--- /dev/null
+++ b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
@@ -0,0 +1,511 @@
+commit a0b1827298dc3210ad0ad16b09cff3507c3ad333
+Author: Thomas Moschny <thomas.moschny@gmx.de>
+Date: Sat Jul 14 12:33:47 2018
+
+ Squashed commit of the following:
+
+ commit e091f24b00ec421e1aadd5e360d1550e658ad5ef
+ Author: Michael James Gratton <mike@vee.net>
+ Date: Sun May 20 19:07:56 2018 +1000
+
+ Clean up JS util API courtesy the new bindings.
+
+ commit 0d966950a2cba888873cd3a7f4f42bb7a017dc6d
+ Author: Rico Tzschichholz <ricotz@ubuntu.com>
+ Date: Mon Apr 23 19:56:18 2018 +0200
+
+ Adjust to upstream javascriptcore-4.0 bindings
+
+ commit 5d0f711426d76f878cf9b71f7e8f785199c7cde1
+ Author: Rico Tzschichholz <ricotz@ubuntu.com>
+ Date: Thu Jun 22 15:01:19 2017 +0200
+
+ bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 vapi
+
+diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata
+deleted file mode 100644
+index f3e72e8..0000000
+--- a/bindings/metadata/Soup-2.4.metadata
++++ /dev/null
+@@ -1,3 +0,0 @@
+-AuthDomain.accepts skip
+-AuthDomain.challenge skip
+-
+diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata
+deleted file mode 100644
+index 3e3044f..0000000
+--- a/bindings/metadata/WebKit2-4.0.metadata
++++ /dev/null
+@@ -1,15 +0,0 @@
+-
+-JavascriptResult
+- .get_global_context nullable=false unowned=true
+- .get_value nullable=false unowned=true
+-
+-//Forward upstream
+-Download
+- .failed#signal.error type="WebKit.DownloadError"
+-PrintOperation
+- .failed#signal.error type="WebKit.PrintError"
+-WebResource
+- .failed#signal.error type="GLib.Error"
+-WebView
+- .load_failed#signal.error type="GLib.Error"
+- .show_option_menu#signal skip
+diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
+deleted file mode 100644
+index a994a77..0000000
+--- a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
++++ /dev/null
+@@ -1,5 +0,0 @@
+-namespace WebKit {
+- namespace DOM {
+- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
+- }
+-}
+diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata
+deleted file mode 100644
+index c496dba..0000000
+--- a/bindings/metadata/WebKit2WebExtension-4.0.metadata
++++ /dev/null
+@@ -1,9 +0,0 @@
+-DOM* parent="WebKit.DOM" name="DOM(.+)"
+-
+-DOMEventTarget.add_event_listener skip
+-_ContextMenu skip
+-_ContextMenuItem skip
+-
+-Frame.get_javascript_* nullable=false unowned=true
+-
+-DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc"
+diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi
+deleted file mode 100644
+index d152ce2..0000000
+--- a/bindings/vapi/javascriptcore-4.0.vapi
++++ /dev/null
+@@ -1,155 +0,0 @@
+-/*
+- * Copyright 2017 Michael Gratton <mike@vee.net>
+- *
+- * This software is licensed under the GNU Lesser General Public License
+- * (version 2.1 or later). See the COPYING file in this distribution.
+- */
+-
+-[CCode (cprefix = "JS",
+- gir_namespace = "JavaScriptCore",
+- gir_version = "4.0",
+- lower_case_cprefix = "JS_",
+- cheader_filename = "JavaScriptCore/JavaScript.h")]
+-namespace JS {
+-
+- [CCode (cname = "JSContextRef")]
+- [SimpleType]
+- public struct Context {
+-
+- [CCode (cname = "JSEvaluateScript")]
+- public Value evaluate_script(String script,
+- Object? thisObject,
+- String? sourceURL,
+- int startingLineNumber,
+- out Value? exception);
+-
+- [CCode (cname = "JSCheckScriptSyntax")]
+- public Value check_script_syntax(String script,
+- String? sourceURL,
+- int startingLineNumber,
+- out Value? exception);
+-
+- }
+-
+- [CCode (cname = "JSGlobalContextRef")]
+- [SimpleType]
+- public struct GlobalContext : Context {
+-
+- [CCode (cname = "JSGlobalContextRetain")]
+- public bool retain();
+-
+- [CCode (cname = "JSGlobalContextRelease")]
+- public bool release();
+-
+- }
+-
+- [CCode (cname = "JSType", has_type_id = false)]
+- public enum Type {
+-
+- [CCode (cname = "kJSTypeUndefined")]
+- UNDEFINED,
+-
+- [CCode (cname = "kJSTypeNull")]
+- NULL,
+-
+- [CCode (cname = "kJSTypeBoolean")]
+- BOOLEAN,
+-
+- [CCode (cname = "kJSTypeNumber")]
+- NUMBER,
+-
+- [CCode (cname = "kJSTypeString")]
+- STRING,
+-
+- [CCode (cname = "kJSTypeObject")]
+- OBJECT
+- }
+-
+- [CCode (cname = "JSObjectRef")]
+- [SimpleType]
+- public struct Object {
+-
+- [CCode (cname = "JSObjectMakeFunction")]
+- public Object.make_function(String? name,
+- [CCode (array_length_pos=1.5)]
+- String[]? parameterNames,
+- String body,
+- String? sourceURL,
+- int startingLineNumber,
+- out Value? exception);
+-
+- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)]
+- public Value call_as_function(Context ctx,
+- Object? thisObject,
+- [CCode (array_length_pos=2.5)]
+- Value[]? arguments,
+- out Value? exception);
+-
+- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
+- public bool has_property(Context ctx, String property_name);
+-
+- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)]
+- public Value get_property(Context ctx,
+- String property_name,
+- out Value? exception);
+-
+- }
+-
+- [CCode (cname = "JSValueRef")]
+- [SimpleType]
+- public struct Value {
+-
+- [CCode (cname = "JSValueGetType", instance_pos = 1.1)]
+- public Type get_type(Context context);
+-
+- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)]
+- public bool is_boolean(Context ctx);
+-
+- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)]
+- public bool is_number(Context ctx);
+-
+- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)]
+- public bool is_object(Context ctx);
+-
+- [CCode (cname = "JSValueIsString", instance_pos = 1.1)]
+- public bool is_string(Context ctx);
+-
+- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)]
+- public bool to_boolean(Context ctx);
+-
+- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)]
+- public double to_number(Context ctx, out Value exception);
+-
+- [CCode (cname = "JSValueToObject", instance_pos = 1.1)]
+- public Object to_object(Context ctx, out Value exception);
+-
+- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)]
+- public String to_string_copy(Context ctx, out Value exception);
+-
+- }
+-
+- [CCode (cname = "JSStringRef")]
+- [SimpleType]
+- public struct String {
+-
+- [CCode (cname = "JSStringCreateWithUTF8CString")]
+- public String.create_with_utf8_cstring(string str);
+-
+- [CCode (cname = "JSStringGetLength")]
+- public int String.get_length();
+-
+- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")]
+- public int String.get_maximum_utf8_cstring_size();
+-
+- [CCode (cname = "JSStringGetUTF8CString")]
+- public void String.get_utf8_cstring(string* buffer, int bufferSize);
+-
+- [CCode (cname = "JSStringRetain")]
+- public void String.retain();
+-
+- [CCode (cname = "JSStringRelease")]
+- public void String.release();
+-
+- }
+-
+-}
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1e4213f..e0bebdf 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES
+ gio-2.0
+ glib-2.0
+ gmime-2.6
+- javascriptcore-4.0
++ javascriptcoregtk-4.0
+ libxml-2.0
+ posix
+ sqlite3
+@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES
+ geary-engine
+ gee-0.8
+ gtk+-3.0
+- javascriptcore-4.0
++ javascriptcoregtk-4.0
+ libsoup-2.4
+ webkit2gtk-web-extension-4.0
+ )
+@@ -618,7 +618,6 @@ add_definitions(${CFLAGS})
+ set(VALAC_OPTIONS
+ --vapidir=${CMAKE_BINARY_DIR}/src
+ --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
+ --target-glib=${TARGET_GLIB}
+ --thread
+ --debug
+@@ -650,38 +649,6 @@ set_property(
+ )
+ target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn)
+
+-# WebKit2GTK VAPI generation
+-#################################################
+-add_custom_target(webkit2gtk-vapi
+- DEPENDS
+- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi"
+- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
+- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
+-)
+-add_custom_command(
+- OUTPUT
+- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi
+- DEPENDS
+- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata"
+- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
+- WORKING_DIRECTORY
+- "${CMAKE_SOURCE_DIR}/bindings/metadata"
+- COMMAND
+- vapigen --library=webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2-4.0.gir
+-)
+-add_custom_command(
+- OUTPUT
+- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
+- DEPENDS
+- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata"
+- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala"
+- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
+- WORKING_DIRECTORY
+- "${CMAKE_SOURCE_DIR}/bindings/metadata"
+- COMMAND
+- vapigen --library=webkit2gtk-web-extension-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2WebExtension-4.0.gir WebKit2WebExtension-4.0-custom.vala
+-)
+-
+ # Client library (static lib used for building client and unit tests)
+ #################################################
+
+@@ -698,7 +665,7 @@ OPTIONS
+ )
+
+ add_library(geary-client STATIC ${CLIENT_VALA_C})
+-add_dependencies(geary-client resource_copy webkit2gtk-vapi)
++add_dependencies(geary-client resource_copy)
+ target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine)
+
+ # Main client application binary
+diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala
+index 588d39b..d851235 100644
+--- a/src/client/conversation-viewer/conversation-web-view.vala
++++ b/src/client/conversation-viewer/conversation-web-view.vala
+@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView {
+
+ private void on_deceptive_link_clicked(WebKit.JavascriptResult result) {
+ try {
+- JS.GlobalContext context = result.get_global_context();
++ unowned JS.GlobalContext context = result.get_global_context();
+ JS.Object details = WebKitUtil.to_object(result);
+
+ uint reason = (uint) Geary.JS.to_number(
+diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
+index 319e28a..45a27c4 100644
+--- a/src/client/util/util-webkit.vala
++++ b/src/client/util/util-webkit.vala
+@@ -18,8 +18,8 @@ namespace WebKitUtil {
+ */
+ public bool to_bool(WebKit.JavascriptResult result)
+ throws Geary.JS.Error {
+- JS.GlobalContext context = result.get_global_context();
+- JS.Value value = result.get_value();
++ unowned JS.GlobalContext context = result.get_global_context();
++ unowned JS.Value value = result.get_value();
+ if (!value.is_boolean(context)) {
+ throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object");
+ }
+@@ -59,12 +59,12 @@ namespace WebKitUtil {
+ */
+ public string as_string(WebKit.JavascriptResult result)
+ throws Geary.JS.Error {
+- JS.GlobalContext context = result.get_global_context();
+- JS.Value js_str_value = result.get_value();
++ unowned JS.GlobalContext context = result.get_global_context();
++ unowned JS.Value js_str_value = result.get_value();
+ JS.Value? err = null;
+ JS.String js_str = js_str_value.to_string_copy(context, out err);
+ Geary.JS.check_exception(context, err);
+- return Geary.JS.to_string_released(js_str);
++ return Geary.JS.to_native_string(js_str);
+ }
+
+ /**
+diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
+index ee89139..1f478a6 100644
+--- a/src/client/web-process/web-process-extension.vala
++++ b/src/client/web-process/web-process-extension.vala
+@@ -87,10 +87,9 @@ public class GearyWebExtension : Object {
+ bool should_load = false;
+ WebKit.Frame frame = page.get_main_frame();
+ // Explicit cast fixes build on s390x/ppc64. Bug 783882
+- JS.GlobalContext context = (JS.GlobalContext)
+- frame.get_javascript_global_context();
++ unowned JS.GlobalContext context = frame.get_javascript_global_context();
+ try {
+- JS.Value ret = execute_script(
++ unowned JS.Value ret = execute_script(
+ context, "geary.allowRemoteImages", int.parse("__LINE__")
+ );
+ should_load = ret.to_boolean(context);
+@@ -106,8 +105,7 @@ public class GearyWebExtension : Object {
+ private void remote_image_load_blocked(WebKit.WebPage page) {
+ WebKit.Frame frame = page.get_main_frame();
+ // Explicit cast fixes build on s390x/ppc64. Bug 783882
+- JS.GlobalContext context = (JS.GlobalContext)
+- frame.get_javascript_global_context();
++ unowned JS.GlobalContext context = frame.get_javascript_global_context();
+ try {
+ execute_script(
+ context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__")
+@@ -123,8 +121,7 @@ public class GearyWebExtension : Object {
+ private void selection_changed(WebKit.WebPage page) {
+ WebKit.Frame frame = page.get_main_frame();
+ // Explicit cast fixes build on s390x/ppc64. Bug 783882
+- JS.GlobalContext context = (JS.GlobalContext)
+- frame.get_javascript_global_context();
++ unowned JS.GlobalContext context = frame.get_javascript_global_context();
+ try {
+ execute_script(
+ context, "geary.selectionChanged();", int.parse("__LINE__")
+@@ -136,20 +133,18 @@ public class GearyWebExtension : Object {
+
+ // Return type is nullable as a workaround for Bug 778046, it will
+ // never actually be null.
+- private JS.Value? execute_script(JS.Context context, string script, int line)
++ private unowned JS.Value? execute_script(JS.Context context, string script, int line)
+ throws Geary.JS.Error {
+ JS.String js_script = new JS.String.create_with_utf8_cstring(script);
+ JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__");
+ JS.Value? err = null;
+ try {
+- JS.Value ret = context.evaluate_script(
++ unowned JS.Value ret = context.evaluate_script(
+ js_script, null, js_source, line, out err
+ );
+ Geary.JS.check_exception(context, err);
+ return ret;
+ } finally {
+- js_script.release();
+- js_source.release();
+ }
+ }
+
+diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
+index 4d22429..a98d798 100644
+--- a/src/engine/util/util-js.vala
++++ b/src/engine/util/util-js.vala
+@@ -10,6 +10,16 @@
+ */
+ namespace Geary.JS {
+
++#if !VALA_0_42
++ // Workaround broken version of this in the vala bindings. See Bug
++ // 788113.
++ [CCode (cname = "JSStringGetUTF8CString")]
++ private extern size_t js_string_get_utf8_cstring(
++ global::JS.String js,
++ [CCode (array_length_type = "gsize")] char[] buffer
++ );
++#endif
++
+ /**
+ * Errors produced by functions in {@link Geary.JS}.
+ */
+@@ -72,7 +82,7 @@ namespace Geary.JS {
+ global::JS.String js_str = value.to_string_copy(context, out err);
+ Geary.JS.check_exception(context, err);
+
+- return Geary.JS.to_string_released(js_str);
++ return to_native_string(js_str);
+ }
+
+ /**
+@@ -101,12 +111,15 @@ namespace Geary.JS {
+ /**
+ * Returns a JSC {@link JS.String} as a Vala {@link string}.
+ */
+- public inline string to_string_released(global::JS.String js) {
+- int len = js.get_maximum_utf8_cstring_size();
+- string str = string.nfill(len, 0);
+- js.get_utf8_cstring(str, len);
+- js.release();
+- return str;
++ public inline string to_native_string(global::JS.String js) {
++ size_t len = js.get_maximum_utf8_cstring_size();
++ uint8[] str = new uint8[len];
++#if VALA_0_42
++ js.get_utf8_cstring(str);
++#else
++ js_string_get_utf8_cstring(js, (char[]) str);
++#endif
++ return (string) str;
+ }
+
+ /**
+@@ -125,11 +138,8 @@ namespace Geary.JS {
+ global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name);
+ global::JS.Value? err = null;
+ global::JS.Value prop = object.get_property(context, js_name, out err);
+- try {
+- Geary.JS.check_exception(context, err);
+- } finally {
+- js_name.release();
+- }
++ Geary.JS.check_exception(context, err);
++
+ return prop;
+ }
+
+@@ -157,7 +167,7 @@ namespace Geary.JS {
+
+ throw new Error.EXCEPTION(
+ "JS exception thrown [%s]: %s"
+- .printf(err_type.to_string(), to_string_released(err_str))
++ .printf(err_type.to_string(), to_native_string(err_str))
+ );
+ }
+ }
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index afcca95..7517b3d 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -56,7 +56,7 @@ set(TEST_PACKAGES
+ glib-2.0
+ gmime-2.6
+ gtk+-3.0
+- javascriptcore-4.0
++ javascriptcoregtk-4.0
+ libsoup-2.4
+ webkit2gtk-4.0
+ )
diff --git a/mail-client/geary/geary-0.12.3.ebuild b/mail-client/geary/geary-0.12.4.ebuild
index 832bb862d28f..57f5e70d95ab 100644
--- a/mail-client/geary/geary-0.12.3.ebuild
+++ b/mail-client/geary/geary-0.12.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+VALA_MIN_API_VERSION="0.40"
# Keep cmake-utils at the end
inherit gnome2 vala cmake-utils
@@ -10,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
DEPEND="
>=dev-libs/glib-2.42:2
@@ -36,6 +37,7 @@ RDEPEND="${DEPEND}
# gnome-doc-utils for xml2po for TRANSLATE_HELP option
DEPEND="${DEPEND}
sys-devel/gettext
+ dev-util/intltool
app-text/gnome-doc-utils
dev-util/desktop-file-utils
virtual/pkgconfig
@@ -43,6 +45,9 @@ DEPEND="${DEPEND}
"
src_prepare() {
+ eapply "${FILESDIR}"/geary-0.12-libdir.patch
+ eapply "${FILESDIR}"/geary-0.12-use-upstream-jsc.patch
+ eapply "${FILESDIR}"/${PV}-fix-cancellable.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=751557
sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 22fe62bc9a1b..74bf29fe16de 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,6 +4,7 @@ AUX thunderbird-gentoo-default-prefs-r1.js 425 BLAKE2B 407ac0280bf3716b7bbf12293
AUX thunderbird-gentoo-default-prefs.js 310 BLAKE2B fb6473176d37e6377fe556a27c3dda154c93fc8a6cce228536a9d571ccbda1b60b38938a6c83b3f34f0a848b5e255f9b56c0d3ca04377a00013977b5212fdf2f SHA512 cf4192686bb07702239b14976cf42abd33dda539382f489d589fe6e35d926df019a16de86868cc7db0eeb15d4fa6ed1df770c973dbb89024eea9e054df5064ed
DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
DIST lightning-6.2.2.1.tar.xz 1521172 BLAKE2B 0155735fbebfa1d7103281f2d24c41ddd16561a09db3502bdc2e689bf8174a86c414608fcae199e2756eaa93b57332b0389433c7e0d86c454f244b8a50b43a85 SHA512 b9427709022e07741dba48f4933e364c2df15c1f4bcda481f50e05fa5f8f118d47a87e4b5322fab412e9f2f89c0889a5154a369bb6d0b9a1a94a748dc768fb59
+DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
DIST thunderbird-52.9.1-be.xpi 570931 BLAKE2B f5a58a51bcd00cc256bc7d97813d89c46feef2ffdea07be3f9509b2dd1787fbde81f49d64e1a1c63d2a09d54a07de9fa8f2c958f74609293f61af9fb971c1ff8 SHA512 6ca311620b04a604801771a40a7405aabb2499624dcb3bb10eaa3f0a6dcec1cb8c2db3f9ab51b1f505b164be89bcafaac1dc0cba3f3f8067f48c4dd61852c469
@@ -166,13 +167,69 @@ DIST thunderbird-60.5.0-uk.xpi 684154 BLAKE2B 5983c0165806f3710b2dcfbc8a4cc0c6be
DIST thunderbird-60.5.0-vi.xpi 637199 BLAKE2B b796c67f9ec8c6eb455a7e0914c7867f2b95094ceb1e099bcc6b0fb4b88dfbf83accf8a9aa8d1727979da4953c543f0b777beebcdba138a478ebde7966e1f416 SHA512 9379035dfebaea5c69dd16b62c12c99e2e9bce13f6944aa9636958b60ab40b8efbb309932cc21002b3c743aee932db412d5bcb7b033a3e0cd442704d7c7a9e97
DIST thunderbird-60.5.0-zh-CN.xpi 626283 BLAKE2B cf4bc1f233e73d1ca5802c50f47e166606e14272ea4270346bd202ddff236d08684da0e6e322aeb31d1f5f8d20af00c4820289646be808e6c1ac651dbb2936c0 SHA512 f33da7be766b95051a55d3186b78069e30cfc9f8a1c0db6f7422103fecf3e1b4e466ced904a80785de25363ced9b970319b5b9c74c5da15dd9ebc7bcca3bd75e
DIST thunderbird-60.5.0-zh-TW.xpi 626190 BLAKE2B 43f34e19d95a7ec4b7e51b4e22e849925ae41f3f12e9571d5feed609be5afb0a55d6b47a9a1082ad5a706f1ebf55dd467bbd3bd0c8123e0dedebed27b3f2c8c2 SHA512 12bbe8b1f71b51be31a6311a7ed2b554e07a7b7f86e2ac4ca261d7bafc983e97652f3b95a011c2fe4628637d5220a15e176d8c7eb2023269dcb464daea69e4fd
+DIST thunderbird-60.5.1-ar.xpi 627181 BLAKE2B eb7cf6b288d8e736c063a641df3b364007fcd7d5985d96f772cd6d533ddf466fc449657424bf4f35233a9aae15b6ae7d86439eeb26be2ae54d5a8b6412656bba SHA512 6b8e55e444c8dd91e40eba6ff9e5a845ab8d84e92d2a50ebb19ed99359e482727e9647390af9e680662e317f368f64df269bba44bdc3f1e2dcd74b9d5e354de7
+DIST thunderbird-60.5.1-ast.xpi 559643 BLAKE2B 12c941dbb4bcac6b14669f02e736e421ef869c56e20eebc3f5062f18daebd227589d7d0511f8ca44fc9bd15f8d64d5a2b201ebf99d0aa00e6c110a65a357f472 SHA512 34dc3028215c2918a77a875c5bd518c662d7a1e516a85f75119e0bd08978e83afaeed1d77b86178ad0dc533fddf8da1c7e8ca2d91061f2cf87847bb77bba9e4d
+DIST thunderbird-60.5.1-be.xpi 659080 BLAKE2B 9b1862cc1ee53c19e1bb74d20f9f05683ccc452834a82862623173d051529a9c23a1a167706d9b6322c4c5ce71093057175051f4bc74f2146eeae927510dd626 SHA512 618138a3953f315be80b0d97eda4b72802c9bf01c24d485b2b02ef0ad1634f144c52e0dfefe241f1e3c961df075e78ddc9353fe3e3fda2e3d8eb69d12b10722c
+DIST thunderbird-60.5.1-bg.xpi 669318 BLAKE2B 88882bb2a68c0a514b56c8bfb2934b1cbad6c0a1c43e23b91fb5a9e31bcd6b59e3f2a99110e6a5d5bf654ab8efdc2955f84915ef556a719865622566076cb012 SHA512 ac5a152f9bc857f0b113d34f391e264b9819394f97c8002635ff972b6888bb55b9f6c35729a6bf3347b447039fc8477cb348e4c6873beff7ebf629e22f9215ab
+DIST thunderbird-60.5.1-br.xpi 580371 BLAKE2B 7bae13c59eeffcd4139c07d7230878c5197b4951296d78aba4d7ef8482d765f34b42a22639656f22177013885af44958c3913cd1259338d48b43e1d378f3f360 SHA512 97f8400405b0223ae08f5c6f20091b6c0a329b3bbecb9e0c9b669b7139e3b4281685c1d95194b0fc75e627b008b4a246c2e9fb71b378f52596bf92fc7be72ea7
+DIST thunderbird-60.5.1-ca.xpi 591972 BLAKE2B cd2a9ba993f580c675f03fb45573bca08f76ced8ed0485917d056a80be90bc5be35b793e7cabdd8824aeaf0aa821fe1eb870f397a7846ad29c5bbe1128165c3b SHA512 9a68de5557cadb2439caebc0aae29301947160e6788159bc75e8d53f05f4a0a6ceecd53c242b9d680858ac03ced1dbda97b92836d664438b970452e98f0e3863
+DIST thunderbird-60.5.1-cs.xpi 611203 BLAKE2B 6ffa39dc3c66534dbcbee0709eb6741b9cb061d29fa24fb515b64325a36c392f96525fdc2fb6c3332cbb4a79baae829a3d59729a3e0c646b3e72c72da0af1de0 SHA512 f7085c67164d80fb360eccf3e736aed6a287b6d7a7caa51b64539a86b40bdcdc2d2680c3f2f18afb1e8833e2dad81b398763eabdadf034ed56ef1c148372f4fd
+DIST thunderbird-60.5.1-cy.xpi 586038 BLAKE2B de00e7b04fba93e92f0454c66d15f54173739bd79c22f340e317caa1cbdcae9fbddf6bc9e9b60f474c4e0c5c09a806270443982be7fe17e230ff152fb7958248 SHA512 e48d20eb206fd0b81c23e32623cace9134e203877b4baf60162725bbb0ca3850c73b80831adf42f52a491460d753e10151d32b5ebaa9105e738854fc8e892903
+DIST thunderbird-60.5.1-da.xpi 570807 BLAKE2B 7fa22e3abe3b026a1d64c8aca907fb7c262efbebfcd643da854fa039e3aff477fff16e30e1a2cbe461c4b98691bdd916acf39bc8aa9b3bb94893fa7c99ab839b SHA512 421b9341d9fba664435248821ab2bc1e850aaf087be246c324b8fdd3f14ad4b1bccecc6b33c766bbf7c8eda7c8d9ab14226968c365cf653a64d63fbdda9410ee
+DIST thunderbird-60.5.1-de.xpi 582576 BLAKE2B 59403dc41fe3a2290630ba820e83e46c28fd94b7ed69cdb84e2f462e6e810262bf2bdc13fb9875e539d05e2b46e39bd3ef87eff5775caa3eaaed4b612d1a4a51 SHA512 400b1d032ef047d8e75c3adced4eb306611eac7f13da53e6565d406771d44c9105e8dd9054af9b087ab3b957ab6417f5d758f9a35bd0bdf4d2bbe97d5af1d994
+DIST thunderbird-60.5.1-el.xpi 694861 BLAKE2B 828d8b163332df8e4c9371aa5458e6a9efa1af778fa8005df7f22943a2861b7d95c61bc13c4265b61112ed414b376a36beeddf90ad3e8ed38a7c74b08d84a549 SHA512 d8cc973b82be08b5a25b30319d68529463e34df4b579ffa76baadc11404c3ace08e58b2b52827b9b6b92d80829fadd8a9044006a13b90981121f8fca28508e82
+DIST thunderbird-60.5.1-en-GB.xpi 553896 BLAKE2B 5dbf7cac5e6a2900facf6276348a0e42126278535388453e9bc280f026ab11de251cdcb9bf7df6bb7785764117fd50fae9111b65ec661d5092e2257df2ce9042 SHA512 5755254053ed2766408312f3242f1d3ea27c5cc25d467862531b93961d752bd2d92f2c7a5e30ee4cb48a6a25718257353af9380d35524dbf7942875905e64a77
+DIST thunderbird-60.5.1-es-AR.xpi 595049 BLAKE2B 8c80c060566f32145300ce42ca6a24f02eeae34cc24abe18ce87f5f953c772c32c28596c4ac8e5c1b380fe2b09d326f7b592f099f135ebfd66fb8be8051c16d6 SHA512 602e42e230f9f19f35895cec616a26918835846e874605ccb04cb2b9378cabf523f6030531f629edee1fa8e5011c0ef775dfa371987261a961eeb6edfadd9edf
+DIST thunderbird-60.5.1-es-ES.xpi 492212 BLAKE2B c3fe3d63363ecf2aef79a0d6a90bf379725891e374f25da749a6bbeb13cd007b8e7c24d9f2be0c7d89b724435a195eb4aeccf702e7abcce3dddb311eeee44fdb SHA512 6c72506e86397f553fc9d7233712e18a29ac9ccce27ef2fff939646ab7a69c9f0612a9d89f238bb25c5497eaf1acd2679622d6305b29ddef823549384f405892
+DIST thunderbird-60.5.1-et.xpi 570867 BLAKE2B 679a861fb95ee54ac8cc9eb34e88201df90e8ef13f911eb45eabbb78b6add51a25f872c85b6fff03d884807f09a38aeed39e8e1f12b42f5ae7dbfa1afc0852e4 SHA512 6d13279f55298a9bf5a07273829e53379e4c321fd0820ccb8cfe054d43ff2a2578863f3734e2ff87ed27768a9183ed6af977175613edf0abc7aaf6deda4cd921
+DIST thunderbird-60.5.1-eu.xpi 581384 BLAKE2B 9059eea25ddc964e582da9b884a501a05e9f8d9e7c44473be2dcdf9138319cf3ab7a21498f6b779a2277d176c0269314b622b665e45a82bf2ea2eb78e9955d9e SHA512 1b23d34547893a29b9b812926b9b8c5947b6e8c2c6b62131251e933175f7cd257d2c2e434b39a3ef9ba831ef568a3dd715ebe9615dfc4023017b095cfedc493a
+DIST thunderbird-60.5.1-fi.xpi 575756 BLAKE2B bb495164f670196d6249e57a28bd7747090dda938fd149963a324bf47592873a4afe1a360541acf03bc6d98f142733655dbf5bb78477a96c0648f47ae2dc45eb SHA512 d6388b2d97c81654c70879d6f2ca0e18cd136ced245d06f357132a8d77bb4b5562cc4ad2e6a981df8badf38e7778d179d5f7e991ab131cef309ed1a1f47fad32
+DIST thunderbird-60.5.1-fr.xpi 608467 BLAKE2B ba1beeb31655826bb680548d82369419ec6c79eac0b6b9f5518520abc8b3c8d3087526b508be3a6080e2242d446116bd7b13fe5b38042a83aa59a7da07146b4f SHA512 e35b8a71a40b38804673508e9fee76e7705529c28749646ec92b3aeb912ed8bfd8df5c99ff6602e0bb2872955a4730529ef0881b4470c9b4a1a3d06a18e06377
+DIST thunderbird-60.5.1-fy-NL.xpi 593851 BLAKE2B 493ef70c48c2cd63b16029248d7d41247cd53bdd439ab29766b5ef2e051d7284b1774da3a082c50fcf2fb73c95a8111c4a30ddc1b3a0cb7da4cebac00ee914ef SHA512 e0681c8e94905c219c5d05fdf46f70713f9772d995fa204163e1e5c0ac187edb2d5844264b5322d0b51667c8644279f702f6c5dd2c6bbb8f3f6fd5cabf8b18c5
+DIST thunderbird-60.5.1-ga-IE.xpi 603506 BLAKE2B 3353fb792299ca0351d799c5f7e07d0946ba5d334c4d1f2b1bd055085cd4649384a6e0636a2d7d38363aa13288964071fcd24df28b55dbb56d40341cfd728a77 SHA512 23f58eb88810d9bf56dd7dc39b5bf4c37812a0db21a1902395ebf5a04b3959ee5538ae72f3dc491799dc443b40df60badd98edf029daeed57630ea0a61688495
+DIST thunderbird-60.5.1-gd.xpi 599262 BLAKE2B 3689d2b1a0f5ecdda6ed3bcabf98e838a19fa303cf5bc2a0df02b92356d573fe199a1030ab27bc0eff51a621e2a9dabdcea6537acad92426b268a12b432c7faa SHA512 f9eae92945b62936348a77a7b98fcda6905d2ddfd1276943755a1f5653e9019c9e577946f0bccf7b8cf058b2673bd0e55ea2eab83cc41c141c3e162f7a841b87
+DIST thunderbird-60.5.1-gl.xpi 580353 BLAKE2B bbc61a9a8402d1a25e6989e4fdf570e1ab0a2c669907f8d32b9e37562e486ffa7bb2ea9af5d80316fd9b0a75175edc0df45e33043d09477d286b231ace340691 SHA512 0a9a827b2adb21d6122438e7e6f811399dc93fe284f3cb96a90cd4c3ceba71bf07ae1d65ae6bc8357b1d17ebc8594a65c66319a20a0c3f78ce244fed9e38a187
+DIST thunderbird-60.5.1-he.xpi 617143 BLAKE2B 1ef1acd57e07f5afad2d0fdc221a6e26a84d8d272290544df607262864a1c089f774977e809fc637e5efe2b9e375f735e31d497e51079cd2e6789607587a4b4e SHA512 98e15d7b612e3adeda7f088591e9936efeb6bf3b53b45f274c5bebf51c0a9225904eff5a7cf0189d06aa161e62a47a447dd93f28c21e199080e29ead14619e6a
+DIST thunderbird-60.5.1-hr.xpi 582239 BLAKE2B 446920b232cf1b342704a43114d0f7440154f608da9d218b7f3c06dace525893624e4c47083c6f29d5ee817ac2dfe9dc2ce3f2aeaa2975239572e303a3cfde8f SHA512 acbb048d2a7bbf64d3c13047afc25fe4f4953b29c3d42f60af0f9de3d4b8a39c050c6f9a532cf161082cbc5f794904d123a20124c2cfcc8ac7d2cd3233e87b2f
+DIST thunderbird-60.5.1-hsb.xpi 615132 BLAKE2B c642be030d34a327b460206b5b762c5336fac8a3fb95a5d1bfbd5bcb04b956318040d92ca289c03f859e865ffacd105f92fa08ef2ec683d9fb32279f33e6b29f SHA512 18fd8f779a9e72e518db356b0484df3b57791bf8c155d3dbdf72dddec5ff2f380e647e2085d47bf18c987f9173495836d9c36d24bd9f4be0ae89d68f0d0fff2c
+DIST thunderbird-60.5.1-hu.xpi 615347 BLAKE2B 5ad5e4a35b0f584f624d2b96c146b4e392a1c1f22ec90a1eb065b71e44a38d013b1890d131befbdef11e5037fc57de8af0f542c4fb49b05815b2363695f923bf SHA512 8aafd83758b58b58da2ed64147b1981a483939a86c957b89fcee94b0210ce099607e5fdb504cfac562e8f3b3b43132881893dfdbceb3170c4818e72bdd808c66
+DIST thunderbird-60.5.1-hy-AM.xpi 653531 BLAKE2B f268c5f6cecdcf34d0fbafa81e242ec6b2240f6a2bd79b0aecbea46c369a05e01ecb286d630e868c1eecae525e5ba88d886c72dc47574866d9041aa8a2435e34 SHA512 51c96f6e1c313361890b991d418257b477b5344343693d403079cb0e186dad0097735b6caec07e0ce06a9f15e64c029c4fd5b578f2c77f081467a845b304c0c0
+DIST thunderbird-60.5.1-id.xpi 568862 BLAKE2B 50a574f7c4840241186e10d92657d711f461ec43aa62c58e3aae77efecb38a45c9331dcb14c373a2c5b5f95858824539a609698c993a1378159a91023bbefb36 SHA512 58de6c785a4fbc1aaffc2e1e8b2d112a14bc8021b787d5958d8cb99b5e6df1d9c3ab2c0b1567aebab1939a7b4dc99e51d8e04daa30ef38c365010efec7f4ce71
+DIST thunderbird-60.5.1-is.xpi 579048 BLAKE2B 1c40a38e6fc98a5568611196f358d93494f7982b88b9b7a5287d1798c1f04d3a8c2fe0e2b2ec1216715e1244b4681aa3bf9413dab19e739765fa3103e50cebfd SHA512 87b2270b23b7f36aabc6283b539a60b6755136fd65d1eec9f6b7e401587ea2e5f448d87491520cd2816b39ae5b9ea351623da8cc4b40575ef52d02bf44d55a9e
+DIST thunderbird-60.5.1-it.xpi 477501 BLAKE2B 001440dd275cbe01f56917f845b5589393ee48aa5f68116074bdfb389f67be824a20b966847d086f047edab11f33787efc327bb010a9198536a8c84eeb449745 SHA512 28ec3c16465fd5ea53e35c1bcb5443469d37fc7d96f17647a3584c099b0b89aed81294c1e0e548c2e239ac050dceedfafadbf875a5fc5e73c1bed056afd0d211
+DIST thunderbird-60.5.1-ja.xpi 653345 BLAKE2B 31648f9ad62730f4d35abdb938207ce2eba502208f4cb6215f85c0073e816518b7b6f0b3e58ae451257670a6a153595f545a5f95bf542791fcb69b2963f26bbc SHA512 f23a19be810688ea6aa4c69fee6aa79988cacfa539dea6401b69db5875e6ff39f3e5d3312aef0fef20cb03d612be48cfb50f4706c6a4df5e57e2933b4478c267
+DIST thunderbird-60.5.1-ko.xpi 619731 BLAKE2B 7bbabbfb153821b743200eef1579fda004ccfdc367328287ad9b710e2384f9876091280ecd1328a030c3a194baff575e8691f45ad37f3c7dd49fe95e53646b7b SHA512 f2099655114e99ec6ceeea4d7e2f875fd7d1e386a6eaa08b8aeb43cb4baffe45f6f1302b84d2447bc458b0b58475e57b7f128d777b1c8dda8fd3b95081bf9659
+DIST thunderbird-60.5.1-lt.xpi 605441 BLAKE2B b46789602a7eb8d74a7c2cf209e5d05d887b1f19e834037ca3118036b9afd0c5e1f215198e092764c962a05a7fcd580b43019f9095372ae4298226017b06d7b4 SHA512 1f737f7734544235d70a71effb02a2aa067c4c06b73e7aea68c09d1df2d0374bd294e48b9b2e90a792f48394fea7c550f5edb4863c0eed51945903baae0d6f4c
+DIST thunderbird-60.5.1-nb-NO.xpi 577002 BLAKE2B b1a31e8c9e4c3e7e0f3385e121ab5f2fd575fb2fa02519bed1caef20f07f341f1aee5e4ce45840db3d93e97c9a0a9765dffdea799b78ed93d53e9f01c2d3ef80 SHA512 42bce132f7e57eaacc32a361dd0ab91f8544850c5fc3e8ed946b6cc67fcf2d9aa7ea979058cb7c37d897a5b6b70ac5f3a938a696d3c1075c527f0f26046075bf
+DIST thunderbird-60.5.1-nl.xpi 583914 BLAKE2B 2a3c429183a6143153f45fddf529612cce27679fee00045362d5be7ad4e9b02e2f6b8dd7bdc6cb5e4d2a24378491c1eb7e9c9681033208e0ec8fe030a74dba6f SHA512 572310396a7eefdeab86bafd6f33b1c4dd6b0fe771430f8b4aa3ca67305ce1eb10ce0b44252b5129b0af206ec46649ec2b1879f1a75c8ec3f950dc16153a7153
+DIST thunderbird-60.5.1-nn-NO.xpi 576423 BLAKE2B fa2d44d33b8cb1ae766e6b2eee8afd3a7874713a9ad33141adc6f44c588808b18e8f4f3a050c7016c27e795f1ed19db812b79b8b802cf50f8799b897037d52bf SHA512 ff8bc24518b696a5a1d4fb44553162515d21a1e3445c086ec657dbf2da639992721b67585f797511f8fb0a5014a377e29d45b524c660801e3c05c233c6bff005
+DIST thunderbird-60.5.1-pl.xpi 480726 BLAKE2B cc5d1d8596eca87f60a3d553d1ccf30fb695e08375a2ec70b1ee2d45f662f28c7b3176e63898a931beaf9638463dbe01a440d7098d2e440459202fab86874716 SHA512 f6569dc00b84fad51fb32d096b1855d89021859626ebbe214267d0d0819008318d39a3061e2989ccc8b16e8ea7013eee078d5ed34a22f94a7c2a2de041fa4e52
+DIST thunderbird-60.5.1-pt-BR.xpi 588835 BLAKE2B fa7606c27fdf59ab3afb57777620be778d1e8d45b04b234a2e8b70086a4c7f9b60e177d9fec3d6c3d037ae26273b62d16b685db6193263cb730c19544b67d979 SHA512 155eb81f08dc9618b7e574a8802537c9de85a48848b419063f04a3988c09ecd3e238a13afbe8dc638cd3bebeb062f8c6e33542c2e4d6b450709fdc6c13baa022
+DIST thunderbird-60.5.1-pt-PT.xpi 593186 BLAKE2B accb82adb8a7882c5ade9b25af45d97e0784fe15ea7da867439d27b7799f6087d7f5bfe5e8fad1839fb4a167d400ef947a0e7eceb2b547786fd8bc648543bac9 SHA512 c678ef2d2ce0702cb41ebb261d31fb86f2b23ef99aaa2a9b69d7c4b6eda376a9cf1b661ebac6fe0d5e7a0a2fcc02b41d0e96435970eaf2632f15472a380ccc9c
+DIST thunderbird-60.5.1-rm.xpi 578385 BLAKE2B 75c57d0dd8691829834dbc171095dc7ce969a8e2dc4102e3aa41a380e5d947bb25b412bd8e3e6a0767d68a937c714aabd9c17033b8510c419426dc7e488773c3 SHA512 590de2aa4cdef25fe87bae3a6fe60e98c5ad4ccf51497540cce9952d5e464a70ffa24c553f9bd89a241ff33e547f2ad2cad8f80ccb9fda2576f1914a197343e6
+DIST thunderbird-60.5.1-ro.xpi 584309 BLAKE2B c8d9a4ed506463488f979e84da444cf1f4680e3973929665d3ec670922004553688948ad591f25087106ea14cf5bb5d86f9c887805297a2aae4b7688d623e3c6 SHA512 3f01b1e8be2041e46c3be86f3428710e52dd6faeeecc4e41468326690bd942f6b356bc430d87ee757e7cb1d759e3301618db74f92488213586eef0243e06aadf
+DIST thunderbird-60.5.1-ru.xpi 694705 BLAKE2B 1b35d03c69b3ded0a2b89f399ccdce657c68e4e47e173a8a5f52f3bf1bcc0ee5c2812e338dbffa861cfe923ff30be8be6cc3e0be60dc3e8d194071f4da6a893a SHA512 34e4fade10607a8e788d388c36f291865da696c2aebfdf12b111ddc7b589d01a547ddd974775eca535431a29030f605b07eed89026791cf58ad7be6be09c8a82
+DIST thunderbird-60.5.1-si.xpi 647597 BLAKE2B 263dec200924acdd0eaa14964b86459979c9777d6682b0328a82b5f3c3434e44a676ddb8a303e92ea0d378f87b028367593305fae934e956d4c696b50b17f649 SHA512 6ace50684a1d0e526ed5da13a9546b67b9a9e562011b7b862ffebf3fb6fed967fc94cc1619c001ff1e229154aadb049e5fa87f46b35ca6871f63f055426ae8fd
+DIST thunderbird-60.5.1-sk.xpi 612217 BLAKE2B 3dd2e6a8f9e884fb92aadd75eea19fcb497f9a94cba952f6024ea18db29064274eec76859166d6cf406a908588a8c84c8d97e82642a431cec7f91c781bf3e5a7 SHA512 5dc55eb93de3e1e22589738ec121ac072b3a223e67573458fee2302d5e99855a9f024215c280d42d1f98d8964b8e7c004ec19163d65dce5efcf7826165a6d7a7
+DIST thunderbird-60.5.1-sl.xpi 589947 BLAKE2B 4fd09b4a19a95f9d667b796765089557cc230c65622aad4f237227d71837a7cc5913ef39c3b9e0560e9feb41b473ffe2080a0567810e2d7d17881336bc090b90 SHA512 09e6f61514209331e17769ae302dd6de0c0319f0a5f90de5bd4b9cb0a6720a408b80a0223e7ad59b72ca815c0b98cde1c2dad1ea13f62a9cd76ce92abf042140
+DIST thunderbird-60.5.1-sq.xpi 593095 BLAKE2B 9e8285e93789f362af874ffee1ebc5dc8f99f7e2c48eaa48d9339c446b5910aa7d2eb13c34958b6548dde6d6fd712548ebf70ded870ff181bc51144fba7c61c1 SHA512 56fff94fc089b63329ba7a3332eb791ac62aaf9ff69d1d582095145afae63af2c2e6926dc2ce06057f5fc76cf3f95f602aad483742ae3d51ac0d9d77a6f21bbb
+DIST thunderbird-60.5.1-sr.xpi 641527 BLAKE2B 6eb9484114e6f056e22ee4744260f434392f7356a499c909faa1e12b0125df3ff88958339565a62e592f07c3241d0b578d1c3ba6befeda00c4d55c5ad8b3f666 SHA512 f306bd143240fbeca628784759354bf2f479f55fe97ec8a79f8207810e481c3907d214aa2c49b25b7a8b2d5cdfaf9a4025fa632ee5dffb91c6932f61f4d27381
+DIST thunderbird-60.5.1-sv-SE.xpi 594079 BLAKE2B 8753c025e5e1596c1afbecee12039cd072df5646e2d3bb84dc0b5808a7e960371004e0f1bb92736aa3d0a8fa9b3557335d58ddeb96b934ae9970e1e0525a26a0 SHA512 418dbbacec1d54ab41702c3e9fc86217171ac00313ae69084b4949a902cbe8021f5e004f3932e72f4c3e5d00ba4c5d7b818c4411359fb176e09d2169eb590c80
+DIST thunderbird-60.5.1-tr.xpi 598011 BLAKE2B d3df09879c4131449e4d0f995ff145d2f68593afc0c5d892d0077b1f2606a1fa26977d786f0215e758c0e07f8cba26267b2e3a50d9b960cfbc1c4c162f117b08 SHA512 bc7bc8418d5676fef313fee11fc41558594438128cd3c3c18d39e69e0b9dce5a3983498fb1b1b9db04800e88361cb95043177b5ce8b74c7f64d68e02fd241a11
+DIST thunderbird-60.5.1-uk.xpi 684155 BLAKE2B 713362e9798239eca8a86c4e005c582ee83173483ecc6ca14565a3f076e8f5431182635f36ab9bc847e72135e2c4b59be0accaa4418e8fe04649ac4459ce4a11 SHA512 581463bdd2239928333df1c69f3e7ab4d5b9b2f4c26e87c63aa584482ccef0fb0d28b85d9035033ffb6a00b1a634754976d31e020a2e55bfd3b3041941f8dc78
+DIST thunderbird-60.5.1-vi.xpi 637198 BLAKE2B f8a96f24bda00dca7833364a8cc8cf38b10bc7a61173b143efa481de269bcb8aa49053c89310f0b2008860fcdd8427ea182c4955def30cc0a2c14526d905f44f SHA512 c77acd499343a13458777ddfe014800506d4a3494ebcca315e7e20e6bf2367a4390efc2178e0a7586f8e14c29cfa174cc74cf17759770d20d3bec77b79f81c32
+DIST thunderbird-60.5.1-zh-CN.xpi 626284 BLAKE2B 04651784e2a4ed1d18d0d70ffdc21948495c6aeaad5be3d80c2e0b283d12b0bb65c22b4dd9374b970b7e0efbfb6dc25c2c9adc2ec56088fbd1e24f48fc340a77 SHA512 0313b5b5931badb9d89f1caa95c628f9ccba2cad447ea36e5b2c7aaffa3a4e17e8ffa1322eb46c7bd253782b7bba63e2bd6a7915e201aac99a8044c2255059fc
+DIST thunderbird-60.5.1-zh-TW.xpi 626190 BLAKE2B 273f6bdb9013f8a1cb9aad9ee2907668ee6a8144f40f5bcce0262c8c042bc6a1f77d001e74d62bc558be24356adb0ea0b3ac2819e55c7d03395741b3712227ba SHA512 d31ae97e8bd0167b021f46088efbc52432e382e167a2999ff55bd3a16b2804ee306340846a3510e98a16bb304cd9f956ecdfa4fd2ffddc4b610729102a6cd8f4
DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
DIST thunderbird-bin_i686-60.4.0.tar.bz2 52473526 BLAKE2B ec4a56376e3466953453a122997024012b0ef6b8b3094722528473d6c5df412af7d999e66bcaacb8a31cc6f57ca5e769450087c3c00f89cad3f5a4d363773df8 SHA512 48b15f12274818477d6618f3d184239789b8538d63b995d48992ef170224b2ad254cabc02330e7ef9e0e4190c17663fa78489226f9cb280d38211cc6431cf413
DIST thunderbird-bin_i686-60.5.0.tar.bz2 52522804 BLAKE2B 07c62546548eda9c9986c6322e531abb3d33cdc5ecf8b5a919d58644c4ac2f7d44c5bc12118665d4aa76af55124c769326e94ad6777312c8230bf8a6403411b7 SHA512 d4f838dc573d9efa2e2e5148cfeb0301d1e63da01bd723fdda9a76bc737e631fb232799f16dc91af2d66cc37008ec538a1d58f42a02cfcaa0333ce6e8c9134c4
+DIST thunderbird-bin_i686-60.5.1.tar.bz2 52606001 BLAKE2B fe5b3f60df5214ed250d17e1bbd02c1a415625c2030655c419bb0f8d6de3b411b109e74d5802d07a2d275042fee6f1167288c11d00a81051a1448539be0c7da5 SHA512 150f6674dd95932c713c275eb24194197ae52cb4ac08aac49c1c6302e3734cd3de5580878b8d73c2dfdcc18df311654920914d9562ca85f580d560c372f5807e
DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
DIST thunderbird-bin_x86_64-60.4.0.tar.bz2 50400692 BLAKE2B afdfca188be3c6d25fc8b4838c6fe7167f63b4a65dd03a47eef5ffadfa577e5226fb34c85396f9c0b4eed822bfafb83e1b1d65e3dcb9f34ae70216d710d8dac9 SHA512 801676c0c93fd0d6730b5c4719a45888916210d8f65b06eb7b416dc596bed7a0ad2ae79cf11307167c0918b5a60ccbb4ba62e4e1c891c831817d3748f91d7221
DIST thunderbird-bin_x86_64-60.5.0.tar.bz2 50401851 BLAKE2B a0f8df62d135a66127bc2bc9415f1a86b91faa889cac468f67504fa74eb2e41655739a11ba9efe868469a3fe4680d3ddf295ee1e1978bef116ee4cb61f8ef5bf SHA512 9794dba4bc6d6eb1d3852d1ddea087fa4561227805dbbe7ab1707d155606ed43d826b94b4a9e28a4f87b234b0c249b05cc00056a76db77af878cd4698835d469
+DIST thunderbird-bin_x86_64-60.5.1.tar.bz2 50384645 BLAKE2B c513677a77dec9372fded1fdf063eba48accd6435095ff8778483a4bb9bdf0f6514ce010d6a1cc474b9d0a1429afd542f3ef0c2688700ce303e18996a8ab0c8f SHA512 99588bd58ef55ff7f9b8b248bc0cbe04707e0f94ccd248f0dd7caa4c1f21945e694deee3b41258c818c33cf845d9a38854a6ded5e225332752942da7dd0bfdc9
EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
EBUILD thunderbird-bin-60.4.0-r1.ebuild 5308 BLAKE2B 5503340fad2346aa87a4ea417864cf530995796098a64f46dba3a2ed6205a956cfd4808276b90785dd144e62a84cc1dce0d1f31ddd094ef13cf13532b062e1e4 SHA512 b36ff39d7c68b7f31fe35ade8ae5242c92bfbf9b3cb24a4b7922b16ef203b4b5005295ea1e4b49ee61dca4a990a681c8bd34e8250a4feafcf47de3bc4c362dbf
EBUILD thunderbird-bin-60.5.0.ebuild 5308 BLAKE2B 5503340fad2346aa87a4ea417864cf530995796098a64f46dba3a2ed6205a956cfd4808276b90785dd144e62a84cc1dce0d1f31ddd094ef13cf13532b062e1e4 SHA512 b36ff39d7c68b7f31fe35ade8ae5242c92bfbf9b3cb24a4b7922b16ef203b4b5005295ea1e4b49ee61dca4a990a681c8bd34e8250a4feafcf47de3bc4c362dbf
+EBUILD thunderbird-bin-60.5.1.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.5.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.5.1.ebuild
new file mode 100644
index 000000000000..c62086bbf2b4
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-60.5.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.5"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+ # ESR releases have slightly version numbers
+ MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+ amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+ x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+ https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+# ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip
+ app-arch/zip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+ dev-libs/atk
+ >=sys-apps/dbus-0.60
+ >=dev-libs/dbus-glib-0.72
+ >=dev-libs/glib-2.26:2
+ >=media-libs/alsa-lib-1.0.16
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.10:2
+ >=x11-libs/cairo-1.10[X]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ >=x11-libs/gtk+-3.4.0:3
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXt
+ >=x11-libs/pango-1.22.0
+ pulseaudio? ( !<media-sound/apulse-0.1.9
+ || ( media-sound/pulseaudio media-sound/apulse ) )
+ ffmpeg? ( media-video/ffmpeg )
+ crashreporter? ( net-misc/curl )
+ selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+ opt/${MOZ_PN}/*.so
+ opt/${MOZ_PN}/${MOZ_PN}
+ opt/${MOZ_PN}/${PN}
+ opt/${MOZ_PN}/crashreporter
+ opt/${MOZ_PN}/pingsender
+ opt/${MOZ_PN}/plugin-container
+ opt/${MOZ_PN}/minidump-analyzer
+ opt/${MOZ_PN}/mozilla-xremote-client
+ opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+ #xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_prepare() {
+ default
+
+ # Lightning
+ local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+ local emxpi="${S}/distribution/extensions/${emid}.xpi"
+ if [[ ! -f "${emxpi}" ]]; then
+ die "Lightning is missing -- something is wrong. Please check ebuild/src!"
+ else
+ ebegin "Add localization to Lightning ..."
+ # hide warning regarding extra bytes at beginning or within zipfile
+ unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
+ rm -f "${emxpi}" || die
+
+ # Install language packs for calendar
+ mozlinguas_xpistage_langpacks \
+ "${WORKDIR}/${emid}" \
+ "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+ # roll a .xpi that mimicks what upstream would roll
+ pushd "${WORKDIR}/${emid}" &>/dev/null || die
+ zip -9 -q -r "${emxpi}" * || die
+ popd &>/dev/null || die
+ eend 0
+ fi
+}
+
+src_install() {
+ declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+ local size sizes icon_path icon name
+ sizes="16 22 24 32 48 128"
+ icon_path="${S}/chrome/icons/default"
+ icon="${PN}-icon"
+ name="Thunderbird"
+
+ # Install icons and .desktop for menu entry
+ for size in ${sizes}; do
+ insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+ newins "${icon_path}/default${size}.png" "${icon}.png"
+ done
+ # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+ newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+ domenu "${FILESDIR}"/icon/${PN}.desktop
+
+ # Install thunderbird in /opt
+ dodir ${MOZILLA_FIVE_HOME%/*}
+ mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+ cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+ # Install language packs
+ MOZEXTENSION_TARGET="distribution/extensions" \
+ mozlinguas_src_install
+
+ # Create /usr/bin/thunderbird-bin
+ dodir /usr/bin/
+ local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+ cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+ fperms 0755 /usr/bin/${PN}
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ doins "${FILESDIR}"/10${PN}
+
+ # Enable very specific settings for thunderbird
+ insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+ newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
+
+ # Plugins dir
+ share_plugins_dir
+
+ pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+
+ use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+ use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 20644e600266..c575c1918f17 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -11,6 +11,7 @@ DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3
DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
DIST lightning-6.2.2.1.tar.xz 1521172 BLAKE2B 0155735fbebfa1d7103281f2d24c41ddd16561a09db3502bdc2e689bf8174a86c414608fcae199e2756eaa93b57332b0389433c7e0d86c454f244b8a50b43a85 SHA512 b9427709022e07741dba48f4933e364c2df15c1f4bcda481f50e05fa5f8f118d47a87e4b5322fab412e9f2f89c0889a5154a369bb6d0b9a1a94a748dc768fb59
+DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
DIST thunderbird-52.9.1-be.xpi 570931 BLAKE2B f5a58a51bcd00cc256bc7d97813d89c46feef2ffdea07be3f9509b2dd1787fbde81f49d64e1a1c63d2a09d54a07de9fa8f2c958f74609293f61af9fb971c1ff8 SHA512 6ca311620b04a604801771a40a7405aabb2499624dcb3bb10eaa3f0a6dcec1cb8c2db3f9ab51b1f505b164be89bcafaac1dc0cba3f3f8067f48c4dd61852c469
@@ -177,7 +178,62 @@ DIST thunderbird-60.5.0-vi.xpi 637199 BLAKE2B b796c67f9ec8c6eb455a7e0914c7867f2b
DIST thunderbird-60.5.0-zh-CN.xpi 626283 BLAKE2B cf4bc1f233e73d1ca5802c50f47e166606e14272ea4270346bd202ddff236d08684da0e6e322aeb31d1f5f8d20af00c4820289646be808e6c1ac651dbb2936c0 SHA512 f33da7be766b95051a55d3186b78069e30cfc9f8a1c0db6f7422103fecf3e1b4e466ced904a80785de25363ced9b970319b5b9c74c5da15dd9ebc7bcca3bd75e
DIST thunderbird-60.5.0-zh-TW.xpi 626190 BLAKE2B 43f34e19d95a7ec4b7e51b4e22e849925ae41f3f12e9571d5feed609be5afb0a55d6b47a9a1082ad5a706f1ebf55dd467bbd3bd0c8123e0dedebed27b3f2c8c2 SHA512 12bbe8b1f71b51be31a6311a7ed2b554e07a7b7f86e2ac4ca261d7bafc983e97652f3b95a011c2fe4628637d5220a15e176d8c7eb2023269dcb464daea69e4fd
DIST thunderbird-60.5.0.source.tar.xz 285636196 BLAKE2B c1b0040156017c6dbbaf16695feefa29b32d02b74655ca357201dcff22be7c61fcd3d2357e175939aada11c0d0211d0ecd8479528d08168f93f9ca1963cf9fd0 SHA512 b18bad3d0ec33a813ec8f2f7f539a9ba08bd05432a16b1838671a101a85d66b2acdd2573d9fc3117cecaa9aa1429c178d4ddbae987a3ce6e4e4211981eecb8d2
+DIST thunderbird-60.5.1-ar.xpi 627181 BLAKE2B eb7cf6b288d8e736c063a641df3b364007fcd7d5985d96f772cd6d533ddf466fc449657424bf4f35233a9aae15b6ae7d86439eeb26be2ae54d5a8b6412656bba SHA512 6b8e55e444c8dd91e40eba6ff9e5a845ab8d84e92d2a50ebb19ed99359e482727e9647390af9e680662e317f368f64df269bba44bdc3f1e2dcd74b9d5e354de7
+DIST thunderbird-60.5.1-ast.xpi 559643 BLAKE2B 12c941dbb4bcac6b14669f02e736e421ef869c56e20eebc3f5062f18daebd227589d7d0511f8ca44fc9bd15f8d64d5a2b201ebf99d0aa00e6c110a65a357f472 SHA512 34dc3028215c2918a77a875c5bd518c662d7a1e516a85f75119e0bd08978e83afaeed1d77b86178ad0dc533fddf8da1c7e8ca2d91061f2cf87847bb77bba9e4d
+DIST thunderbird-60.5.1-be.xpi 659080 BLAKE2B 9b1862cc1ee53c19e1bb74d20f9f05683ccc452834a82862623173d051529a9c23a1a167706d9b6322c4c5ce71093057175051f4bc74f2146eeae927510dd626 SHA512 618138a3953f315be80b0d97eda4b72802c9bf01c24d485b2b02ef0ad1634f144c52e0dfefe241f1e3c961df075e78ddc9353fe3e3fda2e3d8eb69d12b10722c
+DIST thunderbird-60.5.1-bg.xpi 669318 BLAKE2B 88882bb2a68c0a514b56c8bfb2934b1cbad6c0a1c43e23b91fb5a9e31bcd6b59e3f2a99110e6a5d5bf654ab8efdc2955f84915ef556a719865622566076cb012 SHA512 ac5a152f9bc857f0b113d34f391e264b9819394f97c8002635ff972b6888bb55b9f6c35729a6bf3347b447039fc8477cb348e4c6873beff7ebf629e22f9215ab
+DIST thunderbird-60.5.1-br.xpi 580371 BLAKE2B 7bae13c59eeffcd4139c07d7230878c5197b4951296d78aba4d7ef8482d765f34b42a22639656f22177013885af44958c3913cd1259338d48b43e1d378f3f360 SHA512 97f8400405b0223ae08f5c6f20091b6c0a329b3bbecb9e0c9b669b7139e3b4281685c1d95194b0fc75e627b008b4a246c2e9fb71b378f52596bf92fc7be72ea7
+DIST thunderbird-60.5.1-ca.xpi 591972 BLAKE2B cd2a9ba993f580c675f03fb45573bca08f76ced8ed0485917d056a80be90bc5be35b793e7cabdd8824aeaf0aa821fe1eb870f397a7846ad29c5bbe1128165c3b SHA512 9a68de5557cadb2439caebc0aae29301947160e6788159bc75e8d53f05f4a0a6ceecd53c242b9d680858ac03ced1dbda97b92836d664438b970452e98f0e3863
+DIST thunderbird-60.5.1-cs.xpi 611203 BLAKE2B 6ffa39dc3c66534dbcbee0709eb6741b9cb061d29fa24fb515b64325a36c392f96525fdc2fb6c3332cbb4a79baae829a3d59729a3e0c646b3e72c72da0af1de0 SHA512 f7085c67164d80fb360eccf3e736aed6a287b6d7a7caa51b64539a86b40bdcdc2d2680c3f2f18afb1e8833e2dad81b398763eabdadf034ed56ef1c148372f4fd
+DIST thunderbird-60.5.1-cy.xpi 586038 BLAKE2B de00e7b04fba93e92f0454c66d15f54173739bd79c22f340e317caa1cbdcae9fbddf6bc9e9b60f474c4e0c5c09a806270443982be7fe17e230ff152fb7958248 SHA512 e48d20eb206fd0b81c23e32623cace9134e203877b4baf60162725bbb0ca3850c73b80831adf42f52a491460d753e10151d32b5ebaa9105e738854fc8e892903
+DIST thunderbird-60.5.1-da.xpi 570807 BLAKE2B 7fa22e3abe3b026a1d64c8aca907fb7c262efbebfcd643da854fa039e3aff477fff16e30e1a2cbe461c4b98691bdd916acf39bc8aa9b3bb94893fa7c99ab839b SHA512 421b9341d9fba664435248821ab2bc1e850aaf087be246c324b8fdd3f14ad4b1bccecc6b33c766bbf7c8eda7c8d9ab14226968c365cf653a64d63fbdda9410ee
+DIST thunderbird-60.5.1-de.xpi 582576 BLAKE2B 59403dc41fe3a2290630ba820e83e46c28fd94b7ed69cdb84e2f462e6e810262bf2bdc13fb9875e539d05e2b46e39bd3ef87eff5775caa3eaaed4b612d1a4a51 SHA512 400b1d032ef047d8e75c3adced4eb306611eac7f13da53e6565d406771d44c9105e8dd9054af9b087ab3b957ab6417f5d758f9a35bd0bdf4d2bbe97d5af1d994
+DIST thunderbird-60.5.1-el.xpi 694861 BLAKE2B 828d8b163332df8e4c9371aa5458e6a9efa1af778fa8005df7f22943a2861b7d95c61bc13c4265b61112ed414b376a36beeddf90ad3e8ed38a7c74b08d84a549 SHA512 d8cc973b82be08b5a25b30319d68529463e34df4b579ffa76baadc11404c3ace08e58b2b52827b9b6b92d80829fadd8a9044006a13b90981121f8fca28508e82
+DIST thunderbird-60.5.1-en-GB.xpi 553896 BLAKE2B 5dbf7cac5e6a2900facf6276348a0e42126278535388453e9bc280f026ab11de251cdcb9bf7df6bb7785764117fd50fae9111b65ec661d5092e2257df2ce9042 SHA512 5755254053ed2766408312f3242f1d3ea27c5cc25d467862531b93961d752bd2d92f2c7a5e30ee4cb48a6a25718257353af9380d35524dbf7942875905e64a77
+DIST thunderbird-60.5.1-es-AR.xpi 595049 BLAKE2B 8c80c060566f32145300ce42ca6a24f02eeae34cc24abe18ce87f5f953c772c32c28596c4ac8e5c1b380fe2b09d326f7b592f099f135ebfd66fb8be8051c16d6 SHA512 602e42e230f9f19f35895cec616a26918835846e874605ccb04cb2b9378cabf523f6030531f629edee1fa8e5011c0ef775dfa371987261a961eeb6edfadd9edf
+DIST thunderbird-60.5.1-es-ES.xpi 492212 BLAKE2B c3fe3d63363ecf2aef79a0d6a90bf379725891e374f25da749a6bbeb13cd007b8e7c24d9f2be0c7d89b724435a195eb4aeccf702e7abcce3dddb311eeee44fdb SHA512 6c72506e86397f553fc9d7233712e18a29ac9ccce27ef2fff939646ab7a69c9f0612a9d89f238bb25c5497eaf1acd2679622d6305b29ddef823549384f405892
+DIST thunderbird-60.5.1-et.xpi 570867 BLAKE2B 679a861fb95ee54ac8cc9eb34e88201df90e8ef13f911eb45eabbb78b6add51a25f872c85b6fff03d884807f09a38aeed39e8e1f12b42f5ae7dbfa1afc0852e4 SHA512 6d13279f55298a9bf5a07273829e53379e4c321fd0820ccb8cfe054d43ff2a2578863f3734e2ff87ed27768a9183ed6af977175613edf0abc7aaf6deda4cd921
+DIST thunderbird-60.5.1-eu.xpi 581384 BLAKE2B 9059eea25ddc964e582da9b884a501a05e9f8d9e7c44473be2dcdf9138319cf3ab7a21498f6b779a2277d176c0269314b622b665e45a82bf2ea2eb78e9955d9e SHA512 1b23d34547893a29b9b812926b9b8c5947b6e8c2c6b62131251e933175f7cd257d2c2e434b39a3ef9ba831ef568a3dd715ebe9615dfc4023017b095cfedc493a
+DIST thunderbird-60.5.1-fi.xpi 575756 BLAKE2B bb495164f670196d6249e57a28bd7747090dda938fd149963a324bf47592873a4afe1a360541acf03bc6d98f142733655dbf5bb78477a96c0648f47ae2dc45eb SHA512 d6388b2d97c81654c70879d6f2ca0e18cd136ced245d06f357132a8d77bb4b5562cc4ad2e6a981df8badf38e7778d179d5f7e991ab131cef309ed1a1f47fad32
+DIST thunderbird-60.5.1-fr.xpi 608467 BLAKE2B ba1beeb31655826bb680548d82369419ec6c79eac0b6b9f5518520abc8b3c8d3087526b508be3a6080e2242d446116bd7b13fe5b38042a83aa59a7da07146b4f SHA512 e35b8a71a40b38804673508e9fee76e7705529c28749646ec92b3aeb912ed8bfd8df5c99ff6602e0bb2872955a4730529ef0881b4470c9b4a1a3d06a18e06377
+DIST thunderbird-60.5.1-fy-NL.xpi 593851 BLAKE2B 493ef70c48c2cd63b16029248d7d41247cd53bdd439ab29766b5ef2e051d7284b1774da3a082c50fcf2fb73c95a8111c4a30ddc1b3a0cb7da4cebac00ee914ef SHA512 e0681c8e94905c219c5d05fdf46f70713f9772d995fa204163e1e5c0ac187edb2d5844264b5322d0b51667c8644279f702f6c5dd2c6bbb8f3f6fd5cabf8b18c5
+DIST thunderbird-60.5.1-ga-IE.xpi 603506 BLAKE2B 3353fb792299ca0351d799c5f7e07d0946ba5d334c4d1f2b1bd055085cd4649384a6e0636a2d7d38363aa13288964071fcd24df28b55dbb56d40341cfd728a77 SHA512 23f58eb88810d9bf56dd7dc39b5bf4c37812a0db21a1902395ebf5a04b3959ee5538ae72f3dc491799dc443b40df60badd98edf029daeed57630ea0a61688495
+DIST thunderbird-60.5.1-gd.xpi 599262 BLAKE2B 3689d2b1a0f5ecdda6ed3bcabf98e838a19fa303cf5bc2a0df02b92356d573fe199a1030ab27bc0eff51a621e2a9dabdcea6537acad92426b268a12b432c7faa SHA512 f9eae92945b62936348a77a7b98fcda6905d2ddfd1276943755a1f5653e9019c9e577946f0bccf7b8cf058b2673bd0e55ea2eab83cc41c141c3e162f7a841b87
+DIST thunderbird-60.5.1-gl.xpi 580353 BLAKE2B bbc61a9a8402d1a25e6989e4fdf570e1ab0a2c669907f8d32b9e37562e486ffa7bb2ea9af5d80316fd9b0a75175edc0df45e33043d09477d286b231ace340691 SHA512 0a9a827b2adb21d6122438e7e6f811399dc93fe284f3cb96a90cd4c3ceba71bf07ae1d65ae6bc8357b1d17ebc8594a65c66319a20a0c3f78ce244fed9e38a187
+DIST thunderbird-60.5.1-he.xpi 617143 BLAKE2B 1ef1acd57e07f5afad2d0fdc221a6e26a84d8d272290544df607262864a1c089f774977e809fc637e5efe2b9e375f735e31d497e51079cd2e6789607587a4b4e SHA512 98e15d7b612e3adeda7f088591e9936efeb6bf3b53b45f274c5bebf51c0a9225904eff5a7cf0189d06aa161e62a47a447dd93f28c21e199080e29ead14619e6a
+DIST thunderbird-60.5.1-hr.xpi 582239 BLAKE2B 446920b232cf1b342704a43114d0f7440154f608da9d218b7f3c06dace525893624e4c47083c6f29d5ee817ac2dfe9dc2ce3f2aeaa2975239572e303a3cfde8f SHA512 acbb048d2a7bbf64d3c13047afc25fe4f4953b29c3d42f60af0f9de3d4b8a39c050c6f9a532cf161082cbc5f794904d123a20124c2cfcc8ac7d2cd3233e87b2f
+DIST thunderbird-60.5.1-hsb.xpi 615132 BLAKE2B c642be030d34a327b460206b5b762c5336fac8a3fb95a5d1bfbd5bcb04b956318040d92ca289c03f859e865ffacd105f92fa08ef2ec683d9fb32279f33e6b29f SHA512 18fd8f779a9e72e518db356b0484df3b57791bf8c155d3dbdf72dddec5ff2f380e647e2085d47bf18c987f9173495836d9c36d24bd9f4be0ae89d68f0d0fff2c
+DIST thunderbird-60.5.1-hu.xpi 615347 BLAKE2B 5ad5e4a35b0f584f624d2b96c146b4e392a1c1f22ec90a1eb065b71e44a38d013b1890d131befbdef11e5037fc57de8af0f542c4fb49b05815b2363695f923bf SHA512 8aafd83758b58b58da2ed64147b1981a483939a86c957b89fcee94b0210ce099607e5fdb504cfac562e8f3b3b43132881893dfdbceb3170c4818e72bdd808c66
+DIST thunderbird-60.5.1-hy-AM.xpi 653531 BLAKE2B f268c5f6cecdcf34d0fbafa81e242ec6b2240f6a2bd79b0aecbea46c369a05e01ecb286d630e868c1eecae525e5ba88d886c72dc47574866d9041aa8a2435e34 SHA512 51c96f6e1c313361890b991d418257b477b5344343693d403079cb0e186dad0097735b6caec07e0ce06a9f15e64c029c4fd5b578f2c77f081467a845b304c0c0
+DIST thunderbird-60.5.1-id.xpi 568862 BLAKE2B 50a574f7c4840241186e10d92657d711f461ec43aa62c58e3aae77efecb38a45c9331dcb14c373a2c5b5f95858824539a609698c993a1378159a91023bbefb36 SHA512 58de6c785a4fbc1aaffc2e1e8b2d112a14bc8021b787d5958d8cb99b5e6df1d9c3ab2c0b1567aebab1939a7b4dc99e51d8e04daa30ef38c365010efec7f4ce71
+DIST thunderbird-60.5.1-is.xpi 579048 BLAKE2B 1c40a38e6fc98a5568611196f358d93494f7982b88b9b7a5287d1798c1f04d3a8c2fe0e2b2ec1216715e1244b4681aa3bf9413dab19e739765fa3103e50cebfd SHA512 87b2270b23b7f36aabc6283b539a60b6755136fd65d1eec9f6b7e401587ea2e5f448d87491520cd2816b39ae5b9ea351623da8cc4b40575ef52d02bf44d55a9e
+DIST thunderbird-60.5.1-it.xpi 477501 BLAKE2B 001440dd275cbe01f56917f845b5589393ee48aa5f68116074bdfb389f67be824a20b966847d086f047edab11f33787efc327bb010a9198536a8c84eeb449745 SHA512 28ec3c16465fd5ea53e35c1bcb5443469d37fc7d96f17647a3584c099b0b89aed81294c1e0e548c2e239ac050dceedfafadbf875a5fc5e73c1bed056afd0d211
+DIST thunderbird-60.5.1-ja.xpi 653345 BLAKE2B 31648f9ad62730f4d35abdb938207ce2eba502208f4cb6215f85c0073e816518b7b6f0b3e58ae451257670a6a153595f545a5f95bf542791fcb69b2963f26bbc SHA512 f23a19be810688ea6aa4c69fee6aa79988cacfa539dea6401b69db5875e6ff39f3e5d3312aef0fef20cb03d612be48cfb50f4706c6a4df5e57e2933b4478c267
+DIST thunderbird-60.5.1-ko.xpi 619731 BLAKE2B 7bbabbfb153821b743200eef1579fda004ccfdc367328287ad9b710e2384f9876091280ecd1328a030c3a194baff575e8691f45ad37f3c7dd49fe95e53646b7b SHA512 f2099655114e99ec6ceeea4d7e2f875fd7d1e386a6eaa08b8aeb43cb4baffe45f6f1302b84d2447bc458b0b58475e57b7f128d777b1c8dda8fd3b95081bf9659
+DIST thunderbird-60.5.1-lt.xpi 605441 BLAKE2B b46789602a7eb8d74a7c2cf209e5d05d887b1f19e834037ca3118036b9afd0c5e1f215198e092764c962a05a7fcd580b43019f9095372ae4298226017b06d7b4 SHA512 1f737f7734544235d70a71effb02a2aa067c4c06b73e7aea68c09d1df2d0374bd294e48b9b2e90a792f48394fea7c550f5edb4863c0eed51945903baae0d6f4c
+DIST thunderbird-60.5.1-nb-NO.xpi 577002 BLAKE2B b1a31e8c9e4c3e7e0f3385e121ab5f2fd575fb2fa02519bed1caef20f07f341f1aee5e4ce45840db3d93e97c9a0a9765dffdea799b78ed93d53e9f01c2d3ef80 SHA512 42bce132f7e57eaacc32a361dd0ab91f8544850c5fc3e8ed946b6cc67fcf2d9aa7ea979058cb7c37d897a5b6b70ac5f3a938a696d3c1075c527f0f26046075bf
+DIST thunderbird-60.5.1-nl.xpi 583914 BLAKE2B 2a3c429183a6143153f45fddf529612cce27679fee00045362d5be7ad4e9b02e2f6b8dd7bdc6cb5e4d2a24378491c1eb7e9c9681033208e0ec8fe030a74dba6f SHA512 572310396a7eefdeab86bafd6f33b1c4dd6b0fe771430f8b4aa3ca67305ce1eb10ce0b44252b5129b0af206ec46649ec2b1879f1a75c8ec3f950dc16153a7153
+DIST thunderbird-60.5.1-nn-NO.xpi 576423 BLAKE2B fa2d44d33b8cb1ae766e6b2eee8afd3a7874713a9ad33141adc6f44c588808b18e8f4f3a050c7016c27e795f1ed19db812b79b8b802cf50f8799b897037d52bf SHA512 ff8bc24518b696a5a1d4fb44553162515d21a1e3445c086ec657dbf2da639992721b67585f797511f8fb0a5014a377e29d45b524c660801e3c05c233c6bff005
+DIST thunderbird-60.5.1-pl.xpi 480726 BLAKE2B cc5d1d8596eca87f60a3d553d1ccf30fb695e08375a2ec70b1ee2d45f662f28c7b3176e63898a931beaf9638463dbe01a440d7098d2e440459202fab86874716 SHA512 f6569dc00b84fad51fb32d096b1855d89021859626ebbe214267d0d0819008318d39a3061e2989ccc8b16e8ea7013eee078d5ed34a22f94a7c2a2de041fa4e52
+DIST thunderbird-60.5.1-pt-BR.xpi 588835 BLAKE2B fa7606c27fdf59ab3afb57777620be778d1e8d45b04b234a2e8b70086a4c7f9b60e177d9fec3d6c3d037ae26273b62d16b685db6193263cb730c19544b67d979 SHA512 155eb81f08dc9618b7e574a8802537c9de85a48848b419063f04a3988c09ecd3e238a13afbe8dc638cd3bebeb062f8c6e33542c2e4d6b450709fdc6c13baa022
+DIST thunderbird-60.5.1-pt-PT.xpi 593186 BLAKE2B accb82adb8a7882c5ade9b25af45d97e0784fe15ea7da867439d27b7799f6087d7f5bfe5e8fad1839fb4a167d400ef947a0e7eceb2b547786fd8bc648543bac9 SHA512 c678ef2d2ce0702cb41ebb261d31fb86f2b23ef99aaa2a9b69d7c4b6eda376a9cf1b661ebac6fe0d5e7a0a2fcc02b41d0e96435970eaf2632f15472a380ccc9c
+DIST thunderbird-60.5.1-rm.xpi 578385 BLAKE2B 75c57d0dd8691829834dbc171095dc7ce969a8e2dc4102e3aa41a380e5d947bb25b412bd8e3e6a0767d68a937c714aabd9c17033b8510c419426dc7e488773c3 SHA512 590de2aa4cdef25fe87bae3a6fe60e98c5ad4ccf51497540cce9952d5e464a70ffa24c553f9bd89a241ff33e547f2ad2cad8f80ccb9fda2576f1914a197343e6
+DIST thunderbird-60.5.1-ro.xpi 584309 BLAKE2B c8d9a4ed506463488f979e84da444cf1f4680e3973929665d3ec670922004553688948ad591f25087106ea14cf5bb5d86f9c887805297a2aae4b7688d623e3c6 SHA512 3f01b1e8be2041e46c3be86f3428710e52dd6faeeecc4e41468326690bd942f6b356bc430d87ee757e7cb1d759e3301618db74f92488213586eef0243e06aadf
+DIST thunderbird-60.5.1-ru.xpi 694705 BLAKE2B 1b35d03c69b3ded0a2b89f399ccdce657c68e4e47e173a8a5f52f3bf1bcc0ee5c2812e338dbffa861cfe923ff30be8be6cc3e0be60dc3e8d194071f4da6a893a SHA512 34e4fade10607a8e788d388c36f291865da696c2aebfdf12b111ddc7b589d01a547ddd974775eca535431a29030f605b07eed89026791cf58ad7be6be09c8a82
+DIST thunderbird-60.5.1-si.xpi 647597 BLAKE2B 263dec200924acdd0eaa14964b86459979c9777d6682b0328a82b5f3c3434e44a676ddb8a303e92ea0d378f87b028367593305fae934e956d4c696b50b17f649 SHA512 6ace50684a1d0e526ed5da13a9546b67b9a9e562011b7b862ffebf3fb6fed967fc94cc1619c001ff1e229154aadb049e5fa87f46b35ca6871f63f055426ae8fd
+DIST thunderbird-60.5.1-sk.xpi 612217 BLAKE2B 3dd2e6a8f9e884fb92aadd75eea19fcb497f9a94cba952f6024ea18db29064274eec76859166d6cf406a908588a8c84c8d97e82642a431cec7f91c781bf3e5a7 SHA512 5dc55eb93de3e1e22589738ec121ac072b3a223e67573458fee2302d5e99855a9f024215c280d42d1f98d8964b8e7c004ec19163d65dce5efcf7826165a6d7a7
+DIST thunderbird-60.5.1-sl.xpi 589947 BLAKE2B 4fd09b4a19a95f9d667b796765089557cc230c65622aad4f237227d71837a7cc5913ef39c3b9e0560e9feb41b473ffe2080a0567810e2d7d17881336bc090b90 SHA512 09e6f61514209331e17769ae302dd6de0c0319f0a5f90de5bd4b9cb0a6720a408b80a0223e7ad59b72ca815c0b98cde1c2dad1ea13f62a9cd76ce92abf042140
+DIST thunderbird-60.5.1-sq.xpi 593095 BLAKE2B 9e8285e93789f362af874ffee1ebc5dc8f99f7e2c48eaa48d9339c446b5910aa7d2eb13c34958b6548dde6d6fd712548ebf70ded870ff181bc51144fba7c61c1 SHA512 56fff94fc089b63329ba7a3332eb791ac62aaf9ff69d1d582095145afae63af2c2e6926dc2ce06057f5fc76cf3f95f602aad483742ae3d51ac0d9d77a6f21bbb
+DIST thunderbird-60.5.1-sr.xpi 641527 BLAKE2B 6eb9484114e6f056e22ee4744260f434392f7356a499c909faa1e12b0125df3ff88958339565a62e592f07c3241d0b578d1c3ba6befeda00c4d55c5ad8b3f666 SHA512 f306bd143240fbeca628784759354bf2f479f55fe97ec8a79f8207810e481c3907d214aa2c49b25b7a8b2d5cdfaf9a4025fa632ee5dffb91c6932f61f4d27381
+DIST thunderbird-60.5.1-sv-SE.xpi 594079 BLAKE2B 8753c025e5e1596c1afbecee12039cd072df5646e2d3bb84dc0b5808a7e960371004e0f1bb92736aa3d0a8fa9b3557335d58ddeb96b934ae9970e1e0525a26a0 SHA512 418dbbacec1d54ab41702c3e9fc86217171ac00313ae69084b4949a902cbe8021f5e004f3932e72f4c3e5d00ba4c5d7b818c4411359fb176e09d2169eb590c80
+DIST thunderbird-60.5.1-tr.xpi 598011 BLAKE2B d3df09879c4131449e4d0f995ff145d2f68593afc0c5d892d0077b1f2606a1fa26977d786f0215e758c0e07f8cba26267b2e3a50d9b960cfbc1c4c162f117b08 SHA512 bc7bc8418d5676fef313fee11fc41558594438128cd3c3c18d39e69e0b9dce5a3983498fb1b1b9db04800e88361cb95043177b5ce8b74c7f64d68e02fd241a11
+DIST thunderbird-60.5.1-uk.xpi 684155 BLAKE2B 713362e9798239eca8a86c4e005c582ee83173483ecc6ca14565a3f076e8f5431182635f36ab9bc847e72135e2c4b59be0accaa4418e8fe04649ac4459ce4a11 SHA512 581463bdd2239928333df1c69f3e7ab4d5b9b2f4c26e87c63aa584482ccef0fb0d28b85d9035033ffb6a00b1a634754976d31e020a2e55bfd3b3041941f8dc78
+DIST thunderbird-60.5.1-vi.xpi 637198 BLAKE2B f8a96f24bda00dca7833364a8cc8cf38b10bc7a61173b143efa481de269bcb8aa49053c89310f0b2008860fcdd8427ea182c4955def30cc0a2c14526d905f44f SHA512 c77acd499343a13458777ddfe014800506d4a3494ebcca315e7e20e6bf2367a4390efc2178e0a7586f8e14c29cfa174cc74cf17759770d20d3bec77b79f81c32
+DIST thunderbird-60.5.1-zh-CN.xpi 626284 BLAKE2B 04651784e2a4ed1d18d0d70ffdc21948495c6aeaad5be3d80c2e0b283d12b0bb65c22b4dd9374b970b7e0efbfb6dc25c2c9adc2ec56088fbd1e24f48fc340a77 SHA512 0313b5b5931badb9d89f1caa95c628f9ccba2cad447ea36e5b2c7aaffa3a4e17e8ffa1322eb46c7bd253782b7bba63e2bd6a7915e201aac99a8044c2255059fc
+DIST thunderbird-60.5.1-zh-TW.xpi 626190 BLAKE2B 273f6bdb9013f8a1cb9aad9ee2907668ee6a8144f40f5bcce0262c8c042bc6a1f77d001e74d62bc558be24356adb0ea0b3ac2819e55c7d03395741b3712227ba SHA512 d31ae97e8bd0167b021f46088efbc52432e382e167a2999ff55bd3a16b2804ee306340846a3510e98a16bb304cd9f956ecdfa4fd2ffddc4b610729102a6cd8f4
+DIST thunderbird-60.5.1.source.tar.xz 285211052 BLAKE2B 20db1825897984f486e5e4e15229e12f1184b4027efd9abb0b48cf1d41683417b5945a0cbfb9831d70076b0a3f1246ef21ab9c19ef50b33d831bb01d2e45e1e9 SHA512 dafb7c81568b96285aa367fdac3db65aa0972a8224385714b14b67abdd5b17df963aec63608538a566f20c655cf0eb6784ba2b304151b2cc9b9dc3fdd9a48c7c
EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
-EBUILD thunderbird-60.4.0.ebuild 17506 BLAKE2B 1545cd3099e76df51602d7758390701a89aac1dcefd44c1adfaa370b5af8b2d4ca496694e18b73f5a7398a9437e08aa49e59c483bffb2f4bf4e49bb148f3e911 SHA512 a52895b93085328c22b5b5f1dcd97a9b410bb6ebc83e6dd25e99dad50d654d4cc5759202ca5cac108e348c7a7143a748ed0370dcd072b3d80cf1ecf49ec0bfd4
-EBUILD thunderbird-60.5.0.ebuild 17507 BLAKE2B 32478b9cbdf7b455f2960682efffd8c8110fa4b37eb923c28d31437dc212813ec9e3267a8b4a75076c0080de153223a0f696e3459a9b801bf3e2f1f98bb87183 SHA512 a4a69b4f470cc14cb47f75824c18bfad8c1aaae3b652cce600f4712bc189c8e3fc9c43aa52ef6c89f56c946bcb96c152b5095407aae1043d19f767b219519bf5
+EBUILD thunderbird-60.4.0.ebuild 17534 BLAKE2B 7c1fa6a0bd326d3aef9c5f1d6ecc6b87c451f5ac41b6b2f1cdf2885ba852d8563ddb386f7e513e34c9b2f70332db55d732dba820bd6b2161ad521a074cfc3d16 SHA512 666c2196c54315d9fb72027b0629a42f183d7728e3b252c3cac0df901f9b6977e7d59cd82cd3f1829b552b267acd94219d7ebf6d996009e1915eeb045c46fba3
+EBUILD thunderbird-60.5.0.ebuild 17534 BLAKE2B fe04bd460b656ac0f3e6ba1fb3bf8d8467642dd5846d60635a97f7268ee5d4986ea16239e7a53b5a4b4a0e456842c690e3e1e277b4371660551b773455e66a2b SHA512 f0f7f7a422cca547404102cef270865ad935be3dd5cc8d3ce1d2e70344228398526d2eaa1f2f0097e6fa75dce2928e40fa98f0504b42c4f576581875d7912ae6
+EBUILD thunderbird-60.5.1.ebuild 17533 BLAKE2B 4fed34532d428000504bb0501e7f2ac55819369cdef0865bc256b2b54fe2a2fc96bf4190f2eccdd3b4716960bb6b60216a17ea8a2421784600ee139be8f2b3c3 SHA512 bed01cf8d00b8e47083d5500019e28d0159314cf9754abda77e52bba0783ca481943e8ea0284d1ffd53f0797dc4d47ddc2a6756322ff82eb5ba392a67dd86a84
MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/thunderbird-60.4.0.ebuild b/mail-client/thunderbird/thunderbird-60.4.0.ebuild
index dfec50fecb51..cda45675687f 100644
--- a/mail-client/thunderbird/thunderbird-60.4.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -95,7 +95,10 @@ CDEPEND="
system-icu? ( >=dev-libs/icu-59.1:= )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
system-libevent? ( >=dev-libs/libevent-2.0:0= )
- system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+ system-libvpx? (
+ >=media-libs/libvpx-1.5.0:0=[postproc]
+ <media-libs/libvpx-1.8
+ )
system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
wifi? (
kernel_linux? (
diff --git a/mail-client/thunderbird/thunderbird-60.5.0.ebuild b/mail-client/thunderbird/thunderbird-60.5.0.ebuild
index 0884a2e75a64..3fdd349d6f3f 100644
--- a/mail-client/thunderbird/thunderbird-60.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.5.0.ebuild
@@ -37,7 +37,7 @@ inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="https://www.mozilla.org/thunderbird"
-KEYWORDS="~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
@@ -95,7 +95,10 @@ CDEPEND="
system-icu? ( >=dev-libs/icu-59.1:= )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
system-libevent? ( >=dev-libs/libevent-2.0:0= )
- system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+ system-libvpx? (
+ >=media-libs/libvpx-1.5.0:0=[postproc]
+ <media-libs/libvpx-1.8
+ )
system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
wifi? (
kernel_linux? (
diff --git a/mail-client/thunderbird/thunderbird-60.5.1.ebuild b/mail-client/thunderbird/thunderbird-60.5.1.ebuild
new file mode 100644
index 000000000000..53f462d270c0
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-60.5.1.ebuild
@@ -0,0 +1,564 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.5"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
+ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
+sv-SE tr uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHTB="thunderbird-60.0-patches-0"
+PATCHFF="firefox-60.5-patches-01"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+ MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
+ selinux startup-notification system-harfbuzz system-icu system-jpeg
+ system-libevent system-libvpx system-sqlite wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+ https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+ lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+ ${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+ >=dev-libs/nss-3.36.7
+ >=dev-libs/nspr-4.19
+ >=app-text/hunspell-1.5.4:=
+ dev-libs/atk
+ dev-libs/expat
+ >=x11-libs/cairo-1.10[X]
+ >=x11-libs/gtk+-2.18:2
+ >=x11-libs/gtk+-3.4.0:3
+ x11-libs/gdk-pixbuf
+ >=x11-libs/pango-1.22.0
+ >=media-libs/libpng-1.6.34:0=[apng]
+ >=media-libs/mesa-10.2:*
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.10
+ kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+ virtual/freedesktop-icon-theme
+ dbus? (
+ >=sys-apps/dbus-0.60
+ >=dev-libs/dbus-glib-0.72
+ )
+ startup-notification? ( >=x11-libs/startup-notification-0.8 )
+ >=x11-libs/pixman-0.19.2
+ >=dev-libs/glib-2.26:2
+ >=sys-libs/zlib-1.2.3
+ >=virtual/libffi-3.0.10:=
+ virtual/ffmpeg
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXt
+ system-harfbuzz? (
+ >=media-libs/harfbuzz-1.4.2:0=
+ >=media-gfx/graphite2-1.3.9-r1
+ )
+ system-icu? ( >=dev-libs/icu-59.1:= )
+ system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+ system-libevent? ( >=dev-libs/libevent-2.0:0= )
+ system-libvpx? (
+ >=media-libs/libvpx-1.5.0:0=[postproc]
+ <media-libs/libvpx-1.8
+ )
+ system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
+ wifi? (
+ kernel_linux? (
+ >=sys-apps/dbus-0.60
+ >=dev-libs/dbus-glib-0.72
+ net-misc/networkmanager
+ )
+ )
+ jack? ( virtual/jack )"
+
+DEPEND="${CDEPEND}
+ app-arch/zip
+ app-arch/unzip
+ >=sys-devel/binutils-2.30
+ sys-apps/findutils
+ >=sys-devel/llvm-4.0.1
+ >=sys-devel/clang-4.0.1
+ clang? (
+ >=sys-devel/llvm-4.0.1[gold]
+ >=sys-devel/lld-4.0.1
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ elibc_glibc? (
+ virtual/cargo
+ virtual/rust
+ )
+ elibc_musl? (
+ virtual/cargo
+ virtual/rust
+ )
+ amd64? (
+ ${ASM_DEPEND}
+ virtual/opengl
+ )
+ x86? (
+ ${ASM_DEPEND}
+ virtual/opengl
+ )"
+
+RDEPEND="${CDEPEND}
+ pulseaudio? (
+ || (
+ media-sound/pulseaudio
+ >=media-sound/apulse-0.1.9
+ )
+ )
+ selinux? (
+ sec-policy/selinux-mozilla
+ sec-policy/selinux-thunderbird
+ )"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+S="${WORKDIR}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+ moz_pkgsetup
+
+ # Avoid PGO profiling problems due to enviroment leakage
+ # These should *always* be cleaned up anyway
+ unset DBUS_SESSION_BUS_ADDRESS \
+ DISPLAY \
+ ORBIT_SOCKETDIR \
+ SESSION_MANAGER \
+ XDG_SESSION_COOKIE \
+ XAUTHORITY
+
+ if ! use bindist ; then
+ elog "You are enabling official branding. You may not redistribute this build"
+ elog "to any users on your network or the internet. Doing so puts yourself into"
+ elog "a legal problem with Mozilla Foundation"
+ elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+ elog
+ fi
+
+ addpredict /proc/self/oom_score_adj
+
+ llvm_pkg_setup
+}
+
+pkg_pretend() {
+ # Ensure we have enough disk space to compile
+ CHECKREQS_DISK_BUILD="4G"
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+}
+
+src_prepare() {
+ # Apply our patchset from firefox to thunderbird as well
+ rm -f "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
+ "${WORKDIR}"/firefox/2005_ffmpeg4.patch \
+ "${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \
+ || die
+ eapply "${WORKDIR}/firefox"
+
+ eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
+
+ # Ensure that are plugins dir is enabled as default
+ sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+ sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+ # Don't error out when there's no files to be removed:
+ sed 's@\(xargs rm\)$@\1 -f@' \
+ -i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+ -i "${S}"/comm/mail/installer/Makefile.in || die
+
+ # Apply our Thunderbird patchset
+ pushd "${S}"/comm &>/dev/null || die
+ eapply "${WORKDIR}"/thunderbird
+
+ # NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual
+ # check on lightning version or changes:
+ #
+ # Confirm the version of lightning being grabbed for langpacks is the same
+ # as that used in thunderbird
+ #local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
+ #if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+ # eqawarn "The version of lightning used for localization differs from the version"
+ # eqawarn "in thunderbird. Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+ # eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+ #fi
+
+ popd &>/dev/null || die
+
+ # Allow user to apply any additional patches without modifing ebuild
+ eapply_user
+
+ # Autotools configure is now called old-configure.in
+ # This works because there is still a configure.in that happens to be for the
+ # shell wrapper configure script
+ eautoreconf old-configure.in
+
+ # Must run autoconf in js/src
+ cd "${S}"/js/src || die
+ eautoconf old-configure.in
+}
+
+src_configure() {
+ # Add information about TERM to output (build.log) to aid debugging
+ # blessings problems
+ if [[ -n "${TERM}" ]] ; then
+ einfo "TERM is set to: \"${TERM}\""
+ else
+ einfo "TERM is unset."
+ fi
+
+ if use clang && ! tc-is-clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ strip-unsupported-flags
+ elif ! use clang && ! tc-is-gcc ; then
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ strip-unsupported-flags
+ fi
+
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+ # common config components
+ mozconfig_annotate 'system_libs' \
+ --with-system-zlib \
+ --with-system-bz2
+
+ # Must pass release in order to properly select linker
+ mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+ # Avoid auto-magic on linker
+ if use clang ; then
+ # This is upstream's default
+ mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+ elif tc-ld-is-gold ; then
+ mozconfig_annotate "linker is set to gold" --enable-linker=gold
+ else
+ mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+ fi
+
+ # It doesn't compile on alpha without this LDFLAGS
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Add full relro support for hardened
+ if use hardened; then
+ append-ldflags "-Wl,-z,relro,-z,now"
+ mozconfig_use_enable hardened hardening
+ fi
+
+ # Modifications to better support ARM, bug 553364
+ if use neon ; then
+ mozconfig_annotate '' --with-fpu=neon
+
+ if ! tc-is-clang ; then
+ # thumb options aren't supported when using clang, bug 666966
+ mozconfig_annotate '' --with-thumb=yes
+ mozconfig_annotate '' --with-thumb-interwork=no
+ fi
+ fi
+ if [[ ${CHOST} == armv*h* ]] ; then
+ mozconfig_annotate '' --with-float-abi=hard
+ if ! use system-libvpx ; then
+ sed -i -e "s|softfp|hard|" \
+ "${S}"/media/libvpx/moz.build
+ fi
+ fi
+
+ mozconfig_use_enable !bindist official-branding
+ # Enable position independent executables
+ mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+ mozconfig_use_enable debug
+ mozconfig_use_enable debug tests
+ if ! use debug ; then
+ mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+ else
+ mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+ fi
+ # These are enabled by default in all mozilla applications
+ mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+ mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+ mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+ --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+ mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+ mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+ mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+ mozconfig_annotate '' --disable-crashreporter
+ mozconfig_annotate 'Gentoo default' --with-system-png
+ mozconfig_annotate '' --enable-system-ffi
+ mozconfig_annotate '' --disable-gconf
+ mozconfig_annotate '' --with-intl-api
+ mozconfig_annotate '' --enable-system-pixman
+ # Instead of the standard --build= and --host=, mozilla uses --host instead
+ # of --build, and --target intstead of --host.
+ # Note, mozilla also has --build but it does not do what you think it does.
+ # Set both --target and --host as mozilla uses python to guess values otherwise
+ mozconfig_annotate '' --target="${CHOST}"
+ mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+ if use system-libevent; then
+ mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+ fi
+
+ # skia has no support for big-endian platforms
+ if [[ $(tc-endian) == "big" ]]; then
+ mozconfig_annotate 'big endian target' --disable-skia
+ else
+ mozconfig_annotate '' --enable-skia
+ fi
+
+ # use the gtk3 toolkit (the only one supported at this point)
+ mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+ mozconfig_use_enable startup-notification
+ mozconfig_use_enable system-sqlite
+ mozconfig_use_with system-jpeg
+ mozconfig_use_with system-icu
+ mozconfig_use_with system-libvpx
+ mozconfig_use_with system-harfbuzz
+ mozconfig_use_with system-harfbuzz system-graphite2
+ mozconfig_use_enable pulseaudio
+ # force the deprecated alsa sound code if pulseaudio is disabled
+ if use kernel_linux && ! use pulseaudio ; then
+ mozconfig_annotate '-pulseaudio' --enable-alsa
+ fi
+
+ mozconfig_use_enable dbus
+
+ mozconfig_use_enable wifi necko-wifi
+
+ # enable JACK, bug 600002
+ mozconfig_use_enable jack
+
+ # Other tb-specific settings
+ mozconfig_annotate '' --with-user-appdir=.thunderbird
+ mozconfig_annotate '' --enable-ldap
+ mozconfig_annotate '' --enable-calendar
+
+ # Disable built-in ccache support to avoid sandbox violation, #665420
+ # Use FEATURES=ccache instead!
+ mozconfig_annotate '' --without-ccache
+ sed -i -e 's/ccache_stats = None/return None/' \
+ python/mozbuild/mozbuild/controller/building.py || \
+ die "Failed to disable ccache stats call"
+
+ # Stylo is only broken on x86 builds
+ use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+ # Stylo is horribly broken on arm, renders GUI unusable
+ use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
+
+ if use clang ; then
+ # libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
+ mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
+ elif use arm ; then
+ mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
+ fi
+
+ # Use an objdir to keep things organized.
+ echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+ echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+ mozlinguas_mozconfig
+
+ # Finalize and report settings
+ mozconfig_final
+
+ ####################################
+ #
+ # Configure and build
+ #
+ ####################################
+
+ # Disable no-print-directory
+ MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ append-cxxflags -fno-stack-protector
+ fi
+
+ # workaround for funky/broken upstream configure...
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+ ./mach configure || die
+}
+
+src_compile() {
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+ ./mach build --verbose || die
+}
+
+src_install() {
+ declare emid
+ cd "${BUILD_OBJ_DIR}" || die
+
+ # Pax mark xpcshell for hardened support, only used for startupcache creation.
+ pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+ # Copy our preference before omnijar is created.
+ cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
+ "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ # set dictionary path, to use system hunspell
+ echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+ >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+ # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+ if use system-harfbuzz ; then
+ echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+ >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+ fi
+
+ # force cairo as the canvas renderer on platforms without skia support
+ if [[ $(tc-endian) == "big" ]] ; then
+ echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+ >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+ echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+ >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+ fi
+
+ cd "${S}" || die
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+ DESTDIR="${D}" ./mach install || die
+
+ # Install language packs
+ MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+ local size sizes icon_path icon
+ if ! use bindist; then
+ icon_path="${S}/comm/mail/branding/thunderbird"
+ icon="${PN}-icon"
+
+ domenu "${FILESDIR}"/icon/${PN}.desktop
+ else
+ icon_path="${S}/comm/mail/branding/nightly"
+ icon="${PN}-icon-unbranded"
+
+ newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+ ${PN}.desktop
+
+ sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+ "${ED}"/usr/share/applications/${PN}.desktop
+ fi
+
+ # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+ newicon "${icon_path}"/default48.png "${icon}".png
+ # Install icons for menu entry
+ sizes="16 22 24 32 48 256"
+ for size in ${sizes}; do
+ newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
+ done
+
+ local emid
+ # stage extra locales for lightning and install over existing
+ emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+ rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+ mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
+ "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+ mkdir -p "${T}/${emid}" || die
+ cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
+ insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+ doins -r "${T}/${emid}"
+
+ if use lightning; then
+ # move lightning out of distribution/extensions and into extensions for app-global install
+ mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+ # stage extra locales for gdata-provider and install app-global
+ mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+ "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+ emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+ mkdir -p "${T}/${emid}" || die
+ cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+
+ # manifest.json does not allow the addon to load, put install.rdf in place
+ # note, version number needs to be set properly
+ cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
+ sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
+
+ insinto ${MOZILLA_FIVE_HOME}/extensions
+ doins -r "${T}/${emid}"
+ fi
+
+ # thunderbird and thunderbird-bin are identical
+ rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
+ dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+ # Required in order to use plugins and even run thunderbird on hardened.
+ pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 814c0ac2ee91..4619affca1c5 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -3,5 +3,5 @@ AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db
AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
EBUILD trojita-0.7-r2.ebuild 1913 BLAKE2B 045e1f76dc240bdb7f8b9205f44c98a49642dbaba21d697f2b41c302d12253070822b3617b13faac108a88307b43df793ab8a576c257d051bbe1edda07effdcc SHA512 b52d541396a5c99310af90ded525aae4af885b8a897202bba0d2386cffbdd8b7ff4c81584f05d84497a46fc99d62eb6c983a6f130ee666282824c67b29d4b8a6
-EBUILD trojita-9999.ebuild 1798 BLAKE2B 30c5a402d8018dcb23a127206ac86da8883be248a70cbd788c6b8d05b5e196d8eafc9842f3c0a00f51648baca88e6915afa231cd8cb5f4620a7fced6d112162a SHA512 c4a5ae32a89608553cd02751119ae38b716cd450ee6c68959acd055e983cc94e0b9f14b3e70f28cd071edb172ad4392e5f2c470945e6281617f470e6d777871c
+EBUILD trojita-9999.ebuild 1578 BLAKE2B c41bb4515f0dad941f18eddf9fbe5845e72e758f65dc8d98d9a0a3460856a30100553857096d4f9f837bf67981f7992c16fdaf950846ec1664cddd4cd0c4d562 SHA512 09d5c425fb5dfdb53ba929a2dc3e4010942c83c2f96f967c6ad3829a160c96cf808de423737bcc92a62deb902cf3074964bf29de6a250d0adca4bfcdfc2e5fdd
MISC metadata.xml 640 BLAKE2B e60d0eb2b469e6b8f497b6884eea116364f3fbc93632b76367386e65a8d1f3b0a7dff42c48e2a2959799cc61febf5022d3d6ddb4ad6e5e3535dc08ab4633e813 SHA512 3149333258d5506d34854c9b0cc3da3f6560d9a44cf7b26a908e7c2726a145ccfc98c1b521bb56da74517af196e1c3f53a4f0c1d9f4e27fcd3493f5350a4e8e4
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 3868e240b410..268f9915e76b 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/"
-if [[ ${PV} != 9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
+ inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
+inherit cmake-utils virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
@@ -20,7 +21,12 @@ IUSE="+crypt +dbus debug +password test +zlib"
REQUIRED_USE="password? ( dbus )"
-RDEPEND="
+BDEPEND="
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )
+ zlib? ( virtual/pkgconfig )
+"
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -36,11 +42,7 @@ RDEPEND="
password? ( dev-libs/qtkeychain[qt5(+)] )
zlib? ( sys-libs/zlib )
"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- test? ( dev-qt/qttest:5 )
- zlib? ( virtual/pkgconfig )
-"
+RDEPEND="${DEPEND}"
DOCS=( README LICENSE )
@@ -49,7 +51,7 @@ src_prepare() {
# the build system is taking a look at `git describe ... --dirty` and
# gentoo's modifications to CMakeLists.txt break these
- sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+ sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check"
}
src_configure() {
@@ -69,17 +71,3 @@ src_configure() {
src_test() {
virtx cmake-utils_src_test
}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}