pmos/device-pine64-pinenote: fix blacklist

pmos/device-pine64-pinenote: new aport
pmos/linux-pine64-pinenote: upgrade to 6.12.0
2025-01-11 12:27:45 -05:00 · 2025-01-09 14:25:11 +00:00 · 2025-01-09 04:28:46 +00:00 · 2025-01-08 23:01:42 -05:00 · 2025-01-09 03:40:40 +00:00 · 2025-01-09 03:40:40 +00:00
63 changed files with 8472 additions and 621 deletions
--- a/.forgejo/bin/build.sh
+++ b/.forgejo/bin/build.sh
@ -7,7 +7,7 @@
 set -eu -o pipefail

 readonly APORTSDIR=$CI_PROJECT_DIR
-readonly REPOS="backports user"
+readonly REPOS="backports user pmos"
 readonly ALPINE_REPOS="main community testing"
 readonly ARCH=$(apk --print-arch)
 # gitlab variables
@ -16,6 +16,8 @@ readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 : "${REPODEST:=$HOME/packages}"
 : "${MIRROR:=https://ayakael.net/api/packages/forge/alpine}"
 : "${ALPINE_MIRROR:=http://dl-cdn.alpinelinux.org/alpine}"
+: "${PMOS_MIRROR:=http://mirror.postmarketos.org/postmarketos}"
+: "${PMOS_KEY:=https://git.syndicate-lang.org/synit/pmbootstrap/raw/commit/8efee86388408c0d8de45c64fe383580ffd91700/pmb/data/keys/build.postmarketos.org.rsa.pub}"
 : "${MAX_ARTIFACT_SIZE:=300000000}" #300M
 : "${CI_DEBUG_BUILD:=}"

@ -108,7 +110,7 @@ set_repositories_for() {
 		[ "$repo" = "$target_repo" ] && break
 	done
 	doas sh -c "printf '%s\n' $repos >> /etc/apk/repositories"
-	doas apk update
+	doas apk update || true
 }

 apply_offset_limit() {
@ -137,6 +139,22 @@ setup_system() {
 	git config --global init.defaultBranch master
 }

+setup_pmos() {
+	local release
+
+	case $BASEBRANCH in
+		v3.21) release="v24.12";;
+		v3.20) release="v24.6";;
+		v3.19) release="v23.12";;
+		edge) release=master;;
+		*) die "Branch \"$BASEBRANCH\" not supported!"
+	esac
+
+	doas wget "$PMOS_KEY" -P /etc/apk/keys
+	doas sh -c "echo $PMOS_MIRROR/$release >> /etc/apk/repositories"
+	doas apk update || true
+}
+
 sysinfo() {
 	printf ">>> Host system information (arch: %s, release: %s) <<<\n" "$ARCH" "$(get_release)"
 	printf "- Number of Cores: %s\n" "$(nproc)"
@ -144,6 +162,7 @@ sysinfo() {
 	printf "- Free space: %s\n" "$(df -hP / | awk '/\/$/ {print $4}')"
 }

+
 copy_artifacts() {
 	cd "$APORTSDIR"

@ -204,6 +223,7 @@ build_limit=$CI_ALPINE_BUILD_LIMIT

 for repo in $(changed_repos); do
 	set_repositories_for "$repo"
+	[ "$repo" == "pmos" ] && setup_pmos
 	built_aports=0
 	changed_aports_in_repo=$(changed_aports "$repo")
 	changed_aports_in_repo_count=$(echo "$changed_aports_in_repo" | wc -l)
--- a/.forgejo/bin/check_ver.sh
+++ b/.forgejo/bin/check_ver.sh
@ -22,6 +22,12 @@ for pkg in $owned_by_you; do
 	downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1)
 	downstream_version=${downstream_version/-*}

+	# special cases
+	case $pkg in
+		freetube) upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].version' | sed "s|-beta||");;
+		dotnet9-sdk|dotnet9-stage0) upstream_version=${upstream_version/-*};;
+	esac
+
 	if [ -z "$upstream_version" ]; then
 		echo "$pkg not in anitya"
 		echo "$pkg" >> not_in_anitya
--- a/README.md
+++ b/README.md
@ -5,14 +5,14 @@ Upstream: https://ayakael.net/forge/ayaports

 This repository contains aports that are not yet merged in the official Alpine
 Linux repository or don’t adhere to Alpine polices. Packages are automatically
-built using CI. Once built, they are deployed to a git-lfs repository, making
+built using CI. Once built, they are deployed to a Forgejo repository, making
 them available to apk.

 Branches are matched to Alpine releases.

 ## Repositories

-You can browse all the repositories at https://codeberg.org/ayakael/ayaports
+You can browse all the repositories at https://ayakael.net/forge/ayaports
 Affixed to each repository description is the appropriate link for use in
 `/etc/apk/repositories`.

@ -21,11 +21,12 @@ Affixed to each repository description is the appropriate link for use in
 https://ayakael.net/api/packages/forge/alpine/v3.21/backports
 ```

-Aports from the official Alpine repositories backported from edge.
+Aports from the official Alpine repositories backported from edge. This is only
+available and kept up-to-date on latest stable release.

 #### User
 ```
