media-sound/picard: reworked elog info to use flags

to make it more user friendly and also to display
the upgrade hint on each upgrade and not just on the first
install which is pretty useless

Closes: https://bugs.gentoo.org/690538
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

3 files changed, 13 insertions, 34 deletions

diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index c1dcfe9b5112..75560516f38c 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -12,5 +12,6 @@
 	</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.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index ec55fb5d0fb7..5aa35ce6bae8 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.4.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 readme.gentoo-r1 xdg
+inherit distutils-r1 xdg
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/metabrainz/picard"
@@ -22,7 +22,7 @@ HOMEPAGE="https://picard.musicbrainz.org"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="discid nls"
+IUSE="discid fingerprints nls"
 
 BDEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
@@ -34,6 +34,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	media-libs/mutagen
 	discid? ( dev-python/python-discid )
+	fingerprints? ( media-libs/chromaprint[tools] )
 "
 
 RESTRICT="test" # doesn't work with ebuilds
@@ -62,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 ec55fb5d0fb7..5aa35ce6bae8 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 readme.gentoo-r1 xdg
+inherit distutils-r1 xdg
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/metabrainz/picard"
@@ -22,7 +22,7 @@ HOMEPAGE="https://picard.musicbrainz.org"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="discid nls"
+IUSE="discid fingerprints nls"
 
 BDEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
@@ -34,6 +34,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	media-libs/mutagen
 	discid? ( dev-python/python-discid )
+	fingerprints? ( media-libs/chromaprint[tools] )
 "
 
 RESTRICT="test" # doesn't work with ebuilds
@@ -62,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"
 }