gentoo resync : 02.02.2022

4 files changed, 3 insertions, 133 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 7087689789c3..8763e85c43d1 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,10 +1,6 @@
-DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
 DIST picard-2.7.1.tar.gz 4884448 BLAKE2B b9f5ac2b6205aadbb707dcaee2dc6c89c333568d8fc6ca85da3fe8f9d308d0a54076d17b3f14be52e0154767c4f24ee2fd89d9df909ce1c74b9fc57c970ff0b1 SHA512 e3cffc538bdb7bf851e378b5ce7d4155fd6a2c13e77c42eb4c10a6cd129d45bb0c52d295bc209694fd89eadd60b0f04eb2d7c9eedbcec0a03ab00b7ee1f4e0be
 DIST picard-2.7.3.tar.gz 4887533 BLAKE2B 65a10be3dafcdd99e20d6c193d1238b0edfa66425a28c705bd6df0f57f75ddcf874f3bf09cef3c331e583a35f49ec780a63d2960081188081c8f0687f6a0b4d1 SHA512 33cd37ce19e261d14882b4400054c289bf921d3c74313db634f3876bc7f51ecca184aa29a9cb1d673fe799c53eda81de45d23c83caaf2f71b74fe341c258d2f7
-DIST picard-2.7.tar.gz 4868049 BLAKE2B 87f04056843623f81165bdae181699125d5aa8e41e5da47d645026bb1b3ee4a70edeeef0399f3230584026caf8f014cfe27b5d9f3f2e6b71a8e2de48a832655a SHA512 b88d2cc24a9b6a01e6bb1a54f93bb8ec62c901fe9ff352641ea402b5e091d71241665b067fd12bbf77cf219b951db9a570400adda82fa9da9406f9cfa6aee4e5
-EBUILD picard-2.6.4-r1.ebuild 1411 BLAKE2B 25a245abce95b21718ee395eb86b0866ec46ea6a3b8acf2ed747a2b370ba8743f76c862eaa0bba8114b170d6cd346995e4cdf378daf0c15acbc58ba45dda69f5 SHA512 0c1e20ad7072859da7115334755821b2c868dd85442cc5a1a619b2df214cb034328e9b782884ca9606be4a2eed968a0ffc99f4673118e5ea168257eae31b7a83
-EBUILD picard-2.7-r1.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
-EBUILD picard-2.7.1-r1.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
+EBUILD picard-2.7.1-r1.ebuild 1411 BLAKE2B 1eca988cde74b9b7ca3de813b8d5262e432b2c9f055fa8f528b0551842e0192d7f28ba8f3eae283309ed3265d3bb4fda5b0f134e36bfd55e9b3924a50789c07b SHA512 b73760154b1d29344a91fbfc8e5406de9ac4d561e01384ba84a4f631d1cfad54bb743fc6020da26fa69d4bb9fbb4e43f8e2c8971ddcd99edb32355dd8989023d
 EBUILD picard-2.7.3.ebuild 1413 BLAKE2B ef1c81a19e42fedffb65c47278e340c0b7ca27b0f2da934c3f4d232db314f05efd7499c1a818c842a0a94f18afdf18b01e16ab8f8a75ee3d1a03026a2002e8c4 SHA512 d464908123fc47a3770b920ac36d649913a08322d1dfedf4f748fc91bffe2e4eb0ef0a411326411d561aaf312faaf1de890619dacf8c7e5cacd0f51d62ac0786
 EBUILD picard-9999.ebuild 1413 BLAKE2B e4c2e7e17203d3ea53580b91ca547dd1fb8a600fb736a9004c73a3759189796c6813fa500e715dfac2c0070b7b0cdc10eecb529a690dfb55e47876cef65cd2ad SHA512 fd01f4fee1be7998f084b2c2371076c5f54e003003f092cb72e264fe1ac0e927f7e8d03a78dd0cd9936f08a3b6a0d14793ced3593f2b9794bde6de4f0e9ef9a9
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.6.4-r1.ebuild b/media-sound/picard/picard-2.6.4-r1.ebuild
deleted file mode 100644
index 1679584d7db8..000000000000
--- a/media-sound/picard/picard-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=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 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-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/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/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-2.7-r1.ebuild b/media-sound/picard/picard-2.7-r1.ebuild
deleted file mode 100644
index a096198a73fd..000000000000
--- a/media-sound/picard/picard-2.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=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 ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-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/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/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-2.7.1-r1.ebuild b/media-sound/picard/picard-2.7.1-r1.ebuild
index a096198a73fd..c57f433dd767 100644
--- a/media-sound/picard/picard-2.7.1-r1.ebuild
+++ b/media-sound/picard/picard-2.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi