gentoo resync : 15.12.2019

5 files changed, 13 insertions, 15 deletions

diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index b6ed91ad4f2f..5f832b0ffce6 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -3,8 +3,8 @@ AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6f
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
-EBUILD pygments-2.2.0-r1.ebuild 1595 BLAKE2B 69795a6797f94a1c3510e19d31ef2a81da88cfeb1910d23b84429373238e83f77077e34f1ff3db7e2afc307f3630c58b97888632958497c223613ba518242c54 SHA512 d05a1fd0cc575c8aced1620468c704f26f486b0b262495945ce1cd2ed137180628fa737784115b874928cf79f1e5b5fea32e8ea3fc5492855faa49fe2be39331
-EBUILD pygments-2.2.0.ebuild 1746 BLAKE2B 944bdb51615ede9570fc5b909e4cf3c78bfca6931aeb9afaa28e1e22ef1934f8c43aea9044ad2b7780ec23119605dcb36c84ccbf8b9456f330ab712701ed73c4 SHA512 bbf8ab32bc269f70cd413a7c328444ac1a1fd40e672df48438f6d1cd135b1eaba1269665671d20cf43d06b253fc0584024e9773200ef3d0cdb7a893c88cd77cd
-EBUILD pygments-2.3.1.ebuild 1407 BLAKE2B b234ebed8cec318713588088864145a8b8ef33455643285a47247072123a7aaf6b62a0169d5b5b02a357d48c643e989804b277938b3b66af53496c33149e61ea SHA512 4535f51db76b576ca2ac29fedee659e2c851f91a86075ef13ae1134806b9543f2deb670e16109a2c02963f3ac38a428cf6f8973b4b6ee924befa6f60088ecb62
-EBUILD pygments-2.4.2.ebuild 1292 BLAKE2B 8cf3124a333bd9f182649f3fd1e16d5b5328c51a01181fcd1669830ebeb895fd78292034da52015c2fa290c622b2678b7a597969a16dc09f89537d6c18e00a3f SHA512 e2fdee33d110c44a5dadf1e2fff3bd6e39ac96581bd81b5f145f45a46013c4d4ce453e9b9f78831548700245628a91db079218935c62629f2268248d27ff717d
+EBUILD pygments-2.2.0-r1.ebuild 1622 BLAKE2B 50757b289c730c4b9734ad87fb8dd1f050207578aa86792a37176be2901bae7123f4d2f98243765e313bb75b492afe2d34d9ce5752bbfed8970cfa4b7742359c SHA512 92e081bbce77d5fb02a7c7e99ffe48ebd9e3de267803db79814211482a635234ec0c336ba8c2e7edf8f1cb64f8097dcb6422c1e9cd6d7d885e91b8a0bc27a48d
+EBUILD pygments-2.2.0.ebuild 1773 BLAKE2B 75246df8db38092a27bae96a7cbec60492601976b65e6327c30609498d763c0374fd05f098f7283bb67184d59ea7ec7fadd9043180491bbcae032cc2f0b37806 SHA512 8831ad0edf46941a47200715316a19fc41c6a53fa2a16cceed70be04c9ae30e7ad0542bcf18d156041077d38e1349957e47996653ad721578ae7abe136862df2
+EBUILD pygments-2.3.1.ebuild 1434 BLAKE2B 00e4918dcf6cc563e79b66b32bf9df0e80b06b3840316be71f8696fa5d2d2a5559b07fad29b6d2f1302278c3df97bf456e408e9e0d81815cfa237f3aa0bc38ce SHA512 86dcded801cc7719c7aea75590518ee0a18738135e2df2ebc62f0b9d2ea07863e47dc3100c4f57b88cf181edce5fe71550345fc06c5246e0a2b24732ce3eca83
+EBUILD pygments-2.4.2.ebuild 1190 BLAKE2B 0b1181c1839ff1636d470299bb1b51c534de2b4072d01ad6444360047c1f26acdb63090d1ee62c6ca9a816a66a4040b06bef2d09ded2d907aa6f23f338727e7f SHA512 cef3f517a743ca04e7ce337322688c690d7847b9a27facf78289a89ec6bfbdb2f8a626048a6f41034eb8348ac9f557cfea1519ceb25d022aaa329ebabb3adbf4
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.2.0-r1.ebuild b/dev-python/pygments/pygments-2.2.0-r1.ebuild
index e4c425181ab8..5bd14604f253 100644
--- a/dev-python/pygments/pygments-2.2.0-r1.ebuild
+++ b/dev-python/pygments/pygments-2.2.0-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index 2452e52b9f9f..f57a47742fb0 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 4521b7f1a9cc..393608490df7 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
index b7c7753df88e..41541677e930 100644
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ b/dev-python/pygments/pygments-2.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 
 inherit distutils-r1 bash-completion-r1
 
@@ -13,25 +13,22 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Pygments is a syntax highlighting package written in Python"
 HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		virtual/ttf-fonts
 	)"
 
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
+distutils_enable_sphinx doc
 
 python_test() {
 	cp -r -l tests "${BUILD_DIR}"/ || die
@@ -40,8 +37,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
 	distutils-r1_python_install_all
 	newbashcomp external/pygments.bashcomp pygmentize
 }