Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-r1.eclass python-single-r1.eclass
Date: Tue, 21 May 2013 01:31:08
Message-Id: 20130521013102.EB8AE2171D@flycatcher.gentoo.org
1 floppym 13/05/21 01:31:02
2
3 Modified: ChangeLog distutils-r1.eclass python-r1.eclass
4 python-single-r1.eclass
5 Log:
6 Set PYTHON_REQUIRED_USE, and add it to REQUIRED_USE in distutils-r1.
7
8 Revision Changes Path
9 1.833 eclass/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.833&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.833&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.832&r2=1.833
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
18 retrieving revision 1.832
19 retrieving revision 1.833
20 diff -u -r1.832 -r1.833
21 --- ChangeLog 18 May 2013 16:22:27 -0000 1.832
22 +++ ChangeLog 21 May 2013 01:31:02 -0000 1.833
23 @@ -1,6 +1,10 @@
24 # ChangeLog for eclass directory
25 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.832 2013/05/18 16:22:27 pacho Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.833 2013/05/21 01:31:02 floppym Exp $
28 +
29 + 21 May 2013; Mike Gilbert <floppym@g.o> distutils-r1.eclass,
30 + python-r1.eclass, python-single-r1.eclass:
31 + Set PYTHON_REQUIRED_USE, and add it to REQUIRED_USE in distutils-r1.
32
33 18 May 2013; Pacho Ramos <pacho@g.o> readme.gentoo.eclass:
34 Add a note informing people a file is being installed for future reference,
35
36
37
38 1.71 eclass/distutils-r1.eclass
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.71&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.71&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.70&r2=1.71
43
44 Index: distutils-r1.eclass
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
47 retrieving revision 1.70
48 retrieving revision 1.71
49 diff -u -r1.70 -r1.71
50 --- distutils-r1.eclass 30 Apr 2013 05:36:19 -0000 1.70
51 +++ distutils-r1.eclass 21 May 2013 01:31:02 -0000 1.71
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.70 2013/04/30 05:36:19 mgorny Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.71 2013/05/21 01:31:02 floppym Exp $
57
58 # @ECLASS: distutils-r1
59 # @MAINTAINER:
60 @@ -98,6 +98,7 @@
61 if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
62 RDEPEND=${PYTHON_DEPS}
63 DEPEND=${PYTHON_DEPS}
64 + REQUIRED_USE=${PYTHON_REQUIRED_USE}
65 fi
66
67 # @ECLASS-VARIABLE: PATCHES
68
69
70
71 1.55 eclass/python-r1.eclass
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.55&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.55&content-type=text/plain
75 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.54&r2=1.55
76
77 Index: python-r1.eclass
78 ===================================================================
79 RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
80 retrieving revision 1.54
81 retrieving revision 1.55
82 diff -u -r1.54 -r1.55
83 --- python-r1.eclass 10 May 2013 22:03:30 -0000 1.54
84 +++ python-r1.eclass 21 May 2013 01:31:02 -0000 1.55
85 @@ -1,6 +1,6 @@
86 # Copyright 1999-2013 Gentoo Foundation
87 # Distributed under the terms of the GNU General Public License v2
88 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.54 2013/05/10 22:03:30 mgorny Exp $
89 +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.55 2013/05/21 01:31:02 floppym Exp $
90
91 # @ECLASS: python-r1
92 # @MAINTAINER:
93 @@ -150,6 +150,24 @@
94 # python_targets_python2_6(-)?,python_targets_python2_7(-)?
95 # @CODE
96
97 +# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
98 +# @DESCRIPTION:
99 +# This is an eclass-generated required-use expression which ensures at
100 +# least one Python implementation has been enabled.
101 +#
102 +# This expression should be utilized in an ebuild by including it in
103 +# REQUIRED_USE, optionally behind a use flag.
104 +#
105 +# Example use:
106 +# @CODE
107 +# REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
108 +# @CODE
109 +#
110 +# Example value:
111 +# @CODE
112 +# || ( python_targets_python2_6 python_targets_python2_7 )
113 +# @CODE
114 +
115 _python_set_globals() {
116 local impls=()
117
118 @@ -181,7 +199,7 @@
119 optflags+=,${flags_st[@]/%/(-)}
120
121 IUSE=${flags[*]}
122 - #REQUIRED_USE="|| ( ${flags[*]} )"
123 + PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
124 PYTHON_USEDEP=${optflags// /,}
125
126 # 1) well, python-exec would suffice as an RDEP
127
128
129
130 1.18 eclass/python-single-r1.eclass
131
132 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.18&view=markup
133 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.18&content-type=text/plain
134 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.17&r2=1.18
135
136 Index: python-single-r1.eclass
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
139 retrieving revision 1.17
140 retrieving revision 1.18
141 diff -u -r1.17 -r1.18
142 --- python-single-r1.eclass 10 May 2013 22:03:30 -0000 1.17
143 +++ python-single-r1.eclass 21 May 2013 01:31:02 -0000 1.18
144 @@ -1,6 +1,6 @@
145 # Copyright 1999-2013 Gentoo Foundation
146 # Distributed under the terms of the GNU General Public License v2
147 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.17 2013/05/10 22:03:30 mgorny Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.18 2013/05/21 01:31:02 floppym Exp $
149
150 # @ECLASS: python-single-r1
151 # @MAINTAINER:
152 @@ -133,6 +133,27 @@
153 # python_targets_python2_7(-)?,python_single_target_python2_7(+)?
154 # @CODE
155
156 +# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
157 +# @DESCRIPTION:
158 +# This is an eclass-generated required-use expression which ensures the following:
159 +# 1. Exactly one PYTHON_SINGLE_TARGET value has been enabled.
160 +# 2. The selected PYTHON_SINGLE_TARGET value is enabled in PYTHON_TARGETS.
161 +#
162 +# This expression should be utilized in an ebuild by including it in
163 +# REQUIRED_USE, optionally behind a use flag.
164 +#
165 +# Example use:
166 +# @CODE
167 +# REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
168 +# @CODE
169 +#
170 +# Example value:
171 +# @CODE
172 +# python_single_target_python2_6? ( python_targets_python2_6 )
173 +# python_single_target_python2_7? ( python_targets_python2_7 )
174 +# ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
175 +# @CODE
176 +
177 _python_single_set_globals() {
178 local impls=()
179
180 @@ -144,7 +165,7 @@
181 # The chosen targets need to be in PYTHON_TARGETS as well.
182 # This is in order to enforce correct dependencies on packages
183 # supporting multiple implementations.
184 - #REQUIRED_USE+=" python_single_target_${i}? ( python_targets_${i} )"
185 + PYTHON_REQUIRED_USE+=" python_single_target_${i}? ( python_targets_${i} )"
186
187 python_export "${i}" PYTHON_PKG_DEP
188 PYTHON_DEPS+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) "
189 @@ -163,7 +184,7 @@
190 optflags+=,${flags[@]/%/(+)?}
191
192 IUSE="${flags_mt[*]} ${flags[*]}"
193 - #REQUIRED_USE="|| ( ${flags_mt[*]} ) ^^ ( ${flags[*]} )"
194 + PYTHON_REQUIRED_USE+=" ^^ ( ${flags[*]} )"
195 PYTHON_USEDEP=${optflags// /,}
196
197 # 1) well, python-exec would suffice as an RDEP
Report Message
Find on MARC Find on Google Groups