sys-apps/portage: fix -r1 htmldir (bug 638046)

Closes: https://bugs.gentoo.org/638046
Package-Manager: Portage-2.3.14, Repoman-2.3.6

diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index b4ff41814d5fdf8fadb5ce020d701c1949cc431f..9cd0037797371c5e4447e8f76af8f805e5f91b38 100644 (file)
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild
@@ -87,6 +87,10 @@ pkg_setup() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       sed -e "s|user_options = install_data.user_options$|\0 + [\n\
+               ('htmldir=', None, 'HTML documentation install directory')]|" -i \
+               setup.py || die #638046
+
        if use native-extensions; then
                printf "[build_ext]\nportage-ext-modules=true\n" >> \
                        setup.cfg || die
@@ -189,8 +193,14 @@ python_install_all() {
        distutils-r1_python_install_all
 
        local targets=()
-       use doc && targets+=( install_docbook )
-       use epydoc && targets+=( install_epydoc )
+       use doc && targets+=(
+               install_docbook
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
+       use epydoc && targets+=(
+               install_epydoc
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
 
        # install docs
        if [[ ${targets[@]} ]]; then

diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild
index 7ee7d2c75f3096b9fa6dc9a68af10da1fd49976e..e0d4b1ef1b3813de8902110f7589a15e7926b07a 100644 (file)
--- a/sys-apps/portage/portage-2.3.14.ebuild
+++ b/sys-apps/portage/portage-2.3.14.ebuild
@@ -87,6 +87,10 @@ pkg_setup() {
 python_prepare_all() {
        distutils-r1_python_prepare_all
 
+       sed -e "s|user_options = install_data.user_options$|\0 + [\n\
+               ('htmldir=', None, 'HTML documentation install directory')]|" -i \
+               setup.py || die #638046
+
        if use native-extensions; then
                printf "[build_ext]\nportage-ext-modules=true\n" >> \
                        setup.cfg || die
@@ -189,8 +193,14 @@ python_install_all() {
        distutils-r1_python_install_all
 
        local targets=()
-       use doc && targets+=( install_docbook )
-       use epydoc && targets+=( install_epydoc )
+       use doc && targets+=(
+               install_docbook
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
+       use epydoc && targets+=(
+               install_epydoc
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
 
        # install docs
        if [[ ${targets[@]} ]]; then

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c7453d27b016a9f91cbbaa4c7d169f56d70b9e2b..adb4f2b5bde8cfb648b074c32f5797b97a04d006 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -188,8 +188,14 @@ python_install_all() {
        distutils-r1_python_install_all
 
        local targets=()
-       use doc && targets+=( install_docbook )
-       use epydoc && targets+=( install_epydoc )
+       use doc && targets+=(
+               install_docbook
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
+       use epydoc && targets+=(
+               install_epydoc
+               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+       )
 
        # install docs
        if [[ ${targets[@]} ]]; then