From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE61C138359 for ; Sun, 23 Aug 2020 16:19:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAEC0E07F9; Sun, 23 Aug 2020 16:19:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB3DFE07F9 for ; Sun, 23 Aug 2020 16:19:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3BAC340B7E for ; Sun, 23 Aug 2020 16:19:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 710E4315 for ; Sun, 23 Aug 2020 16:19:02 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1598199519.d47039b37b902ade2db76251b0562a38060c491c.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/picard/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/picard/metadata.xml media-sound/picard/picard-2.4.2.ebuild media-sound/picard/picard-9999.ebuild X-VCS-Directories: media-sound/picard/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d47039b37b902ade2db76251b0562a38060c491c X-VCS-Branch: master Date: Sun, 23 Aug 2020 16:19:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 96282259-678d-42c6-9fed-cf0b41f1460a X-Archives-Hash: 1d14f30c4d4e26874774bc579a75b781 commit: d47039b37b902ade2db76251b0562a38060c491c Author: Miroslav Šulc gentoo org> AuthorDate: Sun Aug 23 16:18:39 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sun Aug 23 16:18:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d47039b3 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 gentoo.org> media-sound/picard/metadata.xml | 1 + media-sound/picard/picard-2.4.2.ebuild | 23 ++++++----------------- media-sound/picard/picard-9999.ebuild | 23 ++++++----------------- 3 files changed, 13 insertions(+), 34 deletions(-) diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml index c1dcfe9b511..75560516f38 100644 --- a/media-sound/picard/metadata.xml +++ b/media-sound/picard/metadata.xml @@ -12,5 +12,6 @@ Enable reading the ID of the inserted CD + Enable calculation and lookup of AcoustID fingerprints diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild index ec55fb5d0fb..5aa35ce6bae 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 ec55fb5d0fb..5aa35ce6bae 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" }