From 6324e04414866efc8223e677150e1289e127a883 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Fri, 15 Apr 2022 15:43:21 +0200
Subject: [PATCH] refactor

---
 pkg/de-p1st-gnupg/PKGBUILD                | 2 +-
 pkg/de-p1st-gpu-amdgpu/PKGBUILD           | 2 +-
 pkg/de-p1st-grub/PKGBUILD                 | 2 +-
 pkg/de-p1st-locale/PKGBUILD               | 2 +-
 pkg/de-p1st-makepkg/PKGBUILD              | 2 +-
 pkg/de-p1st-mkinitcpio/PKGBUILD           | 2 +-
 pkg/de-p1st-nano/PKGBUILD                 | 2 +-
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD    | 2 +-
 pkg/de-p1st-pacman-repo-chromium/PKGBUILD | 2 +-
 pkg/de-p1st-pacman-repo-surface/PKGBUILD  | 2 +-
 pkg/de-p1st-pacman/PKGBUILD               | 2 +-
 pkg/de-p1st-screen/PKGBUILD               | 2 +-
 pkg/de-p1st-sddm-theme-nordic/PKGBUILD    | 2 +-
 pkg/de-p1st-signal-desktop/PKGBUILD       | 2 +-
 pkg/de-p1st-smartcard/PKGBUILD            | 2 +-
 pkg/de-p1st-ssh/PKGBUILD                  | 2 +-
 pkg/de-p1st-zoom/PKGBUILD                 | 2 +-
 prototype/proto.PKGBUILD                  | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkg/de-p1st-gnupg/PKGBUILD b/pkg/de-p1st-gnupg/PKGBUILD
index f9d3dfb..203177e 100644
--- a/pkg/de-p1st-gnupg/PKGBUILD
+++ b/pkg/de-p1st-gnupg/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('gnupg')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 source=("git+${url}.git")
diff --git a/pkg/de-p1st-gpu-amdgpu/PKGBUILD b/pkg/de-p1st-gpu-amdgpu/PKGBUILD
index f816fd5..d8dac17 100644
--- a/pkg/de-p1st-gpu-amdgpu/PKGBUILD
+++ b/pkg/de-p1st-gpu-amdgpu/PKGBUILD
@@ -20,7 +20,7 @@ depends+=(libva-mesa-driver)
 # "HW-vide-acceleration: VDPAU"
 depends+=(mesa-vdpau)
 # holo
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 
 makedepends=('git')
 provides=('de-p1st-gpu') # implicitly provides $pkgname
diff --git a/pkg/de-p1st-grub/PKGBUILD b/pkg/de-p1st-grub/PKGBUILD
index c9cce4a..9558aac 100644
--- a/pkg/de-p1st-grub/PKGBUILD
+++ b/pkg/de-p1st-grub/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('grub')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 changelog=
diff --git a/pkg/de-p1st-locale/PKGBUILD b/pkg/de-p1st-locale/PKGBUILD
index 9c9845b..cf58bdf 100644
--- a/pkg/de-p1st-locale/PKGBUILD
+++ b/pkg/de-p1st-locale/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="locale and timezone"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
-depends=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 backup=('etc/locale.conf' 'etc/localtime')
 install='.install'
diff --git a/pkg/de-p1st-makepkg/PKGBUILD b/pkg/de-p1st-makepkg/PKGBUILD
index 5fb4114..5d14f4e 100644
--- a/pkg/de-p1st-makepkg/PKGBUILD
+++ b/pkg/de-p1st-makepkg/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('pacman') # /etc/makepkg.conf belongs to pacman
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 changelog=
diff --git a/pkg/de-p1st-mkinitcpio/PKGBUILD b/pkg/de-p1st-mkinitcpio/PKGBUILD
index b4c8cc7..8d7df5b 100644
--- a/pkg/de-p1st-mkinitcpio/PKGBUILD
+++ b/pkg/de-p1st-mkinitcpio/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('mkinitcpio')
-depends+=('holo' 'git' 'base')  # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 source=("git+${url}.git")
diff --git a/pkg/de-p1st-nano/PKGBUILD b/pkg/de-p1st-nano/PKGBUILD
index b40c97b..5d0bc3b 100644
--- a/pkg/de-p1st-nano/PKGBUILD
+++ b/pkg/de-p1st-nano/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('nano')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 source=("git+${url}.git")
diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index 2ad5f47..ece16a9 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('pacman')
-depends+=('holo' 'git' 'base')  # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 source=("git+${url}.git")
diff --git a/pkg/de-p1st-pacman-repo-chromium/PKGBUILD b/pkg/de-p1st-pacman-repo-chromium/PKGBUILD
index 8447672..114aad1 100644
--- a/pkg/de-p1st-pacman-repo-chromium/PKGBUILD
+++ b/pkg/de-p1st-pacman-repo-chromium/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('pacman')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 depends+=('curl')  # add signing key of mirror in .install
 makedepends=('git')
 install='.install'
