From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A055C138A1D for ; Sat, 1 Nov 2014 23:46:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05AE7E09CD; Sat, 1 Nov 2014 23:46:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9ED4CE09CD for ; Sat, 1 Nov 2014 23:46:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A2EA3401E6 for ; Sat, 1 Nov 2014 23:46:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B99D393D9 for ; Sat, 1 Nov 2014 23:46:40 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1414885567.76ea4b39084f43ebf1e079aa1df02d3a75f62b4e.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-r2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 76ea4b39084f43ebf1e079aa1df02d3a75f62b4e X-VCS-Branch: master Date: Sat, 1 Nov 2014 23:46:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 049ec534-714b-4d0d-ac7c-1b2a9fd933e1 X-Archives-Hash: 390a667523bb0516570c0b7a78f77255 commit: 76ea4b39084f43ebf1e079aa1df02d3a75f62b4e Author: Davide Pesavento gentoo org> AuthorDate: Sat Nov 1 23:46:07 2014 +0000 Commit: Davide Pesavento gentoo 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