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

[Davide Pesavento]

commit:     07f007ae36f9d3cb99df6d4ebd6367098c9b14dc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 19:21:18 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 19:21:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=07f007ae

qt5-build.eclass: sync with gentoo.git

 eclass/qt5-build.eclass | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0c92a306..55537522 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -9,14 +9,14 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 5 or 6.
+# Requires EAPI 6.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
        die "qt5-build.eclass is only to be used for building Qt 5."
 fi
 
 case ${EAPI} in
-       5|6)    : ;;
+       6)      : ;;
        *)      die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
@@ -47,8 +47,7 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-[[ ${EAPI} == 5 ]] && inherit multilib
-inherit eutils flag-o-matic toolchain-funcs versionator virtualx
+inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/";
 
@@ -214,12 +213,7 @@ qt5-build_src_prepare() {
                        src/{corelib/corelib,gui/gui}.pro || die "sed failed 
(optimize_full)"
        fi
 
-       if [[ ${EAPI} == 5 ]]; then
-               [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-               epatch_user
-       else
-               default
-       fi
+       default
 }
 
 # @FUNCTION: qt5-build_src_configure
@@ -477,9 +471,6 @@ qt5_prepare_env() {
 qt5_foreach_target_subdir() {
        [[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
 
-       local die_args=()
-       [[ ${EAPI} != 5 ]] && die_args+=(-n)
-
        local subdir=
        for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
                if [[ ${EBUILD_PHASE} == test ]]; then
@@ -490,12 +481,12 @@ qt5_foreach_target_subdir() {
                local msg="Running $* ${subdir:+in ${subdir}}"
                einfo "${msg}"
 
-               mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die "${die_args[@]}" 
|| return $?
-               pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die 
"${die_args[@]}" || return $?
+               mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die -n || return $?
+               pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die -n || 
return $?
 
-               "$@" || die "${die_args[@]}" "${msg} failed" || return $?
+               "$@" || die -n "${msg} failed" || return $?
 
-               popd >/dev/null || die "${die_args[@]}" || return $?
+               popd >/dev/null || die -n || return $?
        done
 }