From a42fa19dbadd59a196e01929938f98b8f16ac338 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:41:17 +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-video/mplayer,=20media-video/mpv,=20?=
 =?UTF-8?q?media-video/smtube?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 merge/README.txt                               | 4 ++++
 merge/media-video/.calculate_directory         | 1 +
 merge/media-video/mplayer/.calculate_directory | 1 +
 merge/media-video/mplayer/mplayer.conf         | 8 ++++++++
 merge/media-video/mpv/.calculate_directory     | 1 +
 merge/media-video/mpv/mpv.desktop              | 1 +
 merge/media-video/smtube/.calculate_directory  | 1 +
 merge/media-video/smtube/smtube.desktop        | 4 ++++
 8 files changed, 21 insertions(+)
 create mode 100644 merge/media-video/.calculate_directory
 create mode 100644 merge/media-video/mplayer/.calculate_directory
 create mode 100644 merge/media-video/mplayer/mplayer.conf
 create mode 100644 merge/media-video/mpv/.calculate_directory
 create mode 100644 merge/media-video/mpv/mpv.desktop
 create mode 100644 merge/media-video/smtube/.calculate_directory
 create mode 100644 merge/media-video/smtube/smtube.desktop

diff --git a/merge/README.txt b/merge/README.txt
index ed21381..6680a78 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -14,6 +14,10 @@ app-portage/porthole
 Удалены шаблоны media-gfx/splash-themes-calculate, так настраивают этот пакет
 для splashutils, которого уже нет
 Удалены шаблоны для media-plugins/alsa-plugins - настройки для устаревшей версии
+Удалены шаблоны media-tv/xbmc - пакет переименован в kodi
+Удалены шаблоны media-tv/kodi - в шаблоне удаление уже несуществующего xmbc файла
+Удалены шаблоны media-video/gtk-recordmydesktop - пакета больше не существует
+Удалены шаблоны media-video/qt-recordmydesktop - пакета больше не существует
 
 При переносе шаблонов app-office/libreoffice удалены шаблоны для x86
 При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии
diff --git a/merge/media-video/.calculate_directory b/merge/media-video/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/media-video/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/media-video/mplayer/.calculate_directory b/merge/media-video/mplayer/.calculate_directory
new file mode 100644
index 0000000..3bc86cf
--- /dev/null
+++ b/merge/media-video/mplayer/.calculate_directory
@@ -0,0 +1 @@
+{% calculate name='etc', package='media-video/mplayer' %}
diff --git a/merge/media-video/mplayer/mplayer.conf b/merge/media-video/mplayer/mplayer.conf
new file mode 100644
index 0000000..844c3f3
--- /dev/null
+++ b/merge/media-video/mplayer/mplayer.conf
@@ -0,0 +1,8 @@
+{% calculate format='samba', path='/etc/mplayer', autoupdate %}
+[default]
+{% if pkg('media-fonts/droid') %}
+font="Droid Sans"
+{% else %}
+font="Verdana"
+{% endif %}
+!ao=
diff --git a/merge/media-video/mpv/.calculate_directory b/merge/media-video/mpv/.calculate_directory
new file mode 100644
index 0000000..826a369
--- /dev/null
+++ b/merge/media-video/mpv/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='media-video/mpv' %}
diff --git a/merge/media-video/mpv/mpv.desktop b/merge/media-video/mpv/mpv.desktop
new file mode 100644
index 0000000..5396149
--- /dev/null
+++ b/merge/media-video/mpv/mpv.desktop
@@ -0,0 +1 @@
+{% calculate append='remove', path='/usr/share/applications' %}
diff --git a/merge/media-video/smtube/.calculate_directory b/merge/media-video/smtube/.calculate_directory
new file mode 100644
index 0000000..11d3303
--- /dev/null
+++ b/merge/media-video/smtube/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='media-video/smtube' %}
diff --git a/merge/media-video/smtube/smtube.desktop b/merge/media-video/smtube/smtube.desktop
new file mode 100644
index 0000000..2f63874
--- /dev/null
+++ b/merge/media-video/smtube/smtube.desktop
@@ -0,0 +1,4 @@
+{% calculate format='kde', path='/usr/share/applications' %}
+
+[Desktop Entry]
+Categories=Network;