wip parabola-base

17 files changed, 555 insertions, 508 deletions

diff --git a/libre/base/PKGBUILD b/libre/base/PKGBUILD
index 192899a12..7371985be 100644
--- a/libre/base/PKGBUILD
+++ b/libre/base/PKGBUILD
@@ -7,10 +7,11 @@ pkgname=base
 pkgver=3
 pkgrel=1
 pkgrel+=.parabola2
-pkgdesc='Minimal package-set to define the essential Parabola GNU/Linux-libre systemd CLI system'
+pkgdesc='Minimal package-set to define the bare-bones Parabola GNU/Linux-libre systemd/CLI system'
 url='https://www.parabola.nu'
 arch=('any')
-license=(CCPL:zero)
+license=('GPL')
+license+=(CCPL:zero)
 depends=(
   # very very base
   'filesystem' 'gcc-libs' 'glibc' 'bash'
@@ -34,4 +35,4 @@ depends=(
   'systemd-libudev' 'systemd-udev'
 )
 optdepends=('linux-libre: bare metal support'
-            'parabola: standard Parabola GNU/Linux-libre systemd CLI system')
+            'parabola: standard Parabola GNU/Linux-libre systemd/CLI system')
diff --git a/libre/parabola-base/PKGBUILD b/libre/parabola-base/PKGBUILD
index 7d1eea16b..391892235 100644
--- a/libre/parabola-base/PKGBUILD
+++ b/libre/parabola-base/PKGBUILD
@@ -37,34 +37,47 @@
 #     the other package-sets (and consequently, the LiveISOs and installers)
 #     may be curated in cooperation with the community.
 #
+# Rather than maintaining a matrix of all possible init-specific x DE-specific combinations,
+# and to avoid forking libre arch packages for trivia, such as conflict resolutions,
+# the 'parabola-desktop-<WMDE>' meta-packages depend on a new virtual 'init-desktop'
+# provider. The actual provider is determined at install-time, per the local subscribed
+# repos. The primary motivation for this is to install *-openrc init scripts, only onto
+# nonsystemd systems. The default (systemd) provider is currently a dummy, which exists
+# only for the purpose of providing 'init-desktop'. See the caveat below.
+#
 # Caveats:
 #   The logical dependent of 'base' is the init-specific 'parabola-base'. However,
 #   because neither 'nonsystemd/base' nor 'parabola-base' specify systemd and udev
 #   providers, but do require them transitively, it is not possible to install 'base'
-#   or 'parabola-base' alone, on a non-systemd system. Attempting to do, so will install
-#   the real systemd providers, due to the hard-coded dependencies of some arch packages.
-#   Later, that will prevent the installation of OpenRC, or leave the system with a
-#   mixture of OpenRC/systemd packages. Eg:
+#   or 'parabola-base' alone, on a non-systemd system. Attempting to do, so will
+#   install systemd providers, due to the hard-coded dependencies of some arch
+#   packages, and packages which declare virtual provisions, identically-named to a
+#   real package in a lower-priority repo. Later, that will prevent the installation
+#   of OpenRC, or leave the system with a mixture of OpenRC/systemd packages. Eg:
 #     * 'procps-ng' -> 'systemd-libs'
 #     * 'mdadm'     -> 'systemd'
 #
-#   The problem, is that pacman will select packages matching a provision name exactly,
-#   ignoring any other provider in a higher-priority repo (contrary the algorithm for
-#   selecting duplicate-named packages). Eg: pacman will select 'libre/systemd-libs' to
-#   satisfy the 'systemd-libs' dependency of 'procps-ng', even though
-#   'nonsystemd/libelogind' provides 'systemd-libs' in a higher-priority repo.
+#   The snag, is that pacman will always select providers with 'pkgname' matching the
+#   provision name exactly, ignoring other providers in higher-priority repos
+#   (unlike the algorithm for selecting duplicate-named packages). Ie: repo priority
+#   plays no role in the selection of provision providers, unless no such package exists
+#   with 'pkgname' matching the provision name exactly. (Eg: pacman selects
+#   'libre/systemd-libs' to satisfy the 'systemd-libs' dependency of 'procps-ng',
+#   although 'nonsystemd/libelogind' provides 'systemd-libs' in a higher-priority repo.
 #
-#   In order to avoid re-packaging those opinionated packages, the conflict resolving
+#   In order to avoid re-packaging those opinionated packages, the conflict-resolving
 #   dependencies are required by 'parabola'. Ie: 'parabola' is the minimal meta-package
-#   for a non-systemd system. This is currently necessary in order to allow for
-#   alternate providers and init-systems other than OpenRC. Consequently, the
+#   for a non-systemd system. This is currently necessary in order to allow for alternate
+#   udev/logind providers and init-systems other than OpenRC. Consequently, the
 #   'nonsystemd/parabola' meta-package constrain the systemd/udev providers to 'elogind'
-#   and 'libudev' explicitly, in order that migrations to/from system<->nonsytemd be
+#   and 'libudev' explicitly, in order that migrations to/from systemd<->nonsytemd be
 #   conflict-free. The alternatives are more delicate and brittle. Eg:
-#     * 'procps-ng' could require 'libelogind' explicitly (not 'systemd-libs')
-#     * 'mdadm' could require 'logind' explicitly (not 'systemd'), IFF:
-#     * 'systemd' could provide 'logind' to satisfy 'mdadm' - 'elogind' already does;
-#       but there is still the problem of unstable 'provides' resolution, described above.
+#     * a new 'nonsystemd/procps-ng' could require 'libelogind' explicitly,
+#       to satisfy 'systemd-libs'
+#     * a new 'libre/procps-ng' could require a new virtual 'init-system-libs',
+#       to be provided by both 'systemd-libs' and 'libelogind'
+#     * a new 'libre/mdadm' could require the virtual 'logind' to satisfy 'systemd'
+#       to be provided by 'systemd' - 'elogind' already provides 'logind'
 #
 #   Likewise, the logical point of 'your-init-freedom' conflict is 'libre/base'; but that
 #   conflict is pushed back into 'libre/parabola' for symmetry. Ie: 'parabola' is the
