Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.2_rc67.ebuild portage-9999.ebuild portage-2.1.7.17.ebuild ChangeLog portage-2.1.8.3.ebuild
Date: Tue, 03 Aug 2010 05:02:17
Message-Id: 20100803042958.D6EB52CC0B@corvid.gentoo.org
1 zmedico 10/08/03 04:29:58
2
3 Modified: portage-2.2_rc67.ebuild portage-9999.ebuild
4 portage-2.1.7.17.ebuild ChangeLog
5 portage-2.1.8.3.ebuild
6 Log:
7 Bug #321785 - Use build? conditional to avoid pulling in python3 for stage1 builds.
8
9 (Portage version: 2.2_rc67_p298/cvs/Linux i686)
10
11 Revision Changes Path
12 1.2 sys-apps/portage/portage-2.2_rc67.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild?r1=1.1&r2=1.2
17
18 Index: portage-2.2_rc67.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- portage-2.2_rc67.ebuild 10 Mar 2010 04:08:54 -0000 1.1
25 +++ portage-2.2_rc67.ebuild 3 Aug 2010 04:29:58 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2010 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild,v 1.1 2010/03/10 04:08:54 zmedico Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc67.ebuild,v 1.2 2010/08/03 04:29:58 zmedico Exp $
31
32 # Require EAPI 2 since we now require at least python-2.6 (for python 3
33 # syntax support) which also requires EAPI 2.
34 @@ -16,7 +16,10 @@
35 IUSE="build doc epydoc linguas_pl python3 selinux"
36
37 python_dep="python3? ( =dev-lang/python-3* )
38 - !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
39 + !python3? (
40 + build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) )
41 + !build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
42 + )"
43
44 # The pysqlite blocker is for bug #282760.
45 DEPEND="${python_dep}
46
47
48
49 1.6 sys-apps/portage/portage-9999.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.6&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.6&content-type=text/plain
53 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.5&r2=1.6
54
55 Index: portage-9999.ebuild
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
58 retrieving revision 1.5
59 retrieving revision 1.6
60 diff -u -r1.5 -r1.6
61 --- portage-9999.ebuild 27 Jul 2010 07:52:42 -0000 1.5
62 +++ portage-9999.ebuild 3 Aug 2010 04:29:58 -0000 1.6
63 @@ -1,6 +1,6 @@
64 # Copyright 1999-2010 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.5 2010/07/27 07:52:42 zmedico Exp $
67 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.6 2010/08/03 04:29:58 zmedico Exp $
68
69 # Require EAPI 2 since we now require at least python-2.6 (for python 3
70 # syntax support) which also requires EAPI 2.
71 @@ -16,7 +16,10 @@
72 IUSE="build doc epydoc python3 selinux"
73
74 python_dep="python3? ( =dev-lang/python-3* )
75 - !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
76 + !python3? (
77 + build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) )
78 + !build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
79 + )"
80
81 # The pysqlite blocker is for bug #282760.
82 DEPEND="${python_dep}
83
84
85
86 1.12 sys-apps/portage/portage-2.1.7.17.ebuild
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.12&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.12&content-type=text/plain
90 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?r1=1.11&r2=1.12
91
92 Index: portage-2.1.7.17.ebuild
93 ===================================================================
94 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v
95 retrieving revision 1.11
96 retrieving revision 1.12
97 diff -u -r1.11 -r1.12
98 --- portage-2.1.7.17.ebuild 10 Mar 2010 14:12:36 -0000 1.11
99 +++ portage-2.1.7.17.ebuild 3 Aug 2010 04:29:58 -0000 1.12
100 @@ -1,6 +1,6 @@
101 # Copyright 1999-2010 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.11 2010/03/10 14:12:36 ranger Exp $
104 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.12 2010/08/03 04:29:58 zmedico Exp $
105
106 # Require EAPI 2 since we now require at least python-2.6 (for python 3
107 # syntax support) which also requires EAPI 2.
108 @@ -16,7 +16,10 @@
109 IUSE="build doc epydoc linguas_pl python3 selinux"
110
111 python_dep="python3? ( =dev-lang/python-3* )
112 - !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
113 + !python3? (
114 + build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) )
115 + !build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
116 + )"
117
118 # The pysqlite blocker is for bug #282760.
119 DEPEND="${python_dep}
120
121
122
123 1.708 sys-apps/portage/ChangeLog
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.708&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.708&content-type=text/plain
127 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.707&r2=1.708
128
129 Index: ChangeLog
130 ===================================================================
131 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
132 retrieving revision 1.707
133 retrieving revision 1.708
134 diff -u -r1.707 -r1.708
135 --- ChangeLog 27 Jul 2010 07:52:42 -0000 1.707
136 +++ ChangeLog 3 Aug 2010 04:29:58 -0000 1.708
137 @@ -1,6 +1,11 @@
138 # ChangeLog for sys-apps/portage
139 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
140 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.707 2010/07/27 07:52:42 zmedico Exp $
141 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.708 2010/08/03 04:29:58 zmedico Exp $
142 +
143 + 03 Aug 2010; Zac Medico <zmedico@g.o> portage-2.1.7.17.ebuild,
144 + portage-2.1.8.3.ebuild, portage-2.2_rc67.ebuild, portage-9999.ebuild:
145 + Bug #321785 - Use build? conditional to avoid pulling in python3 for
146 + stage1 builds.
147
148 27 Jul 2010; Zac Medico <zmedico@g.o> portage-9999.ebuild:
149 Fix installation of sets/portage.conf (was sets.conf).
150
151
152
153 1.8 sys-apps/portage/portage-2.1.8.3.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild?rev=1.8&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild?rev=1.8&content-type=text/plain
157 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild?r1=1.7&r2=1.8
158
159 Index: portage-2.1.8.3.ebuild
160 ===================================================================
161 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild,v
162 retrieving revision 1.7
163 retrieving revision 1.8
164 diff -u -r1.7 -r1.8
165 --- portage-2.1.8.3.ebuild 30 Apr 2010 14:40:00 -0000 1.7
166 +++ portage-2.1.8.3.ebuild 3 Aug 2010 04:29:58 -0000 1.8
167 @@ -1,6 +1,6 @@
168 # Copyright 1999-2010 Gentoo Foundation
169 # Distributed under the terms of the GNU General Public License v2
170 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild,v 1.7 2010/04/30 14:40:00 ranger Exp $
171 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.8.3.ebuild,v 1.8 2010/08/03 04:29:58 zmedico Exp $
172
173 # Require EAPI 2 since we now require at least python-2.6 (for python 3
174 # syntax support) which also requires EAPI 2.
175 @@ -16,7 +16,10 @@
176 IUSE="build doc epydoc linguas_pl python3 selinux"
177
178 python_dep="python3? ( =dev-lang/python-3* )
179 - !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
180 + !python3? (
181 + build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 ) )
182 + !build? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
183 + )"
184
185 # The pysqlite blocker is for bug #282760.
186 DEPEND="${python_dep}