Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/
Date: Sat, 30 Jul 2016 19:14:03
Message-Id: 1469906026.b7a4174e075a922a255c0ff4a6ebd4f6d0437c61.mgorny@gentoo
1 commit: b7a4174e075a922a255c0ff4a6ebd4f6d0437c61
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 30 19:07:29 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 30 19:13:46 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a4174e
7
8 dev-lang/python: Remove remnants of python-updater
9
10 Remove the remaining dependencies on deprecated python-updater,
11 and update the postinst messages appropriately. For Python 2.7,
12 the message has been removed altogether since it is the oldest version
13 supported by PYTHON_TARGETS. For the remaining versions, just inform
14 about potential PYTHON_TARGETS changes necessary.
15
16 The modified versions are not revision-bumped to avoid unnecessary
17 rebuilds due to a minor change. The versions that are still
18 newest-visible (i.e. not replaced by another version or revision bump)
19 will be bumped when python-updater is lastrited.
20
21 dev-lang/python/python-2.7.10-r1.ebuild | 17 ++---------------
22 dev-lang/python/python-2.7.11-r2.ebuild | 17 ++---------------
23 dev-lang/python/python-2.7.12.ebuild | 15 +--------------
24 dev-lang/python/python-3.3.5-r3.ebuild | 5 +----
25 dev-lang/python/python-3.3.5-r8.ebuild | 5 +----
26 dev-lang/python/python-3.4.3-r1.ebuild | 5 ++---
27 dev-lang/python/python-3.4.3-r7.ebuild | 5 ++---
28 dev-lang/python/python-3.4.4.ebuild | 5 ++---
29 dev-lang/python/python-3.4.5.ebuild | 3 +--
30 9 files changed, 14 insertions(+), 63 deletions(-)
31
32 diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
33 index 5715577..aaf1b14 100644
34 --- a/dev-lang/python/python-2.7.10-r1.ebuild
35 +++ b/dev-lang/python/python-2.7.10-r1.ebuild
36 @@ -1,4 +1,4 @@
37 -# Copyright 1999-2015 Gentoo Foundation
38 +# Copyright 1999-2016 Gentoo Foundation
39 # Distributed under the terms of the GNU General Public License v2
40 # $Id$
41
42 @@ -64,8 +64,7 @@ DEPEND="${RDEPEND}
43 !sys-devel/gcc[libffi]"
44 RDEPEND+=" !build? ( app-misc/mime-types )
45 doc? ( dev-python/python-docs:${SLOT} )"
46 -PDEPEND="app-eselect/eselect-python
47 - app-admin/python-updater"
48 +PDEPEND="app-eselect/eselect-python"
49
50 S="${WORKDIR}/${MY_P}"
51
52 @@ -329,12 +328,6 @@ src_install() {
53 python_domodule epython.py
54 }
55
56 -pkg_preinst() {
57 - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
58 - python_updater_warning="1"
59 - fi
60 -}
61 -
62 eselect_python_update() {
63 if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
64 eselect python update
65 @@ -347,12 +340,6 @@ eselect_python_update() {
66
67 pkg_postinst() {
68 eselect_python_update
69 -
70 - if [[ "${python_updater_warning}" == "1" ]]; then
71 - ewarn "You have just upgraded from an older version of Python."
72 - ewarn "You should switch active version of Python ${PV%%.*} and run"
73 - ewarn "'python-updater [options]' to rebuild Python modules."
74 - fi
75 }
76
77 pkg_postrm() {
78
79 diff --git a/dev-lang/python/python-2.7.11-r2.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
80 index 50bc7a2..9eeab0c 100644
81 --- a/dev-lang/python/python-2.7.11-r2.ebuild
82 +++ b/dev-lang/python/python-2.7.11-r2.ebuild
83 @@ -1,4 +1,4 @@
84 -# Copyright 1999-2015 Gentoo Foundation
85 +# Copyright 1999-2016 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87 # $Id$
88
89 @@ -66,8 +66,7 @@ DEPEND="${RDEPEND}
90 !sys-devel/gcc[libffi]"
91 RDEPEND+=" !build? ( app-misc/mime-types )
92 doc? ( dev-python/python-docs:${SLOT} )"
93 -PDEPEND=">=app-eselect/eselect-python-20140125-r1
94 - app-admin/python-updater"
95 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
96
97 S="${WORKDIR}/${MY_P}"
98
99 @@ -343,12 +342,6 @@ src_install() {
100 fi
101 }
102
103 -pkg_preinst() {
104 - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
105 - python_updater_warning="1"
106 - fi
107 -}
108 -
109 eselect_python_update() {
110 if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
111 eselect python update
112 @@ -357,12 +350,6 @@ eselect_python_update() {
113
114 pkg_postinst() {
115 eselect_python_update
116 -
117 - if [[ "${python_updater_warning}" == "1" ]]; then
118 - ewarn "You have just upgraded from an older version of Python."
119 - ewarn "You should switch active version of Python ${PV%%.*} and run"
120 - ewarn "'python-updater [options]' to rebuild Python modules."
121 - fi
122 }
123
124 pkg_postrm() {
125
126 diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
127 index 15f7436..992882b 100644
128 --- a/dev-lang/python/python-2.7.12.ebuild
129 +++ b/dev-lang/python/python-2.7.12.ebuild
130 @@ -66,8 +66,7 @@ DEPEND="${RDEPEND}
131 !sys-devel/gcc[libffi]"
132 RDEPEND+=" !build? ( app-misc/mime-types )
133 doc? ( dev-python/python-docs:${SLOT} )"
134 -PDEPEND=">=app-eselect/eselect-python-20140125-r1
135 - app-admin/python-updater"
136 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
137
138 S="${WORKDIR}/${MY_P}"
139
140 @@ -343,12 +342,6 @@ src_install() {
141 fi
142 }
143
144 -pkg_preinst() {
145 - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
146 - python_updater_warning="1"
147 - fi
148 -}
149 -
150 eselect_python_update() {
151 if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
152 eselect python update
153 @@ -357,12 +350,6 @@ eselect_python_update() {
154
155 pkg_postinst() {
156 eselect_python_update
157 -
158 - if [[ "${python_updater_warning}" == "1" ]]; then
159 - ewarn "You have just upgraded from an older version of Python."
160 - ewarn "You should switch active version of Python ${PV%%.*} and run"
161 - ewarn "'python-updater [options]' to rebuild Python modules."
162 - fi
163 }
164
165 pkg_postrm() {
166
167 diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r3.ebuild
168 index 6ff606d..42477ed 100644
169 --- a/dev-lang/python/python-3.3.5-r3.ebuild
170 +++ b/dev-lang/python/python-3.3.5-r3.ebuild
171 @@ -54,8 +54,7 @@ DEPEND="${RDEPEND}
172 !sys-devel/gcc[libffi]"
173 RDEPEND+=" !build? ( app-misc/mime-types )
174 doc? ( dev-python/python-docs:${SLOT} )"
175 -PDEPEND="app-eselect/eselect-python
176 - app-admin/python-updater"
177 +PDEPEND="app-eselect/eselect-python"
178
179 S="${WORKDIR}/${MY_P}"
180
181 @@ -319,8 +318,6 @@ pkg_postinst() {
182 ewarn "You have just upgraded from an older version of Python."
183 ewarn
184 ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
185 - ewarn
186 - ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
187 fi
188 }
189
190
191 diff --git a/dev-lang/python/python-3.3.5-r8.ebuild b/dev-lang/python/python-3.3.5-r8.ebuild
192 index 9960449..e7f91bd 100644
193 --- a/dev-lang/python/python-3.3.5-r8.ebuild
194 +++ b/dev-lang/python/python-3.3.5-r8.ebuild
195 @@ -60,8 +60,7 @@ DEPEND="${RDEPEND}
196 !sys-devel/gcc[libffi]"
197 RDEPEND+=" !build? ( app-misc/mime-types )
198 doc? ( dev-python/python-docs:${PYVER} )"
199 -PDEPEND=">=app-eselect/eselect-python-20140125-r1
200 - app-admin/python-updater"
201 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
202
203 S="${WORKDIR}/${MY_P}"
204
205 @@ -363,8 +362,6 @@ pkg_postinst() {
206 ewarn "You have just upgraded from an older version of Python."
207 ewarn
208 ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
209 - ewarn
210 - ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
211 fi
212 }
213
214
215 diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
216 index 0f32b94..d7dab16 100644
217 --- a/dev-lang/python/python-3.4.3-r1.ebuild
218 +++ b/dev-lang/python/python-3.4.3-r1.ebuild
219 @@ -1,4 +1,4 @@
220 -# Copyright 1999-2015 Gentoo Foundation
221 +# Copyright 1999-2016 Gentoo Foundation
222 # Distributed under the terms of the GNU General Public License v2
223 # $Id$
224
225 @@ -51,8 +51,7 @@ DEPEND="${RDEPEND}
226 >=sys-devel/autoconf-2.65
227 !sys-devel/gcc[libffi]"
228 RDEPEND+=" !build? ( app-misc/mime-types )"
229 -PDEPEND="app-eselect/eselect-python
230 - app-admin/python-updater"
231 +PDEPEND="app-eselect/eselect-python"
232
233 S="${WORKDIR}/${MY_P}"
234
235
236 diff --git a/dev-lang/python/python-3.4.3-r7.ebuild b/dev-lang/python/python-3.4.3-r7.ebuild
237 index 38e9228..51a14db 100644
238 --- a/dev-lang/python/python-3.4.3-r7.ebuild
239 +++ b/dev-lang/python/python-3.4.3-r7.ebuild
240 @@ -1,4 +1,4 @@
241 -# Copyright 1999-2015 Gentoo Foundation
242 +# Copyright 1999-2016 Gentoo Foundation
243 # Distributed under the terms of the GNU General Public License v2
244 # $Id$
245
246 @@ -53,8 +53,7 @@ DEPEND="${RDEPEND}
247 >=sys-devel/autoconf-2.65
248 !sys-devel/gcc[libffi]"
249 RDEPEND+=" !build? ( app-misc/mime-types )"
250 -PDEPEND=">=app-eselect/eselect-python-20140125-r1
251 - app-admin/python-updater"
252 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
253
254 S="${WORKDIR}/${MY_P}"
255
256
257 diff --git a/dev-lang/python/python-3.4.4.ebuild b/dev-lang/python/python-3.4.4.ebuild
258 index e1e7af2..a5ef671 100644
259 --- a/dev-lang/python/python-3.4.4.ebuild
260 +++ b/dev-lang/python/python-3.4.4.ebuild
261 @@ -1,4 +1,4 @@
262 -# Copyright 1999-2015 Gentoo Foundation
263 +# Copyright 1999-2016 Gentoo Foundation
264 # Distributed under the terms of the GNU General Public License v2
265 # $Id$
266
267 @@ -53,8 +53,7 @@ DEPEND="${RDEPEND}
268 >=sys-devel/autoconf-2.65
269 !sys-devel/gcc[libffi]"
270 RDEPEND+=" !build? ( app-misc/mime-types )"
271 -PDEPEND=">=app-eselect/eselect-python-20140125-r1
272 - app-admin/python-updater"
273 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
274
275 S="${WORKDIR}/${MY_P}"
276
277
278 diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
279 index 9491f2d..433a3a3 100644
280 --- a/dev-lang/python/python-3.4.5.ebuild
281 +++ b/dev-lang/python/python-3.4.5.ebuild
282 @@ -53,8 +53,7 @@ DEPEND="${RDEPEND}
283 >=sys-devel/autoconf-2.65
284 !sys-devel/gcc[libffi]"
285 RDEPEND+=" !build? ( app-misc/mime-types )"
286 -PDEPEND=">=app-eselect/eselect-python-20140125-r1
287 - app-admin/python-updater"
288 +PDEPEND=">=app-eselect/eselect-python-20140125-r1"
289
290 S="${WORKDIR}/${MY_P}"