[gentoo-commits] repo/gentoo:master commit in: media-sound/picard/

["David Seifert" <soap@gentoo.org>]

commit:     5c6795a3c355753782b794b860d2a2402bed48f6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 21:09:06 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 21:11:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6795a3

media-sound/picard: [QA] Port to readme.gentoo-r1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/picard/picard-1.3.1.ebuild    | 20 ++++++++++----------
 media-sound/picard/picard-1.3.2-r1.ebuild | 18 +++++++++---------
 media-sound/picard/picard-1.4.1.ebuild    | 20 ++++++++++----------
 media-sound/picard/picard-1.4.2.ebuild    | 20 ++++++++++----------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/media-sound/picard/picard-1.3.1.ebuild b/media-sound/picard/picard-1.3.1.ebuild
index 782c950f877..dfa121bd47e 100644
--- a/media-sound/picard/picard-1.3.1.ebuild
+++ b/media-sound/picard/picard-1.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-inherit eutils distutils-r1 readme.gentoo
+inherit eutils distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A cross-platform music tagger"
 HOMEPAGE="http://picard.musicbrainz.org/"
@@ -26,14 +26,6 @@ RESTRICT="test" # doesn't work with ebuilds
 S=${WORKDIR}/${PN}-release-${PV}
 DOCS="AUTHORS.txt NEWS.txt"
 
-DOC_CONTENTS="If you are upgrading Picard and it does not start,
-try removing Picard's settings:
-    rm ~/.config/MusicBrainz/Picard.conf
-
-You should set the environment variable BROWSER to something like
-    firefox '%s' &
-to let python know which browser to use."
-
 src_compile() {
 	distutils-r1_src_compile $(use nls || echo "--disable-locales")
 }
@@ -44,5 +36,13 @@ src_install() {
 
 	doicon picard.ico
 	domenu picard.desktop
+
+	local DOC_CONTENTS="If you are upgrading Picard and it does not start,
+try removing Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf
+
+You should set the environment variable BROWSER to something like
+	firefox '%s' &
+to let python know which browser to use."
 	readme.gentoo_create_doc
 }

diff --git a/media-sound/picard/picard-1.3.2-r1.ebuild b/media-sound/picard/picard-1.3.2-r1.ebuild
index 2e3dfa7a9ee..1592652f1fd 100644
--- a/media-sound/picard/picard-1.3.2-r1.ebuild
+++ b/media-sound/picard/picard-1.3.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-inherit eutils distutils-r1 readme.gentoo
+inherit eutils distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A cross-platform music tagger"
 HOMEPAGE="http://picard.musicbrainz.org/"
@@ -27,14 +27,6 @@ RESTRICT="test" # doesn't work with ebuilds
 S=${WORKDIR}/${PN}-release-${PV}
 DOCS="AUTHORS.txt NEWS.txt"
 
-DOC_CONTENTS="If you are upgrading Picard and it does not start,
-try removing Picard's settings:
-    rm ~/.config/MusicBrainz/Picard.conf
-
-You should set the environment variable BROWSER to something like
-    firefox '%s' &
-to let python know which browser to use."
-
 src_compile() {
 	distutils-r1_src_compile $(use nls || echo "--disable-locales")
 }
@@ -45,5 +37,13 @@ src_install() {
 
 	doicon picard.ico
 	domenu picard.desktop
+
+	local DOC_CONTENTS="If you are upgrading Picard and it does not start,
+try removing Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf
+
+You should set the environment variable BROWSER to something like
+	firefox '%s' &
+to let python know which browser to use."
 	readme.gentoo_create_doc
 }

diff --git a/media-sound/picard/picard-1.4.1.ebuild b/media-sound/picard/picard-1.4.1.ebuild
index 16d806db46f..763fc7e9db2 100644
--- a/media-sound/picard/picard-1.4.1.ebuild
+++ b/media-sound/picard/picard-1.4.1.ebuild
@@ -27,16 +27,6 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 DOCS=( AUTHORS.txt NEWS.txt README.md )
 
-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"
-
 python_compile() {
 	local build_args=(
 		--disable-autoupdate
@@ -60,6 +50,16 @@ 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
 }
 

diff --git a/media-sound/picard/picard-1.4.2.ebuild b/media-sound/picard/picard-1.4.2.ebuild
index 16d806db46f..763fc7e9db2 100644
--- a/media-sound/picard/picard-1.4.2.ebuild
+++ b/media-sound/picard/picard-1.4.2.ebuild
@@ -27,16 +27,6 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 DOCS=( AUTHORS.txt NEWS.txt README.md )
 
-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"
-
 python_compile() {
 	local build_args=(
 		--disable-autoupdate
@@ -60,6 +50,16 @@ 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
 }