diff --git a/merge/README.txt b/merge/README.txt
index 49ec11a..eb3f2ed 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -11,6 +11,8 @@ app-portage/porthole
ссылкает уже отсутствуют.
Удалены шаблоны gnome-extra/cinnamon - настройка для устаревшей версии
Удалены шаблоны kde-plasma/systemsettings - настройка для устаревшей версии
+Удалены шаблоны media-gfx/splash-themes-calculate, так настраивают этот пакет
+для splashutils, которого уже нет
При переносе шаблонов app-office/libreoffice удалены шаблоны для x86
При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии
@@ -24,3 +26,4 @@ desktop файл содержит то же самое значение
Шаблон media-fonts/terminus-font требует обновления (коммит добавления 1021e1ad938492010d8950ef94e8b8631fc56ee0)
Пропущен gfxboot-themes-calculate, так как пока не поддерживается формат backgrounds
+
diff --git a/merge/media-libs/.calculate_directory b/merge/media-libs/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/media-libs/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/media-libs/fontconfig/.calculate_directory b/merge/media-libs/fontconfig/.calculate_directory
new file mode 100644
index 0000000..d90328e
--- /dev/null
+++ b/merge/media-libs/fontconfig/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', name='fonts', package='media-libs/fontconfig' %}
diff --git a/merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf b/merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
new file mode 100644
index 0000000..f246347
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.avail/30-metric-aliases.conf
@@ -0,0 +1,18 @@
+{% calculate format='regex' %}
+
+ <alias binding="same">
+ <family>Helvetica</family>
+ <accept>
+ <family>TeX Gyre Heros</family>
+ <family>Nimbus Sans L</family>
+ </accept>
+ </alias>
+
+
+ <alias binding="same">
+ <family>Helvetica</family>
+ <accept>
+ <family>Arial</family>
+ </accept>
+ </alias>
+
diff --git a/merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf b/merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
new file mode 100644
index 0000000..f9dec44
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.avail/58-droid-sans-mono.conf
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Droid Sans Mono Slashed
+
+ monospace
+
+
+
+
+ monospace
+
+ Droid Sans Mono Slashed
+
+
+
diff --git a/merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf b/merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
new file mode 100644
index 0000000..4997c7d
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.avail/58-droid-sans.conf
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Droid Sans
+
+ sans-serif
+
+
+
+
+ sans-serif
+
+ Droid Sans
+
+
+
diff --git a/merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf b/merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
new file mode 100644
index 0000000..6e404f6
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.avail/58-droid-serif.conf
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Droid Serif
+
+ serif
+
+
+
+
+ serif
+
+ Droid Serif
+
+
+
diff --git a/merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf b/merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
new file mode 100644
index 0000000..ba7ffe8
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.d/10-sub-pixel-rgb.conf
@@ -0,0 +1 @@
+{% calculate append='link', source='/etc/fonts/conf.avail/10-sub-pixel-rgb.conf' %}
diff --git a/merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf b/merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
new file mode 100644
index 0000000..3084e37
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.d/11-lcdfilter-default.conf
@@ -0,0 +1 @@
+{% calculate append='link', source='/etc/fonts/conf.avail/11-lcdfilter-default.conf' %}
diff --git a/merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf b/merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
new file mode 100644
index 0000000..2ee7382
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.d/58-droid-sans-mono.conf
@@ -0,0 +1 @@
+{% calculate append='link', source='/etc/fonts/conf.avail/58-droid-sans-mono.conf' %}
diff --git a/merge/media-libs/fontconfig/conf.d/58-droid-sans.conf b/merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
new file mode 100644
index 0000000..dc542aa
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.d/58-droid-sans.conf
@@ -0,0 +1 @@
+{% calculate append='link', source='/etc/fonts/conf.avail/58-droid-sans.conf' %}
diff --git a/merge/media-libs/fontconfig/conf.d/58-droid-serif.conf b/merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
new file mode 100644
index 0000000..9e72532
--- /dev/null
+++ b/merge/media-libs/fontconfig/conf.d/58-droid-serif.conf
@@ -0,0 +1 @@
+{% calculate append='link', source='/etc/fonts/conf.avail/58-droid-serif.conf' %}
diff --git a/merge/media-libs/libsdl/.calculate_directory b/merge/media-libs/libsdl/.calculate_directory
new file mode 100644
index 0000000..4a9a4b2
--- /dev/null
+++ b/merge/media-libs/libsdl/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', name='env.d', package='media-libs/libsdl' %}
diff --git a/merge/media-libs/libsdl/99sdl b/merge/media-libs/libsdl/99sdl
new file mode 100644
index 0000000..09afa8c
--- /dev/null
+++ b/merge/media-libs/libsdl/99sdl
@@ -0,0 +1,3 @@
+{% calculate format='openrc' %}
+SDL_AUDIODRIVER=alsa
+AUDIODEV=default
diff --git a/merge/media-libs/openimageio/.calculate_directory b/merge/media-libs/openimageio/.calculate_directory
new file mode 100644
index 0000000..45071fa
--- /dev/null
+++ b/merge/media-libs/openimageio/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='media-libs/openimageio' %}
diff --git a/merge/media-libs/openimageio/OpenImageIO/.calculate_directory b/merge/media-libs/openimageio/OpenImageIO/.calculate_directory
new file mode 100644
index 0000000..6b58d41
--- /dev/null
+++ b/merge/media-libs/openimageio/OpenImageIO/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='remove', path='/usr/share/fonts' %}