| 1 |
mgorny 14/07/06 14:41:17 |
| 2 |
|
| 3 |
Modified: ChangeLog python-r1.eclass |
| 4 |
Log: |
| 5 |
python_gen_cond_dep: delay PYTHON_USEDEP substitution until one of the implementations is actually enabled. Fixes bug #516520. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1312 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1312&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1312&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1311&r2=1.1312 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1311 |
| 18 |
retrieving revision 1.1312 |
| 19 |
diff -u -r1.1311 -r1.1312 |
| 20 |
--- ChangeLog 6 Jul 2014 11:45:20 -0000 1.1311 |
| 21 |
+++ ChangeLog 6 Jul 2014 14:41:17 -0000 1.1312 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1311 2014/07/06 11:45:20 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1312 2014/07/06 14:41:17 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 06 Jul 2014; Michał Górny <mgorny@g.o> python-r1.eclass: |
| 29 |
+ python_gen_cond_dep: delay PYTHON_USEDEP substitution until one of the |
| 30 |
+ implementations is actually enabled. Fixes bug #516520. |
| 31 |
|
| 32 |
06 Jul 2014; Michał Górny <mgorny@g.o> python-utils-r1.eclass: |
| 33 |
Disable python2.6 support and clean up the related code. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.75 eclass/python-r1.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.75&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.75&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.74&r2=1.75 |
| 42 |
|
| 43 |
Index: python-r1.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v |
| 46 |
retrieving revision 1.74 |
| 47 |
retrieving revision 1.75 |
| 48 |
diff -u -r1.74 -r1.75 |
| 49 |
--- python-r1.eclass 19 Jun 2014 08:08:10 -0000 1.74 |
| 50 |
+++ python-r1.eclass 6 Jul 2014 14:41:17 -0000 1.75 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.74 2014/06/19 08:08:10 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.75 2014/07/06 14:41:17 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: python-r1 |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -368,17 +368,19 @@ |
| 60 |
local dep=${1} |
| 61 |
shift |
| 62 |
|
| 63 |
- # substitute ${PYTHON_USEDEP} if used |
| 64 |
- if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then |
| 65 |
- local PYTHON_USEDEP=$(python_gen_usedep "${@}") |
| 66 |
- dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} |
| 67 |
- fi |
| 68 |
- |
| 69 |
for impl in "${PYTHON_COMPAT[@]}"; do |
| 70 |
_python_impl_supported "${impl}" || continue |
| 71 |
|
| 72 |
for pattern; do |
| 73 |
if [[ ${impl} == ${pattern} ]]; then |
| 74 |
+ # substitute ${PYTHON_USEDEP} if used |
| 75 |
+ # (since python_gen_usedep() will not return ${PYTHON_USEDEP} |
| 76 |
+ # the code is run at most once) |
| 77 |
+ if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then |
| 78 |
+ local PYTHON_USEDEP=$(python_gen_usedep "${@}") |
| 79 |
+ dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} |
| 80 |
+ fi |
| 81 |
+ |
| 82 |
matches+=( "python_targets_${impl}? ( ${dep} )" ) |
| 83 |
break |
| 84 |
fi |
Archives