From 12c1b746a6572b4110b23afd5b562c40345fe180 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: Tue, 9 Oct 2018 20:36:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B0=20viber=20=D0=B2=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=BE=D1=82=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5?=
 =?UTF-8?q?=D1=82=D0=B0=20apulse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 profiles/templates/3.6/2_ac_install_merge/Depends/apulse      | 1 +
 profiles/templates/3.6/2_ac_install_merge/net-im/viber/viber  | 3 ++-
 profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009 | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/apulse
 create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009

diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/apulse b/profiles/templates/3.6/2_ac_install_merge/Depends/apulse
new file mode 100644
index 000000000..e39136a9c
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/apulse
@@ -0,0 +1 @@
+# Calculate append=skip merge(media-sound/apulse)!= merge=net-im/viber
diff --git a/profiles/templates/3.6/2_ac_install_merge/net-im/viber/viber b/profiles/templates/3.6/2_ac_install_merge/net-im/viber/viber
index 2af15cf78..4998e72cf 100755
--- a/profiles/templates/3.6/2_ac_install_merge/net-im/viber/viber
+++ b/profiles/templates/3.6/2_ac_install_merge/net-im/viber/viber
@@ -1,7 +1,8 @@
 # Calculate chmod=0755
 #!/bin/sh
 
-if grep -q "os_audio = pulse" /var/lib/calculate/calculate.env 2>/dev/null
+if grep -q "os_audio = pulseaudio" /var/lib/calculate/calculate.env 2>/dev/null
+then
 	exec /opt/viber/viber-bin "$@"
 else
 	exec /usr/bin/apulse /opt/viber/viber-bin "$@"
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009
new file mode 100644
index 000000000..6038b77f4
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181009
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-im/viber
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#