As we should not do anything crazy with DOCS and HTML_DOCS, let's simplify our eclass
-- Best regards, Sergey Popov Gentoo developer Gentoo Desktop-effects project lead Gentoo Qt project lead Gentoo Proxy maintainers project lead
--- qt4-r2.eclass.orig 2014-06-18 23:37:57.867075343 +0400 +++ qt4-r2.eclass 2014-06-18 23:38:35.906075145 +0400 @@ -15,7 +15,7 @@ *) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;; esac -inherit base qmake-utils +inherit base eutils qmake-utils export XDG_CONFIG_HOME="${T}" @@ -132,14 +132,7 @@ 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 } EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
signature.asc
Description: OpenPGP digital signature