@@ -79,9 +92,9 @@
 
 
 pkgname=parabola-base
-pkgver=2
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package-set to define the standard Parabola GNU/Linux-libre systemd CLI system"
+pkgdesc="Extended package-set to define the essential Parabola GNU/Linux-libre CLI systems"
 url=https://www.parabola.nu
 arch=(any)
 license=(CCPL:zero)
diff --git a/libre/parabola-desktop-base/PKGBUILD b/libre/parabola-desktop-base/PKGBUILD
index d1cb2af7e..2f2a2d690 100644
--- a/libre/parabola-desktop-base/PKGBUILD
+++ b/libre/parabola-desktop-base/PKGBUILD
@@ -8,10 +8,10 @@
 # See the full description in 'parabola-base'.
 
 
-pkgname=parabola-desktop-base
-pkgver=1
+pkgname=(parabola-desktop-base systemd-desktop)
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package set to define the essential Parabola GNU/Linux-libre GUI system"
+pkgdesc="Extended package set to define the essential Parabola GNU/Linux-libre GUI systems"
 arch=(any)
 url=https://www.parabola.nu
 license=(CCPL:zero)
@@ -20,255 +20,260 @@ license=(CCPL:zero)
 # 'base' chain
 depends=(parabola)
 
-# applications
-depends+=(
-  abiword
-  gnumeric
-  claws-mail
-  iceweasel
-  jami-qt
-  leafpad
-  octopi
-  octopi-cachecleaner
-  octopi-notifier
-  octopi-repoeditor
-  pidgin
-  qtox
-  smplayer
-)
+package_parabola-desktop-base()
+{
+  # applications
+  depends+=(
+    abiword
+    gnumeric
+    claws-mail
+    iceweasel
+    jami-qt
+    leafpad
+    octopi
+    octopi-cachecleaner
+    octopi-notifier
+    octopi-repoeditor
+    pidgin
+    qtox
+    smplayer
+  )
 
-# multimedia
-depends+=(
-  alsa-utils
-  gst-libav
-  gst-plugins-good
-  pulseaudio-alsa
-)
+  # multimedia
+  depends+=(
+    alsa-utils
+    gst-libav
+    gst-plugins-good
+    pulseaudio-alsa
+  )
 
-# look-and-feel
-depends+=(
-  parabola-laf
-  xdg-user-dirs
-)
+  # look-and-feel
+  depends+=(
+    parabola-laf
+    xdg-user-dirs
+  )
 
-# utilities
-depends+=(
-  dmidecode
-  gnome-keyring
-  gparted
-  gvfs
-  gxmessage
-  wbar
-)
+  # utilities
+  depends+=(
+    dmidecode
+    gnome-keyring
+    gparted
+    gvfs
+    gxmessage
+    wbar
+  )
 
-# x-server
-depends+=(
-  ttf-dejavu
-  xf86-input-elographics
-  xf86-input-wacom
-  xf86-video-sisusb
-  xorg-xinit
-)
-depends_armv7h=(
-  # xorg group
-  xf86-video-vesa
-  xorg-bdftopcf
-  xorg-docs
-  xorg-font-util
-  xorg-fonts-100dpi
-  xorg-fonts-75dpi
-  xorg-fonts-encodings
-  xorg-iceauth
-  xorg-mkfontdir
-  xorg-mkfontscale
-  xorg-server
-  xorg-server-common
-  xorg-server-devel
-  xorg-server-xephyr
-  xorg-server-xnest
-  xorg-server-xvfb
-  xorg-sessreg
-  xorg-setxkbmap
-  xorg-smproxy
-  xorg-x11perf
-  xorg-xauth
-  xorg-xbacklight
-  xorg-xcmsdb
-  xorg-xcursorgen
-  xorg-xdpyinfo
-  xorg-xdriinfo
-  xorg-xev
-  xorg-xgamma
-  xorg-xhost
-  xorg-xinput
-  xorg-xkbcomp
-  xorg-xkbevd
-  xorg-xkbutils
-  xorg-xkill
-  xorg-xlsatoms
-  xorg-xlsclients
-  xorg-xmodmap
-  xorg-xpr
-  xorg-xprop
-  xorg-xrandr
-  xorg-xrdb
-  xorg-xrefresh
-  xorg-xset
-  xorg-xsetroot
-  xorg-xvinfo
-  xorg-xwayland
-  xorg-xwd
-  xorg-xwininfo
-  xorg-xwud
+  # x-server
+  depends+=(
+    ttf-dejavu
+    xf86-input-elographics
+    xf86-input-wacom
+    xf86-video-sisusb
+    xorg-xinit
+  )
+  depends_armv7h=(
+    # xorg group
+    xf86-video-vesa
+    xorg-bdftopcf
+    xorg-docs
+    xorg-font-util
+    xorg-fonts-100dpi
+    xorg-fonts-75dpi
+    xorg-fonts-encodings
+    xorg-iceauth
+    xorg-mkfontdir
+    xorg-mkfontscale
+    xorg-server
+    xorg-server-common
+    xorg-server-devel
+    xorg-server-xephyr
+    xorg-server-xnest
+    xorg-server-xvfb
+    xorg-sessreg
+    xorg-setxkbmap
+    xorg-smproxy
+    xorg-x11perf
+    xorg-xauth
+    xorg-xbacklight
+    xorg-xcmsdb
+    xorg-xcursorgen
+    xorg-xdpyinfo
+    xorg-xdriinfo
+    xorg-xev
+    xorg-xgamma
+    xorg-xhost
+    xorg-xinput
+    xorg-xkbcomp
+    xorg-xkbevd
+    xorg-xkbutils
+    xorg-xkill
+    xorg-xlsatoms
+    xorg-xlsclients
+    xorg-xmodmap
+    xorg-xpr
+    xorg-xprop
+    xorg-xrandr
+    xorg-xrdb
+    xorg-xrefresh
+    xorg-xset
+    xorg-xsetroot
+    xorg-xvinfo
+    xorg-xwayland
+    xorg-xwd
+    xorg-xwininfo
+    xorg-xwud
 
-  # xorg-drivers group
-  xf86-input-evdev
-  xf86-input-libinput
-  xf86-input-synaptics
-  xf86-input-void
-  xf86-video-amdgpu
-  xf86-video-dummy
-  xf86-video-fbdev
-  xf86-video-nouveau
-  xf86-video-vesa
-  xf86-video-qxl
-)
-depends_i686=(
-  # xorg group
-  xf86-video-vesa
-  xorg-bdftopcf
-  xorg-docs
-  xorg-font-util
-  xorg-fonts-100dpi
-  xorg-fonts-75dpi
-  xorg-fonts-encodings
-  xorg-iceauth
-  xorg-mkfontscale
-  xorg-server
-  xorg-server-common
-  xorg-server-devel
-  xorg-server-xephyr
-  xorg-server-xnest
-  xorg-server-xvfb
-  xorg-server-xwayland
-  xorg-sessreg
-  xorg-setxkbmap
-  xorg-smproxy
-  xorg-x11perf
-  xorg-xauth
-  xorg-xbacklight
-  xorg-xcmsdb
-  xorg-xcursorgen
-  xorg-xdpyinfo
-  xorg-xdriinfo
-  xorg-xev
-  xorg-xgamma
-  xorg-xhost
-  xorg-xinput
-  xorg-xkbcomp
-  xorg-xkbevd
-  xorg-xkbutils
-  xorg-xkill
-  xorg-xlsatoms
-  xorg-xlsclients
-  xorg-xmodmap
-  xorg-xpr
-  xorg-xprop
-  xorg-xrandr
-  xorg-xrdb
-  xorg-xrefresh
-  xorg-xset
-  xorg-xsetroot
-  xorg-xvinfo
-  xorg-xwayland
-  xorg-xwd
-  xorg-xwininfo
-  xorg-xwud
+    # xorg-drivers group
+    xf86-input-evdev
+    xf86-input-libinput
+    xf86-input-synaptics
+    xf86-input-void
+    xf86-video-amdgpu
+    xf86-video-dummy
+    xf86-video-fbdev
+    xf86-video-nouveau
+    xf86-video-vesa
+    xf86-video-qxl
+  )
+  depends_i686=(
+    # xorg group
+    xf86-video-vesa
+    xorg-bdftopcf
+    xorg-docs
+    xorg-font-util
+    xorg-fonts-100dpi
+    xorg-fonts-75dpi
+    xorg-fonts-encodings
+    xorg-iceauth
+    xorg-mkfontscale
+    xorg-server
+    xorg-server-common
+    xorg-server-devel
+    xorg-server-xephyr
+    xorg-server-xnest
+    xorg-server-xvfb
+    xorg-server-xwayland
+    xorg-sessreg
+    xorg-setxkbmap
+    xorg-smproxy
+    xorg-x11perf
+    xorg-xauth
+    xorg-xbacklight
+    xorg-xcmsdb
+    xorg-xcursorgen
+    xorg-xdpyinfo
+    xorg-xdriinfo
+    xorg-xev
+    xorg-xgamma
+    xorg-xhost
+    xorg-xinput
+    xorg-xkbcomp
+    xorg-xkbevd
+    xorg-xkbutils
+    xorg-xkill
+    xorg-xlsatoms
+    xorg-xlsclients
+    xorg-xmodmap
+    xorg-xpr
+    xorg-xprop
+    xorg-xrandr
+    xorg-xrdb
+    xorg-xrefresh
+    xorg-xset
+    xorg-xsetroot
+    xorg-xvinfo
+    xorg-xwayland
+    xorg-xwd
+    xorg-xwininfo
+    xorg-xwud
 
-  # xorg-drivers group
-  xf86-input-evdev
-  xf86-input-libinput
-  xf86-input-synaptics
-  xf86-input-vmmouse
-  xf86-input-void
-  xf86-video-amdgpu
-  xf86-video-ati
-  xf86-video-dummy
-  xf86-video-fbdev
-  xf86-video-intel
-  xf86-video-nouveau
-  xf86-video-openchrome
-  xf86-video-vesa
-  xf86-video-vmware
-  xf86-video-voodoo
-  xf86-video-qxl
-)
-depends_x86_64=(
-  # xorg group
-  xf86-video-vesa
-  xorg-bdftopcf
-  xorg-docs
-  xorg-font-util
-  xorg-fonts-100dpi
-  xorg-fonts-75dpi
-  xorg-fonts-encodings
-  xorg-iceauth
-  xorg-mkfontscale
-  xorg-server
-  xorg-server-common
-  xorg-server-devel
-  xorg-server-xephyr
-  xorg-server-xnest
-  xorg-server-xvfb
-  xorg-sessreg
-  xorg-setxkbmap
-  xorg-smproxy
-  xorg-x11perf
-  xorg-xauth
-  xorg-xbacklight
-  xorg-xcmsdb
-  xorg-xcursorgen
-  xorg-xdpyinfo
-  xorg-xdriinfo
-  xorg-xev
-  xorg-xgamma
-  xorg-xhost
-  xorg-xinput
-  xorg-xkbcomp
-  xorg-xkbevd
-  xorg-xkbutils
-  xorg-xkill
-  xorg-xlsatoms
-  xorg-xlsclients
-  xorg-xmodmap
-  xorg-xpr
-  xorg-xprop
-  xorg-xrandr
-  xorg-xrdb
-  xorg-xrefresh
-  xorg-xset
-  xorg-xsetroot
-  xorg-xvinfo
-  xorg-xwayland
-  xorg-xwd
-  xorg-xwininfo
-  xorg-xwud
+    # xorg-drivers group
+    xf86-input-evdev
+    xf86-input-libinput
+    xf86-input-synaptics
+    xf86-input-vmmouse
+    xf86-input-void
+    xf86-video-amdgpu
+    xf86-video-ati
+    xf86-video-dummy
+    xf86-video-fbdev
+    xf86-video-intel
+    xf86-video-nouveau
+    xf86-video-openchrome
+    xf86-video-vesa
+    xf86-video-vmware
+    xf86-video-voodoo
+    xf86-video-qxl
+  )
+  depends_x86_64=(
+    # xorg group
+    xf86-video-vesa
+    xorg-bdftopcf
+    xorg-docs
+    xorg-font-util
+    xorg-fonts-100dpi
+    xorg-fonts-75dpi
+    xorg-fonts-encodings
+    xorg-iceauth
+    xorg-mkfontscale
+    xorg-server
+    xorg-server-common
+    xorg-server-devel
+    xorg-server-xephyr
+    xorg-server-xnest
+    xorg-server-xvfb
+    xorg-sessreg
+    xorg-setxkbmap
+    xorg-smproxy
+    xorg-x11perf
+    xorg-xauth
+    xorg-xbacklight
+    xorg-xcmsdb
+    xorg-xcursorgen
+    xorg-xdpyinfo
+    xorg-xdriinfo
+    xorg-xev
+    xorg-xgamma
+    xorg-xhost
+    xorg-xinput
+    xorg-xkbcomp
+    xorg-xkbevd
+    xorg-xkbutils
+    xorg-xkill
+    xorg-xlsatoms
+    xorg-xlsclients
+    xorg-xmodmap
+    xorg-xpr
+    xorg-xprop
+    xorg-xrandr
+    xorg-xrdb
+    xorg-xrefresh
+    xorg-xset
+    xorg-xsetroot
+    xorg-xvinfo
+    xorg-xwayland
+    xorg-xwd
+    xorg-xwininfo
+    xorg-xwud
 
-  # xorg-drivers group
-  xf86-input-evdev
-  xf86-input-libinput
-  xf86-input-synaptics
-  xf86-input-vmmouse
-  xf86-input-void
-  xf86-video-amdgpu
-  xf86-video-ati
-  xf86-video-dummy
-  xf86-video-fbdev
-  xf86-video-intel
-  xf86-video-nouveau
-  xf86-video-openchrome
-  xf86-video-vesa
-  xf86-video-vmware
-  xf86-video-voodoo
-  xf86-video-qxl
-)
+    # xorg-drivers group
+    xf86-input-evdev
+    xf86-input-libinput
+    xf86-input-synaptics
+    xf86-input-vmmouse
+    xf86-input-void
+    xf86-video-amdgpu
+    xf86-video-ati
+    xf86-video-dummy
+    xf86-video-fbdev
+    xf86-video-intel
+    xf86-video-nouveau
+    xf86-video-openchrome
+    xf86-video-vesa
+    xf86-video-vmware
+    xf86-video-voodoo
+    xf86-video-qxl
+  )
+}
+
+package_systemd-desktop() { provides=(init-desktop) ; } ; # your-init-freedom provider
diff --git a/libre/parabola-desktop-gnome/PKGBUILD b/libre/parabola-desktop-gnome/PKGBUILD
index c35ee362d..397b385d5 100644
--- a/libre/parabola-desktop-gnome/PKGBUILD
+++ b/libre/parabola-desktop-gnome/PKGBUILD
@@ -9,14 +9,13 @@
 
 
 pkgname=parabola-desktop-gnome
