gentoo resync : 25.08.2020

5 files changed, 49 insertions, 54 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 1a9cb44c6b8b..b4863f90e59f 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
-DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f
 DIST picard-2.3.1.tar.gz 3778379 BLAKE2B b829c29d95922e31479cea0c8bcb3294cd3751374e71f37d387a013529c294a695a2e2f4c8b73af5eeee2fa8f7423d24074bc18b7db130798411803c70a013ff SHA512 fb5ac4cbd02f4b832cb23e3c8b5881eeca04b7b101c015a97fc20c8e0e7871ad2098b750a0c486af958b2bf30221b0c28666313f768dc7d70389519dd795d9cd
-EBUILD picard-2.1.3-r1.ebuild 1657 BLAKE2B fccc7ac46397e33ff9087da1bd8b3dc03d80ba758dc4abe21c7679977cb1bb8c12967a68c2abdc112f3ca1814030234269ea2a035f144409e218dab3bedf7a09 SHA512 93945e04da0957f96a77a77e670289ce7b9f962533c80c78b0a9f5e53a66384b4c6ae1d268cd088519c38c1da8d79a62154f60d11a908191c27c655597e6af5d
-EBUILD picard-2.3.1.ebuild 1661 BLAKE2B 3941cd8b08808783304c9e4abfd7ab05df9d27cb94b9add63f4ad37e3d3c3c2371b25535e51ff4869bbd8703f606e5356210d000665761f0ad09b8f42a736fb6 SHA512 1380c2ccf307c5949d0310d433167f705491f6a421c4fc3ad7b7e7eddf847f61748fd20d9709f9de6e1eb503327e26df437cc5933bd380c68f50875fb1b41582
-EBUILD picard-9999.ebuild 1738 BLAKE2B 233f5965ecfa2f84ebff049b03bb961eec74fd4c9b2d13e04915c3882446bb0a3e8d229931852af5ccfcd76b9df3ff618fe5e99a716aac6daf87b8d2903161fe SHA512 7070c7ba182374053632d4c4e986f3f34acc9dbdb6fef040572213ea6bec35c42f2582060ae63ce2a300ac914d5bd2c9d40c97e2c903a87cfb2d69b1253f1d97
-MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
+DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
+EBUILD picard-2.3.1.ebuild 1698 BLAKE2B 66c4520ce639d94b5477060aae6fc8cb3b3e56d5e9c1f8b49b82c3b1e3fad72eeb10eb7be87405afee878519aceaa286f76faaa35d90d9abe37043e915fcfba1 SHA512 a5d04bd559fe3504c7348f74abb5492c19eb2f6465419129880f00e0b90a4234f00116d8c5c13427e42173c93fdb22e8165a1fabc8f68792ec45a58ba64cabc8
+EBUILD picard-2.4.2.ebuild 1524 BLAKE2B 20cfc142ad4be84f9d93c4c78c59186cccae7ce27298fe1c68bd4fe5211b1006e8aa7687092a307cd6ddf0a6fffb8665115c617413c25d6003c6e08093b0fef7 SHA512 a53ea2556ebb77b6e5690a802fd3e782b8675482379b3417d7c8725e6b03d842a25429fcc787efff9c4424deef63a45697093e6047280854b36de730b7c6f90e
+EBUILD picard-9999.ebuild 1524 BLAKE2B 20cfc142ad4be84f9d93c4c78c59186cccae7ce27298fe1c68bd4fe5211b1006e8aa7687092a307cd6ddf0a6fffb8665115c617413c25d6003c6e08093b0fef7 SHA512 a53ea2556ebb77b6e5690a802fd3e782b8675482379b3417d7c8725e6b03d842a25429fcc787efff9c4424deef63a45697093e6047280854b36de730b7c6f90e
+MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 8492cea81197..75560516f38c 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -10,4 +10,8 @@
 		tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
 		track based tagging and cross platform compatibility.
 	</longdescription>
+	<use>
+		<flag name="discid">Enable reading the ID of the inserted CD</flag>
+		<flag name="fingerprints">Enable calculation and lookup of AcoustID fingerprints</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/picard/picard-2.3.1.ebuild b/media-sound/picard/picard-2.3.1.ebuild
index 86dadf0cab58..572cf0a4420d 100644
--- a/media-sound/picard/picard-2.3.1.ebuild
+++ b/media-sound/picard/picard-2.3.1.ebuild
@@ -14,15 +14,17 @@ SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
+KEYWORDS="amd64 x86"
+IUSE="discid nls"
 
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
 	')
 	dev-qt/qtgui:5
-	>=media-libs/mutagen-1.38"
+	media-libs/mutagen
+	discid? ( dev-python/python-discid )
+"
 DEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
 "
diff --git a/media-sound/picard/picard-2.1.3-r1.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 8b04ce903747..5aa35ce6bae8 100644
--- a/media-sound/picard/picard-2.1.3-r1.ebuild
+++ b/media-sound/picard/picard-2.4.2.ebuild
@@ -3,34 +3,42 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
+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"
-SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
+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-qt/qtgui:5
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
+	media-libs/mutagen
+	discid? ( dev-python/python-discid )
+	fingerprints? ( media-libs/chromaprint[tools] )
 "
 
 RESTRICT="test" # doesn't work with ebuilds
 
-S="${WORKDIR}/${PN}-release-${PV}"
-
 python_compile() {
 	local build_args=(
 		--disable-autoupdate
@@ -55,19 +63,7 @@ python_install() {
 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
+	elog "If you are upgrading Picard and it does not start, try removing"
+	elog "Picard's settings:"
+	elog "        rm ~/.config/MusicBrainz/Picard.conf"
 }
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 8ddfeb52fa15..5aa35ce6bae8 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -3,24 +3,26 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,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
-inherit distutils-r1 readme.gentoo-r1 xdg
 
-DESCRIPTION="A cross-platform music tagger"
+DESCRIPTION="Cross-platform music tagger"
 HOMEPAGE="https://picard.musicbrainz.org"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="nls"
+IUSE="discid fingerprints nls"
 
 BDEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
@@ -29,8 +31,11 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
 	')
-	dev-qt/qtgui:5[accessibility]
-	>=media-libs/mutagen-1.38"
+	dev-qt/qtgui:5
+	media-libs/mutagen
+	discid? ( dev-python/python-discid )
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
 
 RESTRICT="test" # doesn't work with ebuilds
 
@@ -58,19 +63,7 @@ python_install() {
 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
+	elog "If you are upgrading Picard and it does not start, try removing"
+	elog "Picard's settings:"
+	elog "        rm ~/.config/MusicBrainz/Picard.conf"
 }