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 3A0EF1388C1 for ; Thu, 24 Dec 2015 01:18:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B452E0887; Thu, 24 Dec 2015 01:18:22 +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 C4850E0886 for ; Thu, 24 Dec 2015 01:18:21 +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 CDDA3340686 for ; Thu, 24 Dec 2015 01:18:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 841E5CB1 for ; Thu, 24 Dec 2015 01:18:18 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1450919752.527cf7a49319cd2f8d6cc364fb50aeec54e85deb.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/multibuild.eclass X-VCS-Directories: eclass/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 527cf7a49319cd2f8d6cc364fb50aeec54e85deb X-VCS-Branch: master Date: Thu, 24 Dec 2015 01:18:18 +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: fe4f4b88-24b3-4dc8-af1a-4e64eeda299c X-Archives-Hash: 5e050e53392a42a33eed7bb685c5a18e commit: 527cf7a49319cd2f8d6cc364fb50aeec54e85deb Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Dec 24 01:15:52 2015 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu Dec 24 01:15:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=527cf7a4 multibuild.eclass: sync with gentoo.git eclass/multibuild.eclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass index ede0f03..912545c 100644 --- a/eclass/multibuild.eclass +++ b/eclass/multibuild.eclass @@ -1,8 +1,8 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.20 2014/12/13 08:42:42 mgorny Exp $ +# $Id$ -# @ECLASS: multibuild +# @ECLASS: multibuild.eclass # @MAINTAINER: # Michał Górny # @AUTHOR: @@ -17,7 +17,7 @@ case "${EAPI:-0}" in 0|1|2|3) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 4|5) + 4|5|6) ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -158,6 +158,8 @@ multibuild_foreach_variant() { multibuild_parallel_foreach_variant() { debug-print-function ${FUNCNAME} "${@}" + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" + multibuild_foreach_variant "${@}" } @@ -205,7 +207,7 @@ multibuild_copy_sources() { _multibuild_create_source_copy() { einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}" - cp -pr "${cp_args[@]}" \ + cp -p -R "${cp_args[@]}" \ "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die }