gentoo resync : 14.07.2018

5 files changed, 13 insertions, 13 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index f49d6fb7b612..c8c885bf9d61 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -11,8 +11,8 @@ EBUILD sphinx-1.2.2-r1.ebuild 3045 BLAKE2B 315adfce3238e7b3c21465cd16e9a682255df
 EBUILD sphinx-1.2.3-r1.ebuild 3107 BLAKE2B cad89c3205b3987a80905a95798516a9ca8d6769aa3330bb1648b3a795b32c49a90b3bdb63335f4fb35f4ff95437588c863179d4b8817dd9ad83ede7e3a1ec5c SHA512 91fab1a458af03e497be8527a9afaef1fd97a2115eef6b8e549020701460cedb1e75b3c20f4fabc132f40faeb59880b45d13f5a80bd2c709fb949bd4863fc214
 EBUILD sphinx-1.3.1-r2.ebuild 3463 BLAKE2B 58106fef573a7bdb9e90c67a67aab596ffaaf01aa869111d8422c2e58e0a8f8236ba326bbfa6b52652b48166e7208f652ee1330a55b6d1bb9124ecbeebbd3c5a SHA512 cdb919b247a207534a1b27e7727e00b3e8dd0eeb3c3ed3aa63f59493f1a9840277d8b053a3cff4a0db53b687ecb6ba16d0558aa0697534f7adf211887b72479f
 EBUILD sphinx-1.3.5-r1.ebuild 3577 BLAKE2B 2cb4707c8bb3e1dfec094b359cefd4d03fc2aecc626d2d4a9370dcb696ea16ee08970eb2129c11fa601a043bf7bc783a8bca8e52f04c0a3b77fa1d197feef58b SHA512 bf4e5d4d5f96d3e0114fa81cb403081a68892580c651bdd7712e0ad06b96ab7586fadaf14c83bb0fc9e5c36f06c13fee72aa4805e12895cb1eb27fb649f26248
-EBUILD sphinx-1.6.3-r3.ebuild 3422 BLAKE2B 8aca39ff63500a156c87677f94a205fcce22eb6e42a1a75db9cd994ec150165b34e40c85ec7eceec395916a7dffb932ac57833a4e4f196b6ddef35b48b6602ca SHA512 bfa29c4f9b17c4b2f18ad9c85d40d3f19dbdb974c5d056347ab992d476e16b9f685c9efe4060f2ff5d8547bc71a8321904984b9438c4b5250c76a98591c01343
-EBUILD sphinx-1.6.5.ebuild 3492 BLAKE2B fff58773c0cdfb9b6d2018550b358ed27caf563525c64a05eb4c5082b155efee603cafadab42d089a688c2a39a65ecd9b7cde47592b99c55693aa4d695b7f496 SHA512 0d930ab21647b715d7c47a574c68949bdc6cfbb653d6220ee57bc57474bad134a4a47f7a54b55748a6e7420cdda26fb885c85b6b7b5610d242174209f2c5a64a
-EBUILD sphinx-1.6.7.ebuild 3509 BLAKE2B 62057a6ac52321ea4f7133b51355612b57226edd31d296ef1a971617679f3dd079927c432aeeb80ecb1619b41e50e840f5dc4605192057a33046eb746dd8248d SHA512 caaa45be815893eb08181d69e93512dd50dd21c855f8cc33100f8e16710f545664bf4ab25ace03b4e57765ff7f4fb6503ca66ec76d33363188a794c51da75839
-EBUILD sphinx-1.7.5.ebuild 3097 BLAKE2B 273a970f34667cfa63cddb799f51b89fc82096d44cd233e8f864ce37e51a0363cc0d99eaf7d0567de8cd7a328046d453c86f00e79dd4dbd6b7cab09aacbada52 SHA512 88b9edeb20d51230d2f0585ceca12d1493d20c7ab9eefff026b6a525ade1b3b6dcf685bb1826463cf190e69b87e5f2e9cde17b8daa2c07baad46ab9c044262f0
+EBUILD sphinx-1.6.3-r4.ebuild 3426 BLAKE2B 0dcfb96abd86c6b0439250adc8004894fd653c5070a0e3a425cbaf063c6dae7da3a48d0280a2efcbd65a7d17114f2dcff27d4d970b37af8bdd498db2a79822fd SHA512 70209e8e3c8c5b463ff5320e00efd7b1761dd7e270d4991c9e43b9a360dec966a94dd83dd65ea3d0d01eb9289a4658492809109917c4490124f1822ebb7ca217
+EBUILD sphinx-1.6.5-r1.ebuild 3496 BLAKE2B 61d468b87a23ec4d6247a4ee553d3ae94060e77f7fc4caec8b009cf43ec8849cb4cad2ac43b17ea46daa2b0bc313ee16df571660c1f6015b3173cff28c54774f SHA512 bb3cbc542479b8dbd418af82b935e389fac07d19ded44fa64251c17ef26c4e5500c97aedfcac52ad341195fa278d9235874dba18044c0feb1cbe10069a86d149
+EBUILD sphinx-1.6.7-r1.ebuild 3513 BLAKE2B 60d8965d972f777f87a25fc6b458f987da321dec1dd749d8faf7d5d875ae388d00d071d0b00b09f9e5738b5b938640e2a80f0e3ecb078efebd3c9439edf9246d SHA512 a39cfc9fe463d9100c13beefc0025d8d4cdd1f23509571ad5bd867d86cd469342aa7b66a5c350cbbf7904611369868191f31239726b48af5133f7abf31028c9b
+EBUILD sphinx-1.7.5-r1.ebuild 3128 BLAKE2B 8dde52ec7e56639d79a556e715f388a393e475972307432a14417e3b7fcdeacaeda04bda5381c50f3998456431a85c777e88e88da72ac94898f9ec5784a55826 SHA512 836ee537507dae750388d14063b09ba83bf775135fe528a7bfe7e27bd20afa0f42d65cbae8777a7c756a9481a68b2af8cdbdb94ac79ef19b152a5afa48c3d816
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.6.3-r3.ebuild b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
index 551ff31244cf..7f1d945977a5 100644
--- a/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
index 340cc9bfdfef..ad810d050f81 100644
--- a/dev-python/sphinx/sphinx-1.6.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
diff --git a/dev-python/sphinx/sphinx-1.6.7.ebuild b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
index c00c5313640f..dbbac7ab54b8 100644
--- a/dev-python/sphinx/sphinx-1.6.7.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
diff --git a/dev-python/sphinx/sphinx-1.7.5.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index e9a69465dfe3..130b1d14f223 100644
--- a/dev-python/sphinx/sphinx-1.7.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	dev-python/typing[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
@@ -46,11 +46,9 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
 		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
@@ -64,6 +62,10 @@ python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_websupport.py || die "Failed to remove web tests"
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_remote_images:_&:' tests/test_build_latex.py || die
+
+	# fails when additional sphinx themes are installed
+	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -90,7 +92,5 @@ python_compile_all() {
 python_test() {
 	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
 	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
+	py.test -vv || die "Tests fail with ${EPYTHON}"
 }