| 1 |
commit: 2654ea2bcb9ab0bdfd5457b00618b336639ce8fd |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 19:07:16 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 19:41:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2654ea2b |
| 7 |
|
| 8 |
dev-python/pypy: Remove half-broken USE=doc |
| 9 |
|
| 10 |
The doc building code is currently broken as it is subject to Sphinx |
| 11 |
version mismatch, and given that we would need separate logic to select |
| 12 |
interpreter for the PyPy build, and for the sphinx call, it's better |
| 13 |
to remove the doc building altogether and possible reintroduce it |
| 14 |
as a separate package in the future. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/643046 |
| 17 |
|
| 18 |
dev-python/pypy/pypy-5.10.0.ebuild | 10 ++-------- |
| 19 |
dev-python/pypy/pypy-9999.ebuild | 10 ++-------- |
| 20 |
2 files changed, 4 insertions(+), 16 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-python/pypy/pypy-5.10.0.ebuild b/dev-python/pypy/pypy-5.10.0.ebuild |
| 23 |
index 7cfed8fcca3..286b7be69e1 100644 |
| 24 |
--- a/dev-python/pypy/pypy-5.10.0.ebuild |
| 25 |
+++ b/dev-python/pypy/pypy-5.10.0.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2017 Gentoo Foundation |
| 28 |
+# Copyright 1999-2018 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -19,7 +19,7 @@ LICENSE="MIT" |
| 33 |
# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' |
| 34 |
SLOT="0/41" |
| 35 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 36 |
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk" |
| 37 |
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk" |
| 38 |
|
| 39 |
RDEPEND=">=sys-libs/zlib-1.1.3:0= |
| 40 |
virtual/libffi:0= |
| 41 |
@@ -39,7 +39,6 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= |
| 42 |
# don't enforce the dep on pypy with USE=low-memory since it's going |
| 43 |
# to cause either collisions or circular dep on itself |
| 44 |
DEPEND="${RDEPEND} |
| 45 |
- doc? ( dev-python/sphinx ) |
| 46 |
!low-memory? ( |
| 47 |
|| ( |
| 48 |
dev-python/pypy |
| 49 |
@@ -188,8 +187,6 @@ src_compile() { |
| 50 |
cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die |
| 51 |
pax-mark m pypy-c libpypy-c.so |
| 52 |
|
| 53 |
- use doc && emake -C pypy/doc html |
| 54 |
- |
| 55 |
einfo "Generating caches and CFFI modules ..." |
| 56 |
|
| 57 |
# Generate Grammar and PatternGrammar pickles. |
| 58 |
@@ -262,9 +259,6 @@ src_install() { |
| 59 |
"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die |
| 60 |
fi |
| 61 |
|
| 62 |
- # Install docs |
| 63 |
- use doc && dodoc -r pypy/doc/_build/html |
| 64 |
- |
| 65 |
local -x PYTHON=${ED%/}${dest}/pypy-c |
| 66 |
# we can't use eclass function since PyPy is dumb and always gives |
| 67 |
# paths relative to the interpreter |
| 68 |
|
| 69 |
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild |
| 70 |
index fecf7b18d4e..c0bc0a26454 100644 |
| 71 |
--- a/dev-python/pypy/pypy-9999.ebuild |
| 72 |
+++ b/dev-python/pypy/pypy-9999.ebuild |
| 73 |
@@ -1,4 +1,4 @@ |
| 74 |
-# Copyright 1999-2017 Gentoo Foundation |
| 75 |
+# Copyright 1999-2018 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
|
| 78 |
EAPI=6 |
| 79 |
@@ -20,7 +20,7 @@ LICENSE="MIT" |
| 80 |
# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' |
| 81 |
SLOT="0/41" |
| 82 |
KEYWORDS="" |
| 83 |
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk" |
| 84 |
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk" |
| 85 |
|
| 86 |
RDEPEND=">=sys-libs/zlib-1.1.3:0= |
| 87 |
virtual/libffi:0= |
| 88 |
@@ -40,7 +40,6 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= |
| 89 |
# don't enforce the dep on pypy with USE=low-memory since it's going |
| 90 |
# to cause either collisions or circular dep on itself |
| 91 |
DEPEND="${RDEPEND} |
| 92 |
- doc? ( dev-python/sphinx ) |
| 93 |
!low-memory? ( |
| 94 |
|| ( |
| 95 |
dev-python/pypy |
| 96 |
@@ -194,8 +193,6 @@ src_compile() { |
| 97 |
cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die |
| 98 |
pax-mark m pypy-c libpypy-c.so |
| 99 |
|
| 100 |
- use doc && emake -C pypy/doc html |
| 101 |
- |
| 102 |
einfo "Generating caches and CFFI modules ..." |
| 103 |
|
| 104 |
# Generate Grammar and PatternGrammar pickles. |
| 105 |
@@ -268,9 +265,6 @@ src_install() { |
| 106 |
"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die |
| 107 |
fi |
| 108 |
|
| 109 |
- # Install docs |
| 110 |
- use doc && dodoc -r pypy/doc/_build/html |
| 111 |
- |
| 112 |
local -x PYTHON=${ED%/}${dest}/pypy-c |
| 113 |
# we can't use eclass function since PyPy is dumb and always gives |
| 114 |
# paths relative to the interpreter |
Archives