gentoo resync : 25.08.2020

5 files changed, 4 insertions, 90 deletions

diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index 63fe202752bf..d9bbc06bb6ef 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcffc434150e93c0d57c9291c239639018c28e519032ee2cb251371343d0f3ce6c070b960d4ca8bd1dc5b5b480511f SHA512 ed5b6b674edddcc1d6047bfd97ffdbc1bd4ae3b83e61100b0389cabad84014dce894857faf5555824f245eacaea7541ee18424f630881698b8f2bebceabf8b78
-DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
 DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1195 BLAKE2B 45fc13c619c250077a781e23368ee2301e962605ee91660c5c11495802b1cf3e46ae145a34f2bf1ab60113ae5d840db5a353aa8551754dbedbc05a0c0605d9fd SHA512 232285796b411c587660196112feda843ace095214cdc05a13914c935694b12f174e1db5b4c3fcdef541d8689d673f10565cd7c369935fea5dfb47159ea38c87
-EBUILD python-musicbrainz-ngs-0.7.1.ebuild 917 BLAKE2B cef92aea67cf6a67870a1ef398de497c2182ff8385a86cbf09ee1b86fd7d1983384e1642a4599581a62bbdfd07b1da7b56293494cefa8f41c684d2d720c84463 SHA512 fcf90c132025a0bfe88da66ec213def759a65dc532b8f013055893252f09e35c573cb93d405172eca12ab90b3f9a3d34d1569dc2e198cfc185ea0498da4530d5
-MISC metadata.xml 850 BLAKE2B cff60327b0cffec47ea9a378880dd8c48b9fb7abf684b6c6e0686064d4097dd6e67c19b2495f971689271ecec80dc9ad721562057b6e451a5f52301d9a244f2d SHA512 e554fedc0d886de2e7b1bf60bb20a24b327a3a1b7f8137c0828a52d7f1bd77b00fedc17c6147b7bde7cd48d80888bb4a988faa56fc4a8a5c209ace57a618d0d1
+EBUILD python-musicbrainz-ngs-0.7.1.ebuild 915 BLAKE2B dc3d87f03584c8bc32af75bb7196bcf781acd4ba71ae8c517c2cfee705f02b133369c05be9ad9892594c4cccb2e05d9a091376e95a3f6deb8f91c097eb8c991b SHA512 fce4607a3fa0c1f9baf2424489463cd7f19b3afc2afe076e99daf3f4033b47e7d3999d13211bbd107196fed606b64c2996a0529ce846e50f7265ac92c3ee7334
+MISC metadata.xml 874 BLAKE2B 314e3fcb22de398dc9be9f545ac5aa72e8fbb8474883e88141717ee2d97f17d4c31f5a21060b7b695b318dcf6a532ff934003271796e8ee85bdb392d2983e65a SHA512 8770159a60216cba543a6ff9d558bf3990ba37ba1d04d6514bda3a6674d4cf32c24ca2ff9687df2f20e3e46fad7fc5bc3204aa85cb7d4f2a112bd32c48b0d779
diff --git a/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch b/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch
deleted file mode 100644
index 4881936c80b1..000000000000
--- a/dev-python/python-musicbrainz-ngs/files/0.6-fix-test-submit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/test/test_submit.py b/test/test_submit.py
-index bce5362..2d13811 100644
---- a/test/test_submit.py
-+++ b/test/test_submit.py
-@@ -1,13 +1,23 @@
- import unittest
--import os
--import sys
--sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
--
- import musicbrainzngs
- from musicbrainzngs import musicbrainz
- from test import _common
- 
-+
- class SubmitTest(unittest.TestCase):
-+
-+    def setUp(self):
-+        self.orig_opener = musicbrainzngs.compat.build_opener
-+        musicbrainz.set_useragent("test_client", "1.0")
-+        musicbrainz.auth("user", "password")
-+
-+    def tearDown(self):
-+        musicbrainzngs.compat.build_opener = self.orig_opener
-+        musicbrainz._useragent = ""
-+        musicbrainz._client = ""
-+        musicbrainz.user = ""
-+        musicbrainz.password = ""
-+
-     def test_submit_tags(self):
-         self.opener = _common.FakeOpener("<response/>")
-         musicbrainzngs.compat.build_opener = lambda *args: self.opener
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 766578df9ea2..7495e8fac2c2 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -14,6 +14,7 @@
 		With this library you can retrieve all kinds of music metadata from the MusicBrainz database.
 		The library can retrieve and submit both, the XML and JSON based webservice and provides the data in native Python.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">alastair/python-musicbrainz-ngs</remote-id>
 	</upstream>
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
deleted file mode 100644
index 35e315ca5825..000000000000
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="${PN/%-ngs/ngs}"
-
-DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
-HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
-SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}${PV}.tar.gz"
-
-LICENSE="BSD-2 ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES="${FILESDIR}/0.6-fix-test-submit.patch"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/^ *'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test --verbosity=2
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
index 1977a6d5c123..d4d897c6847e 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}$
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 S="${WORKDIR}/${MY_PN}-${PV}"