From 746e2665a6bbc5a09caf15155c34be4447db508c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Wed, 25 Nov 2020 18:28:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?=
 =?UTF-8?q?=D0=B8=20mail-client/trojita,=20mail-client/claws-mail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 merge/README.txt                                  | 3 +++
 merge/mail-client/.calculate_directory            | 1 +
 merge/mail-client/claws-mail/.calculate_directory | 1 +
 merge/mail-client/claws-mail/claws-mail.desktop   | 4 ++++
 merge/mail-client/trojita/.calculate_directory    | 1 +
 merge/mail-client/trojita/org.kde.trojita.desktop | 4 ++++
 6 files changed, 14 insertions(+)
 create mode 100644 merge/mail-client/.calculate_directory
 create mode 100644 merge/mail-client/claws-mail/.calculate_directory
 create mode 100644 merge/mail-client/claws-mail/claws-mail.desktop
 create mode 100644 merge/mail-client/trojita/.calculate_directory
 create mode 100644 merge/mail-client/trojita/org.kde.trojita.desktop

diff --git a/merge/README.txt b/merge/README.txt
index d7bf532..d588faf 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -17,3 +17,6 @@ app-portage/porthole
 меньше 0.30
 
 dev-lang/php: пока не поддерживается из-за слотов
+
+Шаблон mail-client/claws-mail на данный момент ничего не менят, исходный
+desktop файл содержит то же самое значение
diff --git a/merge/mail-client/.calculate_directory b/merge/mail-client/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/mail-client/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/mail-client/claws-mail/.calculate_directory b/merge/mail-client/claws-mail/.calculate_directory
new file mode 100644
index 0000000..f6bbaa3
--- /dev/null
+++ b/merge/mail-client/claws-mail/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='mail-client/claws-mail' %}
diff --git a/merge/mail-client/claws-mail/claws-mail.desktop b/merge/mail-client/claws-mail/claws-mail.desktop
new file mode 100644
index 0000000..dcb210c
--- /dev/null
+++ b/merge/mail-client/claws-mail/claws-mail.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde', path='/usr/share/applications' %}
+
+[Desktop Entry]
+Categories=Network;Email;
diff --git a/merge/mail-client/trojita/.calculate_directory b/merge/mail-client/trojita/.calculate_directory
new file mode 100644
index 0000000..854394b
--- /dev/null
+++ b/merge/mail-client/trojita/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='mail-client/trojita' %}
diff --git a/merge/mail-client/trojita/org.kde.trojita.desktop b/merge/mail-client/trojita/org.kde.trojita.desktop
new file mode 100644
index 0000000..031c777
--- /dev/null
+++ b/merge/mail-client/trojita/org.kde.trojita.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde', path='/usr/share/applications' %}
+
+[Desktop Entry]
+Categories=Qt;Network;Email;