gentoo resync : 18.05.2019

3 files changed, 24 insertions, 7 deletions

diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 3cd4c284a368..f8f64d53fbf1 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,6 +1,7 @@
 AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f65f6127b78c0480d3bfe6517e71bc05085c7e4226be29f45fdec80f826241f785656b5639f05372 SHA512 588a3cdfe582f449b7bd75df5d6f29e327a20bf472317bfd839013f40a406c19529ad2ec3d0f258aced22e3d18e80bc25f1b8a398ab1b6ffbafbe1e36ee66f65
-DIST xlwt-1.0.0.tar.gz 129588 BLAKE2B e900aec8efc254539936a7e5998c17116c3d95c66fe169aff8caaf11a9509cfbebe29f9cc5ea4a5f6b5b1cdf28f9e08cdd33ce7ae4bf474b4d51df491605f372 SHA512 45788a506635f1ef6380d46aa0af724e511e401e8347dcf48dbf4e2d90e7f4c7f66838cd9616cf58807ffb939daba1f47b0d2cf449f8cb528db41fba84cc8866
+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
-EBUILD xlwt-1.0.0.ebuild 1201 BLAKE2B d8e49df5aa5a783f97f5e6db049677fab6c8afb2724d16dee618584c34217e94e6a9e0f36ef82ee03a01a039d64f57627263b41da5c8c1b3b2eb94c2177d8803 SHA512 1bc44e177f1e01d753ff25bab2deec5be523f2569a33563157025b1cc9baa325393ad2b4ff008aabb5e783b5b146396b064c232e34d5f664ee59ef6f56ef4011
+DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
 EBUILD xlwt-1.2.0.ebuild 1251 BLAKE2B 4f4f733874228768a86ac7fb7aeb8b73df20864780d02eabba37d186bea284da6652c6fa9213752f517fcee41abdd7341067ed82da0c293f539ecd7541a983a2 SHA512 96ddb68fff59342a4fcc3631217c4336063c19e136a14a62794137fec5871a24cd3bb068c21032789b3aea2baa88a02e3962e9ec779c9f2960ab980d2a7869d7
+EBUILD xlwt-1.3.0.ebuild 1274 BLAKE2B 0d775356d7a6fe81d4c3f123db1797e5520542ad3ccd67cf7df0d3382d95707187b406d3d37296f4dc32711a654f49ec502f9078f113456789421a97ff037ff2 SHA512 196c9463ebc6b3e1daf7c5ba67c826530f82fa5b6d6e94fa264fefa4b2648db012bc0086954cc28ba9b803cf1e7842021ec625a1cfd55cb0cbfd9b79fe05536d
 MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
diff --git a/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch b/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
new file mode 100644
index 000000000000..2ef29a1d6cf2
--- /dev/null
+++ b/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index c55fa2f..25db355 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -4,7 +4,7 @@ import os, pkginfo
+ 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'
diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index 747ef3f2e45c..64bd2dff33b4 100644
--- a/dev-python/xlwt/xlwt-1.0.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 DEPEND="
@@ -25,7 +25,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.
@@ -44,6 +44,9 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
 	distutils-r1_python_install_all
 }