From 8f2c7874388f32e3af97665ccf1ade80a2ef3f79 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Tue, 9 Jun 2020 17:13:53 +0200
Subject: community/libktorrent: upgrade to 2.2.0

---
 community/libktorrent/APKBUILD | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/community/libktorrent/APKBUILD b/community/libktorrent/APKBUILD
index 2735dca8118..523ce0186a8 100644
--- a/community/libktorrent/APKBUILD
+++ b/community/libktorrent/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libktorrent
-pkgver=2.1.1
-_ktorrentver=5.1.2 # $_ktorrentver=ktorrent-$pkgver
-pkgrel=2
+pkgver=2.2.0
+_ktorrentver=5.2.0 # $_ktorrentver=ktorrent-$pkgver
+pkgrel=0
 # armhf blocked by extra-cmake-modules
 # mips test failures
 arch="all !armhf !mips !mips64"
@@ -16,34 +16,26 @@ checkdepends="xvfb-run"
 source="https://download.kde.org/stable/ktorrent/$_ktorrentver/libktorrent-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
-prepare() {
-	default_prepare
-
-	mkdir "$builddir"/build
-}
-
 build() {
-	cd "$builddir"/build
-	cmake "$builddir" \
+	cmake -B build \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
-	make
-	make docs
+	make -C build
+	make -C build docs
 }
 
 check() {
-	cd "$builddir"/build
-	# utppolltest is broken
+	cd build
+	# utppolltest requires network access
 	CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest -E "utppolltest"
 }
 
 package() {
-	cd "$builddir"/build
-	DESTDIR="$pkgdir" make install
+	DESTDIR="$pkgdir" cmake --build build --target install
 
 	mkdir -p "$pkgdir"/usr/share/doc
-	mv apidocs/html "$pkgdir"/usr/share/doc/HTML
+	mv build/apidocs/html "$pkgdir"/usr/share/doc/HTML
 }
 
-sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37  libktorrent-2.1.1.tar.xz"
+sha512sums="2edcb3a230f4fa3a55a6b774c819f4964fe8f2f5447b723ba81cdb0c187dc0268b6e78566d710fa364abe2cc40cd618d1874ecb1637e872fbad0ea8c340abc1a  libktorrent-2.2.0.tar.xz"
-- 
cgit v1.2.3