gentoo resync : 15.06.2021

3 files changed, 2 insertions, 76 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 691d4eb54135..b1d3fda587a8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
 DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225
-EBUILD picard-2.4.2.ebuild 1625 BLAKE2B 9afd5a400e7d21531feef4e19408a499a56d5c886878dc8ca1df5c84ebde5e71b5e4102395d480696668bfd7924db39484fe7560258b92c392d9d419f2f59345 SHA512 aa8faa116dbf15efed632e8b568201e8393bbed55b5e80d0a8f23d79ca1f7c2b31a04fe871b8111fbcc5c39ab3655e99969c3e033d5b77cb53a757b99099f946
-EBUILD picard-2.6.2.ebuild 1674 BLAKE2B 911eed027504dd2790676c53d15017d94b4048b3859e929abac5b80f1bd508b2e7d70eb818a04b5532680deb170e556118027b558d94c3472fd1136339fee7a0 SHA512 2e34914d25ac29ef661bf1a9b5134ade25316d1c3c6d98e9ccc44136d25a0cd25a14301a3ad84be54db350f5187da1716e92bb9e6d30db0053041776f22efaad
+EBUILD picard-2.6.2.ebuild 1672 BLAKE2B 5de4147997d5b24cd1b4e68b5c4dbcb045c86ce0d8e0dc9d1345f9875bdf12ccc19ce858312dfa0a03e7bc2bfdef77ddc196b679c4bff8f6308536d17a41b03a SHA512 8338bdaad722e5e1ea204fe194bd836230abab39e8bde5ec0ff5142ecf5fce46e7ed0eaac768dfc207b92c912b5fcb98915ebb31ec35cfec513cd593b7aa29a5
 EBUILD picard-9999.ebuild 1627 BLAKE2B 4472b2464100cc9493cb7e2abaef8d679d114d25be7ccd6beb6ca5e1a0f59c1e5ee908ba879e3bb71456a96db4e670a48eb1362a85b07d7d5ed531fc2e0119b4 SHA512 7e5e7198a0a4364e9d475f614be644718c5fef09213eb14131f6e544186b4aeda8f4c0156659ddd3962c3fd4ed24052d35e83228f43c98e8f44df8a60ed6392d
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
deleted file mode 100644
index d866635fefb1..000000000000
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-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/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-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[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "If you are upgrading Picard and it does not start, try removing"
-		elog "Picard's settings:"
-		elog "        rm ~/.config/MusicBrainz/Picard.conf"
-	fi
-}
diff --git a/media-sound/picard/picard-2.6.2.ebuild b/media-sound/picard/picard-2.6.2.ebuild
index c395e2d4e271..d04919b37454 100644
--- a/media-sound/picard/picard-2.6.2.ebuild
+++ b/media-sound/picard/picard-2.6.2.ebuild
@@ -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