[gentoo-commits] proj/portage:master commit in: bin/

[Michał Górny]

commit:     cb48432a949ecf1bde200b729f3885e9957f90d2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 17 17:40:31 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  4 14:01:34 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cb48432a

Add tentative support for EAPI6 --docdir and --htmldir

Pass --docdir and --htmldir to configure scripts that support it.

---
 bin/eapi.sh          |  4 ++++
 bin/phase-helpers.sh | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bin/eapi.sh b/bin/eapi.sh
index 623b89f..5f96c3b 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -110,6 +110,10 @@ ___eapi_econf_passes_--disable-silent-rules() {
        [[ ! ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
 }
 
+___eapi_econf_passes_--docdir_and_--htmldir() {
+       [[ ! ${1-${EAPI}} =~ 
^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]]
+}
+
 ___eapi_use_enable_and_use_with_support_empty_third_argument() {
        [[ ! ${1-${EAPI}} =~ ^(0|1|2|3)$ ]]
 }

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 3e63b11..9738a3a 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -558,7 +558,7 @@ econf() {
                fi
 
                local conf_args=()
-               if ___eapi_econf_passes_--disable-dependency-tracking || 
___eapi_econf_passes_--disable-silent-rules; then
+               if ___eapi_econf_passes_--disable-dependency-tracking || 
___eapi_econf_passes_--disable-silent-rules || 
___eapi_econf_passes_--docdir_and_--htmldir; then
                        local conf_help=$("${ECONF_SOURCE}/configure" --help 
2>/dev/null)
 
                        if ___eapi_econf_passes_--disable-dependency-tracking; 
then
@@ -572,6 +572,16 @@ econf() {
                                        conf_args+=( --disable-silent-rules )
                                fi
                        fi
+
+                       if ___eapi_econf_passes_--docdir_and_--htmldir; then
+                               if [[ ${conf_help} == *--docdir* ]]; then
+                                       conf_args+=( 
--docdir="${EPREFIX}"/usr/share/doc/${PF} )
+                               fi
+
+                               if [[ ${conf_help} == *--htmldir* ]]; then
+                                       conf_args+=( 
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html )
+                               fi
+                       fi
                fi
 
                # if the profile defines a location to install libs to aside 
from default, pass it on.