| 1 |
commit: f5b2eb0496d133a9a4bc507f0700f0e68a63dae3 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 3 06:27:03 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 3 09:38:11 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b2eb04 |
| 7 |
|
| 8 |
sys-apps/portage: replace epydoc with sphinx-apidoc |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/portage/metadata.xml | 3 ++- |
| 14 |
sys-apps/portage/portage-9999.ebuild | 22 ++++++++-------------- |
| 15 |
2 files changed, 10 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml |
| 18 |
index 5d99599f678..bf8c5a54f96 100644 |
| 19 |
--- a/sys-apps/portage/metadata.xml |
| 20 |
+++ b/sys-apps/portage/metadata.xml |
| 21 |
@@ -10,7 +10,8 @@ |
| 22 |
<email>dev-portage@g.o</email> |
| 23 |
</maintainer> |
| 24 |
<use> |
| 25 |
- <flag name="epydoc">Build html API documentation with epydoc.</flag> |
| 26 |
+ <flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag> |
| 27 |
+ <flag name="epydoc">Build html API documentation with epydoc (deprecated).</flag> |
| 28 |
<flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag> |
| 29 |
<flag name="ipc">Use inter-process communication between portage and |
| 30 |
running ebuilds. |
| 31 |
|
| 32 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 33 |
index e157a1cc9fa..58aa5a833ab 100644 |
| 34 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 35 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 36 |
@@ -19,18 +19,18 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
| 37 |
LICENSE="GPL-2" |
| 38 |
KEYWORDS="" |
| 39 |
SLOT="0" |
| 40 |
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
| 41 |
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
| 42 |
|
| 43 |
DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
| 44 |
>=app-arch/tar-1.27 |
| 45 |
dev-lang/python-exec:2 |
| 46 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
| 47 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
| 48 |
- epydoc? ( |
| 49 |
- $(python_gen_cond_dep ' |
| 50 |
- >=dev-python/epydoc-2.0[${PYTHON_USEDEP}] |
| 51 |
- ' 'python2*') |
| 52 |
+ apidoc? ( |
| 53 |
+ dev-python/sphinx |
| 54 |
+ dev-python/sphinx-epytext |
| 55 |
)" |
| 56 |
+ |
| 57 |
# Require sandbox-2.2 for bug #288863. |
| 58 |
# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
| 59 |
# quite slow, so it's not considered in the dependencies as an alternative to |
| 60 |
@@ -76,8 +76,6 @@ PDEPEND=" |
| 61 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
| 62 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
| 63 |
|
| 64 |
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
| 65 |
- |
| 66 |
SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage" |
| 67 |
|
| 68 |
prefix_src_archives() { |
| 69 |
@@ -98,10 +96,6 @@ pkg_pretend() { |
| 70 |
check_extra_config |
| 71 |
} |
| 72 |
|
| 73 |
-pkg_setup() { |
| 74 |
- use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
| 75 |
-} |
| 76 |
- |
| 77 |
python_prepare_all() { |
| 78 |
distutils-r1_python_prepare_all |
| 79 |
|
| 80 |
@@ -183,7 +177,7 @@ python_prepare_all() { |
| 81 |
python_compile_all() { |
| 82 |
local targets=() |
| 83 |
use doc && targets+=( docbook ) |
| 84 |
- use epydoc && targets+=( epydoc ) |
| 85 |
+ use apidoc && targets+=( apidoc ) |
| 86 |
|
| 87 |
if [[ ${targets[@]} ]]; then |
| 88 |
esetup.py "${targets[@]}" |
| 89 |
@@ -216,8 +210,8 @@ python_install_all() { |
| 90 |
install_docbook |
| 91 |
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 92 |
) |
| 93 |
- use epydoc && targets+=( |
| 94 |
- install_epydoc |
| 95 |
+ use apidoc && targets+=( |
| 96 |
+ install_apidoc |
| 97 |
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 98 |
) |
Archives