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 569BE1384B4 for ; Sun, 22 Nov 2015 23:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B9DC21C015; Sun, 22 Nov 2015 23:09:29 +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 000DF21C015 for ; Sun, 22 Nov 2015 23:09:28 +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 A11CE3405D5 for ; Sun, 22 Nov 2015 23:09:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E53D4A7F for ; Sun, 22 Nov 2015 23:09:24 +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: <1448233649.f3886df8a10a03548efb3941c84aefc51fb4b195.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: f3886df8a10a03548efb3941c84aefc51fb4b195 X-VCS-Branch: master Date: Sun, 22 Nov 2015 23:09:24 +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: 86964e4a-a624-4a70-9223-8fd574bc729b X-Archives-Hash: 2ed8b476b48642991c4c55a33e42b07c commit: f3886df8a10a03548efb3941c84aefc51fb4b195 Author: Davide Pesavento gentoo org> AuthorDate: Sun Nov 22 23:07:29 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Nov 22 23:07:29 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f3886df8 qt5-build.eclass: add missing die when using cat with heredocs eclass/qt5-build.eclass | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 4ad6ee0..63c6617 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -17,12 +17,9 @@ case ${EAPI} in *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; esac +[[ ${EAPI} == 5 ]] && inherit multilib inherit eutils flag-o-matic toolchain-funcs versionator virtualx -if [[ ${EAPI} == 5 ]]; then - inherit multilib -fi - HOMEPAGE="https://www.qt.io/" LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" @@ -243,12 +240,12 @@ qt5-build_src_test() { # create a custom testrunner script that correctly sets # {,DY}LD_LIBRARY_PATH before executing the given test local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner - cat <<-EOF > "${testrunner}" + cat > "${testrunner}" <<-_EOF_ || die #!/bin/sh export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}" export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}" "\$@" - EOF + _EOF_ chmod +x "${testrunner}" _qt5_test_runner() { @@ -293,7 +290,7 @@ qt5-build_src_install() { || die "sed failed (qconfig.h)" # install qtchooser configuration file - cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ + cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die ${QT5_BINDIR} ${QT5_LIBDIR} _EOF_