[gentoo-commits] repo/proj/guru:dev commit in: media-sound/spotify_dl/files/, media-sound/spotify_dl/

[Nicola Smaniotto]

commit:     55a5b3f38fcc577ac1ab605fa9dc71c694dd624e
Author:     Nicola Smaniotto <smaniotto.nicola <AT> gmail <DOT> com>
AuthorDate: Sun May  1 10:08:47 2022 +0000
Commit:     Nicola Smaniotto <smaniotto.nicola <AT> gmail <DOT> com>
CommitDate: Sun May  1 10:28:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=55a5b3f3

media-sound/spotify_dl: add 8.3.0, drop older

All older ebuilds depend on packages that are now outside the tree

Signed-off-by: Nicola Smaniotto <smaniotto.nicola <AT> gmail.com>

 media-sound/spotify_dl/Manifest                    |  4 +--
 .../spotify_dl-8.0.0-fuzzy-requirements.patch      | 20 -----------
 media-sound/spotify_dl/spotify_dl-7.6.0.ebuild     | 30 ----------------
 media-sound/spotify_dl/spotify_dl-8.0.0.ebuild     | 41 ----------------------
 ..._dl-8.1.0-r1.ebuild => spotify_dl-8.3.0.ebuild} | 11 ++++--
 5 files changed, 9 insertions(+), 97 deletions(-)

diff --git a/media-sound/spotify_dl/Manifest b/media-sound/spotify_dl/Manifest
index 24a07b1d5..5db202c7f 100644
--- a/media-sound/spotify_dl/Manifest
+++ b/media-sound/spotify_dl/Manifest
@@ -1,3 +1 @@
-DIST spotify_dl-7.6.0.tar.gz 319723 BLAKE2B 9b0bb4c4839226b83ce6b7f0e030c5136de47f84e4c5f069b9fe573755746a12e0b32a8ad488704aae4a5355920289d9f2e7e955a950b3e9d7c7d78f24f26928 SHA512 21f8111f679c028b71371aa3d8bd822c0e72474fb768834a5f3c84fd3491e74e56bbf7acf0c23a132cdb60ac99dbcb65d4ca60f388ee48cbaeb1b66528bd06a5
-DIST spotify_dl-8.0.0.tar.gz 320100 BLAKE2B a0ad0f732f244b8140f6278ca99c1a392d73455750fec1a97226fc607d3b7a1d226c2629ea3674173f8f9d0ef059c910c7e549f42b68fdbdc03efa4b07435818 SHA512 7c8d385b6777c89a4a75a7b1fc63bfcf20552a1c23e48a80d0688af0d51285085ebfb418ec5b94becd84870a07fc347ade31b6d2da511c000161489cccba23ed
-DIST spotify_dl-8.1.0.tar.gz 319957 BLAKE2B 667f57e74e9d725d26f94239dcd2d6d88d0b33c8d7fb73ea0554f3ce65477905fbd19e9e1fd36f0954dd690f6c0c45bd14af10b18ca8932d2d26bd6aa97023c5 SHA512 f906deac7396b2e1482582294cb81bee54582ccdc97f562cc6eba5d9352a52ac67a86f179a0a52a4e51bd3e59394952e1aa856ef0564123cb37d70ba82b4255c
+DIST spotify_dl-8.3.0.tar.gz 319579 BLAKE2B d61efe74a84704fef028df4d585b249eafdfbd2d48911f7fa36b72a33edf1a94eedb21b498bd53f4e53ce8a2b4b1b0f7e39caadf320485011717221e7c2eaef5 SHA512 739657d0f2f1bea741de8a2e51bc5be70dbb276d83d0e4555a7767d8c359dfd570c9348eaeccaac30d3097be1214648e798fc6c1de8deab3f346e2e0b89bb04a

