wip

9 files changed, 49 insertions, 27 deletions

diff --git a/libre/base/PKGBUILD b/libre/base/PKGBUILD
index ec8be2b60..192899a12 100644
--- a/libre/base/PKGBUILD
+++ b/libre/base/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=base
 pkgver=3
 pkgrel=1
-pkgrel+=.parabola1
+pkgrel+=.parabola2
 pkgdesc='Minimal package-set to define the essential Parabola GNU/Linux-libre systemd CLI system'
 url='https://www.parabola.nu'
 arch=('any')
@@ -24,11 +24,14 @@ depends=(
   # distro defined requirements
   'licenses' 'pacman' 'archlinux-keyring' 'systemd' 'systemd-sysvcompat'
 
-  # your-init-freedom providers
-  'systemd-libudev' 'systemd-udev'
-
   # networking, ping, etc
   'iputils' 'iproute2'
+
+  # parabola-defined requirements
+  'your-freedom' 'your-init-freedom'
+
+  # your-init-freedom providers
+  'systemd-libudev' 'systemd-udev'
 )
 optdepends=('linux-libre: bare metal support'
             'parabola: standard Parabola GNU/Linux-libre systemd CLI system')
diff --git a/libre/parabola-base/PKGBUILD b/libre/parabola-base/PKGBUILD
index 7758fde2f..c3910258b 100644
--- a/libre/parabola-base/PKGBUILD
+++ b/libre/parabola-base/PKGBUILD
@@ -12,7 +12,13 @@
 # which defines the standard Parabola system(s) package sets, in the DRY-est way.
 # These definitions are for common use across the LiveISOs, installers, and wiki.
 #
-# base <- parabola-base <- parabola <- parabola-desktop-base <- parabola-desktop <- parabola-desktop-<WMDE>
+# These meta-packages may be generated as a batch, with the helper script:
+#   $ scripts/package-all-parabola-base
+#
+# Build order:
+#   nonsystemd/base <-               <- nonsystemd/parabola <-                       <- nonsystemd/parabola-desktop <- parabola-desktop-WMDE
+#                   <- parabola-base <-                     <- parabola-desktop-base <-                             <-
+#   libre/base      <-               <- libre/parabola      <-                       <- libre/parabola-desktop      <- parabola-desktop-WMDE
 #
 # Where:
 #   * 'base', 'parabola', 'parabola-desktop', and 'parabola-desktop-<WMDE>' are init-specific.
@@ -21,15 +27,14 @@
 #   * These form exactly two possible chains from any 'parabola-desktop-<WMDE>' to 'base',
 #     which diverge and merge at multiple points. The actual chain is resolved at install-time.
 #   * Only 'parabola' and the 'parabola-desktop-<WMDE>' meta-packages are considered to be
-#     complete, supported, and generally useful configurations.
+#     complete and generally useful configurations, for all arch/init/WMDE combinations.
 #     The other meta-packages, and familiar friends from previous install guides
 #     (base, base-openrc, parabola-base, openrc-desktop, etc - also their cousin: 'posix')
 #     are still helpful for installing custom systems, in the conventional arch way.
-#     'base' PKGBUILDs are kept in-sync, as closely as possible, with arch{,32,arm,},artix.
-#
-#   libre/base      <-               <- libre/parabola      <-                       <- libre/parabola-desktop      <- parabola-desktop-WMDE
-#                   <- parabola-base <-                     <- parabola-desktop-base <-                             <-
-#   nonsystemd/base <-               <- nonsystemd/parabola <-                       <- nonsystemd/parabola-desktop <- parabola-desktop-WMDE
+#   * 'base' PKGBUILDs are kept in-sync, as closely as possible, with arch{,32,arm},artix.
+#     Beyond technicalities such as init compatibility and conflict resolution,
+#     the other package-sets (and consequently, the LiveISOs and installers)
+#     may be curated in cooperation with the community.
 #
 # Caveats:
 #   The logical dependent of 'base' is the init-specific 'parabola-base'. However,
@@ -57,7 +62,8 @@
 #   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)
+#     * 'systemd' could provide 'logind' to satisfy 'mdadm' - 'elogind' already does;
+#       but there is still the problem of unstable 'provides' resolution, described above.
 #
 #   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
@@ -81,7 +87,7 @@ license=(CCPL:zero)
 
 
 # 'base'
