regular.mk: rename targets for unification

conf.d/regular.mk

@@ -34,10 +34,11 @@ distro/.regular-desktop: distro/.regular-wm \
 	@$(call set,KFLAVOURS,std-def)
 
 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
-distro/.regular-sysv: distro/.regular-wm use/init/sysv/polkit; @:
 
-distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
-	use/x11/gdm2.20; @:
+distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit; @:
+
+distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
+	use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
 
 distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
 	use/branding use/bootloader/grub use/luks \
@@ -110,16 +111,16 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
 
-distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
+distro/regular-icewm: distro/.regular-gtk-sysv mixin/regular-icewm \
 	use/browser/chromium
 	@$(call set,KFLAVOURS,un-def)
 
 # wdm can't do autologin so add standalone one for livecd
-distro/regular-wmaker: distro/.regular-sysv \
+distro/regular-wmaker: distro/.regular-desktop-sysv \
 	mixin/regular-wmaker use/live/autologin
 	@$(call add,LIVE_PACKAGES,wdm wmxkbru)
 
-distro/regular-gnustep: distro/.regular-sysv \
+distro/regular-gnustep: distro/.regular-desktop-sysv \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:
@@ -127,24 +128,24 @@ distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
 	@$(call set,KFLAVOURS,un-def)
 
-distro/regular-xfce-sysv: distro/.regular-sysv-gtk mixin/regular-xfce-sysv; @:
+distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
 
 distro/regular-sysv-xfce: distro/.regular-install-x11-full \
 	mixin/regular-xfce-sysv; @:
 
 distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
-distro/regular-lxde-sysv: distro/.regular-sysv-gtk mixin/regular-lxde; @:
+distro/regular-lxde-sysv: distro/.regular-gtk-sysv mixin/regular-lxde; @:
 
 distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad
 	@$(call add,LIVE_PACKAGES,livecd-regular-xmonad)
 
 distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
 
-distro/regular-mate-sysv: distro/.regular-sysv-gtk mixin/mate-base; @:
+distro/regular-mate-sysv: distro/.regular-gtk-sysv mixin/mate-base; @:
 
 distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
 
-distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
+distro/regular-enlightenment-sysv: distro/.regular-gtk-sysv \
 	use/x11/enlightenment
 	@$(call set,META_VOL_ID,ALT regular-E-SysV/$(ARCH)) # see also #28271
 
@@ -164,7 +165,7 @@ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
 	use/browser/falkon use/x11/sddm
 	@$(call add,THE_LISTS,$(call tags,lxqt desktop))
 
-distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
+distro/regular-lxqt-sysv: distro/.regular-desktop-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp; @:
 
 distro/regular-kde5: distro/.regular-desktop \