diff --git a/pkg/de-p1st-pacman-repo-surface/PKGBUILD b/pkg/de-p1st-pacman-repo-surface/PKGBUILD
index 8fa0b1e..65ff59d 100644
--- a/pkg/de-p1st-pacman-repo-surface/PKGBUILD
+++ b/pkg/de-p1st-pacman-repo-surface/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('pacman')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 depends+=('curl')  # add signing key of mirror in .install
 makedepends=('git')
 install='.install'
diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index 6e800a1..42bbd76 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('pacman')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 optdepends=('de-p1st-pacman-mirrorlist' 'de-p1st-pacman-repo-chromium' 'de-p1st-repo-surface')
 install='.install'
diff --git a/pkg/de-p1st-screen/PKGBUILD b/pkg/de-p1st-screen/PKGBUILD
index b4d5ce6..a7c4ad7 100644
--- a/pkg/de-p1st-screen/PKGBUILD
+++ b/pkg/de-p1st-screen/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=()
 depends+=('screen')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 source=("git+${url}.git")
diff --git a/pkg/de-p1st-sddm-theme-nordic/PKGBUILD b/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
index b469349..96a1cd7 100644
--- a/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
+++ b/pkg/de-p1st-sddm-theme-nordic/PKGBUILD
@@ -13,7 +13,7 @@ depends=('sddm' 'sddm-nordic-theme-git')
 # Without plasma-framework the following error occurs:
 # Main.qml:28:1: module "org.kde.plasma.extras" is not installed
 depends+=('plasma-framework')
-depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 depends+=('de-p1st-wallpaper')
 
 makedepends=('git')
diff --git a/pkg/de-p1st-signal-desktop/PKGBUILD b/pkg/de-p1st-signal-desktop/PKGBUILD
index c182b4c..305af6a 100644
--- a/pkg/de-p1st-signal-desktop/PKGBUILD
+++ b/pkg/de-p1st-signal-desktop/PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 install='.install'
 depends=('signal-desktop')
-depends+=('holo' 'git' 'base')  # holo and its dependencies: git because of git-diff; without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 source=("git+${url}.git")
 sha256sums=('SKIP')
diff --git a/pkg/de-p1st-smartcard/PKGBUILD b/pkg/de-p1st-smartcard/PKGBUILD
index de2b180..ca6bb93 100644
--- a/pkg/de-p1st-smartcard/PKGBUILD
+++ b/pkg/de-p1st-smartcard/PKGBUILD
@@ -11,7 +11,7 @@ license=('MIT')
 groups=()
 depends=()
 depends+=('ccid' 'opensc' 'systemd' 'de-p1st-gnupg')
-depends+=('holo' 'git' 'base' ) # without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base' ) # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')
 install='.install'
 source=("git+${url}.git")
diff --git a/pkg/de-p1st-ssh/PKGBUILD b/pkg/de-p1st-ssh/PKGBUILD
index 5b85abf..4129d47 100644
--- a/pkg/de-p1st-ssh/PKGBUILD
+++ b/pkg/de-p1st-ssh/PKGBUILD
@@ -9,7 +9,7 @@ arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('openssh' 'systemd')
-depends+=('holo' 'git' 'base')  # holo and its dependencies: git because of git-diff; without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 depends+=('de-p1st-ssh-key')
 makedepends=('git')
 install='.install'
diff --git a/pkg/de-p1st-zoom/PKGBUILD b/pkg/de-p1st-zoom/PKGBUILD
index 229c31b..09bc459 100644
--- a/pkg/de-p1st-zoom/PKGBUILD
+++ b/pkg/de-p1st-zoom/PKGBUILD
@@ -9,7 +9,7 @@ arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('zoom' 'zoom-firejail')
-depends+=('holo' 'git' 'base')  # holo and its dependencies: git because of git-diff; without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')  # to fetch source(s) via git
 install='.install'
 source=("git+${url}.git")
diff --git a/prototype/proto.PKGBUILD b/prototype/proto.PKGBUILD
index d925fcc..5d11282 100644
--- a/prototype/proto.PKGBUILD
+++ b/prototype/proto.PKGBUILD
@@ -10,7 +10,7 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 groups=()
 depends=()
-depends+=('holo' 'git' 'base')  # holo and its dependencies: git because of git-diff; without base "holo apply" may fail on initial system installation
+depends+=('holo' 'git' 'base') # holo depends on base (otherwise "holo apply" may fail on initial system installation) and git (git-diff)
 makedepends=('git')  # to fetch source(s) via git
 optdepends=()
 provides=()