-pkgver=1
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package set to define the Parabola GNU/Linux-libre systemd/GNOME system"
+pkgdesc="Complete package set to define the Parabola GNU/Linux-libre GNOME systems"
 arch=(any)
 url=https://www.parabola.nu
 license=(CCPL:zero)
 
-
 # 'base' chain
 depends=(parabola-desktop)
 
@@ -24,101 +23,103 @@ depends=(parabola-desktop)
 depends+=(
   $(pacman -Sgq gnome      ) # 'gnome' group
   $(pacman -Sgq gnome-extra) # 'gnome-extra' group
+  init-desktop               # your-init-freedom provider
+
+  # $ date -I ; pacman -Sgq gnome gnome-extra ;
+  # 2023-01-19
+  # epiphany
+  # file-roller
+  # gnome-boxes
+  # baobab
+  # cheese
+  # eog
+  # evince
+  # gdm
+  # gnome-backgrounds
+  # gnome-calculator
+  # gnome-calendar
+  # gnome-characters
+  # gnome-clocks
+  # gnome-color-manager
+  # gnome-console
+  # gnome-contacts
+  # gnome-control-center
+  # gnome-disk-utility
+  # gnome-font-viewer
+  # gnome-keyring
+  # gnome-logs
+  # gnome-maps
+  # gnome-menus
+  # gnome-music
+  # gnome-photos
+  # gnome-remote-desktop
+  # gnome-session
+  # gnome-settings-daemon
+  # gnome-shell
+  # gnome-shell-extensions
+  # gnome-system-monitor
+  # gnome-text-editor
+  # gnome-user-docs
+  # gnome-user-share
+  # gnome-video-effects
+  # gnome-weather
+  # grilo-plugins
+  # gvfs
+  # gvfs-afc
+  # gvfs-goa
+  # gvfs-google
+  # gvfs-gphoto2
+  # gvfs-mtp
+  # gvfs-nfs
+  # gvfs-smb
+  # malcontent
+  # mutter
+  # nautilus
+  # orca
+  # rygel
+  # simple-scan
+  # sushi
+  # totem
+  # tracker3-miners
+  # xdg-user-dirs-gtk
+  # yelp
+  # accerciser
+  # dconf-editor
+  # devhelp
+  # endeavour
+  # evolution
+  # five-or-more
+  # four-in-a-row
+  # ghex
+  # glade
+  # gnome-builder
+  # gnome-chess
+  # gnome-devel-docs
+  # gnome-klotski
+  # gnome-mahjongg
+  # gnome-mines
+  # gnome-nettool
+  # gnome-nibbles
+  # gnome-robots
+  # gnome-sound-recorder
+  # gnome-sudoku
+  # gnome-taquin
+  # gnome-terminal
+  # gnome-tetravex
+  # gnome-tweaks
+  # gnome-usage
+  # hitori
+  # iagno
+  # lightsoff
+  # polari
+  # quadrapassel
+  # swell-foop
+  # sysprof
+  # tali
+  # geary
+  # gedit
+  # gnome-connections
+  # gnome-games
+  # gnome-multi-writer
+  # gnome-recipes
 )
