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