From 949d005e8ab5852224beb9e3e0645409e04ffb7f Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Tue, 23 Mar 2021 18:12:57 +0300
Subject: [PATCH] slinux: fix e2k build

plymouth might better be used through the corresponding feature
(it's the single place to know how it performs on various arches),
and some other packages are just missing.
---
 conf.d/slinux.mk               | 5 ++++-
 pkg.in/lists/slinux/games-base | 2 +-
 pkg.in/lists/slinux/games-full | 2 +-
 pkg.in/lists/slinux/misc-base  | 2 +-
 pkg.in/lists/slinux/misc-full  | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk
index 609a7c25..f304223c 100644
--- a/conf.d/slinux.mk
+++ b/conf.d/slinux.mk
@@ -9,7 +9,10 @@ distro/slinux-live: distro/.livecd-install use/slinux/base
 
 distro/slinux: distro/.installer use/slinux/full use/rescue/base
 	@$(call set,INSTALLER,simply-linux)
-	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/multimedia-full-sound-juicer slinux/multimedia-full-obs-studio slinux/net-base)
+	@$(call add,MAIN_GROUPS,slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics slinux/graphics-full-inkscape slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-shotcut slinux/multimedia-full-sound-juicer slinux/multimedia-full-obs-studio slinux/net-base)
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/graphics-full-shotwell)
+endif
 	@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
 	@$(call set,KFLAVOURS,un-def)
diff --git a/pkg.in/lists/slinux/games-base b/pkg.in/lists/slinux/games-base
index 17a890cf..9fdac682 100644
--- a/pkg.in/lists/slinux/games-base
+++ b/pkg.in/lists/slinux/games-base
@@ -14,7 +14,7 @@ gnome-games-klotski
 #gnome-games-iagno
 gnome-games-mahjongg
 #gnome-games-swell-foop
-gnome-games-aisleriot
+gnome-games-aisleriot@!E2K
 # ALT bug #28998
 #gnome-games-sudoku
 gnome-games-chess
diff --git a/pkg.in/lists/slinux/games-full b/pkg.in/lists/slinux/games-full
index 2bf4f71e..10c95ae6 100644
--- a/pkg.in/lists/slinux/games-full
+++ b/pkg.in/lists/slinux/games-full
@@ -7,7 +7,7 @@ freeciv
 Ri-li
 openttd
 #astromenace
-PokerTH
+PokerTH@!E2K
 
 #celestia-gnome
 
diff --git a/pkg.in/lists/slinux/misc-base b/pkg.in/lists/slinux/misc-base
index 33da2c1c..41f22241 100644
--- a/pkg.in/lists/slinux/misc-base
+++ b/pkg.in/lists/slinux/misc-base
@@ -152,7 +152,7 @@ rekonq-@ARM
 xdg-user-dirs
 x-cursor-theme-jimmac
 
-plymouth
+plymouth@!E2K
 #branding-simply-linux-bootsplash
 
 # Office
diff --git a/pkg.in/lists/slinux/misc-full b/pkg.in/lists/slinux/misc-full
index c1a3cce7..0d99531c 100644
--- a/pkg.in/lists/slinux/misc-full
+++ b/pkg.in/lists/slinux/misc-full
@@ -7,7 +7,8 @@ stardict-engcom
 
 # NVIDIA drivers
 #kernel-modules-nvidia-@KERNEL_MOD@
-nvidia-xconfig
+nvidia-xconfig@X86
+nvidia-xconfig@aarch64
 
 # ATI proprietary driver
 #fglrx_glx