init, mixin.mk, regular.mk, regular-vm.mk: drop elogind, polkit-gnome for sysv

conf.d/mixin.mk

@@ -68,13 +68,12 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
 	@$(call add,LIVE_PACKAGES,installer-feature-no-xconsole-stage3)
 	@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
-	@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
 
 mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
 	@$(call add,THE_LISTS,$(call tags,regular icewm))
 	@$(call add,THE_LISTS,$(call tags,desktop nm))
 	@$(call add,THE_PACKAGES,icewm-startup-networkmanager)
-	@$(call add,THE_PACKAGES,mnt polkit-gnome)
+	@$(call add,THE_PACKAGES,mnt)
 
 # gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
 mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck
@@ -91,7 +90,6 @@ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
 
 mixin/xfce-base: use/x11/xfce +nm-gtk \
 	use/fonts/ttf/redhat use/fonts/ttf/google/extra
-	@$(call add,THE_PACKAGES,xfce-polkit)
 	@$(call add,THE_BRANDING,xfce-settings)
 
 mixin/regular-xfce: mixin/xfce-base use/x11/xfce/full \

conf.d/regular-vm.mk

@@ -34,7 +34,7 @@ endif
 vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 +systemd-optimal; @:
 
 vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
-	+elogind +power; @:
+	use/init/sysv/polkit +power; @:
 
 vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk
 	@$(call add,THE_PACKAGES,blueberry)

conf.d/regular.mk

@@ -34,7 +34,7 @@ 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 +elogind; @:
+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; @:
@@ -105,8 +105,7 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
 	mixin/desktop-installer mixin/regular-desktop use/install2/fs \
 	use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
 	use/branding/complete use/branding/slideshow/once \
-	use/net-eth/dhcp use/efi/shell use/rescue/base \
-	use/init/sysv/elogind
+	use/net-eth/dhcp use/efi/shell use/rescue/base
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
 	@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
 	@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)

features.in/init/config.mk

 +sysvinit: use/init/sysv; @:
 +systemd: use/init/systemd/full; @:
 +systemd-optimal: use/init/systemd/settings/optimal; @:
-+elogind: use/init/sysv/elogind; @:
 
 # NB: the list name MUST be identical to init package name
 use/init: use/pkgpriorities
@@ -18,10 +17,6 @@ use/init/sysv: use/init
 use/init/sysv/polkit: use/init/sysv
 	@$(call add,THE_PACKAGES,polkit-sysvinit)
 
-use/init/sysv/elogind: use/init/sysv
-	@$(call add,THE_PACKAGES,elogind)
-	@$(call add,DEFAULT_SERVICES_ENABLE,elogind)
-
 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
 	@$(call set,INIT_TYPE,systemd)