[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/

[Michał Górny]

commit:     158c24d1959afa6dcac673d7c43866302135fb9a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 19:09:20 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 19:41:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158c24d1

dev-python/pypy-bin: Remove USE=doc

Remove USE=doc to match dev-python/pypy.

Closes: https://bugs.gentoo.org/643046

 dev-python/pypy-bin/pypy-bin-5.10.0.ebuild | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
index 8c3b3d419da..ef34c44ba08 100644
--- a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
+inherit pax-utils python-utils-r1 unpacker versionator
 
 BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
 CPY_PATCHSET_VERSION="2.7.14-0"
@@ -52,7 +51,7 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND="
 	app-arch/bzip2:0/1
@@ -73,9 +72,7 @@ RDEPEND="
 	!dev-python/pypy:0"
 DEPEND="${RDEPEND}
 	app-arch/lzip
-	app-arch/xz-utils
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )"
+	app-arch/xz-utils"
 
 S=${WORKDIR}/${MY_P}-src
 
@@ -83,12 +80,6 @@ QA_PREBUILT="
 	usr/lib*/pypy/pypy-c
 	usr/lib*/pypy/libpypy-c.so"
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
@@ -119,8 +110,6 @@ src_compile() {
 
 	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.
@@ -192,9 +181,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