[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     76ea4b39084f43ebf1e079aa1df02d3a75f62b4e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  1 23:46:07 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov  1 23:46:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76ea4b39

[qt4-r2.eclass] Sync with portage.

---
 eclass/qt4-r2.eclass | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 80c5f5e..c0feabe 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -15,7 +15,7 @@ case ${EAPI} in
        *)       die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit base qmake-utils
+inherit base eutils qmake-utils
 
 export XDG_CONFIG_HOME="${T}"
 
@@ -69,10 +69,10 @@ unset x
 #
 # Example:
 # @CODE
-#      PATCHES=(
-#              "${FILESDIR}/mypatch.patch"
-#              "${FILESDIR}/mypatch2.patch"
-#      )
+# PATCHES=(
+#      "${FILESDIR}/mypatch.patch"
+#      "${FILESDIR}/mypatch2.patch"
+# )
 # @CODE
 
 # @FUNCTION: qt4-r2_src_unpack
@@ -142,14 +142,7 @@ qt4-r2_src_install() {
        debug-print-function $FUNCNAME "$@"
 
        base_src_install INSTALL_ROOT="${D}" "$@"
-
-       # backward compatibility for non-array variables
-       if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != 
"declare -a"* ]]; then
-               dodoc ${DOCS} || die "dodoc failed"
-       fi
-       if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 
2>&1)" != "declare -a"* ]]; then
-               dohtml -r ${HTML_DOCS} || die "dohtml failed"
-       fi
+       einstalldocs
 
        # install translations
        # need to have specified LANGS or LANGSLONG for this to work