-depends=(base your-freedom)
+depends=(base)
 
 # (obsolete '{libre,nonsystemd}/base' groups) - ('{libre,nonsystemd}/base' meta-packages) + posix
 depends+=(cryptsetup dhcpcd inetutils jfsutils linux-libre logrotate lvm2
diff --git a/libre/parabola-desktop-lxde/PKGBUILD b/libre/parabola-desktop-lxde/PKGBUILD
index f72e86774..4f0cb0878 100644
--- a/libre/parabola-desktop-lxde/PKGBUILD
+++ b/libre/parabola-desktop-lxde/PKGBUILD
@@ -30,9 +30,17 @@ depends+=(
   epdfview
   galculator
   gnome-screenshot
-  lxde-gtk3
+  $(pacman -Sgq lxde-gtk3) # lxde-gtk3 group
   network-manager-applet
   obconf
   xarchiver
   xscreensaver
 )
+# FIXME: For some reason, 'lxpanel-gtk3-hidpi' in the '~lukeshu' repo
+#        is visible to libretools. 'lxpanel-gtk3-hidpi' conflicts with 'lxpanel-gtk3'.
+#        However, both declare membership in the 'lxde-gtk3' group,
+#        making the build-time expansion above, unsatisfiable.
+#        If 'lxpanel-gtk3-hidpi' is still useful, maybe it could be moved to libre
+#        (without membership in the 'lxde-gtk3' group). It is more curious, why libretools
+#        detects that package at all (it eventually fails with "target not found").
+depends=( ${depends[*]/lxpanel-gtk3-hidpi/} )
diff --git a/libre/parabola/PKGBUILD b/libre/parabola/PKGBUILD
index 755230961..c3b33a274 100644
--- a/libre/parabola/PKGBUILD
+++ b/libre/parabola/PKGBUILD
@@ -29,4 +29,4 @@ depends=(parabola-base)
 depends+=(netctl)
 
 # your-init-freedom sanity
-conflicts=(liblogind libudev your-init-freedom)
+conflicts=(liblogind libeudev)
diff --git a/nonsystemd/base/PKGBUILD b/nonsystemd/base/PKGBUILD
index 740f14270..1cc32da42 100644
--- a/nonsystemd/base/PKGBUILD
+++ b/nonsystemd/base/PKGBUILD
@@ -25,11 +25,11 @@ depends=(
   # distro defined requirements
   'licenses' 'pacman' 'init' 'esysusers' 'etmpfiles'
 
-  # parabola requirements
-  'your-init-freedom'
-
   # networking, ping, etc
   'iputils' 'iproute2'
+
+  # parabola-defined requirements
+  'your-freedom' 'your-init-freedom'
 )
 optdepends=('linux-libre: bare metal support'
             'parabola: standard Parabola GNU/Linux-libre non-systemd CLI system')
diff --git a/nonsystemd/parabola-desktop-lxde/PKGBUILD b/nonsystemd/parabola-desktop-lxde/PKGBUILD
index c36d9368f..d12293339 100644
--- a/nonsystemd/parabola-desktop-lxde/PKGBUILD
+++ b/nonsystemd/parabola-desktop-lxde/PKGBUILD
@@ -30,10 +30,18 @@ depends+=(
   epdfview
   galculator
   gnome-screenshot
-  lxde-gtk3
+  $(pacman -Sgq lxde-gtk3) # lxde-gtk3 group
   lxdm-openrc
   network-manager-applet
   obconf
   xarchiver
   xscreensaver
 )
+# FIXME: For some reason, 'lxpanel-gtk3-hidpi' in the '~lukeshu' repo
+#        is visible to libretools. 'lxpanel-gtk3-hidpi' conflicts with 'lxpanel-gtk3'.
+#        However, both declare membership in the 'lxde-gtk3' group,
+#        making the build-time expansion above, unsatisfiable.
+#        If 'lxpanel-gtk3-hidpi' is still useful, maybe it could be moved to libre
+#        (without membership in the 'lxde-gtk3' group). It is more curious, why libretools
+#        detects that package at all (it eventually fails with "target not found").
+depends=( ${depends[*]/lxpanel-gtk3-hidpi/} )
diff --git a/nonsystemd/parabola-desktop/PKGBUILD b/nonsystemd/parabola-desktop/PKGBUILD
index 1965bdc41..7373e559f 100644
--- a/nonsystemd/parabola-desktop/PKGBUILD
+++ b/nonsystemd/parabola-desktop/PKGBUILD
@@ -19,9 +19,6 @@ license=(CCPL:zero)
 # 'base' chain
 depends=(parabola-desktop-base)
 
-# obsolete openrc-desktop group
-depends+=(elogind)
-
 # supplemental package set for the LiveISOs
 depends+=(
   gvfs-mtp
diff --git a/nonsystemd/parabola/PKGBUILD b/nonsystemd/parabola/PKGBUILD
index c8ad3ede7..c74c21223 100644
--- a/nonsystemd/parabola/PKGBUILD
+++ b/nonsystemd/parabola/PKGBUILD
@@ -15,7 +15,7 @@
 
 pkgname=parabola
 pkgver=1
-pkgrel=nonsystemd1
+pkgrel=nonsystemd2
 pkgdesc="Extended package-set to define the standard Parabola GNU/Linux-libre non-systemd CLI system"
 url=https://www.parabola.nu
 arch=(any)
@@ -26,13 +26,13 @@ license=(CCPL:zero)
 depends=(parabola-base)
 
 # (obsolete 'base-openrc' group) - ('parabola-base' meta-package)
-depends+=(elogind libudev openresolv)
+depends+=(libelogind libudev openresolv)
 
 # supplemental package-set (eg: the CLI LiveISOs)
 depends+=()
 
 # your-init-freedom sanity
-depends+=(your-init-freedom)
+depends+=(elogind)
 
 # TODO: these are in the deprecated 'base-openrc' group
 #       (most important, installed in ths group, is 'udev-init-scripts')
diff --git a/nonsystemd/your-init-freedom/PKGBUILD b/nonsystemd/your-init-freedom/PKGBUILD
index e74a76f89..e3a2c521c 100644
--- a/nonsystemd/your-init-freedom/PKGBUILD
+++ b/nonsystemd/your-init-freedom/PKGBUILD
@@ -11,8 +11,8 @@ arch=(any)
 url=https://wiki.parabola.nu/Blacklist
 license=(GPL3)
 
-provides=(your-initfreedom)
-replaces=(your-initfreedom)
+provides=(your-initfreedom) # transitional (short-term)
+replaces=(your-initfreedom) # transitional (long-term)
 
 makedepends=(librelib)
 install=${pkgname}.install