gentoo auto-resync : 28:12:2023 - 13:38:18

4 files changed, 6 insertions, 73 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index c489a5c69681..67adaba122b4 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
 DIST picard-2.10.tar.gz 5800268 BLAKE2B 5590b9dd9a88244486688d73ea0e565b789da457e5cab5c57d7abad54cae0a52fb574090d45efeb317ee405dbf61185ff6d24d5a7ec7d5afc1db0713a5b09e92 SHA512 d771a2629163d140edb7d39dfb48a7d2c4d2e3025f3111d3f090036c2ba734f8a4ba08fa1035f2ba4e04c8e80c07a517fe98df430407ee71fac14b289b7316cb
-DIST picard-2.9.2.tar.gz 5526511 BLAKE2B 6708cd82a8ccab4b07d626ccc5fccb47a78503262863e51e6f0dcdca705cc6fd719ed5958bcff701911e18464ea9b0450cec93d2e8834e5f7ec60708bafff8b5 SHA512 b204acde03ed88090459f7c47b81841e9de1acc71542f272b1191b4fe16a2ef294bf10f34e8bf85c6ebb78cbebad4ce2c9a1fa3acb55de55e9a6b8832ed92ad5
-EBUILD picard-2.10.ebuild 1460 BLAKE2B 34e0b283297c2941495ff0df8292fc47b2179e53e1b130b4cf81a10679263be8cd36283899c0aa581f63662fda3eb5d3e791064abcc1f837a963c7e1758a4d4e SHA512 b4c403580d2e534e2f905957e1e7ba4b15e440b35227d0f2833eef98dfb40b518ece221a6835a9c84ac7ac03f0c0955fdcb2137ebb618ab962678706b6db9722
-EBUILD picard-2.9.2.ebuild 1460 BLAKE2B 34e0b283297c2941495ff0df8292fc47b2179e53e1b130b4cf81a10679263be8cd36283899c0aa581f63662fda3eb5d3e791064abcc1f837a963c7e1758a4d4e SHA512 b4c403580d2e534e2f905957e1e7ba4b15e440b35227d0f2833eef98dfb40b518ece221a6835a9c84ac7ac03f0c0955fdcb2137ebb618ab962678706b6db9722
-EBUILD picard-9999.ebuild 1462 BLAKE2B 5ac2687c675ca5100ad06518e89c6a4ff3779123485cd20ac07966c958f3111a58b31fa471e517433d44cc0899fe6b0f46e0298ab34c7ed9c8e065c1167d824f SHA512 8f7165a2a4a34fe51536471ae7bfcf955521492c2f0361e93a22ab57a867f3a35aa577dbc72052cee05b49a01b800204ab7178c6f538ca4f8b48bf326818e775
+EBUILD picard-2.10.ebuild 1458 BLAKE2B e34ec114b1f745ae9854d305ed4e1d767b88b170776fe9916973ea1d199180a1fe089f5cc9a7d7932d6a9dbcb67f39b9ff1fb41ad93ad29e3fb8883086da3d7d SHA512 f6d2838fa37e15c8fe6b09414529c724d846530a4acd42bafcf01b09aaed400a24585b599b7b5773831f7d623fe3239576aadf4919fb95ef5a712ed4ac655fa7
+EBUILD picard-9999.ebuild 1460 BLAKE2B b6b2c08ebed6a02513a6a96bad57e6b1e3f91f693da3c9e5707c670b1aa4914aa53fdc5bb0246af14a0594ae67e3a4d9d5fb7d8fc4714469fdf0f759be3546a8 SHA512 511e956e66b15526d60f7b3c1ef215b7b048eb1dcd473a5bfb145f4eb4e2bfe29648f09380845b0ad335b8b8d58c74b081c2fb87c6520304c5d212f0e0798084
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.10.ebuild b/media-sound/picard/picard-2.10.ebuild
index 1c3ae159e4b3..24e4515370f8 100644
--- a/media-sound/picard/picard-2.10.ebuild
+++ b/media-sound/picard/picard-2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_EXT=1
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/metabrainz/picard"
 	inherit git-r3
 else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 ~arm64 x86"
 fi
 
diff --git a/media-sound/picard/picard-2.9.2.ebuild b/media-sound/picard/picard-2.9.2.ebuild
deleted file mode 100644
index 1c3ae159e4b3..000000000000
--- a/media-sound/picard/picard-2.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_EXT=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 9afdd18025b9..d3dfe8779818 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_EXT=1
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/metabrainz/picard"
 	inherit git-r3
 else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi