4 files changed, 12 insertions, 76 deletions
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 072099821fa0..7a7864600e71 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,5 +1,4 @@
-AUX xlwt-1.3.0-no-intersphinx.patch 447 BLAKE2B 7d861dfcecf1a811c129569703dfb29bace4c8dd7de1b8bad89a4d93b03d80b7b79df5409c69b8ab4b132b16595d1c608885225ef41488382f4811147ae23ccb SHA512 f5c1e731a0a88f012dfc1b62ae37edc71082f3b6e5726389cf4722d69ce69821d1fffa8e2fb7537854325942c1157f68c168d8dbd82936918a1f164cd80f5010
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 1278 BLAKE2B 6ccc742e1e4cbe1b67e720d0cb2552580bd1f777a1e2771df39bcbb912162a92bb5b65ce378ca12275cfafce06e2f5467ac3a63389df1eb065cc81755962fd6f SHA512 bc5f97258bde31c677aff4070fdb8d88af022a60a559639a6c940a76e8b447ae300a93e00fcad1d1979140746396cdc4c76d67f49432039557354d6ce7972aa7
-EBUILD xlwt-1.3.0.ebuild 1288 BLAKE2B 220c87972d7ada518b1dcf0d66f446e27c0026af65bef0875594b94d60eae60e392a9a3211e07b247fd935486f48db1b026879f3dff3fc530ecb334a46199ae9 SHA512 1fd23be2cc1dc966392558fc9dfb62d5ab8e8b3afc7ebbc5bac618043e1cb0bd8359d906665e7c37d76c68060d04020458f81dce63c57b6feb7ac9c5924f6f1a
+EBUILD xlwt-1.3.0-r1.ebuild 668 BLAKE2B a91e3aef63e45d2dc5d75c4c3ea9a9e5b33ff64066261c893707ce9ad4690424f550c45bb1a5c734ea54dbc30d71e75bb59f7f1abded921291556038e552f1a3 SHA512 84e80597e799eca160aca73e3331aa5257235d5786c6145586157eb59ed39f1a58a5efd718097c3179a563d5fba9ec31a82dbcb5c82bb147e3228ec1b11bf927
+EBUILD xlwt-1.3.0.ebuild 678 BLAKE2B 0135d432fc7b6201517636898201c172f4b8dc53682d93c74357b6674d71ee9c9f1ef3f353e58e5aeac5a4a3b37f3390971d323041b696d5bc34a2558e2cffa7 SHA512 a1baed50b5f4f7a600b79187a5e50f3b4450dfce6c4e88711aebb5cd176853532c76bc0a598e0c28532f71c0152fde055f36e6947fcf3f9d2985a24437370eb3
 MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
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
deleted file mode 100644
index 2ef29a1d6cf2..000000000000
--- a/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index 748243eff07d..59d613cb1f5a 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -12,37 +12,13 @@ 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"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
-
-python_prepare_all() {
-	# Don't install documentation and examples in site-packages directories.
-	sed -e "/package_data/d" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests || die "tests failed under ${EPYTHON}}"
-}
+distutils_enable_sphinx docs \
+	dev-python/pkginfo
+distutils_enable_tests nose
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}
diff --git a/dev-python/xlwt/xlwt-1.3.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index f6160030c635..8c36c7f3763d 100644
--- a/dev-python/xlwt/xlwt-1.3.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -14,37 +12,13 @@ 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"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
-
-python_prepare_all() {
-	# Don't install documentation and examples in site-packages directories.
-	sed -e "/package_data/d" -i setup.py || die
+IUSE="examples"
 
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests || die "tests failed under ${EPYTHON}}"
-}
+distutils_enable_sphinx docs \
+	dev-python/pkginfo
+distutils_enable_tests nose
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}