From d9b0a27740d9a5cd1810675b5943e6b60f5eb2d9 Mon Sep 17 00:00:00 2001
From: Artem Proskurnev <tema@proskurnevs.ru>
Date: Tue, 22 Feb 2022 15:16:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D1=8B,=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D1=8F,?=
 =?UTF-8?q?=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bld/distcfg.mk                    |   5 ++--
 bld/files/.disk/date              |   2 +-
 bld/files/.disk/info              |   2 +-
 bld/files/Metadata/pkg-groups.tar | Bin 20480 -> 20480 bytes
 bld/pkg/lists/.base               |  10 ++++++-
 bld/pkg/lists/tagged/base+kometa  |  44 ++++++++++++++++++------------
 6 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/bld/distcfg.mk b/bld/distcfg.mk
index 9914a16..5daa554 100644
--- a/bld/distcfg.mk
+++ b/bld/distcfg.mk
@@ -226,8 +226,8 @@ GRUB_CFG += live
 # use/live
 FEATURES += live
 CLEANUP_BASE_PACKAGES += installer*
-DEFAULT_SERVICES_ENABLE += alteratord cpufreq-simple livecd-evms livecd-fstab livecd-hostname livecd-setauth livecd-setlocale livecd-timezone livecd-net-eth livecd-install-wmaker random rpcbind plymouth avahi-daemon 
-DEFAULT_SERVICES_DISABLE += anacron blk-availability bridge clamd dhcpd dmeventd dnsmasq mdadm netfs o2cb ocfs2 openvpn postfix rawdevices slapd smartd sshd sysstat update_wms xinetd
+DEFAULT_SERVICES_ENABLE += alteratord cpufreq-simple livecd-evms livecd-fstab livecd-hostname livecd-setauth livecd-setlocale livecd-timezone livecd-net-eth livecd-install-wmaker random rpcbind plymouth avahi-daemon sshd simtel
+DEFAULT_SERVICES_DISABLE += anacron blk-availability bridge clamd dhcpd dmeventd dnsmasq mdadm netfs o2cb ocfs2 openvpn postfix rawdevices slapd smartd sysstat update_wms xinetd
 CONTROL += rpcbind:local
 export GLOBAL_LIVE_CLEANUP_KDRIVERS = $(LIVE_CLEANUP_KDRIVERS)
 # use/syslinux/ui/menu
@@ -362,6 +362,7 @@ THE_IMAGEWRITER = altmediawriter
 THE_PACKAGES += upower udev-rules-rfkill-uaccess
 DEFAULT_SERVICES_DISABLE += gssd idmapd krb5kdc rpcbind
 DEFAULT_SERVICES_ENABLE += sshd
+DEFAULT_SERVICES_ENABLE += simtel
 DEFAULT_SERVICES_ENABLE += cups
 DEFAULT_SERVICES_ENABLE += alteratord
 CONTROL += fusermount:public
diff --git a/bld/files/.disk/date b/bld/files/.disk/date
index 577fe0f..ef3b6b1 100644
--- a/bld/files/.disk/date
+++ b/bld/files/.disk/date
@@ -1 +1 @@
-20220218
+20220222
diff --git a/bld/files/.disk/info b/bld/files/.disk/info
index f4fefac..eb1fe36 100644
--- a/bld/files/.disk/info
+++ b/bld/files/.disk/info
@@ -1 +1 @@
-KOMETA p10 kde5/x86_64 build 2022-02-18
+KOMETA p10 kde5/x86_64 build 2022-02-22
diff --git a/bld/files/Metadata/pkg-groups.tar b/bld/files/Metadata/pkg-groups.tar
index 9f0427cd587a89a9ec68a22663cddb4d14ed980c..daaf3a5c70d70e37fb22a1ed7180f08fec61db34 100644
GIT binary patch
delta 181
zcmZozz}T>WaYD0{k%5sJgQ1C$fhmwMGB#r{Ff=qXFknzHm~6<HvYC<bm>8q-=Hud@
znf$qwfk5HH{EH12HeA?rVb_Hn3aP0Dxm+MZH!&qex5!*KKP@dYIhCs<H8HnXH!ZV5
zx40y+s6-c}q97-+l8Y-lKR2}`QMV*DXY*;PI7Yt065ZsY)WnkfBHfhy<joo~)0l+8
V1{S3jBqnD=46iKRyhrY#0RS>LKV|>`

