commit: 527cf7a49319cd2f8d6cc364fb50aeec54e85deb Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Thu Dec 24 01:15:52 2015 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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 <[email protected]> # @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 }
