gentoo resync : 25.11.2020

3 files changed, 2 insertions, 79 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index fdbabf21abc8..8e0157328031 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.3.1.tar.gz 3778379 BLAKE2B b829c29d95922e31479cea0c8bcb3294cd3751374e71f37d387a013529c294a695a2e2f4c8b73af5eeee2fa8f7423d24074bc18b7db130798411803c70a013ff SHA512 fb5ac4cbd02f4b832cb23e3c8b5881eeca04b7b101c015a97fc20c8e0e7871ad2098b750a0c486af958b2bf30221b0c28666313f768dc7d70389519dd795d9cd
 DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
-EBUILD picard-2.3.1.ebuild 1703 BLAKE2B 5a07646e7724a53aac11788c96938cb7b1bd0993637c1dac9915b93e1e6575fbea4a39b8b50f1aa2b951d72e62bc6f1e7eddf74f3a850812b7a521dcf4b67c2d SHA512 544e58c3e617592ec0827eaee0f2dc47f79bfd03f3c71f2542fe05339d25c8ecc05c32424e4c25fb2334c3f77488f040796ef2332910036514401afbdfc08947
-EBUILD picard-2.4.2.ebuild 1576 BLAKE2B 530f5650644056918559c1d7bd017447c7e88c81906c223c1a1dee5a32232820c0629300f9f1f0570b154039732b6546b3b6bc5fbe213d6594d5133e6d328cb4 SHA512 c7d0ed462bb8f99b1ee6f68c42c537e3583bfc2e9f7600d4cf3dcf2568e4c7e0f4c2da1872de794d9276389c085d2da25d575234c683864087ccb3e3217c3821
+EBUILD picard-2.4.2.ebuild 1575 BLAKE2B 8800306017fcb9d675bc1d8ee67bc844e9bfb8541fef28fe5053a72a3c963a47efa3adac4444ccb4a3bd870bd21954e16287b0f635da3436b8614da8f5e4a844 SHA512 d994e8ce751f06dca006dd6442b31029909a40457831870c35df7649c1e0da428445f2fa6cd951d74b6891a495908ea5b13f9b18a9981200d7b98e069e8da187
 EBUILD picard-9999.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.3.1.ebuild b/media-sound/picard/picard-2.3.1.ebuild
deleted file mode 100644
index 6d0e749dc698..000000000000
--- a/media-sound/picard/picard-2.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="discid nls"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[dbus,declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtgui:5
-	media-libs/mutagen
-	discid? ( dev-python/python-discid )
-"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-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
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 9e90f652f615..18c76e92214a 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.4.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