gentoo resync : 08.01.2018

3 files changed, 6 insertions, 18 deletions

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index d20df9eccc9a..3379058cda19 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,7 +5,7 @@ AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f
 DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
-EBUILD pypy-5.10.0.ebuild 7987 BLAKE2B bb23d3399fa7bf74d3eff1c222d2eb06f41a39ed06f340980a44130a27bd6b96bbbdf42b46c04f661f2f1ca242536b135148974d036f92e53b4f54929adbd20f SHA512 7e79e31ea5073ce5581258f6649406320afccc37b01bc83d1ee6a05d0f6980b24f8bc08b314d9394ca85f98583953f5492ffc8ee2f3aa9b92b2f93f6d4943033
+EBUILD pypy-5.10.0.ebuild 7860 BLAKE2B aef28d2f43bb879586b3988345e58d04bc624d6134491787809fd34bd35bd004ed5589684adf428601fb885879da72fd4991e82bd8b57730c67a13b5c25040e3 SHA512 7b67815c1efe03ab475d25e685c0ecf4408873986a99b9bba3d7cc067e5bbffde32b5af8ea13c3e2c2d12351fbc88123ba706cf8b49d40178cb672335f1a2b9e
 EBUILD pypy-5.9.0-r1.ebuild 7987 BLAKE2B bb23d3399fa7bf74d3eff1c222d2eb06f41a39ed06f340980a44130a27bd6b96bbbdf42b46c04f661f2f1ca242536b135148974d036f92e53b4f54929adbd20f SHA512 7e79e31ea5073ce5581258f6649406320afccc37b01bc83d1ee6a05d0f6980b24f8bc08b314d9394ca85f98583953f5492ffc8ee2f3aa9b92b2f93f6d4943033
-EBUILD pypy-9999.ebuild 7997 BLAKE2B 30affa36be13cb3ab09b22cf76b1458b421f07bc4e8279097bfa9650f67422963b624349e1710a501277da9620c6d3b2ca7fe3238b121eb25c49f0b81ef881a0 SHA512 1fced57979aa3902cf12f95e61f4bd946beec808ca78d162e2a9b19e8d7be4b58a2c7b2653c6ccbcadf813e7b34d9d31a19b342e11cdfe6ee75a6239b1a4b137
+EBUILD pypy-9999.ebuild 7870 BLAKE2B 4b7455f9ce4d640900f0bed356d8d1bb43750944685e62a96a299c18a8ec9ffc560cdd666bc2ac98dac512c87981a36e808893e492576a830394d6767926830e SHA512 a9975515dc6c9582105e829cbbbb8c50d87f22a8adaa7c4d0ba06fedeef13f3d5635912f887b958552ce6e983bdfbc6736ca340b999017e75fff346e53fd9997
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-5.10.0.ebuild b/dev-python/pypy/pypy-5.10.0.ebuild
index 7cfed8fcca3b..286b7be69e1d 100644
--- a/dev-python/pypy/pypy-5.10.0.ebuild
+++ b/dev-python/pypy/pypy-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -39,7 +39,6 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 # don't enforce the dep on pypy with USE=low-memory since it's going
 # to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
 	!low-memory? (
 		|| (
 			dev-python/pypy
@@ -188,8 +187,6 @@ src_compile() {
 	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so
 
-	use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -262,9 +259,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index fecf7b18d4e4..c0bc0a26454b 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS=""
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -40,7 +40,6 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 # don't enforce the dep on pypy with USE=low-memory since it's going
 # to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
 	!low-memory? (
 		|| (
 			dev-python/pypy
@@ -194,8 +193,6 @@ src_compile() {
 	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so
 
-	use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -268,9 +265,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter