1 |
mgorny 12/11/30 22:57:27 |
2 |
|
3 |
Modified: ChangeLog python-single-r1.eclass |
4 |
Log: |
5 |
Add missing REQUIRED_USE constraints to enforce PYTHON_SINGLE_TARGET being in PYTHON_TARGETS. |
6 |
|
7 |
Revision Changes Path |
8 |
1.532 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.532&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.532&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.531&r2=1.532 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.531 |
18 |
retrieving revision 1.532 |
19 |
diff -u -r1.531 -r1.532 |
20 |
--- ChangeLog 30 Nov 2012 11:43:14 -0000 1.531 |
21 |
+++ ChangeLog 30 Nov 2012 22:57:26 -0000 1.532 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.531 2012/11/30 11:43:14 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.532 2012/11/30 22:57:26 mgorny Exp $ |
27 |
+ |
28 |
+ 30 Nov 2012; Michał Górny <mgorny@g.o> python-single-r1.eclass: |
29 |
+ Add missing REQUIRED_USE constraints to enforce PYTHON_SINGLE_TARGET being in |
30 |
+ PYTHON_TARGETS. |
31 |
|
32 |
30 Nov 2012; Michał Górny <mgorny@g.o> python-utils-r1.eclass: |
33 |
Support all EAPIs. |
34 |
|
35 |
|
36 |
|
37 |
1.6 eclass/python-single-r1.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.6&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.6&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.5&r2=1.6 |
42 |
|
43 |
Index: python-single-r1.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v |
46 |
retrieving revision 1.5 |
47 |
retrieving revision 1.6 |
48 |
diff -u -r1.5 -r1.6 |
49 |
--- python-single-r1.eclass 30 Nov 2012 11:40:15 -0000 1.5 |
50 |
+++ python-single-r1.eclass 30 Nov 2012 22:57:26 -0000 1.6 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.5 2012/11/30 11:40:15 mgorny Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.6 2012/11/30 22:57:26 mgorny Exp $ |
56 |
|
57 |
# @ECLASS: python-single-r1 |
58 |
# @MAINTAINER: |
59 |
@@ -151,6 +151,11 @@ |
60 |
PYTHON_DEPS="dev-python/python-exec[${PYTHON_USEDEP}]" |
61 |
local i |
62 |
for i in "${PYTHON_COMPAT[@]}"; do |
63 |
+ # The chosen targets need to be in PYTHON_TARGETS as well. |
64 |
+ # This is in order to enforce correct dependencies on packages |
65 |
+ # supporting multiple implementations. |
66 |
+ REQUIRED_USE+=" python_single_target_${i}? ( python_targets_${i} )" |
67 |
+ |
68 |
local d |
69 |
case ${i} in |
70 |
python*) |