Verbosely deprecate python_parallel_foreach_impl and DISTUTILS_NO_PARALLEL_BUILD.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7d9bccd894f0f37c2a2c73731bb7b7c65158877f..b3dc29ff660f7c29c578f532965c47fc66cac418 100644 (file)
--- 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 <mgorny@gentoo.org> distutils-r1.eclass,
+  python-r1.eclass:
+  Verbosely deprecate python_parallel_foreach_impl and
+  DISTUTILS_NO_PARALLEL_BUILD.
 
   28 Dec 2014; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass:
   Add test recipe for rspec:3 slot.

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index c532c152ed1c36f165b6aaa6faab460593a351de..da5c6871af9137bfa706f2b29e64f818a6db6f9b 100644 (file)
--- 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 482e6462be4fc7247a46b066de0dc7a1441701df..32543de87383e19ca310fe9723477ec85cc91dc9 100644 (file)
--- 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 "${@}"