-# $ date -I ; pacman -Sgq gnome gnome-extra ;
-# 2023-01-19
-# epiphany
-# file-roller
-# gnome-boxes
-# baobab
-# cheese
-# eog
-# evince
-# gdm
-# gnome-backgrounds
-# gnome-calculator
-# gnome-calendar
-# gnome-characters
-# gnome-clocks
-# gnome-color-manager
-# gnome-console
-# gnome-contacts
-# gnome-control-center
-# gnome-disk-utility
-# gnome-font-viewer
-# gnome-keyring
-# gnome-logs
-# gnome-maps
-# gnome-menus
-# gnome-music
-# gnome-photos
-# gnome-remote-desktop
-# gnome-session
-# gnome-settings-daemon
-# gnome-shell
-# gnome-shell-extensions
-# gnome-system-monitor
-# gnome-text-editor
-# gnome-user-docs
-# gnome-user-share
-# gnome-video-effects
-# gnome-weather
-# grilo-plugins
-# gvfs
-# gvfs-afc
-# gvfs-goa
-# gvfs-google
-# gvfs-gphoto2
-# gvfs-mtp
-# gvfs-nfs
-# gvfs-smb
-# malcontent
-# mutter
-# nautilus
-# orca
-# rygel
-# simple-scan
-# sushi
-# totem
-# tracker3-miners
-# xdg-user-dirs-gtk
-# yelp
-# accerciser
-# dconf-editor
-# devhelp
-# endeavour
-# evolution
-# five-or-more
-# four-in-a-row
-# ghex
-# glade
-# gnome-builder
-# gnome-chess
-# gnome-devel-docs
-# gnome-klotski
-# gnome-mahjongg
-# gnome-mines
-# gnome-nettool
-# gnome-nibbles
-# gnome-robots
-# gnome-sound-recorder
-# gnome-sudoku
-# gnome-taquin
-# gnome-terminal
-# gnome-tetravex
-# gnome-tweaks
-# gnome-usage
-# hitori
-# iagno
-# lightsoff
-# polari
-# quadrapassel
-# swell-foop
-# sysprof
-# tali
-# geary
-# gedit
-# gnome-connections
-# gnome-games
-# gnome-multi-writer
-# gnome-recipes
diff --git a/libre/parabola-desktop-kde/PKGBUILD b/libre/parabola-desktop-kde/PKGBUILD
index 1b4d71807..282bc2454 100644
--- a/libre/parabola-desktop-kde/PKGBUILD
+++ b/libre/parabola-desktop-kde/PKGBUILD
@@ -9,9 +9,9 @@
 
 
 pkgname=parabola-desktop-kde
