From 4223fd4ac30704cc309b03046824e48e9dcd9025 Mon Sep 17 00:00:00 2001 From: ptrcnull <git@ptrcnull.me> Date: Thu, 18 Aug 2022 04:32:31 +0200 Subject: [PATCH] community/*: deduplicate dependencies --- community/bluedevil/APKBUILD | 1 - community/chromium/APKBUILD | 1 - community/coredns/APKBUILD | 2 +- community/deluge/APKBUILD | 1 - community/kiwiirc/APKBUILD | 2 +- community/kwallet-pam/APKBUILD | 1 - community/lxd/APKBUILD | 1 - community/opam/APKBUILD | 2 +- community/perl-alien-build/APKBUILD | 2 +- community/perl-alien-libxml2/APKBUILD | 2 +- community/phoc/APKBUILD | 1 - community/py3-gevent/APKBUILD | 1 - community/py3-pyside2/APKBUILD | 1 - community/py3-pyside6/APKBUILD | 1 - community/py3-python-gssapi/APKBUILD | 2 +- community/py3-sip/APKBUILD | 5 +---- community/py3-txredisapi/APKBUILD | 2 +- community/py3status/APKBUILD | 1 - community/thonny/APKBUILD | 1 - 19 files changed, 8 insertions(+), 22 deletions(-) diff --git a/community/bluedevil/APKBUILD b/community/bluedevil/APKBUILD index c86695f7c6e3..caaf7ab28ad9 100644 --- a/community/bluedevil/APKBUILD +++ b/community/bluedevil/APKBUILD @@ -18,7 +18,6 @@ makedepends=" extra-cmake-modules kcoreaddons-dev kdbusaddons-dev - kded kded-dev ki18n-dev kiconthemes-dev diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index 04e29f7a2783..0feb56e9963f 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -76,7 +76,6 @@ makedepends=" speex-dev sqlite-dev xcb-proto - xdg-utils zlib-dev " # explicit depends for --headless diff --git a/community/coredns/APKBUILD b/community/coredns/APKBUILD index 3fb813a38b6e..b7dc078009e5 100644 --- a/community/coredns/APKBUILD +++ b/community/coredns/APKBUILD @@ -9,8 +9,8 @@ url="https://github.com/coredns/coredns" license="Apache-2.0" arch="all" options="net chmod-clean" -makedepends="go libcap unbound-libs unbound-dev" depends="unbound-libs" +makedepends="go libcap unbound-dev" install="$pkgname.pre-install" subpackages="$pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/coredns/coredns/archive/v$pkgver.tar.gz diff --git a/community/deluge/APKBUILD b/community/deluge/APKBUILD index 9a4524523761..07d2d5a0afae 100644 --- a/community/deluge/APKBUILD +++ b/community/deluge/APKBUILD @@ -30,7 +30,6 @@ depends=" makedepends=" py3-build py3-installer - py3-wheel " checkdepends=" py3-mock diff --git a/community/kiwiirc/APKBUILD b/community/kiwiirc/APKBUILD index f23ea4d7a83f..af1bd2ca97ec 100644 --- a/community/kiwiirc/APKBUILD +++ b/community/kiwiirc/APKBUILD @@ -9,7 +9,7 @@ url="https://www.kiwiirc.com/" arch="noarch" license="AGPL-3.0" depends="nodejs>=0.10.0" -makedepends="nodejs npm" +makedepends="npm" install="$pkgname.pre-install" subpackages="$pkgname-doc" pkgusers="kiwiirc" diff --git a/community/kwallet-pam/APKBUILD b/community/kwallet-pam/APKBUILD index df955503756c..6acfdaf04eaf 100644 --- a/community/kwallet-pam/APKBUILD +++ b/community/kwallet-pam/APKBUILD @@ -15,7 +15,6 @@ makedepends=" libgcrypt-dev linux-pam-dev samurai - socat " case "$pkgver" in diff --git a/community/lxd/APKBUILD b/community/lxd/APKBUILD index f88d1e11cce9..b35e0459cd79 100644 --- a/community/lxd/APKBUILD +++ b/community/lxd/APKBUILD @@ -39,7 +39,6 @@ makedepends="acl-dev lxc-dev lz4-dev raft-dev - rsync sqlite-dev tcl-dev " diff --git a/community/opam/APKBUILD b/community/opam/APKBUILD index 844d252d079d..825461ee843a 100644 --- a/community/opam/APKBUILD +++ b/community/opam/APKBUILD @@ -12,7 +12,7 @@ arch="all !riscv64" # ocaml license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception" depends="curl patch unzip coreutils bubblewrap" options="net !check" # The tests use bubblewrap which cannot be run inside docker -makedepends="curl tar ocaml-compiler-libs" +makedepends="tar ocaml-compiler-libs" checkdepends="rsync bash diffutils" source="$pkgname-$pkgver.tar.gz::https://github.com/ocaml/opam/archive/$pkgver.tar.gz" subpackages="$pkgname-doc" diff --git a/community/perl-alien-build/APKBUILD b/community/perl-alien-build/APKBUILD index e82bd5a845b2..95780bc1d705 100644 --- a/community/perl-alien-build/APKBUILD +++ b/community/perl-alien-build/APKBUILD @@ -11,7 +11,7 @@ url="https://metacpan.org/release/Alien-Build/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-file-chdir perl-path-tiny perl-capture-tiny perl-ffi-checklib perl-file-which" -makedepends="perl-dev perl-file-which" +makedepends="perl-dev" checkdepends="perl-test2-suite" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-$pkgver.tar.gz" diff --git a/community/perl-alien-libxml2/APKBUILD b/community/perl-alien-libxml2/APKBUILD index 1e5dfde10a77..fa20e8bdb4fb 100644 --- a/community/perl-alien-libxml2/APKBUILD +++ b/community/perl-alien-libxml2/APKBUILD @@ -11,7 +11,7 @@ url="https://metacpan.org/release/Alien-Libxml2/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-alien-build" -makedepends="perl-dev perl-alien-build libxml2-dev" +makedepends="perl-dev libxml2-dev" checkdepends="perl-test2-suite perl-alien-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Libxml2-$pkgver.tar.gz" diff --git a/community/phoc/APKBUILD b/community/phoc/APKBUILD index f28f5d31e907..c2a7b5578b1f 100644 --- a/community/phoc/APKBUILD +++ b/community/phoc/APKBUILD @@ -30,7 +30,6 @@ _wlrootsmakedepends=" makedepends=" glib-dev gnome-desktop-dev - gsettings-desktop-schemas libdrm-dev libinput-dev libxkbcommon-dev diff --git a/community/py3-gevent/APKBUILD b/community/py3-gevent/APKBUILD index 13dd7923e052..e830ddee7687 100644 --- a/community/py3-gevent/APKBUILD +++ b/community/py3-gevent/APKBUILD @@ -21,7 +21,6 @@ makedepends=" libev-dev libevent-dev libuv-dev - py3-setuptools python3-dev " source="https://github.com/gevent/gevent/archive/$pkgver/gevent-$pkgver.tar.gz" diff --git a/community/py3-pyside2/APKBUILD b/community/py3-pyside2/APKBUILD index f33704ca3c5c..480ddf055e97 100644 --- a/community/py3-pyside2/APKBUILD +++ b/community/py3-pyside2/APKBUILD @@ -12,7 +12,6 @@ depends="py3-shiboken2" makedepends=" cmake libshiboken2-dev - py3-shiboken2 qt5-qt3d-dev qt5-qtbase-dev qt5-qtcharts-dev diff --git a/community/py3-pyside6/APKBUILD b/community/py3-pyside6/APKBUILD index 79bc42afe0a6..dafabc8a3999 100644 --- a/community/py3-pyside6/APKBUILD +++ b/community/py3-pyside6/APKBUILD @@ -11,7 +11,6 @@ makedepends=" cmake ninja libshiboken6-dev - py3-shiboken6 qt6-qt3d-dev qt6-qtbase-dev qt6-qtcharts-dev diff --git a/community/py3-python-gssapi/APKBUILD b/community/py3-python-gssapi/APKBUILD index 7a9603289eb9..c653ded150a0 100644 --- a/community/py3-python-gssapi/APKBUILD +++ b/community/py3-python-gssapi/APKBUILD @@ -10,7 +10,7 @@ arch="all" license="ISC" depends="python3 krb5-dev py3-decorator" checkdepends="py3-nose py3-k5test py3-parameterized" -makedepends="python3-dev krb5-dev py3-setuptools" +makedepends="python3-dev py3-setuptools" source="https://files.pythonhosted.org/packages/source/g/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver diff --git a/community/py3-sip/APKBUILD b/community/py3-sip/APKBUILD index afe2b22fc00e..3c0c9c5a80df 100644 --- a/community/py3-sip/APKBUILD +++ b/community/py3-sip/APKBUILD @@ -14,10 +14,7 @@ depends=" py3-setuptools py3-toml " -makedepends=" - py3-setuptools - python3-dev - " +makedepends="python3-dev" source="https://pypi.python.org/packages/source/s/sip/sip-$pkgver.tar.gz" builddir="$srcdir/sip-$pkgver" diff --git a/community/py3-txredisapi/APKBUILD b/community/py3-txredisapi/APKBUILD index 3299c7bd3161..8e85ab3b992b 100644 --- a/community/py3-txredisapi/APKBUILD +++ b/community/py3-txredisapi/APKBUILD @@ -9,7 +9,7 @@ url="https://github.com/IlyaSkriblovsky/txredisapi" arch="all" license="Apache-2.0" depends="python3 py3-twisted" -makedepends="py3-setuptools python3-dev py3-twisted" +makedepends="py3-setuptools python3-dev" source="$_pkgname-$pkgver.tar.gz::https://github.com/IlyaSkriblovsky/txredisapi/archive/$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver options="!check" # needs running redis diff --git a/community/py3status/APKBUILD b/community/py3status/APKBUILD index 3891ec0fc6f4..f0b71bd37ca8 100644 --- a/community/py3status/APKBUILD +++ b/community/py3status/APKBUILD @@ -8,7 +8,6 @@ url="https://py3status.readthedocs.io" arch="noarch" license="BSD-3-Clause" depends="python3 py3-setuptools" -makedepends="py3-setuptools" checkdepends="py3-pytest" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/ultrabug/py3status/archive/refs/tags/$pkgver.tar.gz" diff --git a/community/thonny/APKBUILD b/community/thonny/APKBUILD index 5e44910dea50..1f7a3aaca664 100644 --- a/community/thonny/APKBUILD +++ b/community/thonny/APKBUILD @@ -22,7 +22,6 @@ depends=" py3-wheel python3-tkinter " -makedepends="py3-setuptools" source="https://files.pythonhosted.org/packages/source/t/thonny/thonny-$pkgver.tar.gz" options="!check" # Tests need a DISPLAY -- GitLab