From 8461b76cd72e0f69ecf4e5b0a08626bcd98500d9 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Mon, 18 Dec 2023 14:28:06 +0100
Subject: [PATCH] */*: remove duplicate variables

---
 community/bird_exporter/APKBUILD            | 3 +--
 community/cargo-audit/APKBUILD              | 1 -
 community/cni-plugin-flannel/APKBUILD       | 1 -
 community/girara/APKBUILD                   | 1 -
 community/gitea/APKBUILD                    | 3 +--
 community/gnome-boxes/APKBUILD              | 1 -
 community/mauikit-terminal/APKBUILD         | 1 -
 community/pwclient/APKBUILD                 | 1 -
 community/py3-adapt-parser/APKBUILD         | 1 -
 community/py3-colour/APKBUILD               | 1 -
 community/py3-distributed/APKBUILD          | 1 -
 community/py3-django-guardian/APKBUILD      | 1 -
 community/py3-html2markdown/APKBUILD        | 1 -
 community/py3-matrix-common/APKBUILD        | 1 -
 community/py3-portalocker/APKBUILD          | 1 -
 community/py3-purl/APKBUILD                 | 1 -
 community/py3-pynitrokey/APKBUILD           | 1 -
 community/py3-ruamel.yaml/APKBUILD          | 3 +--
 community/py3-service_identity/APKBUILD     | 2 --
 community/py3-websockets/APKBUILD           | 1 -
 community/v2ray/APKBUILD                    | 1 -
 community/wezterm/APKBUILD                  | 1 -
 main/dovecot/APKBUILD                       | 1 -
 main/gummiboot/APKBUILD                     | 1 -
 main/iputils/APKBUILD                       | 1 -
 main/lua-pty/APKBUILD                       | 1 -
 main/mandoc/APKBUILD                        | 3 +--
 main/ngircd/APKBUILD                        | 1 -
 main/squid/APKBUILD                         | 2 --
 main/tinyproxy/APKBUILD                     | 2 --
 testing/belcard/APKBUILD                    | 1 -
 testing/blocky/APKBUILD                     | 3 +--
 testing/etcd/APKBUILD                       | 1 -
 testing/fbp/APKBUILD                        | 1 -
 testing/gr-satellites/APKBUILD              | 1 -
 testing/lomiri-system-settings/APKBUILD     | 1 -
 testing/lua-lapis-console/APKBUILD          | 1 -
 testing/minikube/APKBUILD                   | 1 -
 testing/py3-nikola/APKBUILD                 | 1 -
 testing/py3-sphinx-theme-bootstrap/APKBUILD | 1 -
 testing/srain/APKBUILD                      | 1 -
 testing/tomcat9/APKBUILD                    | 1 -
 testing/wroomd/APKBUILD                     | 1 -
 43 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/community/bird_exporter/APKBUILD b/community/bird_exporter/APKBUILD
index 4d2de130747..656d6e530ea 100644
--- a/community/bird_exporter/APKBUILD
+++ b/community/bird_exporter/APKBUILD
@@ -9,11 +9,10 @@ license="MIT"
 pkgusers="$pkgname"
 depends="bird"
 makedepends="go ronn"
-options="net"
 source="https://github.com/czerwonk/bird_exporter/archive/$pkgver/bird_exporter-$pkgver.tar.gz
 	bird_exporter.initd
 	"
-options="!check" # no checks available
+options="!check net" # no checks available
 install="bird_exporter.pre-install"
 subpackages="$pkgname-openrc $pkgname-doc"
 
diff --git a/community/cargo-audit/APKBUILD b/community/cargo-audit/APKBUILD
index 838f6ec3177..add18936009 100644
--- a/community/cargo-audit/APKBUILD
+++ b/community/cargo-audit/APKBUILD
@@ -10,7 +10,6 @@ arch="all !s390x !ppc64le !riscv64"
 license="MIT OR Apache-2.0"
 makedepends="cargo libgit2-dev openssl-dev>3 cargo-auditable"
 subpackages="$pkgname-doc"
-options="net"
 source="$pkgname-$pkgver.tar.gz::https://github.com/RustSec/cargo-audit/archive/cargo-audit/v$pkgver.tar.gz"
 builddir="$srcdir/rustsec-$pkgname-v$pkgver/$pkgname"
 options="net !check" # requires running binaries prebuilt against glibc as part of the tests and fails
diff --git a/community/cni-plugin-flannel/APKBUILD b/community/cni-plugin-flannel/APKBUILD
index 5249bef8932..6f63b1a3140 100644
--- a/community/cni-plugin-flannel/APKBUILD
+++ b/community/cni-plugin-flannel/APKBUILD
@@ -4,7 +4,6 @@ pkgname=cni-plugin-flannel
 pkgver=1.1.2
 pkgrel=6
 pkgdesc="networking plugin, designed to work with flannel network fabric"
-options="!check"
 url="https://github.com/flannel-io/cni-plugin/"
 arch="all"
 license="Apache-2.0"
diff --git a/community/girara/APKBUILD b/community/girara/APKBUILD
index 32c8abc776d..58ab77e0cf8 100644
--- a/community/girara/APKBUILD
+++ b/community/girara/APKBUILD
@@ -9,7 +9,6 @@ pkgdesc="girara - gtk user interface that focuses on simplicity and minimalism"
 url="https://git.pwmt.org/pwmt/girara"
 arch="all"
 license="Zlib"
-checkdepends="dbus"
 makedepends="
 	check-dev
 	doxygen
diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD
index 5c4dc3f61e6..3b2a6a1fc91 100644
--- a/community/gitea/APKBUILD
+++ b/community/gitea/APKBUILD
@@ -9,7 +9,6 @@ pkgdesc="Self-hosted Git service written in Go"
 url="https://about.gitea.com"
 arch="all"
 license="MIT"
-options="net"
 depends="git git-lfs gnupg"
 makedepends="go"
 checkdepends="bash openssh openssh-keygen sqlite tzdata"
@@ -22,7 +21,7 @@ source="$pkgname-$pkgver.tar.gz::https://dl.gitea.com/gitea/$pkgver/gitea-src-$p
 	$pkgname.ini
 	"
 builddir="$srcdir/gitea-src-$pkgver"
-options="!check" # broken with GIT_CEILING
+options="!check net" # broken with GIT_CEILING
 
 # secfixes:
 #   1.17.3-r0:
diff --git a/community/gnome-boxes/APKBUILD b/community/gnome-boxes/APKBUILD
index 4f862978288..8fa7a011a6e 100644
--- a/community/gnome-boxes/APKBUILD
+++ b/community/gnome-boxes/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="Virtualization made simple"
 url="https://wiki.gnome.org/Apps/Boxes"
 arch="all"
 license="GPL-2.0-only"
-depends="libvirt-daemon"
 makedepends="
 	desktop-file-utils
 	freerdp-dev
diff --git a/community/mauikit-terminal/APKBUILD b/community/mauikit-terminal/APKBUILD
index 4a208fffc1f..9c881e2d6df 100644
--- a/community/mauikit-terminal/APKBUILD
+++ b/community/mauikit-terminal/APKBUILD
@@ -10,7 +10,6 @@ pkgdesc="Terminal support components for Maui applications"
 url="https://mauikit.org/"
 # armhf blocked by mauikit -> qt5-qtdeclarative
 arch="all !armhf"
-url="https://mauikit.org/"
 license="GPL-2.0-or-later"
 depends="kirigami2"
 depends_dev="
diff --git a/community/pwclient/APKBUILD b/community/pwclient/APKBUILD
index 2fc090b6bf1..fb5c2c37cd4 100644
--- a/community/pwclient/APKBUILD
+++ b/community/pwclient/APKBUILD
@@ -11,7 +11,6 @@ depends="python3"
 makedepends="py3-setuptools py3-pbr"
 checkdepends="py3-pytest py3-pytest-cov py3-mock"
 subpackages="$pkgname-doc $pkgname-pyc"
-subpackages="$pkgname-doc $pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/getpatchwork/pwclient/archive/$pkgver.tar.gz"
 
 build() {
diff --git a/community/py3-adapt-parser/APKBUILD b/community/py3-adapt-parser/APKBUILD
index 9ac77c1f0f3..d93e2c05180 100644
--- a/community/py3-adapt-parser/APKBUILD
+++ b/community/py3-adapt-parser/APKBUILD
@@ -18,7 +18,6 @@ checkdepends="
 	"
 subpackages="$pkgname-pyc"
 #source="https://pypi.python.org/packages/source/a/adapt-parser/adapt-parser-$pkgver.tar.gz
-subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/MycroftAI/adapt/archive/refs/tags/release/v$pkgver.tar.gz"
 builddir="$srcdir/adapt-release-v$pkgver"
 
diff --git a/community/py3-colour/APKBUILD b/community/py3-colour/APKBUILD
index 084b1edd0bc..948fc56af52 100644
--- a/community/py3-colour/APKBUILD
+++ b/community/py3-colour/APKBUILD
@@ -15,7 +15,6 @@ source="https://files.pythonhosted.org/packages/source/c/colour/colour-$pkgver.t
 	remove-d2to1.patch"
 builddir="$srcdir/colour-$pkgver"
 
-replaces="py-colour" # Backwards compatibility
 replaces="py-colour=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
diff --git a/community/py3-distributed/APKBUILD b/community/py3-distributed/APKBUILD
index 34b3b6dee78..5390ddbd190 100644
--- a/community/py3-distributed/APKBUILD
+++ b/community/py3-distributed/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="A library for distributed computation"
 url="https://distributed.dask.org/"
 arch="noarch"
 license="BSD-3-Clause"
-depends="python3"
 depends="
 	py3-click
 	py3-cloudpickle
diff --git a/community/py3-django-guardian/APKBUILD b/community/py3-django-guardian/APKBUILD
index 2b892590679..35db5d70e56 100644
--- a/community/py3-django-guardian/APKBUILD
+++ b/community/py3-django-guardian/APKBUILD
@@ -21,7 +21,6 @@ checkdepends="
 	py3-pytest
 	py3-pytest-django
 	"
-subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/d/django-guardian/django-guardian-$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
 subpackages="$pkgname-pyc"
diff --git a/community/py3-html2markdown/APKBUILD b/community/py3-html2markdown/APKBUILD
index 5fb4ac1edf3..218db5d10ec 100644
--- a/community/py3-html2markdown/APKBUILD
+++ b/community/py3-html2markdown/APKBUILD
@@ -18,7 +18,6 @@ checkdepends="
 	"
 subpackages="$pkgname-pyc"
 #source="https://pypi.python.org/packages/source/h/html2markdown/html2markdown-$pkgver.tar.gz"
-subpackages="$pkgname-pyc"
 source="https://github.com/dlon/html2markdown/archive/v$pkgver/html2markdown-v$pkgver.tar.gz"
 builddir="$srcdir/html2markdown-$pkgver"
 
diff --git a/community/py3-matrix-common/APKBUILD b/community/py3-matrix-common/APKBUILD
index 69f8593695a..a6aa583c8d8 100644
--- a/community/py3-matrix-common/APKBUILD
+++ b/community/py3-matrix-common/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="Common utilities for Synapse, Sydent and Sygnal"
 url="https://github.com/matrix-org/matrix-python-common"
 arch="noarch"
 license="Apache-2.0"
-depends="python3"
 depends="python3 py3-attrs"
 makedepends="
 	py3-gpep517
diff --git a/community/py3-portalocker/APKBUILD b/community/py3-portalocker/APKBUILD
index 023a7e03eb8..8cc801a9370 100644
--- a/community/py3-portalocker/APKBUILD
+++ b/community/py3-portalocker/APKBUILD
@@ -31,7 +31,6 @@ source="https://pypi.python.org/packages/source/p/portalocker/portalocker-$pkgve
 # Tests requires deprecated Python package pytest-flakes and pytest-pep8
 options="!check"
 builddir="$srcdir/portalocker-$pkgver"
-subpackages="$pkgname-pyc"
 
 build() {
 	gpep517 build-wheel \
diff --git a/community/py3-purl/APKBUILD b/community/py3-purl/APKBUILD
index d9860a9e2b0..9c189cc0f83 100644
--- a/community/py3-purl/APKBUILD
+++ b/community/py3-purl/APKBUILD
@@ -8,7 +8,6 @@ pkgdesc="immutable Python3 URL class for easy URL-building and manipulation"
 url="https://github.com/codeinthehole/purl"
 arch="noarch"
 license="MIT"
-depends="py3-six"
 # Tests are not included in the tarball
 options="!check"
 depends="python3"
diff --git a/community/py3-pynitrokey/APKBUILD b/community/py3-pynitrokey/APKBUILD
index 756d3a37fbd..03dc0eebfba 100644
--- a/community/py3-pynitrokey/APKBUILD
+++ b/community/py3-pynitrokey/APKBUILD
@@ -8,7 +8,6 @@ url="https://github.com/Nitrokey/pynitrokey"
 # s390x, ppc64le and riscv64 blocked by py3-spsdk and py3-nrfutil
 arch="noarch !s390x !ppc64le !riscv64"
 license="Apache-2.0 AND MIT"
-depends="python3"
 # libnitrokey is purely pulled in for the udev rules
 depends="
 	libnitrokey
diff --git a/community/py3-ruamel.yaml/APKBUILD b/community/py3-ruamel.yaml/APKBUILD
index 4671d1d3002..23d09d0211f 100644
--- a/community/py3-ruamel.yaml/APKBUILD
+++ b/community/py3-ruamel.yaml/APKBUILD
@@ -8,7 +8,6 @@ _pyname=ruamel.yaml
 pkgver=0.17.28
 pkgrel=0
 pkgdesc="Python YAML parser/emitter"
-options="!check" # tests are not included in the latest artifact on PyPI
 url="https://sourceforge.net/projects/ruamel-yaml/"
 arch="noarch"
 license="MIT"
@@ -24,7 +23,7 @@ checkdepends="py3-pytest py3-ruamel.std.pathlib"
 subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/r/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir/$_pyname-$pkgver"
-options="!check" # pypy no tests
+options="!check" # tests are not included in the latest artifact on PyPI
 
 build() {
 	gpep517 build-wheel \
diff --git a/community/py3-service_identity/APKBUILD b/community/py3-service_identity/APKBUILD
index edfd23bda56..705b24d16f7 100644
--- a/community/py3-service_identity/APKBUILD
+++ b/community/py3-service_identity/APKBUILD
@@ -12,8 +12,6 @@ depends="py3-asn1 py3-asn1-modules py3-attrs py3-cryptography"
 makedepends="py3-gpep517 py3-hatchling py3-hatch-vcs"
 checkdepends="py3-idna py3-openssl py3-pytest-runner"
 subpackages="$pkgname-pyc"
-source="https://files.pythonhosted.org/packages/source/s/$_pkgname/$_pkgname-$pkgver.tar.gz"
-subpackages="$pkgname-pyc"
 source="https://github.com/pyca/service-identity/archive/$pkgver/$pkgname-$pkgver.tar.gz
 	remove-fancy-pypi-readme.patch
 	"
diff --git a/community/py3-websockets/APKBUILD b/community/py3-websockets/APKBUILD
index 89f44652dca..134e78792d2 100644
--- a/community/py3-websockets/APKBUILD
+++ b/community/py3-websockets/APKBUILD
@@ -6,7 +6,6 @@ _pkgname=websockets
 pkgver=12.0
 pkgrel=0
 pkgdesc="An implementation of the WebSocket Protocol (RFC 6455)"
-options="net"
 url="https://websockets.readthedocs.io/"
 arch="all"
 license="BSD-3-Clause"
diff --git a/community/v2ray/APKBUILD b/community/v2ray/APKBUILD
index 07018db5b1a..d7653bebd81 100644
--- a/community/v2ray/APKBUILD
+++ b/community/v2ray/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="A platform for building proxies to bypass network restrictions"
 url="https://v2fly.org"
 arch="all"
 license="MIT"
-options="chmod-clean"
 makedepends="go"
 subpackages="$pkgname-openrc"
 _geosite_ver=20231128180936
diff --git a/community/wezterm/APKBUILD b/community/wezterm/APKBUILD
index 02877aae092..cce216dfc6c 100644
--- a/community/wezterm/APKBUILD
+++ b/community/wezterm/APKBUILD
@@ -11,7 +11,6 @@ url="https://wezfurlong.org/wezterm/"
 # armv7 armhf x86 limited by 32-bit incompatibility
 arch="x86_64 aarch64"
 license="MIT"
-options="net"
 # See remove-bundled-fonts.patch for more info about fonts.
 _depends_fonts="
 	font-jetbrains-mono-vf
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 66bd8090e5f..70c1c398b36 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -16,7 +16,6 @@ _pigeonholever=0.5.19
 pkgdesc="IMAP and POP3 server"
 url="https://www.dovecot.org/"
 arch="all"
-options="libtool"
 license="MIT AND LGPL-2.1-or-later"
 depends="openssl>3"
 pkgusers="dovecot dovenull"
diff --git a/main/gummiboot/APKBUILD b/main/gummiboot/APKBUILD
index de2327d053f..f6a50f56e74 100644
--- a/main/gummiboot/APKBUILD
+++ b/main/gummiboot/APKBUILD
@@ -9,7 +9,6 @@ license="LGPL-2.0-or-later"
 depends="$pkgname-efistub=$pkgver-r$pkgrel"
 makedepends="util-linux-dev gnu-efi-dev autoconf automake docbook-xsl libxslt"
 subpackages="$pkgname-doc $pkgname-efistub"
-options="!check" # No tests
 #source="https://cgit.freedesktop.org/gummiboot/snapshot/gummiboot-$pkgver.tar.gz"
 source="https://dev.alpinelinux.org/archive/gummiboot/gummiboot-$pkgver.tar.gz
 	gummiboot-aarch64-support.patch
diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD
index 4899acd5727..3a7d88c14f4 100644
--- a/main/iputils/APKBUILD
+++ b/main/iputils/APKBUILD
@@ -3,7 +3,6 @@ pkgname=iputils
 pkgver=20221126
 pkgrel=2
 pkgdesc="IP Configuration Utilities"
-options="!check suid"
 url="https://github.com/iputils/iputils/"
 arch="all"
 license="BSD-3-Clause AND GPL-2.0-or-later"
diff --git a/main/lua-pty/APKBUILD b/main/lua-pty/APKBUILD
index edbb5b3ffb7..580248fb8db 100644
--- a/main/lua-pty/APKBUILD
+++ b/main/lua-pty/APKBUILD
@@ -8,7 +8,6 @@ pkgdesc="Lua module to control other programs via PTYs"
 url="https://www.tset.de/lpty/"
 arch="all"
 license="MIT"
-source="http://www.tset.de/downloads/$_pkgname-$pkgver-$_rockver.tar.gz"
 source=$pkgname-$pkgver.tar.gz::https://codeberg.org/gnarz/lpty/archive/version_$pkgver.tar.gz
 builddir="$srcdir/lpty"
 options="!check"
diff --git a/main/mandoc/APKBUILD b/main/mandoc/APKBUILD
index 08550a92e28..610d1b7df02 100644
--- a/main/mandoc/APKBUILD
+++ b/main/mandoc/APKBUILD
@@ -13,7 +13,6 @@ checkdepends="perl"
 install="$pkgname-apropos.post-deinstall"
 triggers="$pkgname-apropos.trigger=/usr/share/man/*"
 replaces="mdocml"
-provides="mdocml=$pkgver-r$pkgrel"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-apropos $pkgname-soelim"
 source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz
 	dynamic-tagfile-support.patch
@@ -22,7 +21,7 @@ source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz
 	"
 
 # higher than community/man-db for this
-provides="doc-provider"
+provides="doc-provider mdocml=$pkgver-r$pkgrel"
 provider_priority=100
 
 prepare() {
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 1e1665c0966..6f08fbdcd05 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="Next Generation IRC Daemon"
 url="https://ngircd.barton.de/"
 arch="all"
 license="GPL-2.0-or-later"
-options="!check"
 makedepends="openssl-dev>3 zlib-dev linux-pam-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.pre-install"
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 5513b3d9698..adeffcb05a1 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -7,8 +7,6 @@ _langpack=20230225
 pkgdesc="Full-featured Web proxy cache server"
 url="http://www.squid-cache.org/"
 install="squid.pre-install squid.pre-upgrade"
-pkgusers="squid"
-pkggroups="squid"
 arch="all"
 license="GPL-2.0-or-later"
 depends="logrotate"
diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 6fd4a3d074c..c3503166546 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -4,8 +4,6 @@ pkgname=tinyproxy
 pkgver=1.11.1
 pkgrel=3
 pkgdesc="Lightweight HTTP proxy"
-pkgusers="tinyproxy"
-pkggroups="tinyproxy"
 url="https://tinyproxy.github.io/"
 arch="all"
 license="GPL-2.0-or-later"
diff --git a/testing/belcard/APKBUILD b/testing/belcard/APKBUILD
index 8da481fb3a5..6848e2a2bc8 100644
--- a/testing/belcard/APKBUILD
+++ b/testing/belcard/APKBUILD
@@ -10,7 +10,6 @@ license="GPL-3.0-or-later"
 options="!check" # not test available
 makedepends="cmake bctoolbox-dev belr-dev samurai"
 subpackages="$pkgname-dev $pkgname-libs"
-source="https://www.linphone.org/releases/sources/belcard/belcard-$pkgver.tar.gz"
 source="$pkgname-$pkgver.tar.bz2::https://gitlab.linphone.org/BC/public/belcard/-/archive/$pkgver/belcard-$pkgver.tar.bz2"
 
 build() {
diff --git a/testing/blocky/APKBUILD b/testing/blocky/APKBUILD
index 6fe4364a1af..25f635799e5 100644
--- a/testing/blocky/APKBUILD
+++ b/testing/blocky/APKBUILD
@@ -7,11 +7,10 @@ pkgdesc="DNS proxy as ad-blocker for local network"
 url="https://github.com/0xERR0R/blocky"
 license="Apache-2.0"
 arch="all"
-options="net"
 makedepends="go"
 source="$pkgname-$pkgver.tar.gz::https://github.com/0xERR0R/blocky/archive/v$pkgver.tar.gz"
 # fail with new go for some reason, even with tzdata/goroot
-options="!check"
+options="!check net"
 
 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
 export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
diff --git a/testing/etcd/APKBUILD b/testing/etcd/APKBUILD
index e77c0b5416e..b5c56b97783 100644
--- a/testing/etcd/APKBUILD
+++ b/testing/etcd/APKBUILD
@@ -4,7 +4,6 @@ pkgname=etcd
 pkgver=3.5.11
 pkgrel=0
 pkgdesc="A highly-available key value store for shared configuration and service discovery"
-options="chmod-clean"
 url="https://github.com/etcd-io/etcd"
 license="Apache-2.0"
 arch="all"
diff --git a/testing/fbp/APKBUILD b/testing/fbp/APKBUILD
index 0abbb3ff7f6..0172a1e8cf4 100644
--- a/testing/fbp/APKBUILD
+++ b/testing/fbp/APKBUILD
@@ -2,7 +2,6 @@
 # Contributor: Miles Alan <m@milesalan.com>
 pkgname=fbp
 pkgver=0.5
-pkgrel=0
 pkgrel=1
 arch="aarch64 x86_64" # Limited by zig aport
 url="https://git.sr.ht/~mil/fbp"
diff --git a/testing/gr-satellites/APKBUILD b/testing/gr-satellites/APKBUILD
index 9dbeaf36d7c..1f26abb0d26 100644
--- a/testing/gr-satellites/APKBUILD
+++ b/testing/gr-satellites/APKBUILD
@@ -8,7 +8,6 @@ url="https://github.com/daniestevez/gr-satellites"
 # gnuradio
 arch="aarch64 armv7 x86_64"
 license="GPL-3.0-or-later"
-subpackages="$pkgname-doc"
 depends="python3 py3-requests py3-construct"
 makedepends="
 	cmake
diff --git a/testing/lomiri-system-settings/APKBUILD b/testing/lomiri-system-settings/APKBUILD
index 6f6c42bd43c..ede5ce2e70e 100644
--- a/testing/lomiri-system-settings/APKBUILD
+++ b/testing/lomiri-system-settings/APKBUILD
@@ -6,7 +6,6 @@ pkgver=1.0.2
 pkgrel=0
 pkgdesc="System Settings application for Lomiri"
 url="https://gitlab.com/ubports/development/core/lomiri-system-settings"
-arch="all !armhf"
 # armhf: blocked by lomiri-ui-toolkit
 # s390x, riscv64, ppc64le: blocked by ayatana-indicator-datetime
 arch="all !armhf !s390x !riscv64 !ppc64le"
diff --git a/testing/lua-lapis-console/APKBUILD b/testing/lua-lapis-console/APKBUILD
index 44ac4257b42..89476125de7 100644
--- a/testing/lua-lapis-console/APKBUILD
+++ b/testing/lua-lapis-console/APKBUILD
@@ -12,7 +12,6 @@ makedepends="luarocks"
 source="$pkgname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz
 	fix_lua_ver.patch"
 builddir="$srcdir/$_rockname-$pkgver"
-options="!check"
 depends="lua-lapis"
 options="!check" #There are no checks
 
diff --git a/testing/minikube/APKBUILD b/testing/minikube/APKBUILD
index 3e2987b23eb..8c6bdd69d39 100644
--- a/testing/minikube/APKBUILD
+++ b/testing/minikube/APKBUILD
@@ -8,7 +8,6 @@ url="https://github.com/kubernetes/minikube"
 license="Apache-2.0"
 arch="all !s390x !riscv64" # blocked by libvirt
 arch="$arch !x86 !armhf !armv7 !ppc64le !aarch64" # FTBFS (kvm2 driver)
-options="chmod-clean"
 makedepends="go bash libvirt-dev"
 subpackages="
 	$pkgname-bash-completion
diff --git a/testing/py3-nikola/APKBUILD b/testing/py3-nikola/APKBUILD
index e859c71682b..e477c64f6bf 100644
--- a/testing/py3-nikola/APKBUILD
+++ b/testing/py3-nikola/APKBUILD
@@ -15,7 +15,6 @@ depends="py3-babel py3-blinker py3-doit py3-dateutil py3-docutils py3-logbook
 	py3-pygments py3-pyphen py3-pyrss2gen py3-requests py3-unidecode py3-yapsy
 	"
 makedepends="py3-setuptools"
-subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/N/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
 
diff --git a/testing/py3-sphinx-theme-bootstrap/APKBUILD b/testing/py3-sphinx-theme-bootstrap/APKBUILD
index 6e433136f71..c2d3291f92c 100644
--- a/testing/py3-sphinx-theme-bootstrap/APKBUILD
+++ b/testing/py3-sphinx-theme-bootstrap/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-pyc"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/refs/tags/v$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
-replaces="py-sphinx-theme-bootstrap" # Backwards compatibility
 replaces="py-sphinx-theme-bootstrap=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
diff --git a/testing/srain/APKBUILD b/testing/srain/APKBUILD
index 3c272486758..d982d729c3c 100644
--- a/testing/srain/APKBUILD
+++ b/testing/srain/APKBUILD
@@ -9,7 +9,6 @@ arch="all"
 license="GPL-2.0"
 makedepends="cmake gettext glib-dev gtk+3.0-dev libconfig-dev libsecret-dev libsoup-dev
 	meson ninja openssl-dev>3 py3-sphinx"
-subpackages="$pkgname-doc $pkgname-lang"
 subpackages="$pkgname-lang"
 source="$pkgname-$pkgver.tar.gz::https://github.com/SrainApp/srain/archive/$pkgver.tar.gz"
 
diff --git a/testing/tomcat9/APKBUILD b/testing/tomcat9/APKBUILD
index 34ba9f28d10..043d6a22fc8 100644
--- a/testing/tomcat9/APKBUILD
+++ b/testing/tomcat9/APKBUILD
@@ -18,7 +18,6 @@ subpackages="
 	$pkgname-doc
 	$pkgname-examples
 	"
-builddir="$srcdir/apache-tomcat-$pkgver-src/"
 
 source="
 	https://archive.apache.org/dist/tomcat/tomcat-9/v$pkgver/bin/apache-tomcat-$pkgver.tar.gz
diff --git a/testing/wroomd/APKBUILD b/testing/wroomd/APKBUILD
index fabc094a4db..1b1df2d1e95 100644
--- a/testing/wroomd/APKBUILD
+++ b/testing/wroomd/APKBUILD
@@ -6,7 +6,6 @@ pkgdesc="Modem management daemon for Qualcomm platforms"
 url="https://git.abscue.de/obp/wroomd"
 arch="all"
 license="GPL-3.0-or-later"
-pkggroups="wroomd"
 makedepends="
 	cargo
 	cargo-auditable