From 77932abffb0fde51f2747e8bbe56ae82c23e4a22 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Wed, 26 Aug 2020 12:18:21 +0300
Subject: [PATCH] education/*: e2k fixes

Not every package is available on Elbrus, avoid the missing ones;
add mplayer along with vlc just in case as it's better optimized
for e2k already (including MCST patches and automatic use of more
than one CPU core).
---
 pkg.in/lists/education/base        | 17 +++++++++++------
 pkg.in/lists/education/gradeschool |  3 ++-
 pkg.in/lists/education/highschool  |  3 ++-
 pkg.in/lists/education/misc        |  4 +++-
 pkg.in/lists/education/teacher     |  2 ++
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkg.in/lists/education/base b/pkg.in/lists/education/base
index c1be8200..ff4210d5 100644
--- a/pkg.in/lists/education/base
+++ b/pkg.in/lists/education/base
@@ -10,7 +10,7 @@ codeblocks-contrib
 dia
 dosbox
 fbreader
-goldendict
+goldendict@!E2K
 dict-mueller7-utf8
 freebasic@X86
 gcc
@@ -30,7 +30,8 @@ fpc@X86
 fpc-ide@X86
 geany
 geany-plugins
-freeplane
+freeplane@!E2K
+freemind@E2K
 gnome-games-klotski
 gnome-games-mahjongg
 gnome-games-aisleriot@!E2K
@@ -72,7 +73,7 @@ kde5-khelpcenter@!E2K
 netpolice-filter
 netpolice-main
 # For Skydns
-ddclient
+ddclient@!E2K
 perl-IO-Socket-SSL
 
 # New utilites
@@ -98,7 +99,7 @@ openresolv-bind
 # GUI utilities
 gparted
 rosa-imagewriter
-grub-customizer
+grub-customizer@!E2K
 
 # Additional filesystem support
 fuse-exfat
@@ -129,6 +130,10 @@ LibreOffice-still-integrated@!E2K
 LibreOffice-still-gtk3@!E2K
 LibreOffice-still-langpack-ru@!E2K
 libreoffice-languagetool
+LibreOffice-extensions@E2K
+LibreOffice-integrated@E2K
+LibreOffice-gtk3@E2K
+LibreOffice-langpack-ru@E2K
 mythes-ru
 hyphen-ru
 gst-plugins-bad
@@ -139,8 +144,8 @@ postgresql-jdbc
 mysql-connector-java
 
 # Firmware
-^firmware-ipw[[:digit:]].*
-^firmware-zd[[:digit:]].*
+^firmware-ipw[[:digit:]]+
+^firmware-zd[[:digit:]]+
 ^xorg-extension-[[:alpha:]]+$
 firmware-p54
 
diff --git a/pkg.in/lists/education/gradeschool b/pkg.in/lists/education/gradeschool
index c36c8638..075530ae 100644
--- a/pkg.in/lists/education/gradeschool
+++ b/pkg.in/lists/education/gradeschool
@@ -1,4 +1,5 @@
-scratch-desktop
+scratch-desktop@!E2K
+scratch@E2K
 kde5-profile
 kde5-kolourpaint
 kde5-ktouch
diff --git a/pkg.in/lists/education/highschool b/pkg.in/lists/education/highschool
index 16c61bd7..cf12dc83 100644
--- a/pkg.in/lists/education/highschool
+++ b/pkg.in/lists/education/highschool
@@ -1,5 +1,6 @@
 kumir2
-scratch-desktop
+scratch-desktop@!E2K
+scratch@E2K
 lazarus@X86
 codeblocks
 geany
diff --git a/pkg.in/lists/education/misc b/pkg.in/lists/education/misc
index b785caa3..eb6d562c 100644
--- a/pkg.in/lists/education/misc
+++ b/pkg.in/lists/education/misc
@@ -1,5 +1,7 @@
 # Multimedia
 vlc-maxi
+# better optimized for 8C
+mplayer@E2K
 simplescreenrecorder
 libva-driver-intel@X86
 libva-intel-media-driver@x86_64
@@ -18,7 +20,7 @@ gnome-games-mahjongg
 gnome-games-sol@!E2K
 
 # Dictionary
-goldendict
+goldendict@!E2K
 dict-mueller7-utf8
 
 # Fonts
diff --git a/pkg.in/lists/education/teacher b/pkg.in/lists/education/teacher
index e819473f..a53dd44e 100644
--- a/pkg.in/lists/education/teacher
+++ b/pkg.in/lists/education/teacher
@@ -1,7 +1,9 @@
 italc3-master@X86
+italc3-master@E2K
 #nxclient
 itest-server
 installer-feature-init-italc@X86
+installer-feature-init-italc@E2K
 # Mass management
 ansible
 semaphore@!E2K