| 1 |
commit: f56e082cc2c2960031a34bb45c801ad23465bab8 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 20 01:34:55 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 20 01:47:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56e082c |
| 7 |
|
| 8 |
sys-apps/portage: fix -r1 htmldir (bug 638046) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/638046 |
| 11 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 12 |
|
| 13 |
sys-apps/portage/portage-2.3.13-r1.ebuild | 14 ++++++++++++-- |
| 14 |
sys-apps/portage/portage-2.3.14.ebuild | 14 ++++++++++++-- |
| 15 |
sys-apps/portage/portage-9999.ebuild | 10 ++++++++-- |
| 16 |
3 files changed, 32 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild |
| 19 |
index b4ff41814d5..9cd00377973 100644 |
| 20 |
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild |
| 21 |
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild |
| 22 |
@@ -87,6 +87,10 @@ pkg_setup() { |
| 23 |
python_prepare_all() { |
| 24 |
distutils-r1_python_prepare_all |
| 25 |
|
| 26 |
+ sed -e "s|user_options = install_data.user_options$|\0 + [\n\ |
| 27 |
+ ('htmldir=', None, 'HTML documentation install directory')]|" -i \ |
| 28 |
+ setup.py || die #638046 |
| 29 |
+ |
| 30 |
if use native-extensions; then |
| 31 |
printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
| 32 |
setup.cfg || die |
| 33 |
@@ -189,8 +193,14 @@ python_install_all() { |
| 34 |
distutils-r1_python_install_all |
| 35 |
|
| 36 |
local targets=() |
| 37 |
- use doc && targets+=( install_docbook ) |
| 38 |
- use epydoc && targets+=( install_epydoc ) |
| 39 |
+ use doc && targets+=( |
| 40 |
+ install_docbook |
| 41 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 42 |
+ ) |
| 43 |
+ use epydoc && targets+=( |
| 44 |
+ install_epydoc |
| 45 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 46 |
+ ) |
| 47 |
|
| 48 |
# install docs |
| 49 |
if [[ ${targets[@]} ]]; then |
| 50 |
|
| 51 |
diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild |
| 52 |
index 7ee7d2c75f3..e0d4b1ef1b3 100644 |
| 53 |
--- a/sys-apps/portage/portage-2.3.14.ebuild |
| 54 |
+++ b/sys-apps/portage/portage-2.3.14.ebuild |
| 55 |
@@ -87,6 +87,10 @@ pkg_setup() { |
| 56 |
python_prepare_all() { |
| 57 |
distutils-r1_python_prepare_all |
| 58 |
|
| 59 |
+ sed -e "s|user_options = install_data.user_options$|\0 + [\n\ |
| 60 |
+ ('htmldir=', None, 'HTML documentation install directory')]|" -i \ |
| 61 |
+ setup.py || die #638046 |
| 62 |
+ |
| 63 |
if use native-extensions; then |
| 64 |
printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
| 65 |
setup.cfg || die |
| 66 |
@@ -189,8 +193,14 @@ python_install_all() { |
| 67 |
distutils-r1_python_install_all |
| 68 |
|
| 69 |
local targets=() |
| 70 |
- use doc && targets+=( install_docbook ) |
| 71 |
- use epydoc && targets+=( install_epydoc ) |
| 72 |
+ use doc && targets+=( |
| 73 |
+ install_docbook |
| 74 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 75 |
+ ) |
| 76 |
+ use epydoc && targets+=( |
| 77 |
+ install_epydoc |
| 78 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 79 |
+ ) |
| 80 |
|
| 81 |
# install docs |
| 82 |
if [[ ${targets[@]} ]]; then |
| 83 |
|
| 84 |
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild |
| 85 |
index c7453d27b01..adb4f2b5bde 100644 |
| 86 |
--- a/sys-apps/portage/portage-9999.ebuild |
| 87 |
+++ b/sys-apps/portage/portage-9999.ebuild |
| 88 |
@@ -188,8 +188,14 @@ python_install_all() { |
| 89 |
distutils-r1_python_install_all |
| 90 |
|
| 91 |
local targets=() |
| 92 |
- use doc && targets+=( install_docbook ) |
| 93 |
- use epydoc && targets+=( install_epydoc ) |
| 94 |
+ use doc && targets+=( |
| 95 |
+ install_docbook |
| 96 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 97 |
+ ) |
| 98 |
+ use epydoc && targets+=( |
| 99 |
+ install_epydoc |
| 100 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
| 101 |
+ ) |
| 102 |
|
| 103 |
# install docs |
| 104 |
if [[ ${targets[@]} ]]; then |
Archives