From 81a7cb1821ea667c5557057415bfe8accfc910d6 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 11:26:38 +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=20media-sound/alsa-utils,=20media-sound/puls?=
 =?UTF-8?q?eaudio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 merge/README.txt                                          | 1 +
 merge/media-sound/.calculate_directory                    | 1 +
 merge/media-sound/alsa-utils/.calculate_directory         | 1 +
 merge/media-sound/alsa-utils/changemixer                  | 8 ++++++++
 merge/media-sound/alsa-utils/default/.calculate_directory | 1 +
 merge/media-sound/alsa-utils/default/alsasound            | 2 ++
 merge/media-sound/pulseaudio/.calculate_directory         | 1 +
 merge/media-sound/pulseaudio/daemon.conf                  | 3 +++
 8 files changed, 18 insertions(+)
 create mode 100644 merge/media-sound/.calculate_directory
 create mode 100644 merge/media-sound/alsa-utils/.calculate_directory
 create mode 100755 merge/media-sound/alsa-utils/changemixer
 create mode 100644 merge/media-sound/alsa-utils/default/.calculate_directory
 create mode 100644 merge/media-sound/alsa-utils/default/alsasound
 create mode 100644 merge/media-sound/pulseaudio/.calculate_directory
 create mode 100644 merge/media-sound/pulseaudio/daemon.conf

diff --git a/merge/README.txt b/merge/README.txt
index eb3f2ed..ed21381 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -13,6 +13,7 @@ app-portage/porthole
 Удалены шаблоны kde-plasma/systemsettings - настройка для устаревшей версии
 Удалены шаблоны media-gfx/splash-themes-calculate, так настраивают этот пакет
 для splashutils, которого уже нет
+Удалены шаблоны для media-plugins/alsa-plugins - настройки для устаревшей версии
 
 При переносе шаблонов app-office/libreoffice удалены шаблоны для x86
 При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии
diff --git a/merge/media-sound/.calculate_directory b/merge/media-sound/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/media-sound/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/media-sound/alsa-utils/.calculate_directory b/merge/media-sound/alsa-utils/.calculate_directory
new file mode 100644
index 0000000..d64a2b3
--- /dev/null
+++ b/merge/media-sound/alsa-utils/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='media-sound/alsa-utils' %}
diff --git a/merge/media-sound/alsa-utils/changemixer b/merge/media-sound/alsa-utils/changemixer
new file mode 100755
index 0000000..fd54d90
--- /dev/null
+++ b/merge/media-sound/alsa-utils/changemixer
@@ -0,0 +1,8 @@
+{% calculate path='/usr/bin', comment='#', chmod='755' %}
+#!/bin/sh
+if grep -q "selected = pulse" /var/lib/calculate/calculate.ini 2>/dev/null
+then
+	pavucontrol
+else
+	qasmixer
+fi
diff --git a/merge/media-sound/alsa-utils/default/.calculate_directory b/merge/media-sound/alsa-utils/default/.calculate_directory
new file mode 100644
index 0000000..3e91c01
--- /dev/null
+++ b/merge/media-sound/alsa-utils/default/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc/runlevels' %}
diff --git a/merge/media-sound/alsa-utils/default/alsasound b/merge/media-sound/alsa-utils/default/alsasound
new file mode 100644
index 0000000..7957d99
--- /dev/null
+++ b/merge/media-sound/alsa-utils/default/alsasound
@@ -0,0 +1,2 @@
+{% calculate append="link", source="/etc/init.d/alsasound", custom.runlevels.alsasound != 'on' or grep('var/lib/calculate/-runlevels-alsa-utils','/alsasound') %}
+{% save.system custom.runlevels.alsasound = "on" %}
diff --git a/merge/media-sound/pulseaudio/.calculate_directory b/merge/media-sound/pulseaudio/.calculate_directory
new file mode 100644
index 0000000..21b1dd8
--- /dev/null
+++ b/merge/media-sound/pulseaudio/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='media-sound/pulseaudio' %}
diff --git a/merge/media-sound/pulseaudio/daemon.conf b/merge/media-sound/pulseaudio/daemon.conf
new file mode 100644
index 0000000..fd1f12e
--- /dev/null
+++ b/merge/media-sound/pulseaudio/daemon.conf
@@ -0,0 +1,3 @@
+{% calculate format='postfix', path='/etc/pulse' %}
+
+resample-method = speex-float-3