commit 39cd51bc2efc7fcc17728f4ffe337683758d05ef
Author: Хирецкий Михаил <mh@calculate.ru>
Date:   Mon Nov 16 10:58:51 2020 +0300

    Добавлены шаблоны
    
    * app-admin/hardinfo
    * app-admin/syslog-ng
    * app-admin/system-config-printer
    * app-admin/webapp-config

diff --git a/merge/.calculate_directory b/merge/.calculate_directory
new file mode 100644
index 0000000..a154c99
--- /dev/null
+++ b/merge/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip', action = 'merge', group = 'install' %}
diff --git a/merge/app-admin/.calculate_directory b/merge/app-admin/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/app-admin/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/app-admin/hardinfo/.calculate_directory b/merge/app-admin/hardinfo/.calculate_directory
new file mode 100644
index 0000000..2125f1a
--- /dev/null
+++ b/merge/app-admin/hardinfo/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path = '/usr/share', name = 'applications', package='app-admin/hardinfo' %}
diff --git a/merge/app-admin/hardinfo/hardinfo-gnome.png b/merge/app-admin/hardinfo/hardinfo-gnome.png
new file mode 100644
index 0000000..fb957f1
--- /dev/null
+++ b/merge/app-admin/hardinfo/hardinfo-gnome.png
@@ -0,0 +1 @@
+{% calculate append="replace", format="raw", source="/usr/share/hardinfo/pixmaps/logo.png", path="/usr/share/icons/gnome/48x48/apps", name="hardinfo.png", mirror %}
diff --git a/merge/app-admin/hardinfo/hardinfo-hicolor.png b/merge/app-admin/hardinfo/hardinfo-hicolor.png
new file mode 100644
index 0000000..5bc4981
--- /dev/null
+++ b/merge/app-admin/hardinfo/hardinfo-hicolor.png
@@ -0,0 +1 @@
+{% calculate append="replace", format="raw", source="/usr/share/hardinfo/pixmaps/logo.png", path="/usr/share/icons/hicolor/48x48/apps", name="hardinfo.png", mirror %}
diff --git a/merge/app-admin/hardinfo/hardinfo.desktop b/merge/app-admin/hardinfo/hardinfo.desktop
new file mode 100644
index 0000000..164141b
--- /dev/null
+++ b/merge/app-admin/hardinfo/hardinfo.desktop
@@ -0,0 +1,3 @@
+{% calculate format="kde", path="/usr/share/applications" %}
+[Desktop Entry]
+Icon=hardinfo
diff --git a/merge/app-admin/syslog-ng/.calculate_directory b/merge/app-admin/syslog-ng/.calculate_directory
new file mode 100644
index 0000000..f61e8d0
--- /dev/null
+++ b/merge/app-admin/syslog-ng/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append="skip", package="app-admin/syslog-ng" %}
diff --git a/merge/app-admin/syslog-ng/boot/.calculate_directory b/merge/app-admin/syslog-ng/boot/.calculate_directory
new file mode 100644
index 0000000..274a844
--- /dev/null
+++ b/merge/app-admin/syslog-ng/boot/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path="/etc/runlevels" %}
diff --git a/merge/app-admin/syslog-ng/boot/syslog-ng b/merge/app-admin/syslog-ng/boot/syslog-ng
new file mode 100644
index 0000000..73a9618
--- /dev/null
+++ b/merge/app-admin/syslog-ng/boot/syslog-ng
@@ -0,0 +1,2 @@
+{% save custom.runlevels.syslogng = "on" %}
+{% calculate append="link", source="/etc/init.d/syslog-ng" %}
diff --git a/merge/app-admin/system-config-printer/.calculate_directory b/merge/app-admin/system-config-printer/.calculate_directory
new file mode 100644
index 0000000..f0ec702
--- /dev/null
+++ b/merge/app-admin/system-config-printer/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append="skip", package="app-admin/system-config-printer" %}
diff --git a/merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop b/merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
new file mode 100644
index 0000000..9d106bd
--- /dev/null
+++ b/merge/app-admin/system-config-printer/Gentoo-system-config-printer.desktop
@@ -0,0 +1,4 @@
+{% calculate format="kde", path="/usr/share/applications" %}
+[Desktop Entry]
+NotShowIn=KDE
+Categories=Settings;HardwareSettings;Printing;GTK;
diff --git a/merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory b/merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
new file mode 100644
index 0000000..5705216
--- /dev/null
+++ b/merge/app-admin/system-config-printer/system-config-printer.remove/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append="remove", path="/", name="system-config-printer" %}
diff --git a/merge/app-admin/webapp-config/.calculate_directory b/merge/app-admin/webapp-config/.calculate_directory
new file mode 100644
index 0000000..2fd4843
--- /dev/null
+++ b/merge/app-admin/webapp-config/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path="/etc", name="vhosts", package="app-admin/webapp-config" %}
diff --git a/merge/app-admin/webapp-config/webapp-config b/merge/app-admin/webapp-config/webapp-config
new file mode 100644
index 0000000..0afeea3
--- /dev/null
+++ b/merge/app-admin/webapp-config/webapp-config
@@ -0,0 +1,2 @@
+{% calculate format="openrc" %}
+vhost_server="nginx"