-pkgver=1
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package set to define the Parabola GNU/Linux-libre systemd/KDE system"
+pkgdesc="Complete package set to define the Parabola GNU/Linux-libre KDE systems"
 arch=(any)
 url=https://www.parabola.nu
 license=(CCPL:zero)
@@ -20,58 +20,61 @@ license=(CCPL:zero)
 # 'base' chain
 depends=(parabola-desktop)
 
-# WM/DE and applications
+# WM/DE and GUI applications
 depends+=(
+  $(pacman -Sgq plasma) # 'plasma' group
+  init-desktop          # your-init-freedom provider
+
   gwenview
   okular
-  $(pacman -Sgq plasma) # 'plasma' group
   spectacle
+
+  # $ date -I ; pacman -Sgq plasma ;
+  # 2023-01-19
+  # khotkeys
+  # kinfocenter
+  # libksysguard
+  # bluedevil
+  # breeze
+  # breeze-gtk
+  # drkonqi
+  # kactivitymanagerd
+  # kde-cli-tools
+  # kde-gtk-config
+  # kdecoration
+  # kdeplasma-addons
+  # kgamma5
+  # kmenuedit
+  # kpipewire
+  # kscreen
+  # kscreenlocker
+  # ksshaskpass
+  # ksystemstats
+  # kwallet-pam
+  # kwayland-integration
+  # kwin
+  # kwrited
+  # layer-shell-qt
+  # libkscreen
+  # milou
+  # oxygen
+  # oxygen-sounds
+  # plasma-browser-integration
+  # plasma-desktop
+  # plasma-disks
+  # plasma-firewall
+  # plasma-integration
+  # plasma-nm
+  # plasma-pa
+  # plasma-sdk
+  # plasma-systemmonitor
+  # plasma-thunderbolt
+  # plasma-vault
+  # plasma-workspace
+  # plasma-workspace-wallpapers
+  # polkit-kde-agent
+  # powerdevil
+  # sddm-kcm
+  # systemsettings
+  # xdg-desktop-portal-kde
 )