-https://ayakael.net/api/packages/forge/alpine/v3.21/user
+https://ayakael.net/api/packages/forge/alpine/edge/user
 ```

 Aports that have yet to be (or may never be) upstreamed to the official
--- a/backports/APKBUILD
+++ b/backports/APKBUILD
@ -1,58 +0,0 @@
-# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
-# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
-pkgname=py3-limits
-pkgver=3.14.1
-pkgrel=0
-pkgdesc="Rate limiting using various strategies and storage backends such as redis & memcached"
-url="https://github.com/alisaifee/limits"
-arch="noarch"
-license="MIT"
-depends="
-	py3-deprecated
-	python3
-	"
-makedepends="py3-setuptools py3-gpep517"
-checkdepends="
-	py3-flaky
-	py3-mongo
-	py3-pytest
-	py3-pytest-asyncio
-	py3-pytest-benchmark
-	py3-pytest-cov
-	py3-pytest-lazy-fixtures
-	py3-pymemcache
-	py3-redis
-	"
-subpackages="$pkgname-pyc"
-source="
-	https://github.com/alisaifee/limits/archive/refs/tags/$pkgver/limits-$pkgver.tar.gz
-
-	our-std-is-good-enough.patch
-	tests-drop-etcd3-and-k-argument.patch
-	"
-builddir="$srcdir/limits-$pkgver"
-
-build() {
-	gpep517 build-wheel \
-		--wheel-dir .dist \
-		--output-fd 3 3>&1 >&2
-}
-
-check() {
-	python3 -m venv --clear --without-pip --system-site-packages .testenv
-	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
-	.testenv/bin/python3 -m pytest -W ignore::DeprecationWarning \
-		-m 'not benchmark and not etcd and not integration and not memcached' \
-		-k 'not aio and not Storage and not strategy' -v
-}
-
-package() {
-	gpep517 install-wheel --destdir "$pkgdir" \
-		.dist/*.whl
-}
-
-sha512sums="
-f30c7ec19c2d1edad9ed77dc590ae35717efa3956a4d97e465793e1923a4af08dc9921d90ee95d3c54ce3364b867ca67a9de62c61d627e07a3f50da20bdabd0f  limits-3.14.1.tar.gz
-271e3b0501f9f144eda8d2e96c93b285714e339b9217385e38cdbce1f4dec88f9c949e9419f8be94885092e7977f7dca29b86b5499e9fead678b42a686c337db  our-std-is-good-enough.patch
-e84f4db49349a6feba0f701b9d4357c5f66d64c4a23f8ce512528b0f44b5bbef55041c02d92aae3a4cc8d5340846f9e909217beb869a5aeb49df166dd29ae9e3  tests-drop-etcd3-and-k-argument.patch
-"
--- a/backports/calibre/APKBUILD
+++ b/backports/calibre/APKBUILD
@ -1,6 +1,6 @@
 # Maintainer: Cowington Post <cowingtonpost@gmail.com>
 pkgname=calibre
-pkgver=7.22.0
+pkgver=7.21.0
 pkgrel=0
 pkgdesc="Ebook management application"
 # qt6-webengine
@ -111,6 +111,6 @@ package() {
 }

 sha512sums="
-583a1e2bcdd05c350e57cb205fc95eb076210ea5c9156f95a08c63e27f418ecb735c0a68212514edaa05af61e780cf8377a1e1b76a89729ee13b4d5ed34359c7  calibre-7.22.0.tar.xz
+0c2ee610833df83219c0c33b09e1374a8262f1630ccd48e3c4725c92922a3ac5d102ad83fc213457fb9de3efa4f5a2c98ff6dff039828e1661085a1054d7f631  calibre-7.21.0.tar.xz
 eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76  0001-calibre-no-update.patch
 "
--- a/backports/caprine/APKBUILD
+++ b/backports/caprine/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=caprine
-pkgver=2.60.3
-pkgrel=0
+pkgver=2.60.1
+pkgrel=2
 pkgdesc="Elegant Facebook Messenger desktop app"
 arch="x86_64 aarch64" # blocked by electron
 url="https://github.com/sindresorhus/caprine"
@ -17,10 +17,12 @@ source="
 	"

 build() {
-	npm ci --ignore-scripts
-	npx patch-package
+	npm install --ignore-scripts
+	npx --yes patch-package
 	npx tsc
-	npm prune --ignore-scripts --omit=dev
+	rm -r node_modules
+	npm install --ignore-scripts --production
+	npx --yes patch-package
 }

 package() {
@ -57,7 +59,7 @@ package() {
 		-or -name "test" -prune -exec rm -r '{}' \;
 }
 sha512sums="
-edf6452294b3c661befd9811c5836da33311171d587cb9a5939ac11a0c1e2a7ebbc4f2a8d81e02c1db1a2d814ac1aa7bbdadca9e21892cc8d7f7e9c23dc2e221  caprine-2.60.3.tar.gz
+0df7f233c91f5a044dcffde94b976c6ad71e6d355518615c48cd825a249c01d63f455de31ece69193a66ca0fd8157506f9b88088da1bd47fc75e9d3800784ed0  caprine-2.60.1.tar.gz
 a469e3bea24926119e51642b777ef794c5fa65421107903f967c36d81bbb1adb3d52469ce3a3301b2c890f1aa53ab989ded22a7c6e811fb8cf0a582dbd835e19  caprine.desktop
 3ad8994c1a0417e73d622587769e527b4236a32c1a89442ff76413b75b4392d667c9e2908979b453e5926e54db6d94b31625340c5a94e84e91ea77f56feae778  caprine.sh
 "
--- a/backports/coin/APKBUILD
+++ b/backports/coin/APKBUILD
@ -1,15 +1,15 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer:
 pkgname=coin
-pkgver=4.0.3
-pkgrel=0
+pkgver=4.0.0
+pkgrel=7
 pkgdesc="OpenGL OpenInventor compatible graphics library"
 url="https://github.com/coin3d/coin"
 license="BSD-3-Clause"
 arch="all"
 makedepends="boost-dev cmake glu-dev graphviz samurai"
 subpackages="$pkgname-dev"
-source="https://github.com/coin3d/coin/releases/download/v$pkgver/coin-$pkgver-src.tar.gz
+source="https://github.com/coin3d/coin/releases/download/Coin-$pkgver/coin-$pkgver-src.tar.gz
 	TestSuitePatch.patch
 	"
 builddir="$srcdir/coin"
@ -31,6 +31,6 @@ package() {
 }

 sha512sums="
-b661bf2124b0de1b46e76a6699b0975abb3aed4dc9019bf32531c535179dc84a90fe4e19def6f6cda7b175470636040d0e58812d532198cf207296d37c539915  coin-4.0.3-src.tar.gz
+e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae  coin-4.0.0-src.tar.gz
 aab464244b13371badf0878e5bfbcce859a42756cf8c7657d1480318aa291d296eac2741219c346bae056f761c5f46857f8fd1ec1c4129f86bc10236d3869deb  TestSuitePatch.patch
 "
--- a/backports/electron/APKBUILD
+++ b/backports/electron/APKBUILD
@ -1,10 +1,10 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=electron
-pkgver=33.3.0
+pkgver=33.2.1
 _gittag=v"${pkgver/_beta/-beta.}"
 pkgrel=0
-_chromium=130.0.6723.152
+_chromium=130.0.6723.127
 _copium_tag=129.1
 _depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6
 pkgdesc="Electron cross-platform desktop toolkit"
@ -544,7 +544,7 @@ lang() {
 }

 sha512sums="
-2aa8d27657fea4a86169929c39a67dc2afcf4baa52f4fbc1227f9bd3113b61ae7966186d363cc1307113182d4e5181ce5187842801dc6699ee965fd3057d94a3  electron-v33.3.0-130.0.6723.152.tar.zst
+e2df4454f4178af859c13aadee4ea04a5b6aa202972cad625e54bc68f5b8c25e098e50d428ec9c1886c37ccf49aaaedb4c5f02fc8bdd498314ba216901932185  electron-v33.2.1-130.0.6723.127.tar.zst
 6138b3dbf3903c78f4ca1ed5a6c3c3c485471ded31976010484ce8893d03953df2b8f066a4fe84bbde5ae7ef9bbff664ef917e247b2e95dd471de40f2774d7d0  copium-129.1.tar.gz
 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020  chromium-revert-drop-of-system-java.patch
 53b7cdee8f7bfb4c9371cb385c473e34ed3d8ac7efaa43c0af061107560be30d8747b07fb0b16c01079b8c770f2c721bb5a8081313b7c126856ea4078a74da2a  compiler.patch
--- a/backports/freetube/APKBUILD
+++ b/backports/freetube/APKBUILD
@ -1,8 +1,8 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=freetube
-pkgver=0.22.1
-pkgrel=0
+pkgver=0.21.3
+pkgrel=2
 pkgdesc="An open source desktop YouTube player built with privacy in mind."
 arch="x86_64 aarch64" # blocked by electron
 license="AGPL-3.0-only"
@ -50,7 +50,7 @@ package() {
 }

 sha512sums="
-7ea436ac67d9fe4e99e0a234d04ca88215e066006d3456d1474f2097773ba40f5bca57081155f948c41d429ea74e6185600bdcff56d87f047c6f7978037fd9ba  freetube-0.22.1.tar.gz
+22e5ab677cd442d50237b2d62534698d8ad73a37e1731003dc23c4ea3da992b3cae936f0bb3a0a86cd4b7fba731c9fa53276cb0a6cd5bab213ff2a6c9006cb05  freetube-0.21.3.tar.gz
 2ce2effc794bb663789cefe968b5899122127983dbfa1b240aa33a2be383720b18204e6d01b4a550df72956f02b6636b79c93a58f470a970b09b770f5b8f2fc4  freetube.sh
 d27cb896b65a7e8d52ffe86e5f74eed72b6cf976b28e1a13012d34c7eceba5ff6f20298017738dfa93c0336ffa52b8ee4da7e06b02747062898db7e678819526  tasje-dotdash.patch
 "
--- a/backports/nb/APKBUILD
+++ b/backports/nb/APKBUILD
@ -1,7 +1,7 @@
 # Contributor: Quillith <tag.quill@protonmail.com>
 # Maintainer: Quillith <tag.quill@protonmail.com>
 pkgname=nb
-pkgver=7.15.0
+pkgver=7.12.1
 pkgrel=0
 pkgdesc="Command line note-taking, bookmarking, archiving, and knowledge base application"
 url="https://github.com/xwmx/nb"
@ -41,5 +41,5 @@ full() {
 }

 sha512sums="
-54b270aa7f9b89a95fb7b11ca472c2fd24c627d2a3dc14d96f587d89e110940cd4158b2398168c70abc9440f79cefd5cefab40c93829a5b494e9201bc8d41493  nb-7.15.0.tar.gz
+ed3d41a809e39a19711c6c97c38216f17f144b8b474eb94aec4134f9756da03440073f3f6557acf8f7959d3d9fba6392d1d5f59e8b94d5269b7336b11353457e  nb-7.12.1.tar.gz
 "
--- a/backports/our-std-is-good-enough.patch
+++ b/backports/our-std-is-good-enough.patch
@ -1,11 +0,0 @@
--- ./limits/typing.py.orig
-+++ ./limits/typing.py
-@@ -13,7 +13,7 @@
-     Union,
- )
- 
-from typing_extensions import ClassVar, Counter, ParamSpec, Protocol, TypeAlias
-+from typing import ClassVar, Counter, ParamSpec, Protocol, TypeAlias
- 
- Serializable = Union[int, str, float]
-
--- a/backports/py3-apsw/APKBUILD
+++ b/backports/py3-apsw/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-apsw
 _pkgname=apsw
-pkgver=3.47.2.0
+pkgver=3.46.1.0
 pkgrel=0
 pkgdesc="Another Python SQLite Wrapper"
 url="https://github.com/rogerbinns/apsw"
@ -41,6 +41,6 @@ package() {
 }

 sha512sums="
-9884f36811bfff7276642841ebaa198669c48f4d54bb764a985ea5bdd88f9f630f9fd8a13cf0a44b5675e374c2a911fcec579ca4165622e8049bff327ef66c1d  py3-apsw-3.47.2.0.zip
+8d24825c8346b05a99b8959ce1fd45ae5162c95b020ecc63bd3491bfd1579370a0e6b1a962f7f64a7e7e415846007e64d90b28e2065ae047e228d60b12b9cb02  py3-apsw-3.46.1.0.zip
 8f3957bd6fecb5660a7cab367043e4ccdacd87d8963bbe41cc3d525265de28f08aa207099658d785be29c5c90b818c1418f766995cd780d02b8e36252a389758  detect-sqlite-config.patch
 "
--- a/backports/py3-colored/APKBUILD
+++ b/backports/py3-colored/APKBUILD
@ -1,14 +1,14 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
 pkgname=py3-colored
 _pyname=${pkgname/py3-/}
-pkgver=2.2.4
-pkgrel=0
+pkgver=1.4.4
+pkgrel=3
 pkgdesc="Simple Python library for color and formatting in terminal"
 url="https://gitlab.com/dslackw/colored"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools py3-gpep517 py3-flit"
+makedepends="py3-setuptools py3-gpep517"
 checkdepends="py3-pytest"
 subpackages="$pkgname-pyc"
 source="https://gitlab.com/dslackw/colored/-/archive/$pkgver/colored-$pkgver.tar.gz"
@ -27,5 +27,5 @@ package() {
 }

 sha512sums="
-8fd293c95c2cfa6c3c31a91f946414e5c2581ea12a60e38ad1e6a5e44a85589a81c5e8205c4c518ed0d809840bf1b37b0cb5af4cf48c0706aa52017bf9c04489  colored-2.2.4.tar.gz
+d49075f97bcc220802a8a64780b4c3910acd420e7e0e82ee71659132e7a294a638b098e4e46ae54f531739f8a43cd35979e521c02bb359205a13d96e37cfe8ed  colored-1.4.4.tar.gz
 "
--- a/backports/py3-levenshtein/APKBUILD
+++ b/backports/py3-levenshtein/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: Galen Abell <galen@galenabell.com>
 # Maintainer: Galen Abell <galen@galenabell.com>
 pkgname=py3-levenshtein
-pkgver=0.26.1
-pkgrel=0
+pkgver=0.25.1
+pkgrel=2
 pkgdesc="Python extension for computing string edit distances and similarities"
 url="https://github.com/maxbachmann/Levenshtein"
 arch="all"
@ -13,7 +13,6 @@ makedepends="
 	cython
 	py3-gpep517
 	py3-scikit-build
-	py3-scikit-build-core
 	python3-dev
 	rapidfuzz
 	samurai
@ -32,15 +31,15 @@ build() {
 check() {
 	python3 -m venv --clear --without-pip --system-site-packages .testenv
 	.testenv/bin/python3 -m installer \
-		.dist/levenshtein*.whl
+		.dist/Levenshtein*.whl
 	.testenv/bin/python3 -m pytest
 }

 package() {
 	python3 -m installer -d "$pkgdir" \
-		.dist/levenshtein*.whl
+		.dist/Levenshtein*.whl
 }

 sha512sums="
-589b1f404108f488caf880063f20ee9c6a2033b0a2cd819352bf15e285ea8537c1dc8117de70679f720fd3da47546f7e0e5c620e4da8cf09bf8df9b119e6abc9  py3-levenshtein-0.26.1.tar.gz
+936dab36b15df6f2ee5425efb1fdb1490fb8f618ba453f464a6dd615bcc427e55ceee7474f06b34392871d9f38470b853602a11d8f9776eee66ec34156511ca4  py3-levenshtein-0.25.1.tar.gz
 "
--- a/backports/py3-limits/APKBUILD
+++ b/backports/py3-limits/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
 # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=py3-limits
-pkgver=3.14.1
-pkgrel=0
+pkgver=3.13.0
+pkgrel=1
 pkgdesc="Rate limiting using various strategies and storage backends such as redis & memcached"
 url="https://github.com/alisaifee/limits"
 arch="noarch"
@ -19,16 +19,14 @@ checkdepends="
 	py3-pytest-asyncio
 	py3-pytest-benchmark
 	py3-pytest-cov
-	py3-pytest-lazy-fixtures
-	py3-pymemcache
 	py3-redis
 	"
 subpackages="$pkgname-pyc"
+options="!check" # most tests are integration with db connections, assume all connectors installed
 source="
 	https://github.com/alisaifee/limits/archive/refs/tags/$pkgver/limits-$pkgver.tar.gz

 	our-std-is-good-enough.patch
-	tests-drop-etcd3-and-k-argument.patch
 	"
 builddir="$srcdir/limits-$pkgver"

@ -41,7 +39,7 @@ build() {
 check() {
 	python3 -m venv --clear --without-pip --system-site-packages .testenv
 	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
-	.testenv/bin/python3 -m pytest -W ignore::DeprecationWarning \
+	.testenv/bin/python3 -m pytest \
 		-m 'not benchmark and not etcd and not integration and not memcached' \
 		-k 'not aio and not Storage and not strategy' -v
 }
@ -52,7 +50,6 @@ package() {
 }

 sha512sums="
-f30c7ec19c2d1edad9ed77dc590ae35717efa3956a4d97e465793e1923a4af08dc9921d90ee95d3c54ce3364b867ca67a9de62c61d627e07a3f50da20bdabd0f  limits-3.14.1.tar.gz
-271e3b0501f9f144eda8d2e96c93b285714e339b9217385e38cdbce1f4dec88f9c949e9419f8be94885092e7977f7dca29b86b5499e9fead678b42a686c337db  our-std-is-good-enough.patch
-e84f4db49349a6feba0f701b9d4357c5f66d64c4a23f8ce512528b0f44b5bbef55041c02d92aae3a4cc8d5340846f9e909217beb869a5aeb49df166dd29ae9e3  tests-drop-etcd3-and-k-argument.patch
+0a13d08001c2f95e559ac1be35fa8cc178ad2d41bd5bf7b7e85781a428f550c350c21b92942b5b7e45f0f4c0604e96e579c8a26b5e9ca1196e6605608721030a  limits-3.13.0.tar.gz
+0364d51f9f879b95c6a4a3c9e9fd3d7d1e15ea214c50ae98cd36826b8c0b2d903cf1128741ac83738e305a207dae8955a0b2c8679484d2d6643e334595bdb1d7  our-std-is-good-enough.patch
 "
--- a/backports/py3-limits/our-std-is-good-enough.patch
+++ b/backports/py3-limits/our-std-is-good-enough.patch
@ -1,3 +1,14 @@
+--- ./limits/util.py.orig
+++ ./limits/util.py
+@@ -8,7 +8,7 @@
+ from types import ModuleType
+ from typing import TYPE_CHECKING, cast
+ 
+-import importlib_resources
+from importlib import resources as importlib_resources
+ from packaging.version import Version
+ 
+ from limits.typing import Dict, List, NamedTuple, Optional, Tuple, Type, Union
 --- ./limits/typing.py.orig
 +++ ./limits/typing.py
@@ -13,7 +13,7 @@
--- a/backports/py3-limits/tests-drop-etcd3-and-k-argument.patch
+++ b/backports/py3-limits/tests-drop-etcd3-and-k-argument.patch
@ -1,24 +0,0 @@
-diff --git a/tests/conftest.py.orig b/tests/conftest.py
-index 2aeb758dda6..a9b2b8b2bd1 100644
--- a/tests/conftest.py.orig
-+++ b/tests/conftest.py
-@@ -3,7 +3,6 @@ import platform
- import socket
- import time
- 
-import etcd3
- import pymemcache
- import pymemcache.client
- import pymongo
-diff --git a/pytest.ini.orig b/pytest.ini
-index 38c40a713d0..8c6659e21c2 100644
--- a/pytest.ini.orig
-+++ b/pytest.ini
-@@ -17,7 +17,6 @@ addopts =
-     -rfEsxX
-     --cov=limits
-     -m "not benchmark"
-    -K
- filterwarnings =
-     error
-     module::ResourceWarning
--- a/backports/rapidfuzz/APKBUILD
+++ b/backports/rapidfuzz/APKBUILD
@ -1,6 +1,6 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer:
 pkgname=rapidfuzz
-pkgver=3.2.0
+pkgver=3.0.0
 pkgrel=0
 pkgdesc="Rapid fuzzy string matching in C++ using the Levenshtein Distance"
 url="https://github.com/maxbachmann/rapidfuzz-cpp"
@ -40,6 +40,6 @@ package() {
 }

 sha512sums="
-cf306fc4a6c0b6fc1a1c3b0b235aa54588bd87a5d07f96c1bc9711a08159ca71580b5958e66e8b4358d34e522041934903079aabe6e5a450cece7d6db6edcbe0  rapidfuzz-cpp-3.2.0.tar.gz
+c5f20399bd1cfaa057c40cc17be5d730d50c1014553241f80f461a2fa89de670357d17a4f090394170263b09a53aa29238e5eff2caf9064a2a118c42aa14f320  rapidfuzz-cpp-3.0.0.tar.gz
 216c5082498830d42d2eb14d3eba35dd08446008916c920db7b55eaf3dd2358f86a61c238315b85fefecf08b9e902dc4db172f91a8479cfd735e53c7b3e03bf5  cstdint.patch
 "
--- a/backports/signal-desktop/APKBUILD
+++ b/backports/signal-desktop/APKBUILD
@ -2,14 +2,14 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=signal-desktop
-pkgver=7.36.0
-pkgrel=1
+pkgver=7.34.0
+pkgrel=0
 pkgdesc="A messaging app for simple private communication with friends"
 url="https://github.com/signalapp/Signal-Desktop/"
 # same as electron
 arch="aarch64 x86_64"
 license="AGPL-3.0-only"
-_llvmver=19
+_llvmver=18
 depends="
 	electron
 	font-barlow
@ -45,7 +45,7 @@ makedepends="
 	libvpx-dev
 	libwebp-dev
 	libxml2-dev
-	lld
+	lld$_llvmver
 	llvm$_llvmver-dev
 	mesa-dev
 	nodejs
@ -66,7 +66,7 @@ makedepends="
 options="net !check"

 # use _check_depends to validate this
-_libsignalver=0.62.0
+_libsignalver=0.60.2
 _ringrtcver=2.48.7
 _webrtcver=6723a
 _stokenizerver=0.2.1
@ -88,9 +88,9 @@ source="
 	webrtc-compiler.patch
 	webrtc-gcc13.patch

-	signal-desktop.sh
+	signal-desktop
 	"
-builddir="$srcdir"
+builddir="$srcdir/Signal-Desktop-$pkgver"

 # webrtc broken on clang https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227
 export CC=gcc
@ -112,8 +112,7 @@ export CARGO_PROFILE_RELEASE_STRIP="symbols"

 export YARN_CACHE_FOLDER="$srcdir/.yarn"

-_update_depends() {
-	msg "Updating extra dependencies version information in $APKBUILD..."
+_check_depends() {
 	# _libsignalver: follow signal-desktop package.json -> @signalapp/libsignal-client
 	# _ringrtcver: follow signal-desktop package.json -> @signalapp/ringrtc
 	# _webrtcver: follow ringrtc (on version above) -> config/version.properties -> webrtc.version
@ -127,12 +126,10 @@ _update_depends() {
 	local _extensionver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const EXTENSION_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' |  head -n 1)
 	local _stokenizerver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Sqlcipher-Extension/refs/tags/v$_extensionver/Cargo.lock | sed -n "/^name = \"signal-tokenizer\"$/,/^$/p" | awk -F ' = ' '{if($1=="version"){print $2}}' | tr -d '"')

-	sed -i \
-		-e "s|^_libsignalver=.*|_libsignalver=$_libsignalver|" \
-		-e "s|^_ringrtcver=.*|_ringrtcver=$_ringrtcver|" \
-		-e "s|^_webrtcver=.*|_webrtcver=$_webrtcver|" \
-		-e "s|^_stokenizerver=.*|_stokenizerver=$_stokenizerver|" \
-		APKBUILD
+	echo _libsignalver=$_libsignalver
+	echo _ringrtcver=$_ringrtcver
+	echo _webrtcver=$_webrtcver
+	echo _stokenizerver=$_stokenizerver
 }

 # webrtc only, the other dependencies are fine with tarballs
@ -186,17 +183,13 @@ target_cpu_only = True

 prepare() {
 	# Moves to builddir to use abuild patch logics
-	for i in Signal-Desktop-$pkgver libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver Signal-FTS5-Extension-$_stokenizerver; do
+	for i in libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver Signal-FTS5-Extension-$_stokenizerver; do
 		mv "$srcdir"/$i "$builddir"/${i%-*}
 	done

-	cd "$builddir"/Signal-Desktop
 	msg "Installing signal-desktop JS dependencies"
 	npm ci --ignore-scripts

-	# remove shipped fonts for system-provided (part 1)
-	rm -rf fonts/
-
 	default_prepare

 	(
@ -297,6 +290,9 @@ prepare() {
 		msg "Installing libsignal js dependencies"
 		yarn --ignore-scripts --frozen-lockfile
 	)
+
+	# remove shipped fonts for system-provided (part 1)
+	rm -rf fonts/
 }

 build() {
@ -390,9 +386,6 @@ build() {
 		cbindgen --profile release . -o target/release/signal-tokenizer.h
 	)

-	msg "Building signal-desktop"
-	cd "$builddir"/Signal-Desktop
-
 	# from package.json postinstall
 	npm run build:acknowledgments
 	npm exec patch-package
@ -412,15 +405,15 @@ build() {

 	# use our libsignal
 	rm -rf node_modules/@signalapp/libsignal-client/
-	mv "$builddir"/libsignal/node/ node_modules/@signalapp/libsignal-client
+	mv libsignal/node/ node_modules/@signalapp/libsignal-client

 	# use our libringrtc
 	rm -rf node_modules/@signalapp/ringrtc/
-	mv "$builddir"/ringrtc/src/node/ node_modules/@signalapp/ringrtc
+	mv ringrtc/src/node/ node_modules/@signalapp/ringrtc

 	mkdir node_modules/@signalapp/better-sqlite3/tokenizer
-	mv "$builddir"/Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/
-	mv "$builddir"/Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/
+	mv Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/
+	mv Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/

 	npm rebuild \
 		sharp @signalapp/better-sqlite3 spellchecker websocket \
@ -432,13 +425,12 @@ build() {
 }

 check() {
-	cd "$builddir"/Signal-Desktop
 	# tests run against downloaded build of electron for glibc, probably can be patched
 	npm run test
 }

 package() {
-	cd "$builddir"/Signal-Desktop/tasje_out
+	cd "$builddir"/tasje_out

 	install -Dm644 resources/app.asar "$pkgdir"/usr/lib/$pkgname/app.asar
 	cp -r resources/app.asar.unpacked "$pkgdir"/usr/lib/$pkgname/app.asar.unpacked
@ -447,7 +439,7 @@ package() {
 	# this should be in /usr/lib/signal-desktop. however, it does not simply work and I stopped to care
 	install -Dm755 "$builddir"/ringrtc/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so

-	install -Dm755 "$srcdir"/signal-desktop.sh "$pkgdir"/usr/bin/signal-desktop
+	install -Dm755 "$srcdir"/signal-desktop "$pkgdir"/usr/bin/signal-desktop

 	while read -r size; do
 		install -Dm644 icons/$size.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/$pkgname.png
@ -455,19 +447,19 @@ package() {
 }

 sha512sums="
-935f767cfd63d61573ec3bcae50e506c25194acbb73cf439c3cc0ef929b8d86d4a56b0876027a7e6fff5186003bc34cc73df90757b2d8131ce779cbe19cd0b3d  Signal-Desktop-7.36.0.tar.gz
-2a1d171a6bf9f1dfea9fc1fbc4f200c8b9e2ccb30d9d63f29007f252ff79ae7d149ab5707a8e430010da90ad1e3112475bd0eba8efb5cc011d5e3098aa1e26de  libsignal-0.62.0.tar.gz
+30e06721b01e580414c5e57b63350fc42edbe837b0a60a9cd100bc6ab1758fa6fd5744dc3a35d991db62f363eab791c45b43e1d9d5c81af9e67685114ae2e630  Signal-Desktop-7.34.0.tar.gz
+26780a0a6a529cee18f5c3b58f0395c6b5b630dbc8d2bbaa345dd7dd319a0e8548575c915dc16de6ac5d421fffdbe898f2dedb1fa3b4eab5d26debdfc1da515b  libsignal-0.60.2.tar.gz
 e5e5ab27dc3bd37ef577c248d450e70fa11e72bdfab00fef233aad84d3d8aa3434166c03267f6b95b69d593e9da2f37017b5b7a0913f68499f387354742ba50a  ringrtc-2.48.7.tar.gz
 64eed5c2a6f5a505d014bc4fa80e15b21103df1ea27825eaa1dfecc23c269f198a7e98472f29de7cae4ac7fa4fede6e837c27494b8ec4d03e36b85b029c64831  webrtc-6723a.tar.zst
 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28  stokenizer-0.2.1.tar.gz
 8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f  libsignal-auditable.patch
-18d5a0208d75fa910b6c0d531997402bba83290dfc7d7ce903acdcd0ce1d88bd3026ace40ecd32a88c2e429e48530b4e40f207a3d15bd9c0d6ebc8c447fa8ff9  signal-use-system-sqlcipher.patch
-fc2af28645364cd85c106304a26811b036f6be048c52137fbbcc112870a84132a181f532563e0569b560fde3cf8c02480666a9b01d804b0008f97c728005b1c7  signal-disable-updates.patch
-853de84d636f730694f17bcec63463fa7bfbdd0a7f7a64618a8fc6bc523ce1a9854b4c651753735af735c18101295d3efbe54f83ae0bccbed83c8c1fee3e7049  signal-update-links.patch
-882d6889b23a3ebc6449c8b6acec8c3853674a7e94f066d65b57bab674ba8c11d582ba2c760825cb67b9202716e6d8b7123001d1e9f9229e49a0b77e9d978265  signal-show-window-please.patch
+cee74edb504ee5ae685e8a449ac35fabf949c33bfee5905778f850c3b18e17f9ae9bd501c89a7fd2c9c81a5bb2b0af0c0b3c72e32128603b3923c32d2a493ce9  signal-use-system-sqlcipher.patch
+152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b  signal-disable-updates.patch
+d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d  signal-update-links.patch
+bfc8acdd13aa48d29c7657311733cc9d33c4899782efbd1ef6d25ad1698be4de7cc67e829324bc0309715d69ae37ea9f782cf54887317e817213e110d73d68e7  signal-show-window-please.patch
 10284e0d86ab88de161ae689871082194f689ce416f3ebada8991d5db707994ea1cb8b4212756dd93ba5a3469964050988220f18afc37e38f3404a6e17ec8caf  ringrtc-webrtc-renamed.patch
 98a7e4df27c3ed56c5968ebc3ae8e08bfb54362d0c910f9af1d414079a6d5fe0f18aa570ae3c38042f4691af6a130cb3ff689625e26a3987720dd319a5f587b1  webrtc-shared-libs.patch
 fe78cdc58c18826fc4227cc8e9377980766229390544578f6a1a6f7322bc3243c066963b589323dbfe4f2bfd37f8859ad84f63cb3783317892e5ae3652270a3a  webrtc-compiler.patch
 48ab5c733e643eaff08ccbe839086bebbb68d397984ad7c5c5b68df8071f75d2dfe92c3f52d9fbf9b81754934bdfa8a67c69addd476ce4265b978592fb4ff9bd  webrtc-gcc13.patch
-87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5  signal-desktop.sh
+87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5  signal-desktop
 "
--- a/backports/signal-desktop/README.md
+++ b/backports/signal-desktop/README.md
@ -1,61 +0,0 @@
-# signal-desktop
-
-This is the `signal-desktop` package for Alpine Linux.
-
-Please report any issues [using Gitlab](https://gitlab.alpinelinux.org/alpine/aports/-/issues/new) and tag @ayakael
-
-## Building signal-desktop
-
-Signal-desktop is an electron application that is rather complex to build
-
-The first layer of complexity is the use of dependencies that are themselves
-rather complex to build. Some are based on nodejs, others rust. Those
-dependencies are built before signal-desktop, like ringrtc, webrtc and
-libsignal. The versions of those dependencies are tracked in different files,
-which adds complexity when maintaining the package. Executing `abuild
-_update_depends` automatically fetches the expected versions and updates
-the relevant variables. 
-
-A second layer of complexity is that webrtc's source code isn't available as a
-downloadable tarball. It is only fetchable using Google's `gclient` available
-in `depot_tools` with a reimplemented version in the `teapot` package. By
-executing, `abuild snapshot`, webrtc tarball can be fetched and packaged, as
-long as `gclient` is in your path. For ease of maintenance, a workflow on
-[Ayakael's Forge](https://ayakael.net/mirrors/signal-desktop) automatically
-fetches and packages the source code and makes it available in a [generic
-Forgejo repository](https://ayakael.net/mirrors/-/packages/generic/webrtc).
-
-## Updating signal-desktop
-
-In a nutshell:
-
-1. Set `pkgver` to up-to-date version
-
-2. Update the dependency versions using  `abuild _update_depends`
-
-3. Optional: fetch webrtc using `abuild snapshot`, making sure `client`
-is in your path
-
-4. Update source checksum using `abuild checksum`
-
-## Finding dependency version information
-
-Here is where the version information is stored. It is different for every
-extra dependency.
-
-* _libsignalver: follow signal-desktop package.json ->
-@signalapp/libsignal-client
-* _ringrtcver: follow signal-desktop package.json -> @signalapp/ringrtc
-* _webrtcver: follow ringrtc (on version above) -> config/version.properties ->
-webrtc.version downloading tarball generated with abuild snapshot (with gclient
-dependencies fetched)
-* _stokenizerver: follow @signalapp/better-sqlite3 (on version in package.json)
-> deps/download.js -> TOKENIZER_VERSION
-
-## Why is this package still in testing
-
-As `electron` is still in testing, this package cannot yet be moved to
-`community`. Until that changes, this package is also kept-to-date against the
-latest release of Alpine Linux (along with `electron`) in
-[Ayakael's Forge](https://ayakael.net/forge/-/packages/alpine/signal-desktop).
-This is true of all Ayakael's packages still in `testing`.
--- a/backports/signal-desktop/signal-desktop.sh
+++ b/backports/signal-desktop/signal-desktop.sh
@ -1,6 +0,0 @@
-#!/bin/sh
-
-# app chooses config (including used endpoints) based on this
-export NODE_ENV=production
-
-exec electron /usr/lib/signal-desktop/app.asar
--- a/backports/signal-desktop/signal-disable-updates.patch
+++ b/backports/signal-desktop/signal-disable-updates.patch
@ -1,5 +1,5 @@
--- a/Signal-Desktop/config/production.json
-+++ b/Signal-Desktop/config/production.json
+--- a/config/production.json
+++ b/config/production.json
@@ -16,5 +16,5 @@
   "serverTrustRoot": "BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF",
   "genericServerPublicParams": "AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN",
--- a/backports/signal-desktop/signal-show-window-please.patch
+++ b/backports/signal-desktop/signal-show-window-please.patch
@ -1,7 +1,7 @@
-diff --git a/Signal-Desktop/app/main.ts.orig b/Signal-Desktop/app/main.ts
+diff --git a/app/main.ts.orig b/app/main.ts
 index aa1bec8..bd7c1d5 100644
--- a/Signal-Desktop/app/main.ts.orig
-+++ b/Signal-Desktop/app/main.ts
+--- a/app/main.ts.orig
+++ b/app/main.ts
@@ -690,7 +690,7 @@ async function createWindow() {
     : DEFAULT_HEIGHT;
 
--- a/backports/signal-desktop/signal-update-links.patch
+++ b/backports/signal-desktop/signal-update-links.patch
@ -1,5 +1,5 @@
--- ./Signal-Desktop/ts/components/DialogExpiredBuild.tsx.orig
-+++ ./Signal-Desktop/ts/components/DialogExpiredBuild.tsx
+--- ./ts/components/DialogExpiredBuild.tsx.orig
+++ ./ts/components/DialogExpiredBuild.tsx
@@ -23,9 +23,9 @@
       containerWidthBreakpoint={containerWidthBreakpoint}
       type="error"
@ -12,8 +12,8 @@
       hasAction
     >
       {i18n('icu:expiredWarning')}{' '}
--- ./Signal-Desktop/ts/types/support.ts.orig
-+++ ./Signal-Desktop/ts/types/support.ts
+--- ./ts/types/support.ts.orig
+++ ./ts/types/support.ts
@@ -1,7 +1,7 @@
 // Copyright 2023 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
--- a/backports/signal-desktop/signal-use-system-sqlcipher.patch
+++ b/backports/signal-desktop/signal-use-system-sqlcipher.patch
@ -1,7 +1,7 @@
-diff --git a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp.orig b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp
+diff --git a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig b/node_modules/@signalapp/better-sqlite3/binding.gyp
 index c370c30b309..bf0207e6fec 100644
--- a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp.orig
-+++ b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/binding.gyp
+--- a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig
+++ b/node_modules/@signalapp/better-sqlite3/binding.gyp
@@ -7,7 +7,16 @@
   'targets': [
     {
@ -28,10 +28,10 @@ index c370c30b309..bf0207e6fec 100644
           ],
         }],
       ],
-diff --git a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json.orig b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json
+diff --git a/node_modules/@signalapp/better-sqlite3/package.json.orig b/node_modules/@signalapp/better-sqlite3/package.json
 index fbb9d360352..a9217039c01 100644
--- a/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json.orig
-+++ b/Signal-Desktop/node_modules/@signalapp/better-sqlite3/package.json
+--- a/node_modules/@signalapp/better-sqlite3/package.json.orig
+++ b/node_modules/@signalapp/better-sqlite3/package.json
@@ -35,7 +35,7 @@
   },
   "scripts": {
--- a/backports/soqt/APKBUILD
+++ b/backports/soqt/APKBUILD
@ -1,23 +1,22 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer:
 pkgname=soqt
-pkgver=1.6.3
-pkgrel=0
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="GUI binding library for coin"
 url="https://github.com/coin3d/soqt"
 arch="all"
 license="BSD-3-Clause"
-makedepends="coin-dev cmake mesa-dev qt5-qtbase-dev doxygen"
+makedepends="coin-dev cmake mesa-dev qt5-qtbase-dev"
 options="!check" # test suite consists only of interactive programs
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/coin3d/soqt/releases/download/v$pkgver/soqt-$pkgver-src.tar.gz"
+source="https://github.com/coin3d/soqt/releases/download/SoQt-$pkgver/soqt-$pkgver-src.tar.gz"
 builddir="$srcdir/$pkgname"

 build() {
 	cmake -B build . \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=None \
-		-DSOQT_BUILD_DOCUMENTATION=ON \
 		-DSOQT_BUILD_DOC_MAN=ON
 	cmake --build build
 }
@ -27,5 +26,5 @@ package() {
 }

 sha512sums="
-8cef22cf4214dd03bb4639c1fff77c127bf80f99e3b7fb7c1c21c25a281aa484252414f4a48fa59b8b2485afe7920ce9e86366fd1343badc77b75b78d3ac4c53  soqt-1.6.3-src.tar.gz
+4221e98f51cca4dda23043428e869b60ab4d994710f97c0f44cd82631ffad2bd8bbaf0b820434a4636892df663d66ecd2aec14b185972671b2d22c0fe242b553  soqt-1.6.0-src.tar.gz
 "
--- a/backports/tests-drop-etcd3-and-k-argument.patch
+++ b/backports/tests-drop-etcd3-and-k-argument.patch
@ -1,24 +0,0 @@
-diff --git a/tests/conftest.py.orig b/tests/conftest.py
-index 2aeb758dda6..a9b2b8b2bd1 100644
--- a/tests/conftest.py.orig
-+++ b/tests/conftest.py
-@@ -3,7 +3,6 @@ import platform
- import socket
- import time
- 
-import etcd3
- import pymemcache
- import pymemcache.client
- import pymongo
-diff --git a/pytest.ini.orig b/pytest.ini
-index 38c40a713d0..8c6659e21c2 100644
--- a/pytest.ini.orig
-+++ b/pytest.ini
-@@ -17,7 +17,6 @@ addopts =
-     -rfEsxX
-     --cov=limits
-     -m "not benchmark"
-    -K
- filterwarnings =
-     error
-     module::ResourceWarning
--- a/pmos/device-pine64-pinenote/50-touchscreen.conf
+++ b/pmos/device-pine64-pinenote/50-touchscreen.conf
@ -0,0 +1,11 @@
+Section "InputClass"
+    Identifier "evdev touchscreen"
+    MatchProduct "tt21000"
+    MatchIsTouchscreen "on"
+    Driver        "evdev"
+EndSection
+Section "InputClass"
+    Identifier    "RotateTouch"
+    MatchProduct    "w9013"
+    Option    "TransformationMatrix" "-1 0 1 0 -1 1 0 0 1"
+EndSection
--- a/pmos/device-pine64-pinenote/81-libinput-pinenote.rules
+++ b/pmos/device-pine64-pinenote/81-libinput-pinenote.rules
@ -0,0 +1,9 @@
+ACTION=="remove", GOTO="libinput_device_group_end"
+KERNEL!="event[0-9]*", GOTO="libinput_device_group_end"
+
+ATTRS{phys}=="?*", ATTRS{name}=="cyttsp5", ENV{LIBINPUT_DEVICE_GROUP}="pinenotetouch"
+ATTRS{phys}=="?*", ATTRS{name}=="w9013 2D1F:0095 Stylus", ENV{LIBINPUT_DEVICE_GROUP}="pinenotetouch"
+
+ATTRS{phys}=="?*", ATTRS{name}=="cyttsp5", ENV{LIBINPUT_CALIBRATION_MATRIX}="-1 0 1 0 -1 1"
+
+LABEL="libinput_device_group_end"
--- a/pmos/device-pine64-pinenote/82-ebc-rockchip.rules
+++ b/pmos/device-pine64-pinenote/82-ebc-rockchip.rules
@ -0,0 +1,2 @@
+SUBSYSTEM=="module", KERNEL=="rockchip_ebc", RUN+="/bin/chgrp video /sys/module/%k/parameters/dclk_select /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/split_area_limit /sys/module/%k/parameters/default_waveform", RUN+="/bin/chmod g+w /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/default_waveform  /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/split_area_limit"
+DRIVER=="rockchip-ebc", RUN+="/bin/chgrp video /sys/%p/power/control", RUN+="/bin/chmod g+w /sys/%p/power/control"
--- a/pmos/device-pine64-pinenote/APKBUILD
+++ b/pmos/device-pine64-pinenote/APKBUILD
@ -0,0 +1,77 @@
+# Maintainer: Petr Hodina <phodina@protonmail.com>
+pkgname=device-pine64-pinenote
+pkgdesc="Pine64 PineNote"
+pkgver=2
+pkgrel=9
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	u-boot-pine64-pinenote
+	linux-pine64-pinenote
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+	phoc.ini
+	local-overrides.quirks
+	50-touchscreen.conf
+	81-libinput-pinenote.rules
+	82-ebc-rockchip.rules
+	panfrost.conf
+	rockchip_ebc.conf
+"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/local-overrides.quirks \
+		-t "$pkgdir"/etc/libinput/
+	install -Dm644 "$srcdir"/50-touchscreen.conf \
+		-t "$pkgdir"/etc/X11/xorg.conf.d
+	install -Dm644 "$srcdir"/81-libinput-pinenote.rules \
+		-t "$pkgdir"/usr/lib/udev/rules.d
+	install -Dm644 "$srcdir"/82-ebc-rockchip.rules \
+		"$pkgdir"/usr/lib/udev/rules.d
+	install -Dm644 "$srcdir"/panfrost.conf \
+		-t "$pkgdir"/etc/modprobe.d
+	install -Dm644 "$srcdir"/rockchip_ebc.conf \
+		"$pkgdir"/etc/modprobe.d
+}
+
+phosh() {
+	install_if="$pkgname=$pkgver-r$pkgrel phosh"
+	depends="postmarketos-theme"
+
+	install -Dm644 "$srcdir"/phoc.ini \
+		-t "$subpkgdir"/etc/phosh
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi, Bluetooth and display firmware"
+	depends="firmware-pine64-pinenote linux-firmware"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+5829b9b52206a7520066e4bb3c08c2535d98002a3940664a0239344f5e7522fe7b6a9cb0c0074f9846c7e42c40746f2991f6aeeefeba8efa9140c16630b2893e  deviceinfo
+473accb3497244742dd9fd15f8a02957a13e08fa4d4393fec185ecbb27f1f17726e4b5ece22da861151f9d358d3266206c647def8aa75adb672b6f1f1904c66f  modules-initfs
+4bf5158fbd53274a7429e825bb66225001f2403a4851e2d6803323b77d9095738ee3e5340ac85baf3e86bb4f47d38af8cbd78d8a5055c59a62f5b06e722e19cb  phoc.ini
+1123720962c9c8fec3c50302ca6a3dd56e2907dc9eea361a7b8eb4201b042476633d41a0ee4f6ab61d9c60eeccc894f83491ba9fa309a9bce2f1db0b0341d79d  local-overrides.quirks
+ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
+2bc51f200baefc37abfaaad368a911244999e906bdca4b728ac233f49a8fb3ae7206ee3c95cdb20d7dceae2a31d25a57f4e1da4fd67057fd64724b8232e42aed  81-libinput-pinenote.rules
+19e922eec89dba419798c4e1dc9b39c040db33986d0969a39a8220c642fa081763f15ff2418115d5a748af4054a1be0784927d1712ea79942c2b237ebab47728  82-ebc-rockchip.rules
+6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
+b52d2e7f0c62d7c313b6db9aeb706cdb2596b6aa637aeddb862abf1e256103377fb6267e38cd4285e25d32112acf8d03bbf32ecff7be3dfbb9176209ea7ae283  rockchip_ebc.conf
+"
--- a/pmos/device-pine64-pinenote/deviceinfo
+++ b/pmos/device-pine64-pinenote/deviceinfo
@ -0,0 +1,37 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Pine64 PineNote"
+deviceinfo_manufacturer="Pine64"
+deviceinfo_codename="pine64-pinenote"
+deviceinfo_year="2021"
+deviceinfo_dtb="rockchip/rk3566-pinenote-v1.2"
+deviceinfo_arch="aarch64"
+deviceinfo_gpu_accelerated="true"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1404"
+deviceinfo_screen_height="1872"
+deviceinfo_getty="ttyS2;1500000"
+
+# initfs
+
+# Bootloader related
+deviceinfo_flash_method="rkdeveloptool"
+deviceinfo_flash_sparse="true"
+
+deviceinfo_boot_part_start="65536"
+
+deviceinfo_sd_embed_firmware="u-boot/pine64-pinenote/u-boot-rockchip.bin:1"
+deviceinfo_sd_embed_firmware_step_size="32768"
+
+deviceinfo_flash_rk_partition_kernel="boot"
+deviceinfo_flash_rk_partition_rootfs="os1"
+
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_kernel_cmdline="drm.debug=0x0 vt.color=0xf earlycon console=tty0 console=ttyS2,1500000n8 PMOS_FORCE_PARTITION_RESIZE"
--- a/pmos/device-pine64-pinenote/local-overrides.quirks
+++ b/pmos/device-pine64-pinenote/local-overrides.quirks
@ -0,0 +1,5 @@
+[PineNote]
+MatchName=cyttsp5
+AttrPalmPressureThreshold=28
+AttrThumbPressureThreshold=27
+AttrSizeHint=210x157
--- a/pmos/device-pine64-pinenote/modules-initfs
+++ b/pmos/device-pine64-pinenote/modules-initfs
@ -0,0 +1,5 @@
+tps65185-regulator
+rockchip_ebc
+drm_kms_helper
+drm_shmem_helper
+pvi_waveform
--- a/pmos/device-pine64-pinenote/panfrost.conf
+++ b/pmos/device-pine64-pinenote/panfrost.conf
@ -0,0 +1,2 @@
+softdep panfrost pre: rockchip_ebc
+# blacklist rockchip_ebc
--- a/pmos/device-pine64-pinenote/phoc.ini
+++ b/pmos/device-pine64-pinenote/phoc.ini
@ -0,0 +1,6 @@
+# /etc/phosh/phoc.ini
+# Overwrites values set in /usr/share/phosh/phoc.ini
+
+# e-ink is an "Unknown" display type for now in mainline
+[output:Unknown-1]
+scale = 2.0
--- a/pmos/device-pine64-pinenote/rockchip_ebc.conf
+++ b/pmos/device-pine64-pinenote/rockchip_ebc.conf
@ -0,0 +1,5 @@
+# rockchip-rga will crash the kernel on unload at the moment
+blacklist rockchip-rga
+blacklist ws8100_pen
+
+options rockchip_ebc direct_mode=0 auto_refresh=1 refresh_threshold=60 split_area_limit=0 panel_reflection=1 prepare_prev_before_a2=0 dclk_select=0
--- a/pmos/linux-pine64-pinenote/APKBUILD
+++ b/pmos/linux-pine64-pinenote/APKBUILD
@ -0,0 +1,59 @@
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm64/configs/(CHANGEME!)
+
+pkgname=linux-pine64-pinenote
+pkgver=6.12.0
+pkgrel=0
+pkgdesc="Pine64 PineNote kernel fork"
+arch="aarch64"
+_carch="arm64"
+_flavor="pine64-pinenote"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+makedepends="
+	bash
+	bc
+	bison
+	devicepkg-dev
+	findutils
+	flex
+	openssl-dev
+	perl
+"
+
+# Source
+_repository="linux"
+_commit="9d066a65f5cbaa8cd3bfc73a1b54fbac2d0f76ac"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/m-weigand/linux/archive/$_commit.tar.gz
+	$_config
+"
+builddir="$srcdir/$_repository-$_commit"
+
+prepare() {
+	default_prepare
+	REPLACE_GCCH=0 \
+		. downstreamkernel_prepare
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
+
+	make modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
+}
+
+sha512sums="
+d3c2510f9f835a0570fbb812cec2f9e12e402878c1f9f214364ae1918bc4c00f69a1fc5e005cf6b85c0690e6fd5f6ce9e61efd88145a83725ed12b6b8c07b97e  linux-pine64-pinenote-9d066a65f5cbaa8cd3bfc73a1b54fbac2d0f76ac.tar.gz
+99294bd6c53b1cf3832addbc80ea23b9089bb03463e2a9ebe93ab5feb1b2ff9ee38f158032705429230765bae2df23bb3401ec14902134c80d9dd6e58e188be5  config-pine64-pinenote.aarch64
+"
--- a/pmos/linux-pine64-pinenote/config-pine64-pinenote.aarch64
+++ b/pmos/linux-pine64-pinenote/config-pine64-pinenote.aarch64
--- a/pmos/pinenote-dbus-service/APKBUILD
+++ b/pmos/pinenote-dbus-service/APKBUILD
@ -0,0 +1,34 @@
+# Maintainer: Petr Hodina <phodina@protonmail.com>
+pkgname=pinenote-dbus-service
+pkgver=0.2.2_pre5
+_gittag=0.2.2-dev5
+pkgrel=1
+pkgdesc="Dbus daemon for controlling driver aspects on Pine64 Pinenote"
+url="https://github.com/m-weigand/pinenote_dbus_service"
+arch="aarch64"
+license="MIT"
+makedepends="cargo"
+depends="dbus-dev"
+source="
+	pinenote-dbus-service-$_gittag.tar.gz::https://github.com/m-weigand/pinenote_dbus_service/archive/refs/tags/v$_gittag.tar.gz
+	pinenote.initd
+"
+
+builddir="$srcdir/pinenote_dbus_service-$_gittag"
+
+build() {
+	cargo build --release --locked
+}
+
+package() {
+	cargo install --path . --root="$pkgdir/usr"
+	install -Dm644 dbus_security_configuration/pinenote.conf -t "$pkgdir"/usr/share/dbus-1/system.d/
+	install -Dm755 "$srcdir"/pinenote.initd $pkgdir/etc/init.d/pinenote
+	rm "$pkgdir"/usr/.crates.toml
+	rm "$pkgdir"/usr/.crates2.json
+}
+
+sha512sums="
+10cf05f9e1e8affec97b532611a9bffb86928cabe4eb9bd321b66e8dba340e6a7916fa0c8286f81300bfa655d5596bba09f0316abcafa6c55128823c78acb807  pinenote-dbus-service-0.2.2-dev5.tar.gz
+362c20218610e7a5349eef40d54463a05906e258157e590ad1635591a548ddc60050142cfab41a0423797182e5ae392a7fe6476fc71b9c01cece384351e6f148  pinenote.initd
+"
--- a/pmos/pinenote-dbus-service/pinenote.initd
+++ b/pmos/pinenote-dbus-service/pinenote.initd
@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+
+description="Launch DBus service for driver aspects"
+command="/usr/bin/pinenote_dbus_service"
+command_background=yes
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need dbus
+}
--- a/unmaintained/craftbukkit-plugin-essentialsx/APKBUILD
+++ b/unmaintained/craftbukkit-plugin-essentialsx/APKBUILD
@ -1,108 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=craftbukkit-plugin-essentialx
-_pkgver=2.19.2
-_buildver=release
-_buildcommit=0
-pkgrel=2
-pkgdesc="EssentialsX is the essential plugin suite for Minecraft servers, with over 130 commands for servers of all size and scale."
-options=!check
-arch='noarch'
-url="https://essentialsx.net/"
-license="GPL-3.0"
-depends="craftbukkit>=1.8.8 craftbukkit<=1.18.1"
-
-if _buildver=release; then
-	pkgver=$_pkgver
-	_url=https://github.com/EssentialsX/Essentials/releases/download/$pkgver
-	_filename="$pkgver.jar"
-else
-	pkgver=$_pkgver.$_buildver
-	_url=https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/jars
-	_filename="$_pkgver-dev+$_buildver-$_buildcommit.jar"
-fi
-
-source="
-	$_url/EssentialsX-$_filename
-	$_url/EssentialsXChat-$_filename
-	$_url/EssentialsXSpawn-$_filename
-	$_url/EssentialsXAntiBuild-$_filename
-	$_url/EssentialsXDiscord-$_filename
-	$_url/EssentialsXGeoIP-$_filename
-	$_url/EssentialsXProtect-$_filename
-	$_url/EssentialsXXMPP-$_filename
-"
-
-subpackages="$pkgname-core $pkgname-chat $pkgname-spawn $pkgname-antibuild $pkgname-discord $pkgname-geo $pkgname-protect $pkgname-xmpp"
-
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-core() {
-	pkgdesc="Core functionality: teleports, private messages, homes, warps and more"
-	install -Dm644 "$srcdir"/EssentialsX-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/Essentials.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/Essentials.jar
-}
-
-chat() {
-	pkgdesc="Chat formatting, local chat"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXChat-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsChat.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsChat.jar
-}
-
-spawn() {
-	pkgdesc="Spawnpoint control, per-player spawns"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXSpawn-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsSpawn.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsSpawn.jar
-}
-
-antibuild() {
-	pkgdesc="Simple permissions-based building control"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXAntiBuild-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsAntiBuild.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsAntiBuild.jar
-}
-
-discord() {
-	pkgdesc="Lightweight chat, messaging and command integration with Discord"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXDiscord-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsDiscord.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsDiscord.jar
-}
-
-geo() {
-	pkgdesc="Geographical player lookup (formerly EssentialsX GeoIP)"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXGeoIP-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsGeo.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsGeo.jar
-}
-
-protect() {
-	pkgdesc="Configurable world protection and control"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXProtect-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsProtect.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsProtect.jar
-}
-
-xmpp() {
-	pkgdesc="Lightweight chat, messaging and server log integration with Jabber/XMPP services"
-	depends="$pkgname-core"
-	install -Dm644 "$srcdir"/EssentialsXXMPP-*.jar "$subpkgdir/var/lib/craftbukkit/plugins/EssentialsXMPP.jar"
-	chown craftbukkit:craftbukkit "$subpkgdir"/var/lib/craftbukkit/plugins/EssentialsXMPP.jar
-}
-
-sha512sums="
-c91c0905c11482d93b1565f8b9dce7b6f939567b4cb2756b112ee408bdcca1fece04742f9b7b0876d5b2e84cebdbc555d35cf783e9e86ab12fafb9dc02bc6008  EssentialsX-2.19.2.jar
-e2df6f242db38689579501b34763ad7d4b5e8ddd87b7b57956c6b5cc667f1b34af6b1289d668a64761da63f8ae8507eb9687ca490cc715a3eff6338770963240  EssentialsXChat-2.19.2.jar
-24e41168428f20bd6506282b9920718c43f7e5227bf35e174522e49859e294048a1d979ae42044bdbdba45c8a1109f4db6ffd0e24d5f3e909d0f9a3ac31e21d3  EssentialsXSpawn-2.19.2.jar
-326ec004241b526965cb67ae0f0245dfa960da2fdb4b59d867eb08e5196fceb468f9314cb838c8a0bc513cc55f43cf58023d11b18ed98e472be7089838538f97  EssentialsXAntiBuild-2.19.2.jar
-211c575adde17c3f2f901144e5c31beb2918df7e6e15f8ebe16805d3b53214a4756b87ec84466790ebf1dacb41e1aea97b6a9ba8ed39e85092293a821044d579  EssentialsXDiscord-2.19.2.jar
-7845e7666f983d3e793528a7085ced7c9f1bf881740bcc68b6a54fea74e31c3c0c2a52e26fc20330ba7d4a190dad0a1b27195fed0e1417a48494c5fa2ac60d92  EssentialsXGeoIP-2.19.2.jar
-e74ed72a15b5e6cd3c5f61d032a26c151865e3197638c9059237dc2d1144b0cb15668545532fc532ac8ec247bdf9b9ee6843b8f4af7506aef86d155dd5672c5f  EssentialsXProtect-2.19.2.jar
-8d35009499557700f49c27ca3132e866f511a200791dbcfd2f595396977058cc2fc9349d0b4eaa0eb67b27331e91e6209df6ed57a766c06fd3b3325718462478  EssentialsXXMPP-2.19.2.jar
-"
--- a/unmaintained/craftbukkit-plugin-luckperms/APKBUILD
+++ b/unmaintained/craftbukkit-plugin-luckperms/APKBUILD
@ -1,23 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=craftbukkit-plugin-luckperms
-_pkgver=5.3.89
-_buildver=1389
-pkgver=$_pkgver.$_buildver
-pkgrel=1
-pkgdesc="An advanced permissions plugin for Bukkit/Spigot, BungeeCord and Sponge."
-options=!check
-arch='noarch'
-url="https://github.com/lucko/LuckPerms"
-license="MIT"
-depends="craftbukkit>=1.8.8 craftbukkit<=1.18.1"
-source="https://ci.lucko.me/job/LuckPerms/$_buildver/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-$_pkgver.jar"
-
-package() {
-	install -Dm644 "$srcdir"/LuckPerms-Bukkit-$_pkgver.jar "$pkgdir/var/lib/craftbukkit/plugins/LuckPerms.jar"
-	chown craftbukkit:craftbukkit "$pkgdir"/var/lib/craftbukkit/plugins/LuckPerms.jar
-}
-sha512sums="
-7e146616cdf7f667c483bbe2112439c85f32427e9aa3714f0b0e869abf0cde6aacc7341d8d9e6a72ddcf8f35af840f4ba678c4690222912113f497cafce11154  LuckPerms-Bukkit-5.3.89.jar
-"
--- a/unmaintained/craftbukkit-plugin-worldedit/APKBUILD
+++ b/unmaintained/craftbukkit-plugin-worldedit/APKBUILD
@ -1,22 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=craftbukkit-plugin-worldedit
-pkgver=7.2.8
-_pkgver=$pkgver
-pkgrel=1
-pkgdesc="WorldEdit is an easy-to-use in-game Minecraft map editor"
-options=!check
-arch='noarch'
-url="https://dev.bukkit.org/projects/worldedit"
-license="GPL-3.0"
-depends="craftbukkit>=1.13.2 craftbukkit<=1.18.1"
-source="https://media.forgecdn.net/files/3559/523/worldedit-bukkit-7.2.8.jar"
-
-package() {
-	install -Dm644 "$srcdir"/worldedit-bukkit-$_pkgver.jar "$pkgdir/var/lib/craftbukkit/plugins/WorldEdit.jar"
-	chown craftbukkit:craftbukkit $pkgdir/var/lib/craftbukkit/plugins/WorldEdit.jar
-}
-sha512sums="
-b57eacf7a2d90461f996f71cf55aa2e328d7b75c724291f11bcd1ab0f7e64e980db7ae3a2a56fffdf2bc31bfbcf68dda89b7c6f2ffa32ee430b8016020d796e3  worldedit-bukkit-7.2.8.jar
-"
--- a/unmaintained/craftbukkit-plugin-worldguard/APKBUILD
+++ b/unmaintained/craftbukkit-plugin-worldguard/APKBUILD
@ -1,22 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=craftbukkit-plugin-worldedit
-pkgver=7.0.6
-_pkgver=$pkgver
-pkgrel=3
-pkgdesc="WorldGuard lets you and players guard areas of land against griefers and undesirables"
-options=!check
-arch='noarch'
-url="https://dev.bukkit.org/projects/worldguard"
-license="GPL-3.0"
-depends="craftbukkit>=1.17.0 craftbukkit<=1.18.1"
-source="https://media.forgecdn.net/files/3461/546/worldguard-bukkit-7.0.6-dist.jar"
-
-package() {
-	install -Dm644 "$srcdir"/worldguard-bukkit-$_pkgver-dist.jar "$pkgdir/var/lib/craftbukkit/plugins/WorldGuard.jar"
-	chown craftbukkit:craftbukkit $pkgdir/var/lib/craftbukkit/plugins/WorldGuard.jar
-}
-sha512sums="
-f2f857ffbbe7896b8986d5944564d7ab01e51d86476e05c66067a57d83dcb2ee60019ab9d75b16d551e9cfe102d29a602de41f316da57d7743d2595d6a11d839  worldguard-bukkit-7.0.6-dist.jar
-"
--- a/unmaintained/papermc/APKBUILD
+++ b/unmaintained/papermc/APKBUILD
@ -1,56 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=papermc
-_pkgver=1.18.1
-_build=99
-_license_commit=4a7962c
-pkgver="$_pkgver.$_build"
-pkgrel=1
-pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
-pkgusers="craftbukkit"
-pkggroups="craftbukkit"
-arch='noarch'
-url="https://papermc.io/"
-license='custom'
-depends='openjdk17-jre-headless screen sudo bash gawk sed netcat-openbsd tar'
-options="!check"
-provides="craftbukkit=$_pkgver"
-subpackages="$pkgname-openrc"
-source="papermc.$pkgver.jar::https://papermc.io/api/v2/projects/paper/versions/$_pkgver/builds/$_build/downloads/paper-$_pkgver-$_build.jar
-	papermc.initd
-	papermc.conf
-	papermc.sh
-	LICENSE_$pkgver.md::https://raw.githubusercontent.com/PaperMC/Paper/$_license_commit/LICENSE.md
-"
-
-_game="papermc"
-_server_root="/var/lib/papermc"
-
-package() {
-	install -Dm644 "$srcdir"/$_game.conf              "$pkgdir"/etc/conf.d/$_game
-	install -Dm755 "$srcdir"/$_game.sh                "$pkgdir"/usr/bin/$_game
-	install -Dm755 "$srcdir"/$_game.initd           "$pkgdir"/etc/init.d/$_game
-	install -Dm644 "$srcdir"/$_game.$pkgver.jar     "$pkgdir"/$_server_root/$_game/$pkgver.jar
-	ln -s "$_game"/$pkgver.jar "$pkgdir"/$_server_root/$_game/server.jar
-
-	# Link to craftbukkit plugins var
-	ln -s "/var/lib/craftbukkit/plugins" "$pkgdir"/$_server_root/plugins
-
-	# Link the log files
-	mkdir -p "$pkgdir"/var/log/
-	install -dm2755 "$pkgdir"/$_server_root/logs
-	ln -s "$_server_root"/logs "$pkgdir"/var/log/$_game
-
-	# Give the group write permissions and set user or group ID on execution
-	chmod g+ws "$pkgdir"/$_server_root
-
-	install -D "$srcdir"/LICENSE_$pkgver.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-sha512sums="
-623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a  papermc.1.18.1.99.jar
-c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e  papermc.initd
-9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789  papermc.conf
-943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7  papermc.sh
-d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5  LICENSE_1.18.1.99.md
-"
--- a/unmaintained/papermc/APKBUILD.orig
+++ b/unmaintained/papermc/APKBUILD.orig
@ -1,56 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=papermc
-_pkgver=1.18.1
-_build=99
-_license_commit=4a7962c
-pkgver="$_pkgver.$_build"
-pkgrel=1
-pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
-pkgusers="craftbukkit"
-pkggroups="craftbukkit"
-arch='noarch'
-url="https://papermc.io/"
-license='custom'
-depends='openjdk17-jre-headless screen sudo bash gawk sed netcat-openbsd tar'
-options="!check"
-provides="craftbukkit=$_pkgver"
-subpackages="$pkgname.openrc"
-source="papermc.$pkgver.jar::https://papermc.io/api/v2/projects/paper/versions/$_pkgver/builds/$_build/downloads/paper-$_pkgver-$_build.jar
-	papermc.initd
-	papermc.conf
-	papermc.sh
-	LICENSE_$pkgver.md::https://raw.githubusercontent.com/PaperMC/Paper/$_license_commit/LICENSE.md
-"
-
-_game="papermc"
-_server_root="/var/lib/papermc"
-
-package() {
-	install -Dm644 $srcdir.$_game.conf              "$pkgdir.etc/conf.d/$_game"
-	install -Dm755 $srcdir.$_game.sh                "$pkgdir.usr/bin/$_game"
-	install -Dm755 $srcdir.$_game.initd           "$pkgdir.etc/init.d/$_game"
-	install -Dm644 $srcdir.$_game.$pkgver.jar     "$pkgdir.$_server_root.$_game.$pkgver.jar"
-	ln -s "$_game.$pkgver.jar" "$pkgdir._server_root.$_game.server.jar"
-
-	# Link to craftbukkit plugins var
-	ln -s "/var/lib/craftbukkit/plugins" "$pkgdir.$_server_root.plugins"
-
-	# Link the log files
-	mkdir -p "$pkgdir.var/log/"
-	install -dm2755 "$pkgdir.$_server_root.logs"
-	ln -s "$_server_root.logs" "$pkgdir.var/log/$_game"
-
-	# Give the group write permissions and set user or group ID on execution
-	chmod g+ws "$pkgdir._server_root"
-
-	install -D $srcdir../LICENSE_$pkgver.md "$pkgdir.usr/share/licenses/$pkgname.LICENSE"
-}
-sha512sums="
-623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a  papermc.1.18.1.99.jar
-c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e  papermc.initd
-9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789  papermc.conf
-943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7  papermc.sh
-d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5  LICENSE_1.18.1.99.md
-"
--- a/unmaintained/papermc/APKBUILD.rej
+++ b/unmaintained/papermc/APKBUILD.rej
@ -1,38 +0,0 @@
--- user/papermc/APKBUILD
-+++ user/papermc/APKBUILD
-@@ -28,24 +28,24 @@ _game="papermc"
- _server_root="/var/lib/papermc"
- 
- package() {
-       install -Dm644 $srcdir.$_game.conf              "$pkgdir.etc/conf.d/$_game"
-       install -Dm755 $srcdir.$_game.sh                "$pkgdir.usr/bin/$_game"
-       install -Dm755 $srcdir.$_game.initd           "$pkgdir.etc/init.d/$_game"
-       install -Dm644 $srcdir.$_game.$pkgver.jar     "$pkgdir.$_server_root.$_game.$pkgver.jar"
-       ln -s "$_game.$pkgver.jar" "$pkgdir._server_root.$_game.server.jar"
-+       install -Dm644 "$srcdir"/$_game.conf              "$pkgdir"/etc/conf.d/$_game
-+       install -Dm755 "$srcdir"/$_game.sh                "$pkgdir"/usr/bin/$_game
-+       install -Dm755 "$srcdir"/$_game.initd           "$pkgdir"/etc/init.d/$_game
-+       install -Dm644 "$srcdir"/$_game.$pkgver.jar     "$pkgdir"/$_server_root/$_game/$pkgver.jar
-+       ln -s "$_game"/$pkgver.jar "$pkgdir"/$_server_root/$_game/server.jar
- 
-        # Link to craftbukkit plugins var
-       ln -s "/var/lib/craftbukkit/plugins" "$pkgdir.$_server_root.plugins"
-+       ln -s "/var/lib/craftbukkit/plugins" "$pkgdir"/$_server_root/plugins
- 
-        # Link the log files
-       mkdir -p "$pkgdir.var/log/"
-       install -dm2755 "$pkgdir.$_server_root.logs"
-       ln -s "$_server_root.logs" "$pkgdir.var/log/$_game"
-+       mkdir -p "$pkgdir"/var/log/
-+       install -dm2755 "$pkgdir"/$_server_root/logs
-+       ln -s "$_server_root"/logs "$pkgdir"/var/log/$_game
- 
-        # Give the group write permissions and set user or group ID on execution
-       chmod g+ws "$pkgdir._server_root"
-+       chmod g+ws "$pkgdir"/$_server_root
- 
-       install -D $srcdir../LICENSE_$pkgver.md "$pkgdir.usr/share/licenses/$pkgname.LICENSE"
-+       install -D "$srcdir"/LICENSE_$pkgver.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- }
- sha512sums="
- 623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a  papermc.1.18.1.99.jar
--- a/user/papermc-plugin-essentialsx/APKBUILD
+++ b/user/papermc-plugin-essentialsx/APKBUILD
@ -0,0 +1,79 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc-plugin-essentialsx
+pkgver=2.21.0_pre151
+_gittag=f2af9528b0f99f2ff121dda2607e51d391a2a8bf
+pkgrel=0
+pkgdesc="EssentialsX is the essential plugin suite for Minecraft servers, with over 130 commands for servers of all size and scale."
+arch='noarch'
+url="https://essentialsx.net/"
+license="GPL-3.0"
+depends="
+	papermc>=1.8.8
+	papermc-plugin-luckperms
+	papermc-plugin-vault
+"
+makedepends="openjdk21-jdk"
+source="$pkgname-$_gittag.tar.gz::https://github.com/EssentialsX/Essentials/archive/$_gittag.tar.gz"
+builddir="$srcdir"/Essentials-$_gittag
+
+subpackages="$pkgname-chat $pkgname-spawn $pkgname-antibuild $pkgname-discord $pkgname-geo $pkgname-protect $pkgname-xmpp"
+
+build() {
+	./gradlew build
+}
+
+check() {
+	./gradlew test
+}
+
+package() {
+	install -Dm644 "$builddir"/jars/EssentialsX-*.jar "$pkgdir/var/lib/papermc/plugins/Essentials.jar"
+}
+
+chat() {
+	pkgdesc="Chat formatting, local chat"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXChat-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsChat.jar"
+}
+
+spawn() {
+	pkgdesc="Spawnpoint control, per-player spawns"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXSpawn-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsSpawn.jar"
+}
+
+antibuild() {
+	pkgdesc="Simple permissions-based building control"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXAntiBuild-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsAntiBuild.jar"
+}
+
+discord() {
+	pkgdesc="Lightweight chat, messaging and command integration with Discord"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXDiscord-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsDiscord.jar"
+	install -Dm644 "$builddir"/jars/EssentialsXDiscordLink-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsDiscordLink.jar"
+}
+
+geo() {
+	pkgdesc="Geographical player lookup (formerly EssentialsX GeoIP)"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXGeoIP-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsGeo.jar"
+}
+
+protect() {
+	pkgdesc="Configurable world protection and control"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXProtect-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsProtect.jar"
+}
+
+xmpp() {
+	pkgdesc="Lightweight chat, messaging and server log integration with Jabber/XMPP services"
+	depends="$pkgname"
+	install -Dm644 "$builddir"/jars/EssentialsXXMPP-*.jar "$subpkgdir/var/lib/papermc/plugins/EssentialsXMPP.jar"
+}
+
+sha512sums="
+5fabf6b2091f7182ff23ca02e2f93ff22527668d55bbf60977ad414881c201bdc4608fe3618ca0d1312beb8fe8768f36cd792099817a0205f791ab2f9b212e04  papermc-plugin-essentialsx-f2af9528b0f99f2ff121dda2607e51d391a2a8bf.tar.gz
+"
--- a/user/papermc-plugin-luckperms/APKBUILD
+++ b/user/papermc-plugin-luckperms/APKBUILD
@ -0,0 +1,34 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc-plugin-luckperms
+pkgver=5.4.151
+_gittag=0fef481d480737528491fc0b3b8487eb1612f955
+pkgrel=0
+pkgdesc="An advanced permissions plugin for Bukkit/Spigot, BungeeCord and Sponge."
+arch='noarch'
+url="https://github.com/lucko/LuckPerms"
+license="MIT"
+depends="papermc>=1.8.8"
+makedepends="openjdk21-jdk"
+source="$pkgname-$_gittag.tar.gz::https://github.com/LuckPerms/LuckPerms/archive/$_gittag.tar.gz"
+builddir="$srcdir"/LuckPerms-$_gittag
+
+prepare() {
+	default_prepare
+	sed -i "s|project.ext.patchVersion = determinePatchVersion()|project.ext.patchVersion = '${pkgver##*.}'|" build.gradle
+}
+
+build() {
+	./gradlew build
+}
+
+check() {
+	./gradlew test
+}
+
+package() {
+	install -Dm644 "$builddir"/bukkit/loader/build/libs/LuckPerms-Bukkit-*.jar "$pkgdir/var/lib/papermc/plugins/LuckPerms.jar"
+}
+sha512sums="
+e016d2a161472974cc75151e1a6cb3495881d4db7e0aa75d81a1c54fd16d191fe721b1f9fadeaac0bef7ec4a7c47329a2cf367cf3a7577b284077ec173db0579  papermc-plugin-luckperms-0fef481d480737528491fc0b3b8487eb1612f955.tar.gz
+"
--- a/user/papermc-plugin-vault/1996cfa_finish-removal-native-support-for-abandonned-economy-plugins.patch
+++ b/user/papermc-plugin-vault/1996cfa_finish-removal-native-support-for-abandonned-economy-plugins.patch
--- a/user/papermc-plugin-vault/2022cb0_support-newer-jdk-for-building.patch
+++ b/user/papermc-plugin-vault/2022cb0_support-newer-jdk-for-building.patch
@ -0,0 +1,33 @@
+From 2022cb08922caa42aa77faca254c9b7d7506bee8 Mon Sep 17 00:00:00 2001
+From: Geolykt <admin@geolykt.de>
+Date: Mon, 27 Jun 2022 12:02:49 +0200
+Subject: [PATCH] Support newer JDKs for building
+
+Apparently the ancient version of lombok used
+by a dependency is not compatible with newer
+versions of java. As Vault proper did not make
+use of lombok, it can be safely removed without
+declaring an alternative.
+
+This commit allows Vault to build under Java 17.
+---
+ pom.xml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index 5b8a6dfd..17c189fd 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -324,6 +324,12 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
+ 			<artifactId>craftconomy3</artifactId>
+ 			<version>3.2.2-SNAPSHOT</version>
+ 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>org.projectlombok</groupId>
+					<artifactId>lombok</artifactId>
+				</exclusion>
+			</exclusions>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>net.crystalyx.bukkit.simplyperms</groupId>
--- a/user/papermc-plugin-vault/823_add-option-to-silence-no-update-logs.patch
+++ b/user/papermc-plugin-vault/823_add-option-to-silence-no-update-logs.patch
@ -0,0 +1,37 @@
+From 52df9d3287e8d593d0e4d999c6d5daaebe947ca1 Mon Sep 17 00:00:00 2001
+From: Ricardo Boss <mail@ricardoboss.de>
+Date: Tue, 28 Jun 2022 18:50:18 +0200
+Subject: [PATCH] Add option to silence "no update" logs (#823)
+
+* Added "silent-no-update" config option
+
+Added switch to turn off messages if no update is available.
+
+* Set default value for "silent-no-update"
+
+* Removed any "no update available" option and message
+---
+ src/net/milkbowl/vault/Vault.java | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java
+index ef8b5578..fd2a9787 100644
+--- a/src/net/milkbowl/vault/Vault.java
+++ b/src/net/milkbowl/vault/Vault.java
+@@ -171,8 +171,6 @@ public void run() {
+                                     log.warning("Update at: https://dev.bukkit.org/projects/vault");
+                                 } else if (currentVersion > newVersion) {
+                                     log.info("Stable Version: " + newVersionTitle + " | Current Version: " + currentVersionTitle);
+-                                } else {
+-                                    log.info("No new version available");
+                                 }
+                             } catch (Exception e) {
+                                 // ignore exceptions
+@@ -182,7 +180,6 @@ public void run() {
+                 }, 0, 432000);
+ 
+             }
+-
+         });
+ 
+         // Load up the Plugin metrics
--- a/user/papermc-plugin-vault/868_update-bstats.patch
+++ b/user/papermc-plugin-vault/868_update-bstats.patch
@ -0,0 +1,72 @@
+From 3f20655f0b1b9c7a0f69eb241c5bedd8e748b5c9 Mon Sep 17 00:00:00 2001
+From: Leonardo Di Gianfelice Stornelli
+ <leonardo.digianfelicestornelli@gmail.com>
+Date: Tue, 28 Jun 2022 00:34:40 +0200
+Subject: [PATCH] Update bStats (#868)
+
+---
+ pom.xml                           | 2 +-
+ src/net/milkbowl/vault/Vault.java | 9 +++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 17c189fd..ccd8cde4 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -85,7 +85,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
+ 		<dependency>
+ 			<groupId>org.bstats</groupId>
+ 			<artifactId>bstats-bukkit</artifactId>
+-			<version>1.5</version>
+			<version>3.0.0</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>com.gmail.bleedobsidian.miconomy</groupId>
+diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java
+index 30f6f17f..ef8b5578 100644
+--- a/src/net/milkbowl/vault/Vault.java
+++ b/src/net/milkbowl/vault/Vault.java
+@@ -78,6 +78,7 @@
+ import net.milkbowl.vault.permission.plugins.Permission_KPerms;
+ 
+ import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
+ import org.bukkit.Bukkit;
+ import org.bukkit.OfflinePlayer;
+ import org.bukkit.command.Command;
+@@ -185,7 +186,7 @@ public void run() {
+         });
+ 
+         // Load up the Plugin metrics
+-        Metrics metrics = new Metrics(this);
+        Metrics metrics = new Metrics(this, 887);
+         findCustomData(metrics);
+ 
+         log.info(String.format("Enabled Version %s", getDescription().getVersion()));
+@@ -581,7 +582,7 @@ private void findCustomData(Metrics metrics) {
+             econ = rspEcon.getProvider();
+         }
+         final String econName = econ != null ? econ.getName() : "No Economy";
+-        metrics.addCustomChart(new Metrics.SimplePie("economy", new Callable<String>() {
+        metrics.addCustomChart(new SimplePie("economy", new Callable<String>() {
+             @Override
+             public String call() {
+                 return econName;
+@@ -590,7 +591,7 @@ public String call() {
+ 
+         // Create our Permission Graph and Add our permission Plotters
+         final String permName = Bukkit.getServer().getServicesManager().getRegistration(Permission.class).getProvider().getName();
+-        metrics.addCustomChart(new Metrics.SimplePie("permission", new Callable<String>() {
+        metrics.addCustomChart(new SimplePie("permission", new Callable<String>() {
+             @Override
+             public String call() {
+                 return permName;
+@@ -604,7 +605,7 @@ public String call() {
+             chat = rspChat.getProvider();
+         }
+         final String chatName = chat != null ? chat.getName() : "No Chat";
+-        metrics.addCustomChart(new Metrics.SimplePie("chat", new Callable<String>() {
+        metrics.addCustomChart(new SimplePie("chat", new Callable<String>() {
+             @Override
+             public String call() {
+                 return chatName;
--- a/user/papermc-plugin-vault/APKBUILD
+++ b/user/papermc-plugin-vault/APKBUILD
@ -0,0 +1,42 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc-plugin-vault
+pkgver=1.7.3
+pkgrel=0
+pkgdesc="Vault of common APIs for Bukkit Plugins"
+arch='noarch'
+url="https://github.com/MilkBowl/Vault"
+license="MIT"
+depends="papermc>=1.8.8"
+makedepends="
+	openjdk21-jdk
+	maven
+"
+source="
+	vault-$pkgver.tar.gz::https://github.com/MilkBowl/Vault/archive/refs/tags/1.7.3.tar.gz
+	2022cb0_support-newer-jdk-for-building.patch
+	868_update-bstats.patch
+	823_add-option-to-silence-no-update-logs.patch
+	1996cfa_finish-removal-native-support-for-abandonned-economy-plugins.patch
+	"
+builddir="$srcdir"/Vault-$pkgver
+
+build() {
+	mvn compile
+	mvn package
+}
+
+check() {
+	mvn test
+}
+
+package() {
+	install -Dm644 "$builddir"/target/Vault-$pkgver.jar "$pkgdir/var/lib/papermc/plugins/Vault.jar"
+}
+sha512sums="
+3d154945e63b7824f0a0e0900fe6db7dc77c97f1967c29760d27a3322ca0b95d76965d8574c24b7cc0e86e822f9b5e3f860cb7167796351c9a921ddf5ef3d36b  vault-1.7.3.tar.gz
+8b7197b25acf06e545f10dd7dc5447aab6a73d3455bf89b01a4b466331eefa77c86152a47818348cfb901a0d65cff115b75ae37e0f8bb702c35cf13a3942a484  2022cb0_support-newer-jdk-for-building.patch
+9124d0feef633f405c3aea6081d4b749df9828d99d0c93d09ba52adb680a781288523d2dfc71be566b8cafd58ac97f152258174ab02294c6e97020a033ee0faa  868_update-bstats.patch
+b76b385ff62a955430db8d4d60592983e7475e1e63cd6a9e8c0be0a035662ec4472c6f9c8f09125745c198074695b3e04fe6ad96cbafa5faaba72bcf1bfee896  823_add-option-to-silence-no-update-logs.patch
+ea5e36649e65ca690fd8a075bb5f251a8b449ab780a546007e242ec465c58c8c5ae346efac5f1b52e3287f4f400c658f745d130d1e361ecca3436dcf5cb46fb5  1996cfa_finish-removal-native-support-for-abandonned-economy-plugins.patch
+"
--- a/user/papermc-plugin-worldedit/APKBUILD
+++ b/user/papermc-plugin-worldedit/APKBUILD
@ -0,0 +1,29 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc-plugin-worldedit
+pkgver=7.3.9
+_pkgver=$pkgver
+pkgrel=1
+pkgdesc="WorldEdit is an easy-to-use in-game Minecraft map editor"
+arch='noarch !aarch64'
+url="https://github.com/EngineHub/WorldEdit"
+license="GPL-3.0"
+depends="papermc>=1.13.2"
+makedepends="openjdk21-jdk"
+source="$pkgname-$pkgver.tar.gz::https://github.com/EngineHub/WorldEdit/archive/refs/tags/$pkgver.tar.gz"
+builddir="$srcdir"/WorldEdit-$pkgver
+
+build() {
+	./gradlew build --parallel
+}
+
+check() {
+	./gradlew test
+}
+
+package() {
+	install -Dm644 "$builddir"/worldedit-bukkit/build/libs/worldedit-bukkit-$pkgver-dist.jar "$pkgdir/var/lib/papermc/plugins/WorldEdit.jar"
+}
+sha512sums="
+35eb83dfcd192884a86f9bec3cbe586af6141b8c10461937b2ef112bfb4d64f5f7c6e950108a7893dc5b1054f1d0206f74ec6b4702481c0da69bf89627dbfb06  papermc-plugin-worldedit-7.3.9.tar.gz
+"
--- a/user/papermc-plugin-worldguard/APKBUILD
+++ b/user/papermc-plugin-worldguard/APKBUILD
@ -0,0 +1,29 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc-plugin-worldguard
+pkgver=7.0.13_beta1
+_gittag=2f13ae0444409376feb6c7674591142fe854e12e
+pkgrel=0
+pkgdesc="WorldGuard lets you and players guard areas of land against griefers and undesirables"
+arch='noarch'
+url="https://github.com/EngineHub/WorldGuard"
+license="GPL-3.0"
+depends="papermc>=1.17.0"
+makedepends="openjdk21-jdk"
+source="$pkgname-$_gittag.tar.gz::https://github.com/EngineHub/WorldGuard/archive/$_gittag.tar.gz"
+builddir="$srcdir"/WorldGuard-$_gittag
+
+build() {
+	./gradlew build
+}
+
+check() {
+	./gradlew test
+}
+
+package() {
+	install -Dm644 "$builddir"/worldguard-bukkit/build/libs/worldguard-bukkit-*dist.jar "$pkgdir/var/lib/papermc/plugins/WorldGuard.jar"
+}
+sha512sums="
+755646330c17df22b1d4eb6f38fc8ea712eff86a0165f2dba6dc1bcd420d2d112547adf60a35f268f45730b8444e540d7d08a02a50df0238bf16c9ff7dc799ff  papermc-plugin-worldguard-2f13ae0444409376feb6c7674591142fe854e12e.tar.gz
+"
--- a/user/papermc/APKBUILD
+++ b/user/papermc/APKBUILD
@ -0,0 +1,50 @@
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc
+pkgver=1.21.3
+_gittag=${pkgver/.0}
+pkgrel=0
+pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
+arch='noarch'
+url="https://papermc.io/"
+license='custom'
+depends='openjdk21-jdk screen sudo bash gawk sed netcat-openbsd'
+makedepends="gradle zstd"
+options="!check"
+subpackages="$pkgname-openrc"
+source="
+	https://ayakael.net/api/packages/mirrors/generic/papermc/$_gittag/papermc-$_gittag.tar.zst
+	papermc.initd
+	papermc.conf
+	papermc.sh
+"
+
+build() {
+	./gradlew --parallel createMojmapBundlerJar
+}
+
+check() {
+	./gradlew --parallel check
+}
+
+package() {
+	install -Dm644 "$srcdir"/$pkgname.conf              "$pkgdir"/etc/conf.d/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.sh                "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd           "$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$builddir"/build/libs/paper*.jar     "$pkgdir"/var/lib/$pkgname/$pkgver.jar
+	ln -s $pkgver.jar "$pkgdir"/var/lib/$pkgname/server.jar
+
+	# Link the log files
+	mkdir -p "$pkgdir"/var/log/
+	install -dm2755 "$pkgdir"/var/lib/$pkgname/logs
+	ln -s "/var/lib/$pkgname"/logs "$pkgdir"/var/log/$pkgname
+
+	# Give the group write permissions and set user or group ID on execution
+	chmod g+ws "$pkgdir"/var/lib/$pkgname
+}
+sha512sums="
+630c0fafd53082bec3992234f7422c4714c30ad0fac240c6dc80091fc7d49b57bc2cb7365366ac015d2a9217c4fd561f0649f738cb0d90ea7a7b6355f9839ff6  papermc-1.21.3.tar.zst
+c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e  papermc.initd
+9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789  papermc.conf
+943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7  papermc.sh
+"
--- a/unmaintained/papermc/papermc.conf
+++ b/unmaintained/papermc/papermc.conf
--- a/unmaintained/papermc/papermc.initd
+++ b/unmaintained/papermc/papermc.initd
--- a/unmaintained/papermc/papermc.post-install
+++ b/unmaintained/papermc/papermc.post-install
--- a/unmaintained/papermc/papermc.service
+++ b/unmaintained/papermc/papermc.service
--- a/unmaintained/papermc/papermc.sh
+++ b/unmaintained/papermc/papermc.sh
Author	SHA1	Message	Date
Antoine Martin	b03043f08c	pmos/device-pine64-pinenote: fix blacklist All checks were successful / lint (pull_request) Successful in 26s Details / deploy-x86_64 (pull_request) Successful in 25s Details / build-x86_64 (pull_request) Successful in 36s Details / deploy-aarch64 (pull_request) Successful in 57s Details / build-aarch64 (pull_request) Successful in 2m1s Details	2025-01-11 12:27:45 -05:00
Antoine Martin	d08c1392bc	pmos/device-pine64-pinenote: new aport	2025-01-09 14:25:11 +00:00
Antoine Martin	c6d37636b6	pmos/linux-pine64-pinenote: upgrade to 6.12.0	2025-01-09 04:28:46 +00:00
Antoine Martin	c82ac68ca4	pmos/pinenote-dbus-service: move from user All checks were successful / lint (pull_request) Successful in 27s Details / deploy-x86_64 (pull_request) Successful in 25s Details / build-x86_64 (pull_request) Successful in 39s Details / build-aarch64 (pull_request) Successful in 11m52s Details / deploy-aarch64 (pull_request) Successful in 2m22s Details	2025-01-08 23:01:42 -05:00
Antoine Martin	5d7449a835	pmos/linux-pine64-pinenote: new aport	2025-01-09 03:40:40 +00:00
Antoine Martin	c2b6767bfa	forgejo-ci: add postmarketOS repo when building aport under pmos	2025-01-09 03:40:40 +00:00
Antoine Martin	8c9065c3af	user/papermc-plugin-worldedit: fix packaging All checks were successful / lint (pull_request) Successful in 31s Details / build-aarch64 (pull_request) Successful in 1m20s Details / deploy-aarch64 (pull_request) Successful in 56s Details / build-x86_64 (pull_request) Successful in 10m25s Details / deploy-x86_64 (pull_request) Successful in 34s Details	2025-01-07 11:01:44 -05:00
Antoine Martin	fafce64d02	user/pinenote-dbus-service: new aport All checks were successful / lint (pull_request) Successful in 27s Details / build-x86_64 (pull_request) Successful in 40s Details / deploy-x86_64 (pull_request) Successful in 25s Details / build-aarch64 (pull_request) Successful in 5m10s Details / deploy-aarch64 (pull_request) Successful in 55s Details	2025-01-04 20:42:40 -05:00
Antoine Martin	aa7f92dd6e	README: update description to not mention LFS	2024-12-29 14:27:41 -05:00
Antoine Martin	648e4d3b84	forgejo-ci: make repository update never fail	2024-12-27 22:07:34 -05:00
Antoine Martin	0a990a5021	user/papermc-plugin-essentialsx: move from unmaintained, upgrade to 2.21.0_pre151, add build function	2024-12-26 06:40:54 +00:00
Antoine Martin	5d3ff7043c	user/papermc-plugin-worldedit: move from unmaintained, upgrade to 7.3.9, add build function	2024-12-26 06:13:04 +00:00
Antoine Martin	d31452f43a	user/papermc-plugin-worldguard: move from unmaintained, upgrade to 7.0.13_beta1, add build function	2024-12-26 06:00:46 +00:00
Antoine Martin	382b03e3f2	user/papermc-plugin-luckperms: move from unmaintained, upgrade to 5.4.151, add build function	2024-12-26 05:26:38 +00:00
Antoine Martin	56a29dc807	user/papermc-plugin-vault: new aport All checks were successful / lint (pull_request) Successful in 32s Details / deploy-x86_64 (pull_request) Successful in 40s Details / build-x86_64 (pull_request) Successful in 1m9s Details / deploy-aarch64 (pull_request) Successful in 56s Details / build-aarch64 (pull_request) Successful in 2m41s Details	2024-12-24 14:05:52 -05:00
Antoine Martin	233a098355	backports/py3-rapidjson: drop due to orphan dependency	2024-12-13 11:20:41 -05:00
Antoine Martin	9ee55e001b	forgejo: add special case for dotnet9-stage0	2024-12-13 10:29:04 -05:00
Antoine Martin	a053fd35f3	forgejo: add special case for dotnet9-sdk	2024-12-13 10:26:58 -05:00
Antoine Martin	88d9198fee	forgejo: add special case for freetube	2024-12-13 10:20:15 -05:00
Antoine Martin	9e7a9c464e	user/papermc: move from unmaintained, upgrade to 1.21.3 All checks were successful / lint (pull_request) Successful in 42s Details / deploy-x86_64 (pull_request) Successful in 29s Details / build-x86_64 (pull_request) Successful in 4m14s Details / deploy-aarch64 (pull_request) Successful in 1m2s Details / build-aarch64 (pull_request) Successful in 15m44s Details	2024-12-10 16:20:45 -05:00
Antoine Martin	0a88d5c3a3	README: update notice for backports	2024-12-01 14:55:11 -05:00
Antoine Martin	f853f9956d	README: add notice for backports	2024-12-01 14:53:38 -05:00