delta 86
zcmV-c0IC0gpaFoO0g!_lF*Y_c05LQ&Ff%qaH8wCa05CBzHZd~*ATX0L0c5iQ0mc@y
s$QSbh5oKj?Z7pGBWG!+xEpKLKX=Aer8(smkcN~=hvmqbfFq1$5V-Z^!l>h($

diff --git a/bld/pkg/lists/.base b/bld/pkg/lists/.base
index bfd4511..e9373bd 100644
--- a/bld/pkg/lists/.base
+++ b/bld/pkg/lists/.base
@@ -366,7 +366,7 @@ plasma5-xdg-desktop-portal-kde
 
 ###kde5-maxi
 kde5-digikam
-kde5-k3b
+#kde5-k3b
 kde5-keditbookmarks
 kde5-kipi-plugins
 kde5-kmag
@@ -405,7 +405,12 @@ kometa-xdg-pam-env
 kometa-icons-core-classic
 kometa-icons-theme-classic
 polkit-rule-gparted-as-root
+
+#### Правки eepm
 eepm-add-r7-office
+teams-fix-start-epm-play
+
+kometa-tele
 
 #### R7
 #fonts-ttf-dejavu
@@ -429,6 +434,7 @@ darktable
 wxMaxima
 kdenlive
 qt-creator
+qt-creator-doc
 openshot
 
 #### Fonts
@@ -477,6 +483,8 @@ scribus
 tesseract-langpack-ru
 gimagereader-qt5
 eepm
+eepm-repack
+eepm-yum
 ksnip
 v4l-utils
 
diff --git a/bld/pkg/lists/tagged/base+kometa b/bld/pkg/lists/tagged/base+kometa
index 53e7baf..733cbcd 100644
--- a/bld/pkg/lists/tagged/base+kometa
+++ b/bld/pkg/lists/tagged/base+kometa
@@ -9,31 +9,37 @@ kometa-xdg-pam-env
 kometa-icons-core-classic
 kometa-icons-theme-classic
 polkit-rule-gparted-as-root
+
+#### Правки eepm
 eepm-add-r7-office
+teams-fix-start-epm-play
+
+kometa-tele
 
 #### R7
-#fonts-ttf-dejavu
-#fonts-ttf-google-crosextra-carlito
-#fonts-ttf-liberation
-#glibc gst-libav
-#gst-plugins-ugly1.0
-#libX11
-#libXScrnSaver
-#libcairo
-#libgcc1
-#libgtk+2
-#libgtkglext
-#r7-office
+fonts-ttf-dejavu
+fonts-ttf-google-crosextra-carlito
+fonts-ttf-liberation
+glibc gst-libav
+gst-plugins-ugly1.0
+libX11
+libXScrnSaver
+libcairo
+libgcc1
+libgtk+2
+libgtkglext
+r7-office
 
 #### МойОфис
-#myoffice-standard-documents
+myoffice-standard-documents
 
 #### Убираем для установки офисов
-darktable
-wxMaxima
-kdenlive
-qt-creator
-openshot
+#darktable
+#wxMaxima
+#kdenlive
+#qt-creator
+#qt-creator-doc
+#openshot
 
 #### Fonts
 fonts-ttf-ms
@@ -81,6 +87,8 @@ scribus
 tesseract-langpack-ru
 gimagereader-qt5
 eepm
+eepm-repack
+eepm-yum
 ksnip
 v4l-utils