-# $ date -I ; pacman -Sgq plasma ;
-# 2023-01-19
-# khotkeys
-# kinfocenter
-# libksysguard
-# bluedevil
-# breeze
-# breeze-gtk
-# drkonqi
-# kactivitymanagerd
-# kde-cli-tools
-# kde-gtk-config
-# kdecoration
-# kdeplasma-addons
-# kgamma5
-# kmenuedit
-# kpipewire
-# kscreen
-# kscreenlocker
-# ksshaskpass
-# ksystemstats
-# kwallet-pam
-# kwayland-integration
-# kwin
-# kwrited
-# layer-shell-qt
-# libkscreen
-# milou
-# oxygen
-# oxygen-sounds
-# plasma-browser-integration
-# plasma-desktop
-# plasma-disks
-# plasma-firewall
-# plasma-integration
-# plasma-nm
-# plasma-pa
-# plasma-sdk
-# plasma-systemmonitor
-# plasma-thunderbolt
-# plasma-vault
-# plasma-workspace
-# plasma-workspace-wallpapers
-# polkit-kde-agent
-# powerdevil
-# sddm-kcm
-# systemsettings
-# xdg-desktop-portal-kde
diff --git a/libre/parabola-desktop-lxde/PKGBUILD b/libre/parabola-desktop-lxde/PKGBUILD
index 26fb76772..a85ccf0f0 100644
--- a/libre/parabola-desktop-lxde/PKGBUILD
+++ b/libre/parabola-desktop-lxde/PKGBUILD
@@ -15,9 +15,9 @@
 
 
 pkgname=parabola-desktop-lxde
-pkgver=1
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package set to define the Parabola GNU/Linux-libre systemd/LXDE system"
+pkgdesc="Complete package set to define the Parabola GNU/Linux-libre LXDE systems"
 arch=(any)
 url=https://www.parabola.nu
 license=(CCPL:zero)
@@ -26,16 +26,36 @@ license=(CCPL:zero)
 # 'base' chain
 depends=(parabola-desktop)
 
-# WM/DE and applications
+# WM/DE and GUI applications
 depends+=(
+  $(pacman -Sgq lxde-gtk3) # 'lxde-gtk3' group
+  init-desktop             # your-init-freedom provider
+
   epdfview
   galculator
   gnome-screenshot
-  $(pacman -Sgq lxde-gtk3) # 'lxde-gtk3' group
   network-manager-applet
   obconf
   xarchiver
   xscreensaver
+
+  # $ echo "$(date -I) $(grep VARIANT_ID= /etc/os-release)" ; pacman -Sgq lxde-gtk3 ;
+  # 2023-01-19 VARIANT_ID="x86_64-openrc"
+  # lxappearance-obconf-gtk3
+  # lxappearance-gtk3
+  # lxde-common
+  # lxde-icon-theme
+  # lxdm-gtk3
+  # lxhotkey-gtk3
+  # lxinput-gtk3
+  # lxlauncher-gtk3
+  # lxpanel-gtk3
+  # lxrandr-gtk3
+  # lxsession-gtk3
+  # lxtask-gtk3
+  # lxterminal
+  # openbox
+  # pcmanfm-gtk3
 )
 # FIXME: For some reason, 'lxpanel-gtk3-hidpi' in the '~lukeshu' repo
 #        is visible to libretools. 'lxpanel-gtk3-hidpi' conflicts with 'lxpanel-gtk3'.
