mixin.mk, regular.mk: factor out cinnamon, kde5

...into mixins to make the distro configuration more reusable and portable across target arches. Think grafting instead of just growing from seed. See-also: ba437ba8

mixin.mk, regular.mk: factor out cinnamon, kde5
50a9dbf2 · Anton Midyukov · Michael Shigorin · fddbb12a · 50a9dbf2 · 50a9dbf2
Commit 50a9dbf2 authored Jul 04, 2019 by Anton Midyukov Committed by Michael Shigorin Jul 08, 2019
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 9 deletions

mixin.mk conf.d/mixin.mk +10 -0

regular.mk conf.d/regular.mk +3 -9

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -79,6 +79,16 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm
 mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck
 	@$(call add,THE_BRANDING,graphics)
+mixin/regular-cinnamon: use/x11/cinnamon \
+	use/fonts/ttf/google use/net/nm/mmgui use/im
+	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n
+mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
+	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+	+nm +pulse
+	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
+	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 mixin/regular-xfce: use/x11/xfce use/x11/gtk/nm +nm \
 	use/fonts/ttf/redhat use/fonts/ttf/google/extra
 	@$(call add,THE_PACKAGES,xfce-polkit)

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -142,9 +142,7 @@ distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
 	use/x11/enlightenment
 	@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
-distro/regular-cinnamon: distro/.regular-gtk use/x11/cinnamon \
+distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
-	use/fonts/ttf/google use/net/nm/mmgui use/im
-	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n
 # not .regular-gtk due to gdm vs lightdm
 distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@@ -161,12 +159,8 @@ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp; @:
-distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
+distro/regular-kde5: distro/.regular-desktop \
-	use/x11/kde5 use/x11/sddm use/domain-client \
+	mixin/regular-kde5 use/domain-client use/x11/sddm +plymouth; @:
-	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
-	+nm +pulse +plymouth
-	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
-	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 distro/regular-robo: distro/regular-mate +robotics use/live/ru; @: