From a09f9806b305a50bd3b065a5a3dce966f34d638c Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Fri, 15 Apr 2022 15:36:53 +0200 Subject: [PATCH] refactor --- pkg/de-p1st-gnupg/PKGBUILD | 4 +++- pkg/de-p1st-gpu-amdgpu/PKGBUILD | 2 +- pkg/de-p1st-grub/PKGBUILD | 4 +++- pkg/de-p1st-locale/PKGBUILD | 2 +- pkg/de-p1st-makepkg/PKGBUILD | 4 +++- pkg/de-p1st-mkinitcpio/PKGBUILD | 4 +++- pkg/de-p1st-nano/PKGBUILD | 4 +++- pkg/de-p1st-pacman-mirrorlist/PKGBUILD | 4 +++- pkg/de-p1st-pacman-repo-chromium/PKGBUILD | 4 +++- pkg/de-p1st-pacman-repo-surface/PKGBUILD | 4 +++- pkg/de-p1st-pacman/PKGBUILD | 4 +++- pkg/de-p1st-screen/PKGBUILD | 4 +++- pkg/de-p1st-sddm-theme-nordic/PKGBUILD | 2 +- pkg/de-p1st-smartcard/PKGBUILD | 4 +++- 14 files changed, 36 insertions(+), 14 deletions(-) diff --git a/pkg/de-p1st-gnupg/PKGBUILD b/pkg/de-p1st-gnupg/PKGBUILD index 2d31882..f9d3dfb 100644 --- a/pkg/de-p1st-gnupg/PKGBUILD +++ b/pkg/de-p1st-gnupg/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="gnupg with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('gnupg' 'holo' 'git' 'base') +depends=() +depends+=('gnupg') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 b8ab3b4..f816fd5 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') # without base "holo apply" may fail on initial system installation makedepends=('git') provides=('de-p1st-gpu') # implicitly provides $pkgname diff --git a/pkg/de-p1st-grub/PKGBUILD b/pkg/de-p1st-grub/PKGBUILD index 246651c..c9cce4a 100644 --- a/pkg/de-p1st-grub/PKGBUILD +++ b/pkg/de-p1st-grub/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="grub with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('grub' 'holo' 'git' 'base') +depends=() +depends+=('grub') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation makedepends=('git') install='.install' changelog= diff --git a/pkg/de-p1st-locale/PKGBUILD b/pkg/de-p1st-locale/PKGBUILD index 80720b9..9c9845b 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') +depends=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 20627f2..5fb4114 100644 --- a/pkg/de-p1st-makepkg/PKGBUILD +++ b/pkg/de-p1st-makepkg/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="Personalized makepkg.conf" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('pacman' 'holo' 'git' 'base') # /etc/makepkg.conf belongs to pacman +depends=() +depends+=('pacman') # /etc/makepkg.conf belongs to pacman +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation makedepends=('git') install='.install' changelog= diff --git a/pkg/de-p1st-mkinitcpio/PKGBUILD b/pkg/de-p1st-mkinitcpio/PKGBUILD index 6dfd9d7..b4c8cc7 100644 --- a/pkg/de-p1st-mkinitcpio/PKGBUILD +++ b/pkg/de-p1st-mkinitcpio/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="mkinitcpio configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('mkinitcpio' 'holo' 'git' 'base') # without base "holo apply" may fail on initial system installation +depends=() +depends+=('mkinitcpio') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation makedepends=('git') install='.install' source=("git+${url}.git") diff --git a/pkg/de-p1st-nano/PKGBUILD b/pkg/de-p1st-nano/PKGBUILD index 23d14d2..b40c97b 100644 --- a/pkg/de-p1st-nano/PKGBUILD +++ b/pkg/de-p1st-nano/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="nano with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('nano' 'holo' 'git' 'base') +depends=() +depends+=('nano') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 9666557..2ad5f47 100644 --- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD +++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="Selected Arch Linux mirrors" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('pacman' 'holo' 'git' 'base') # without base "holo apply" may fail on initial system installation +depends=() +depends+=('pacman') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 0559d72..8447672 100644 --- a/pkg/de-p1st-pacman-repo-chromium/PKGBUILD +++ b/pkg/de-p1st-pacman-repo-chromium/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="Enable ungoogled-chromium repo" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('pacman' 'holo' 'git' 'base') +depends=() +depends+=('pacman') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 4dfb0f2..8fa0b1e 100644 --- a/pkg/de-p1st-pacman-repo-surface/PKGBUILD +++ b/pkg/de-p1st-pacman-repo-surface/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="Enable linux-surface repo" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('pacman' 'holo' 'git' 'base') +depends=() +depends+=('pacman') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 af29648..6e800a1 100644 --- a/pkg/de-p1st-pacman/PKGBUILD +++ b/pkg/de-p1st-pacman/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="pacman with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('pacman' 'holo' 'git' 'base') +depends=() +depends+=('pacman') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 f656523..b4d5ce6 100644 --- a/pkg/de-p1st-screen/PKGBUILD +++ b/pkg/de-p1st-screen/PKGBUILD @@ -8,7 +8,9 @@ pkgdesc="screen with configuration" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') -depends=('screen' 'holo' 'git' 'base') +depends=() +depends+=('screen') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation 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 7cc63a0..b469349 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') +depends+=('holo' 'git' 'base') # without base "holo apply" may fail on initial system installation depends+=('de-p1st-wallpaper') makedepends=('git') diff --git a/pkg/de-p1st-smartcard/PKGBUILD b/pkg/de-p1st-smartcard/PKGBUILD index 106a522..de2b180 100644 --- a/pkg/de-p1st-smartcard/PKGBUILD +++ b/pkg/de-p1st-smartcard/PKGBUILD @@ -9,7 +9,9 @@ arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') groups=() -depends=('ccid' 'opensc' 'systemd' 'holo' 'git' 'base' 'de-p1st-gnupg') +depends=() +depends+=('ccid' 'opensc' 'systemd' 'de-p1st-gnupg') +depends+=('holo' 'git' 'base' ) # without base "holo apply" may fail on initial system installation makedepends=('git') install='.install' source=("git+${url}.git")