From 698303706a08c4fc53da0060f8eaab668437efdc 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: Fri, 27 Nov 2020 12:09:36 +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=20net?=
 =?UTF-8?q?-im?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

net-im/coturn, net-im/ejabberd,
net-im/telegram-desktop-bin, net-im/viber
---
 merge/README.txt                                       | 3 +++
 merge/net-im/.calculate_directory                      | 1 +
 merge/net-im/coturn/.calculate_directory               | 1 +
 merge/net-im/coturn/setcap                             | 5 +++++
 merge/net-im/ejabberd/.calculate_directory             | 1 +
 merge/net-im/ejabberd/ejabberd                         | 3 +++
 merge/net-im/telegram-desktop-bin/.calculate_directory | 1 +
 merge/net-im/telegram-desktop-bin/mimeapps.list        | 4 ++++
 merge/net-im/viber/.calculate_directory                | 1 +
 merge/net-im/viber/viber                               | 9 +++++++++
 10 files changed, 29 insertions(+)
 create mode 100644 merge/net-im/.calculate_directory
 create mode 100644 merge/net-im/coturn/.calculate_directory
 create mode 100644 merge/net-im/coturn/setcap
 create mode 100644 merge/net-im/ejabberd/.calculate_directory
 create mode 100644 merge/net-im/ejabberd/ejabberd
 create mode 100644 merge/net-im/telegram-desktop-bin/.calculate_directory
 create mode 100644 merge/net-im/telegram-desktop-bin/mimeapps.list
 create mode 100644 merge/net-im/viber/.calculate_directory
 create mode 100755 merge/net-im/viber/viber

diff --git a/merge/README.txt b/merge/README.txt
index 59e2ee4..73f1748 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -18,6 +18,9 @@ app-portage/porthole
 Удалены шаблоны media-tv/kodi - в шаблоне удаление уже несуществующего xmbc файла
 Удалены шаблоны media-video/gtk-recordmydesktop - пакета больше не существует
 Удалены шаблоны media-video/qt-recordmydesktop - пакета больше не существует
+Удалены шаблоны net-im/gajim - патч на отключение смены статуса в окне чата утсарел 0.16 уже удалена
+Удалены шаблоны net-im/riot-web - патчи устарели, пакет переименовался
+Удалены шаблоны net-im/skype - пакет полностью другой
 
 При переносе шаблонов app-office/libreoffice удалены шаблоны для x86
 При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии
diff --git a/merge/net-im/.calculate_directory b/merge/net-im/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/net-im/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/net-im/coturn/.calculate_directory b/merge/net-im/coturn/.calculate_directory
new file mode 100644
index 0000000..6a1e95a
--- /dev/null
+++ b/merge/net-im/coturn/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='net-im/coturn' %}
diff --git a/merge/net-im/coturn/setcap b/merge/net-im/coturn/setcap
new file mode 100644
index 0000000..87259aa
--- /dev/null
+++ b/merge/net-im/coturn/setcap
@@ -0,0 +1,5 @@
+{% calculate exec='/bin/bash', pkg('sys-libs/libcap') %}
+
+setcap 'cap_net_bind_service=+ep' /usr/bin/turnserver &>/dev/null
+
+true
diff --git a/merge/net-im/ejabberd/.calculate_directory b/merge/net-im/ejabberd/.calculate_directory
new file mode 100644
index 0000000..0abdda3
--- /dev/null
+++ b/merge/net-im/ejabberd/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', name='conf.d', package='net-im/ejabberd', pkg('net-nds/openldap') %}
diff --git a/merge/net-im/ejabberd/ejabberd b/merge/net-im/ejabberd/ejabberd
new file mode 100644
index 0000000..3c8974c
--- /dev/null
+++ b/merge/net-im/ejabberd/ejabberd
@@ -0,0 +1,3 @@
+{% calculate format='openrc' %}
+
+rc_after="ldap"
diff --git a/merge/net-im/telegram-desktop-bin/.calculate_directory b/merge/net-im/telegram-desktop-bin/.calculate_directory
new file mode 100644
index 0000000..ce42782
--- /dev/null
+++ b/merge/net-im/telegram-desktop-bin/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='net-im/telegram-desktop-bin' %}
diff --git a/merge/net-im/telegram-desktop-bin/mimeapps.list b/merge/net-im/telegram-desktop-bin/mimeapps.list
new file mode 100644
index 0000000..687788c
--- /dev/null
+++ b/merge/net-im/telegram-desktop-bin/mimeapps.list
@@ -0,0 +1,4 @@
+{% calculate format='kde', path='/usr/share/applications' %}
+
+[Default Applications]
+x-scheme-handler/tg=telegramdesktop.desktop
diff --git a/merge/net-im/viber/.calculate_directory b/merge/net-im/viber/.calculate_directory
new file mode 100644
index 0000000..21fba09
--- /dev/null
+++ b/merge/net-im/viber/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/opt', package='net-im/viber', pkg('media-sound/apulse') %}
diff --git a/merge/net-im/viber/viber b/merge/net-im/viber/viber
new file mode 100755
index 0000000..2fc2329
--- /dev/null
+++ b/merge/net-im/viber/viber
@@ -0,0 +1,9 @@
+{% calculate comment='#', chmod='755' %}
+#!/bin/sh
+
+if grep -q "selected = pulse" /var/lib/calculate/calculate.ini 2>/dev/null
+then
+	exec /opt/viber/viber-bin "$@"
+else
+	exec /usr/bin/apulse /opt/viber/viber-bin "$@"
+fi