gentoo resync : 25.08.2018

4 files changed, 134 insertions, 0 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 76cdebb1b88d..d86e56c37ba4 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,8 @@
+AUX picard-2.0.3-crashfix.patch 639 BLAKE2B 2476104b4d1cb73cf1a88f006d88dcb598a5394794b9d28281b51a9661e5d8bed3a6693c98d8e84420980b98aabebae8430d6dc92478c2ab2c6d2d4a85a03cc6 SHA512 80380f0151b0ea5c3eea03d4f0e1a318c422d454324bdd403788e1553b129d9e3c41d79ffe4f74f492f752fb8e66ae6a53817ae4469a9066d2adc31e869b4ee8
+AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe4b268eaa09b28f493ccdb37da865d8d8d59f218a0c4d87b15013954bf3cf272d5776cc722a6fd47254a35d54f7d17d68e85 SHA512 b13e65e46a8fe0930473a76e414ac55443bf32516728221f902767510442807d5d2ddf70e15df1a851a31458876f578a270e630c0402379ff8f517b84be01865
 DIST picard-2.0.0_beta3.tar.gz 2686246 BLAKE2B e11cc85282bb3dfe7298090e42b62f7e9b2d4ee7df09b040905665694074ede611884e1544abc89aa3d07e0844d6599d5fac7c0db09bad7d9e64439c0c4478c9 SHA512 c8c5bdd84af3946bc24eb495bcb83877dffedb81e6ff64742925f6d1b4f2780f86280dda839d96030ea15ee2a7bf7708c20cc4ac92e97bf9cd372ea36715d156
+DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
 EBUILD picard-2.0.0_beta3.ebuild 1774 BLAKE2B 0dd094c47179e50704a8431322051a1942cbebf34ebd171f27823734b34103dc7427b13fce2714297cb7f811a62cbf90595212dc3b0205a0c55cb02be9ebb2fa SHA512 2f6936e6544930d2d60eec787e6a0f8cc36b49f891269448b0b308c9595aa5d9441012fe2f6eafa9d30fc40f647e9c74bc0e844f9323248f5477b562157cb768
+EBUILD picard-2.0.3.ebuild 1865 BLAKE2B 96e6997ca21026d9d48bc6dd1f87fec61a8b3c6322e2d03ddfb986a7d7aac64f35672532475a156f6045ea93b1c3aff0298a93c95254376ccd20004793ca0eb8 SHA512 50267055f69dd61d6542654672e55fc50cdefc9cd0790f3028643a40c086048adf842d7a1c4c5933cf86835a40c4144abc6c977f8ae409de45fec3cd0fe2b59a
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/files/picard-2.0.3-crashfix.patch b/media-sound/picard/files/picard-2.0.3-crashfix.patch
new file mode 100644
index 000000000000..33c331778219
--- /dev/null
+++ b/media-sound/picard/files/picard-2.0.3-crashfix.patch
@@ -0,0 +1,23 @@
+From 24722cc47cc9e968eb05becf6056517b23e81e34 Mon Sep 17 00:00:00 2001
+From: Sambhav Kothari <sambhavs.email@gmail.com>
+Date: Sun, 12 Aug 2018 18:06:58 +0100
+Subject: [PATCH] PICARD-1310: Fix crash on clearing the log, due to wrong var.
+ name
+
+---
+ picard/log.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/picard/log.py b/picard/log.py
+index 5974a8a8c..a388af554 100644
+--- a/picard/log.py
++++ b/picard/log.py
+@@ -90,7 +90,7 @@ def contents(self, prev=-1):
+         return contents
+ 
+     def clear(self):
+-        with self.log_queue_lock:
++        with self._queue_lock:
+             self._log_queue.clear()
+ 
+ 
diff --git a/media-sound/picard/files/picard-2.0.3-iteration-error.patch b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
new file mode 100644
index 000000000000..36e0b8092c54
--- /dev/null
+++ b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
@@ -0,0 +1,24 @@
+From c5f8237bba87dcf113e41cd53a723ce1dad2c3dd Mon Sep 17 00:00:00 2001
+From: Laurent Monin <github@norz.org>
+Date: Mon, 20 Aug 2018 14:08:11 +0200
+Subject: [PATCH] PICARD-1318: Fix dictionary changed size during iteration
+ error
+
+It happens when looking up a track with script $set(newartists, %artists%)
+---
+ picard/metadata.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/picard/metadata.py b/picard/metadata.py
+index 8e2aa5266..4f9269b0c 100644
+--- a/picard/metadata.py
++++ b/picard/metadata.py
+@@ -333,7 +333,7 @@ def rawitems(self):
+     def apply_func(self, func):
+         for key, values in self.rawitems():
+             if key not in PRESERVED_TAGS:
+-                self[key] = [func(value) for value in values]
++                super().__setitem__(key, [func(value) for value in values])
+ 
+     def strip_whitespace(self):
+         """Strip leading/trailing whitespace.
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
new file mode 100644
index 000000000000..4db7f7a110a7
--- /dev/null
+++ b/media-sound/picard/picard-2.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+
+inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtgui:5[accessibility]
+	>=media-libs/mutagen-1.38"
+DEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-iteration-error.patch"
+)
+
+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_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}