diff --git a/media-sound/spotify_dl/files/spotify_dl-8.0.0-fuzzy-requirements.patch b/media-sound/spotify_dl/files/spotify_dl-8.0.0-fuzzy-requirements.patch
deleted file mode 100644
index fecc8e667..000000000
--- a/media-sound/spotify_dl/files/spotify_dl-8.0.0-fuzzy-requirements.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Accept a wider range of versions, the provided ones are too
-restrictive and sometimes outside the gentoo tree.
-Patch by Nicola Smaniotto.
-
-diff --git a/requirements.txt b/requirements.txt
-index 586b007..987eeb2 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,5 +1,5 @@
--sentry_sdk==1.5.3
--yt-dlp>=2022.01.21
--spotipy==2.16.1
--mutagen==1.45.1
--rich==11.0.0
-\ No newline at end of file
-+sentry_sdk>=1.5, <2
-+yt-dlp>=2021.10.27
-+spotipy>=2.16, <3
-+mutagen>=1.45, <2
-+rich>=11.0, <12

diff --git a/media-sound/spotify_dl/spotify_dl-7.6.0.ebuild b/media-sound/spotify_dl/spotify_dl-7.6.0.ebuild
deleted file mode 100644
index 962c38845..000000000
--- a/media-sound/spotify_dl/spotify_dl-7.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/-}"
-
-DESCRIPTION="Downloads songs from a Spotify Playlist/Track/Album that you provide"
-HOMEPAGE="https://github.com/SathyaBhat/spotify-dl/"
-SRC_URI="https://github.com/SathyaBhat/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test" # tests require network access
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="
-	dev-python/spotipy[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	dev-python/peewee[${PYTHON_USEDEP}]
-	>=net-misc/youtube-dl-2021.06.06[${PYTHON_USEDEP}]
-"

diff --git a/media-sound/spotify_dl/spotify_dl-8.0.0.ebuild b/media-sound/spotify_dl/spotify_dl-8.0.0.ebuild
deleted file mode 100644
index aebf95422..000000000
--- a/media-sound/spotify_dl/spotify_dl-8.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/-}"
-
-DESCRIPTION="Downloads songs from a Spotify Playlist/Track/Album that you provide"
-HOMEPAGE="https://github.com/SathyaBhat/spotify-dl/"
-SRC_URI="https://github.com/SathyaBhat/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="
-	>=dev-python/sentry-sdk-1.5[${PYTHON_USEDEP}]
-	<dev-python/sentry-sdk-2[${PYTHON_USEDEP}]
-	net-misc/yt-dlp[${PYTHON_USEDEP}]
-	>=dev-python/spotipy-2.16[${PYTHON_USEDEP}]
-	<dev-python/spotipy-3[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.45[${PYTHON_USEDEP}]
-	<media-libs/mutagen-2[${PYTHON_USEDEP}]
-	>=dev-python/rich-11.0[${PYTHON_USEDEP}]
-	<dev-python/rich-12[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}"-fuzzy-requirements.patch
-)
-
-distutils_enable_tests pytest

diff --git a/media-sound/spotify_dl/spotify_dl-8.1.0-r1.ebuild b/media-sound/spotify_dl/spotify_dl-8.3.0.ebuild
similarity index 78%
rename from media-sound/spotify_dl/spotify_dl-8.1.0-r1.ebuild
rename to media-sound/spotify_dl/spotify_dl-8.3.0.ebuild
index b9df9dbba..26e98a14b 100644
--- a/media-sound/spotify_dl/spotify_dl-8.1.0-r1.ebuild
+++ b/media-sound/spotify_dl/spotify_dl-8.3.0.ebuild
@@ -26,12 +26,17 @@ RDEPEND="
 	>=dev-python/sentry-sdk-1.5[${PYTHON_USEDEP}]
 	<dev-python/sentry-sdk-2[${PYTHON_USEDEP}]
 	>=net-misc/yt-dlp-2022.1.21[${PYTHON_USEDEP}]
-	>=dev-python/spotipy-2.16[${PYTHON_USEDEP}]
+	>=dev-python/spotipy-2.19[${PYTHON_USEDEP}]
 	<dev-python/spotipy-3[${PYTHON_USEDEP}]
 	>=media-libs/mutagen-1.45[${PYTHON_USEDEP}]
 	<media-libs/mutagen-2[${PYTHON_USEDEP}]
-	>=dev-python/rich-11.0[${PYTHON_USEDEP}]
-	<dev-python/rich-12[${PYTHON_USEDEP}]
+	>=dev-python/rich-12.0[${PYTHON_USEDEP}]
+	<dev-python/rich-13[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	sed -i "s/\.0$//" requirements.txt || die "Could not patch requrements"
+}