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-#