From 23e11927b27d60e42b87a5014e8514a148cee0e6 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: Thu, 19 Nov 2020 15:02:44 +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=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20app-office/libreoffice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 merge/README.txt                                  | 7 +++++++
 merge/app-office/.calculate_directory             | 1 +
 merge/app-office/libreoffice/.calculate_directory | 1 +
 merge/app-office/libreoffice/base.desktop         | 4 ++++
 merge/app-office/libreoffice/calc.desktop         | 4 ++++
 merge/app-office/libreoffice/draw.desktop         | 5 +++++
 merge/app-office/libreoffice/impress.desktop      | 4 ++++
 merge/app-office/libreoffice/math.desktop         | 5 +++++
 merge/app-office/libreoffice/startcenter.desktop  | 4 ++++
 merge/app-office/libreoffice/writer.desktop       | 4 ++++
 10 files changed, 39 insertions(+)
 create mode 100644 merge/README.txt
 create mode 100644 merge/app-office/.calculate_directory
 create mode 100644 merge/app-office/libreoffice/.calculate_directory
 create mode 100644 merge/app-office/libreoffice/base.desktop
 create mode 100644 merge/app-office/libreoffice/calc.desktop
 create mode 100644 merge/app-office/libreoffice/draw.desktop
 create mode 100644 merge/app-office/libreoffice/impress.desktop
 create mode 100644 merge/app-office/libreoffice/math.desktop
 create mode 100644 merge/app-office/libreoffice/startcenter.desktop
 create mode 100644 merge/app-office/libreoffice/writer.desktop

diff --git a/merge/README.txt b/merge/README.txt
new file mode 100644
index 0000000..48ee8fe
--- /dev/null
+++ b/merge/README.txt
@@ -0,0 +1,7 @@
+{% calculate append='skip' %}
+
+Удалены шаблоны по причине отсутствия версий в портежах для настроек:
+app-office/scribus
+app-emulation/lxd
+
+При переносе шаблонов libreoffice удалены шаблоны для x86
diff --git a/merge/app-office/.calculate_directory b/merge/app-office/.calculate_directory
new file mode 100644
index 0000000..a154c99
--- /dev/null
+++ b/merge/app-office/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip', action = 'merge', group = 'install' %}
diff --git a/merge/app-office/libreoffice/.calculate_directory b/merge/app-office/libreoffice/.calculate_directory
new file mode 100644
index 0000000..a60beba
--- /dev/null
+++ b/merge/app-office/libreoffice/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/usr/lib64/libreoffice/share', name='xdg', package='app-office/libreoffice' %}
diff --git a/merge/app-office/libreoffice/base.desktop b/merge/app-office/libreoffice/base.desktop
new file mode 100644
index 0000000..21b1d7f
--- /dev/null
+++ b/merge/app-office/libreoffice/base.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-base.png
diff --git a/merge/app-office/libreoffice/calc.desktop b/merge/app-office/libreoffice/calc.desktop
new file mode 100644
index 0000000..0267450
--- /dev/null
+++ b/merge/app-office/libreoffice/calc.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-calc.png
diff --git a/merge/app-office/libreoffice/draw.desktop b/merge/app-office/libreoffice/draw.desktop
new file mode 100644
index 0000000..d6f71eb
--- /dev/null
+++ b/merge/app-office/libreoffice/draw.desktop
@@ -0,0 +1,5 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Categories=Office
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-draw.png
diff --git a/merge/app-office/libreoffice/impress.desktop b/merge/app-office/libreoffice/impress.desktop
new file mode 100644
index 0000000..1f18cf1
--- /dev/null
+++ b/merge/app-office/libreoffice/impress.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-impress.png
diff --git a/merge/app-office/libreoffice/math.desktop b/merge/app-office/libreoffice/math.desktop
new file mode 100644
index 0000000..4b0ee76
--- /dev/null
+++ b/merge/app-office/libreoffice/math.desktop
@@ -0,0 +1,5 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Categories=Office
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-math.png
diff --git a/merge/app-office/libreoffice/startcenter.desktop b/merge/app-office/libreoffice/startcenter.desktop
new file mode 100644
index 0000000..5d57d7c
--- /dev/null
+++ b/merge/app-office/libreoffice/startcenter.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-startcenter.png
diff --git a/merge/app-office/libreoffice/writer.desktop b/merge/app-office/libreoffice/writer.desktop
new file mode 100644
index 0000000..4b4ef6d
--- /dev/null
+++ b/merge/app-office/libreoffice/writer.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde' %}
+
+[Desktop Entry]
+Icon=/usr/share/icons/gnome/256x256/apps/libreoffice-writer.png