gentoo resync : 07.10.2018

3 files changed, 3 insertions, 83 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 20fe3889c0e6..88d436dc975f 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,6 @@
 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 1864 BLAKE2B 54931c2fcb87851c1e050844297b2f864cc39856afef8c6181a90811b96e97d8b121aa028444b8425dd884ab415cad007cabf9c5b3569f3053cb5e57fc1747fe SHA512 407c1bead0ed119f9ec81d40040c014a4111530e9298b76c57bfe056c8a09b7bd1afe8a4ecbb817563c95aec0b749eacb2a5b663c3a2e968ac91745709e8e957
+EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.0_beta3.ebuild b/media-sound/picard/picard-2.0.0_beta3.ebuild
deleted file mode 100644
index b4fa7700a16a..000000000000
--- a/media-sound/picard/picard-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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/${PV/_beta3/dev6}.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}/${P/_beta3/dev6}"
-
-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
-}
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
index f3bbe1494326..c81de29bc6b7 100644
--- a/media-sound/picard/picard-2.0.3.ebuild
+++ b/media-sound/picard/picard-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="