From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5ECC7139694 for ; Tue, 25 Apr 2017 19:22:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5DC5E0DED; Tue, 25 Apr 2017 19:22:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89F57E0DED for ; Tue, 25 Apr 2017 19:21:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4AC3341659 for ; Tue, 25 Apr 2017 19:21:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53C7B7429 for ; Tue, 25 Apr 2017 19:21:47 +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: <1493148078.07f007ae36f9d3cb99df6d4ebd6367098c9b14dc.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: 07f007ae36f9d3cb99df6d4ebd6367098c9b14dc X-VCS-Branch: master Date: Tue, 25 Apr 2017 19:21:47 +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: 60943500-fc03-4625-a5e4-c013fcce895a X-Archives-Hash: f8a8f5b8c4f9d1e1a85843328a1b9fb4 commit: 07f007ae36f9d3cb99df6d4ebd6367098c9b14dc Author: Davide Pesavento gentoo org> AuthorDate: Tue Apr 25 19:21:18 2017 +0000 Commit: Davide Pesavento gentoo 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 }