gentoo Easter resync : 12.04.2020

5 files changed, 9 insertions, 29 deletions

diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 9f32f9ae0624..b95461964181 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,7 +1,5 @@
-AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f65f6127b78c0480d3bfe6517e71bc05085c7e4226be29f45fdec80f826241f785656b5639f05372 SHA512 588a3cdfe582f449b7bd75df5d6f29e327a20bf472317bfd839013f40a406c19529ad2ec3d0f258aced22e3d18e80bc25f1b8a398ab1b6ffbafbe1e36ee66f65
 AUX xlwt-1.3.0-no-intersphinx.patch 447 BLAKE2B 7d861dfcecf1a811c129569703dfb29bace4c8dd7de1b8bad89a4d93b03d80b7b79df5409c69b8ab4b132b16595d1c608885225ef41488382f4811147ae23ccb SHA512 f5c1e731a0a88f012dfc1b62ae37edc71082f3b6e5726389cf4722d69ce69821d1fffa8e2fb7537854325942c1157f68c168d8dbd82936918a1f164cd80f5010
-DIST xlwt-1.2.0.tar.gz 153909 BLAKE2B 553315b6f6ba822122c18cfabaf5a30f25a6ccdc1c507bf7fbf293df42e380520ef647d3501b51443a90f77c59497b87c70f6a71d3b3ce53658d3a6cf2356f6a SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.2.0.ebuild 1270 BLAKE2B a07424fd5c1c5cf5d1710d098798d1797f5391bb3e952a32220dac61579480104a81670bef1f041071e284989fa43ed5ea0d7747bea13362cadc26d77974c30b SHA512 da634110dde9f522e8ca2e72928c8163c1ac0387e4f2b0f512c96ae9288d5d2604855f519b0620d64a9c813ed6c1c3ca7ba1993a6b257bcb87b05d9496da5cb9
-EBUILD xlwt-1.3.0.ebuild 1294 BLAKE2B e865f84d93ea19dd5f15fd85314b212128239742dc4cc4be89b58f33bc7595ecc7b9bd1acd37a96a9349143e8f78ef1e32aad1f677bcff28fd227498262e5194 SHA512 1259ac5788a76be4e2ca9b96083c07080ac6225bec6623b74985c6e78e4328d8fa448216cdcf1d87c58ecc9802e34aefd035bc347a2cbce9ac66ed07b93c48a5
-MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
+EBUILD xlwt-1.3.0-r1.ebuild 1284 BLAKE2B be05188b9ca0a15c9e22616b49c44539fed4679713847fc780f3124db429e02c4c98fd295424acbe840d7a97db2a5152766d3fac586d9ce51e9f1411ea9b21ed SHA512 fe826ec1f1e4c0dd6bb8749a9c8e7f1bab6cfd52b6ecf4e92c74e14388afdf82aba0efef4d60fac1b488dcc08c1b2b99be377ff53f72321b4cdcc6334fb0e979
+EBUILD xlwt-1.3.0.ebuild 1288 BLAKE2B 220c87972d7ada518b1dcf0d66f446e27c0026af65bef0875594b94d60eae60e392a9a3211e07b247fd935486f48db1b026879f3dff3fc530ecb334a46199ae9 SHA512 1fd23be2cc1dc966392558fc9dfb62d5ab8e8b3afc7ebbc5bac618043e1cb0bd8359d906665e7c37d76c68060d04020458f81dce63c57b6feb7ac9c5924f6f1a
+MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/files/docbuild.patch b/dev-python/xlwt/files/docbuild.patch
deleted file mode 100644
index 20ed580a628e..000000000000
--- a/dev-python/xlwt/files/docbuild.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur xlwt-1.0.0.orig xlwt-1.0.0
---- xlwt-1.0.0.orig/docs/conf.py
-+++ xlwt-1.0.0/docs/conf.py
-@@ -4,7 +4,7 @@
- on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
- pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__), os.pardir))
- 
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.autodoc']
- source_suffix = '.rst'
- master_doc = 'index'
- project = u'xlwt'
-@@ -19,4 +19,3 @@
-     html_theme = 'classic'
- 
- htmlhelp_basename = project+'doc'
--intersphinx_mapping = {'python': ('http://docs.python.org', None)}
diff --git a/dev-python/xlwt/metadata.xml b/dev-python/xlwt/metadata.xml
index 81183eabced6..3745e34e31ac 100644
--- a/dev-python/xlwt/metadata.xml
+++ b/dev-python/xlwt/metadata.xml
@@ -12,6 +12,7 @@
 		be generated on any platform without needing Excel or a COM
 		server. xlwt is a fork of pyExcelerator.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">xlwt</remote-id>
 	</upstream>
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index c3abfc46f697..c3f628912de3 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -13,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
@@ -26,7 +24,7 @@ DEPEND="
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}"/docbuild.patch )
+PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
 
 python_prepare_all() {
 	# Don't install documentation and examples in site-packages directories.
diff --git a/dev-python/xlwt/xlwt-1.3.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index 6fb1875b7aca..f6160030c635 100644
--- a/dev-python/xlwt/xlwt-1.3.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"