@@ -45,20 +65,3 @@ depends+=(
 #        (without membership in the 'lxde-gtk3' group). It is more curious, why libretools
 #        detects that package at all, as it eventually fails with "target not found".
 depends=( ${depends[*]/lxpanel-gtk3-hidpi/} )
-# $ echo "$(date -I) $(grep VARIANT_ID= /etc/os-release)" ; pacman -Sgq lxde-gtk3 ;
-# 2023-01-19 VARIANT_ID="x86_64-openrc"
-# lxappearance-obconf-gtk3
-# lxappearance-gtk3
-# lxde-common
-# lxde-icon-theme
-# lxdm-gtk3
-# lxhotkey-gtk3
-# lxinput-gtk3
-# lxlauncher-gtk3
-# lxpanel-gtk3
-# lxrandr-gtk3
-# lxsession-gtk3
-# lxtask-gtk3
-# lxterminal
-# openbox
-# pcmanfm-gtk3
diff --git a/libre/parabola-desktop-mate/PKGBUILD b/libre/parabola-desktop-mate/PKGBUILD
index 41b65eb1d..3cc20528e 100644
--- a/libre/parabola-desktop-mate/PKGBUILD
+++ b/libre/parabola-desktop-mate/PKGBUILD
@@ -9,9 +9,9 @@
 
 
 pkgname=parabola-desktop-mate
-pkgver=1
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package set to define the Parabola GNU/Linux-libre systemd/MATE system"
+pkgdesc="Complete package set to define the Parabola GNU/Linux-libre MATE systems"
 arch=(any)
 url=https://www.parabola.nu
 license=(CCPL:zero)
@@ -20,50 +20,53 @@ license=(CCPL:zero)
 # 'base' chain
 depends=(parabola-desktop)
 
-# WM/DE and applications
+# WM/DE and GUI applications
 depends+=(
-  lightdm-gtk-greeter-settings
   $(pacman -Sgq mate      ) # 'mate' group
   $(pacman -Sgq mate-extra) # 'mate-extra' group
+  init-desktop              # your-init-freedom provider
+
+  lightdm-gtk-greeter-settings
   network-manager-applet
   volumeicon
+
+  # $ date -I ; pacman -Sgq mate mate-extra ;
+  # 2023-01-19
+  # caja
+  # marco
+  # mate-backgrounds
+  # mate-control-center
+  # mate-desktop
+  # mate-icon-theme
+  # mate-menus
+  # mate-notification-daemon
+  # mate-panel
+  # mate-polkit
+  # mate-session-manager
+  # mate-settings-daemon
+  # mate-themes
+  # mate-user-guide
+  # engrampa
+  # mate-icon-theme-faenza
+  # mate-sensors-applet
+  # atril
+  # caja-image-converter
+  # caja-open-terminal
+  # caja-sendto
+  # caja-share
+  # caja-wallpaper
+  # caja-xattr-tags
+  # eom
+  # mate-applets
+  # mate-calc
+  # mate-media
+  # mate-netbook
+  # mate-power-manager
+  # mate-screensaver
+  # mate-system-monitor
+  # mate-terminal
+  # mate-user-share
+  # mate-utils
+  # mozo
+  # pluma
 )
-# $ date -I ; pacman -Sgq mate mate-extra ;
-# 2023-01-19
-# caja
-# marco
-# mate-backgrounds
-# mate-control-center
-# mate-desktop
-# mate-icon-theme
-# mate-menus
-# mate-notification-daemon
-# mate-panel
-# mate-polkit
-# mate-session-manager
-# mate-settings-daemon
-# mate-themes
-# mate-user-guide
-# engrampa
-# mate-icon-theme-faenza
-# mate-sensors-applet
-# atril
-# caja-image-converter
-# caja-open-terminal
-# caja-sendto
-# caja-share
-# caja-wallpaper
-# caja-xattr-tags
-# eom
-# mate-applets
-# mate-calc
-# mate-media
-# mate-netbook
-# mate-power-manager
-# mate-screensaver
-# mate-system-monitor
-# mate-terminal
-# mate-user-share
-# mate-utils
-# mozo
-# pluma
diff --git a/libre/parabola-desktop/PKGBUILD b/libre/parabola-desktop/PKGBUILD
index d2e3aad82..0b1afdd5a 100644
--- a/libre/parabola-desktop/PKGBUILD
+++ b/libre/parabola-desktop/PKGBUILD
@@ -9,7 +9,7 @@
 
 
 pkgname=parabola-desktop
-pkgver=1
+pkgver=20230119
 pkgrel=1
 pkgdesc="Extended package set to define the essential Parabola GNU/Linux-libre systemd GUI system"
 arch=(any)
diff --git a/libre/parabola/PKGBUILD b/libre/parabola/PKGBUILD
index 181650e97..37fb16490 100644
--- a/libre/parabola/PKGBUILD
+++ b/libre/parabola/PKGBUILD
@@ -15,9 +15,9 @@
 
 
 pkgname=parabola
-pkgver=1
+pkgver=20230119
 pkgrel=1
-pkgdesc="Extended package-set to define the standard Parabola GNU/Linux-libre systemd CLI system"
+pkgdesc="Complete package-set to define the standard Parabola GNU/Linux-libre systemd/CLI system"
 url=https://www.parabola.nu
 arch=(any)
 license=(CCPL:zero)
diff --git a/nonsystemd/base/PKGBUILD b/nonsystemd/base/PKGBUILD
index 1cc32da42..e35b85bbe 100644
--- a/nonsystemd/base/PKGBUILD
+++ b/nonsystemd/base/PKGBUILD
@@ -8,10 +8,11 @@ pkgver=3
 pkgrel=1
 pkgrel+=.parabola1
 pkgrel+=.nonsystemd1
-pkgdesc='Minimal package-set to define the essential Parabola GNU/Linux-libre non-systemd CLI system'
+pkgdesc='Minimal package-set to define the bare-bones Parabola GNU/Linux-libre non-systemd/CLI system'
 url='https://www.parabola.nu'
 arch=('any')
-license=(CCPL:zero)
+license=('GPL')
+license+=(CCPL:zero)
 depends=(
   # very very base
   'filesystem' 'gcc-libs' 'glibc' 'bash'
@@ -30,6 +31,11 @@ depends=(
 
   # parabola-defined requirements
   'your-freedom' 'your-init-freedom'
+
+  # your-init-freedom providers
+  # FIXME: Installing this package alone (without elogind, eudev, etc), produces
+  #        an untested/unsupported hybrid system (eg: both systemd-* and non-systemd-*
+  #        packages are installed). See "Caveats:" in 'parabola-base'.
 )
 optdepends=('linux-libre: bare metal support'
-            'parabola: standard Parabola GNU/Linux-libre non-systemd CLI system')
+            'parabola: standard Parabola GNU/Linux-libre non-systemd/CLI system')
diff --git a/nonsystemd/gdm-openrc/PKGBUILD b/nonsystemd/gdm-openrc/PKGBUILD
index 3f2d5fc90..37a156568 100644
--- a/nonsystemd/gdm-openrc/PKGBUILD
+++ b/nonsystemd/gdm-openrc/PKGBUILD
@@ -9,7 +9,8 @@ arch=('any')
 url="https://gitea.artixlinux.org/packagesG/gdm-openrc"
 license=('GPL2')
 groups=('openrc-world')
-provides=('init-displaymanager')
+provides=('init-displaymanager'
+          'init-desktop')
 conflicts=('init-displaymanager')
 source=("gdm.initd")
 sha256sums=('b46bb53bf9eb0c8d292133216af3c451060e8acc278e837d2bb5a58d548baec0')
diff --git a/nonsystemd/lightdm-openrc/PKGBUILD b/nonsystemd/lightdm-openrc/PKGBUILD
index 82307ac6a..a3836175d 100644
--- a/nonsystemd/lightdm-openrc/PKGBUILD
+++ b/nonsystemd/lightdm-openrc/PKGBUILD
@@ -9,7 +9,8 @@ arch=('any')
 url="https://gitea.artixlinux.org/packagesL/lightdm-openrc"
 license=('GPL2')
 groups=('openrc-world')
-provides=('init-displaymanager')
+provides=('init-displaymanager'
+          'init-desktop')
 conflicts=('init-displaymanager')
 source=("lightdm.initd")
 sha256sums=('a33a505b49088a5d5c8388da03c826e40699694fcbfd22775b15a957a07880dc')
diff --git a/nonsystemd/lxdm-openrc/PKGBUILD b/nonsystemd/lxdm-openrc/PKGBUILD
index fcd9c7f87..ebf9e2620 100644
--- a/nonsystemd/lxdm-openrc/PKGBUILD
+++ b/nonsystemd/lxdm-openrc/PKGBUILD
@@ -9,7 +9,8 @@ arch=('any')
 url="https://gitea.artixlinux.org/packagesL/lxdm-openrc"
 license=('GPL2')
 groups=('openrc-galaxy')
-provides=('init-displaymanager')
+provides=('init-displaymanager'
+          'init-desktop')
 conflicts=('init-displaymanager')
 source=("lxdm.initd")
 sha256sums=('57ec70f482e606961971978565fc268fba9388b277ce751c2d0a16f44d081e42')
diff --git a/nonsystemd/parabola-desktop/PKGBUILD b/nonsystemd/parabola-desktop/PKGBUILD
index d9883361c..850aeb1be 100644
--- a/nonsystemd/parabola-desktop/PKGBUILD
+++ b/nonsystemd/parabola-desktop/PKGBUILD
@@ -9,7 +9,7 @@
 
 
 pkgname=parabola-desktop
-pkgver=1
+pkgver=20230119
 pkgrel=nonsystemd1
 pkgdesc="Extended package set to define the essential Parabola GNU/Linux-libre non-systemd GUI system"
 arch=(any)
diff --git a/nonsystemd/parabola/PKGBUILD b/nonsystemd/parabola/PKGBUILD
index 73a752f53..e365d1b48 100644
--- a/nonsystemd/parabola/PKGBUILD
+++ b/nonsystemd/parabola/PKGBUILD
@@ -15,9 +15,9 @@
 
 
 pkgname=parabola
-pkgver=1
+pkgver=20230119
 pkgrel=nonsystemd2
-pkgdesc="Extended package-set to define the standard Parabola GNU/Linux-libre non-systemd CLI system"
+pkgdesc="Complete package-set to define the standard Parabola GNU/Linux-libre non-systemd/CLI system"
 url=https://www.parabola.nu
 arch=(any)
 license=(CCPL:zero)
@@ -26,27 +26,28 @@ license=(CCPL:zero)
 # 'base' chain
 depends=(parabola-base)
 
-# (obsolete 'base-openrc' group) - ('parabola-base' meta-package)
+# (obsolete 'base-openrc' group) - (obsolete 'parabola-base' meta-package)
 depends+=(libelogind libudev openresolv)
 
 # init-specific, supplemental package-set (eg: the CLI LiveISOs)
-depends+=()
+depends+=() # TODO: https://labs.parabola.nu/issues/2549
 
 # your-init-freedom sanity
 depends+=(elogind)
 
 # TODO: these are in the deprecated 'base-openrc' group
 #       (most important, installed in ths group, is 'udev-init-scripts')
-#       many of these will eventually be moved from [pcr] into the corresponding
-#         main program packages [nonsystemd] (without the *-openrc suffix)
-#       once that happens, these can be merged into the base-openrc packages array above
+#       many of these will eventually be moved from [pcr] to [nonsystemd],
+#         or into their corresponding program packages (without the *-openrc suffix),
+#         or removed from the system (remove from this array).
+#       these can eventually be merged into the base-openrc package-set above
 #         https://labs.parabola.nu/issues/2549
 depends+=(cronie-openrc cryptsetup-openrc dhcpcd-openrc glibc-openrc
           inetutils-openrc lvm2-openrc mdadm-openrc netifrc nfs-utils-openrc
           quota-tools-openrc rpcbind-openrc syslog-ng-openrc udev-init-scripts)
 
-# TODO: analogous *-openrc sub-set, corresponding to the supplemental LiveISOs package set
-#       these can eventually be merged into the array above
+# TODO: analogous *-openrc sub-set, corresponding to the supplemental LiveISOs packages
+#       these can eventually be merged into the supplemental package-set above
 #         https://labs.parabola.nu/issues/2549
 depends+=(gpm-openrc haveged-openrc hdparm-openrc ntp-openrc openssh-openrc
           openvpn-openrc rsync-openrc wpa_supplicant-openrc)
diff --git a/nonsystemd/sddm-openrc/PKGBUILD b/nonsystemd/sddm-openrc/PKGBUILD
index b3412909f..465287e44 100644
--- a/nonsystemd/sddm-openrc/PKGBUILD
+++ b/nonsystemd/sddm-openrc/PKGBUILD
@@ -9,7 +9,8 @@ arch=('any')
 url="https://gitea.artixlinux.org/packagesS/sddm-openrc"
 license=('GPL2')
 groups=('openrc-world')
-provides=('init-displaymanager')
+provides=('init-displaymanager'
+          'init-desktop')
 conflicts=('init-displaymanager')
 source=("sddm.initd")
 sha256sums=('0d24660f022b3e5e1f8196a4022981045d9dd79eb74531d19d6981a5ba735f1e')
diff --git a/scripts/package-all-parabola-base b/scripts/package-all-parabola-base
index be62e352c..4094e40c3 100755
--- a/scripts/package-all-parabola-base
+++ b/scripts/package-all-parabola-base
@@ -46,7 +46,14 @@ do  cd ${ABSLIBRE_DIR}/${pkg_dir}
          # but is trouble for `chcleanup` of librechroots.
          [[ "${pkg_dir}" =~ ^nonsystemd/parabola-desktop-(gnome|kde|lxde|mate)$ ]] &&
          sudo librechroot  -n ${NONSYSTEMD_CHROOT} clean-pkgs                      &&
-         sudo libremakepkg -n ${NONSYSTEMD_CHROOT} || ! echo "${pkg_dir} failed" || break
-    else sudo libremakepkg -n ${SYSTEMD_CHROOT}    || ! echo "${pkg_dir} failed" || break
+         sudo libremakepkg -n ${NONSYSTEMD_CHROOT} || ! echo "${pkg_dir} failed" || exit 1
+    else sudo libremakepkg -n ${SYSTEMD_CHROOT}    || ! echo "${pkg_dir} failed" || exit 1
     fi
 done
+
+echo "all packages built successfully - staging ...."
+for pkg_dir in ${PKG_DIRS[*]}
+do  cd ${ABSLIBRE_DIR}/${pkg_dir}
+    librestage $(dirname ${ABSLIBRE_DIR}/${pkg_dir})-testing
+done
+librerelease -l