package cleanup

2 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 382ab2d5588c..08934488da01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = spotify-ripper
 	pkgdesc = CLI Spotify ripper
 	pkgver = 2.18
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/scaronni/spotify-ripper
 	install = spotify-ripper.install
 	arch = any
 	license = MIT
 	makedepends = python-setuptools
-	makedepends = libspotify
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
 	depends = python-pyspotify
 	depends = python-spotipy
 	depends = python-mutagen
@@ -15,11 +17,11 @@ pkgbase = spotify-ripper
 	depends = python-requests
 	depends = python-schedule
 	depends = lame
+	optdepends = ffmpeg
 	optdepends = flac: Rip songs to lossless FLAC encoding
 	optdepends = opus-tools: Rip songs to Opus encoding
 	optdepends = vorbis-tools: Rip songs to Ogg Vorbis encoding
 	optdepends = faac: Rip songs to AAC format with FreeAAC
-	optdepends = libav-git-no-libs: Rip songs to Apple Lossless format
 	optdepends = fdkaac: Rip songs to MP4/M4A format with Fraunhofer FDK AAC codec
 	source = spotify-ripper-2.18.tar.gz::https://github.com/scaronni/spotify-ripper/archive/2.18.tar.gz
 	source = 001-setup.py.patch
diff --git a/PKGBUILD b/PKGBUILD
index 0d311d41ddb3..2e2e23de6fb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=spotify-ripper
 pkgver=2.18
-pkgrel=2
+pkgrel=3
 pkgdesc='CLI Spotify ripper'
 arch=('any')
 url="https://github.com/scaronni/spotify-ripper"
@@ -18,17 +18,16 @@ depends=(
 	'python-schedule'
 	'lame')
 optdepends=(
+	'ffmpeg'
 	'flac: Rip songs to lossless FLAC encoding'
 	'opus-tools: Rip songs to Opus encoding'
 	'vorbis-tools: Rip songs to Ogg Vorbis encoding'
 	'faac: Rip songs to AAC format with FreeAAC'
-	'libav-git-no-libs: Rip songs to Apple Lossless format'
 	'fdkaac: Rip songs to MP4/M4A format with Fraunhofer FDK AAC codec')
-makedepends=('python-setuptools' 'libspotify')
+makedepends=('python-setuptools' 'python-build' 'python-installer' 'python-wheel')
 install=spotify-ripper.install
-source=(
-	"$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
-	'001-setup.py.patch')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+        '001-setup.py.patch')
 sha256sums=('2536ec8a8b395f594a47e6f9aee1412d03109b6c06d43ee4563e45550138f950'
             '527eaeed0947406598f215fae3bb6fe150dbdeb3599e98f15807f519dbdff7b9')
 
@@ -39,14 +38,17 @@ prepare() {
 
 build() {
 	cd "$pkgname-$pkgver"
-	python setup.py build
+	python -m build --wheel --no-isolation
 }
 
 package() {
-	export PYTHONHASHSEED=0
 	cd "$pkgname-$pkgver"
-	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir/" dist/*.whl
 	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
 	install -Dm644 default_config.ini -t "$pkgdir/usr/share/$pkgname/"
+	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+	install -d "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -s \
+		"$_site/${pkgname/-/_}-$pkgver.dist-info/LICENSE" \
+		"$pkgdir/usr/share/licenses/$pkgname/"
 }