From 4ac0bd159b620bd9fac443edf2c5cef4323433c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 28 Dec 2014 10:56:55 +0000 Subject: [PATCH] Verbosely deprecate python_parallel_foreach_impl and DISTUTILS_NO_PARALLEL_BUILD. --- eclass/ChangeLog | 7 ++++++- eclass/distutils-r1.eclass | 9 ++++++++- eclass/python-r1.eclass | 9 ++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 7d9bccd894f0..b3dc29ff660f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1483 2014/12/28 10:13:18 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1484 2014/12/28 10:56:55 mgorny Exp $ + + 28 Dec 2014; Michał Górny distutils-r1.eclass, + python-r1.eclass: + Verbosely deprecate python_parallel_foreach_impl and + DISTUTILS_NO_PARALLEL_BUILD. 28 Dec 2014; Hans de Graaff ruby-fakegem.eclass: Add test recipe for rspec:3 slot. diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index c532c152ed1c..da5c6871af91 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.107 2014/12/27 19:00:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.108 2014/12/28 10:56:55 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -652,6 +652,13 @@ _distutils-r1_run_common_phase() { _distutils-r1_run_foreach_impl() { debug-print-function ${FUNCNAME} "${@}" + if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then + eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds" + eqawarn "are non-parallel. Please remove it from the ebuild." + + unset DISTUTILS_NO_PARALLEL_BUILD # avoid repeated warnings + fi + # store for restoring after distutils-r1_run_phase. local _DISTUTILS_INITIAL_CWD=${PWD} set -- distutils-r1_run_phase "${@}" diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 482e6462be4f..32543de87383 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.80 2014/12/07 19:15:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.81 2014/12/28 10:56:55 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -724,6 +724,13 @@ python_foreach_impl() { python_parallel_foreach_impl() { debug-print-function ${FUNCNAME} "${@}" + if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then + eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs" + eqawarn "are non-parallel now. Please replace the call with python_foreach_impl." + + _PYTHON_PARALLEL_WARNED=1 + fi + local MULTIBUILD_VARIANTS _python_obtain_impls multibuild_foreach_variant _python_multibuild_wrapper "${@}" -- 2.26.2