Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
Date: Wed, 30 Oct 2013 19:14:05
Message-Id: 20131030191402.8857C20047@flycatcher.gentoo.org
1 mgorny 13/10/30 19:14:02
2
3 Modified: ChangeLog python-r1.eclass python-single-r1.eclass
4 python-utils-r1.eclass
5 Log:
6 Switch the eclasses to use dev-lang/python-exec.
7
8 Revision Changes Path
9 1.1040 eclass/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1040&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1040&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1039&r2=1.1040
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
18 retrieving revision 1.1039
19 retrieving revision 1.1040
20 diff -u -r1.1039 -r1.1040
21 --- ChangeLog 27 Oct 2013 13:44:35 -0000 1.1039
22 +++ ChangeLog 30 Oct 2013 19:14:02 -0000 1.1040
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.1039 2013/10/27 13:44:35 mgorny Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1040 2013/10/30 19:14:02 mgorny Exp $
28 +
29 + 30 Oct 2013; Michał Górny <mgorny@g.o> python-r1.eclass,
30 + python-single-r1.eclass, python-utils-r1.eclass:
31 + Switch the eclasses to use dev-lang/python-exec.
32
33 27 Oct 2013; Michał Górny <mgorny@g.o> git-r3.eclass:
34 Create a fake ".git" directory inside the checkout to satisfy git rev-parse
35
36
37
38 1.64 eclass/python-r1.eclass
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.64&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.64&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.63&r2=1.64
43
44 Index: python-r1.eclass
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
47 retrieving revision 1.63
48 retrieving revision 1.64
49 diff -u -r1.63 -r1.64
50 --- python-r1.eclass 22 Oct 2013 15:16:56 -0000 1.63
51 +++ python-r1.eclass 30 Oct 2013 19:14:02 -0000 1.64
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/python-r1.eclass,v 1.63 2013/10/22 15:16:56 mgorny Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.64 2013/10/30 19:14:02 mgorny Exp $
57
58 # @ECLASS: python-r1
59 # @MAINTAINER:
60 @@ -122,7 +122,7 @@
61 #
62 # Example value:
63 # @CODE
64 -# dev-python/python-exec:=
65 +# dev-lang/python-exec:=
66 # python_targets_python2_6? ( dev-lang/python:2.6[gdbm] )
67 # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] )
68 # @CODE
69 @@ -206,9 +206,9 @@
70 # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
71 # just fix :2 since := deps are not supported.
72 if [[ ${EAPI} != 4 ]]; then
73 - PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]"
74 + PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
75 else
76 - PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]"
77 + PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
78 fi
79 }
80 _python_set_globals
81 @@ -418,7 +418,7 @@
82 _PYTHON_USE_PYTHON_CHECKED=1
83
84 # python-exec has profile-forced flags.
85 - if [[ ${CATEGORY}/${PN} == dev-python/python-exec ]]; then
86 + if [[ ${CATEGORY}/${PN} == dev-lang/python-exec ]]; then
87 return
88 fi
89
90
91
92
93 1.24 eclass/python-single-r1.eclass
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.24&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.24&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.23&r2=1.24
98
99 Index: python-single-r1.eclass
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
102 retrieving revision 1.23
103 retrieving revision 1.24
104 diff -u -r1.23 -r1.24
105 --- python-single-r1.eclass 22 Oct 2013 15:16:56 -0000 1.23
106 +++ python-single-r1.eclass 30 Oct 2013 19:14:02 -0000 1.24
107 @@ -1,6 +1,6 @@
108 # Copyright 1999-2013 Gentoo Foundation
109 # Distributed under the terms of the GNU General Public License v2
110 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.23 2013/10/22 15:16:56 mgorny Exp $
111 +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.24 2013/10/30 19:14:02 mgorny Exp $
112
113 # @ECLASS: python-single-r1
114 # @MAINTAINER:
115 @@ -109,7 +109,7 @@
116 #
117 # Example value:
118 # @CODE
119 -# dev-python/python-exec:0
120 +# dev-lang/python-exec:=
121 # python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] )
122 # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
123 # @CODE
124 @@ -195,9 +195,9 @@
125 # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
126 # just fix :2 since := deps are not supported.
127 if [[ ${EAPI} != 4 ]]; then
128 - PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]"
129 + PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
130 else
131 - PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]"
132 + PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
133 fi
134 }
135 _python_single_set_globals
136
137
138
139 1.45 eclass/python-utils-r1.eclass
140
141 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.45&view=markup
142 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.45&content-type=text/plain
143 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.44&r2=1.45
144
145 Index: python-utils-r1.eclass
146 ===================================================================
147 RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
148 retrieving revision 1.44
149 retrieving revision 1.45
150 diff -u -r1.44 -r1.45
151 --- python-utils-r1.eclass 27 Oct 2013 07:27:52 -0000 1.44
152 +++ python-utils-r1.eclass 30 Oct 2013 19:14:02 -0000 1.45
153 @@ -1,6 +1,6 @@
154 # Copyright 1999-2013 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.44 2013/10/27 07:27:52 mgorny Exp $
157 +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.45 2013/10/30 19:14:02 mgorny Exp $
158
159 # @ECLASS: python-utils-r1
160 # @MAINTAINER:
161 @@ -981,7 +981,7 @@
162
163 # Check if we cached the result, or someone put an override.
164 if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then
165 - has_version 'dev-python/python-exec:2'
166 + has_version 'dev-lang/python-exec:2'
167 _PYTHON_WANT_PYTHON_EXEC2=$(( ! ${?} ))
168 fi