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-python/pycurl/
Date: Thu, 27 Aug 2020 05:55:30
Message-Id: 1598507705.10bc81be806dc626ac31707cae3a16c155de7607.mgorny@gentoo
1 commit: 10bc81be806dc626ac31707cae3a16c155de7607
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 27 05:50:40 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 27 05:55:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10bc81be
7
8 dev-python/pycurl: Hack the version to make upgrade less painful
9
10 Change the version number so that egg path changes and avoids collisions
11 while switching from setuptools to distutils.
12
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild | 3 +++
16 dev-python/pycurl/pycurl-7.43.0.5.ebuild | 3 +++
17 2 files changed, 6 insertions(+)
18
19 diff --git a/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
20 index 1b678aa041e..e5a319f2804 100644
21 --- a/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
22 +++ b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
23 @@ -60,6 +60,9 @@ python_prepare_all() {
24 sed -e 's:import wheel:raise ImportError:' -i setup.py || die
25 # these tests are broken with newer versions of bottle
26 sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
27 + # temporary hack to make setuptools->distutils change less painful
28 + # (suggested by Arfrever)
29 + sed -e "/VERSION/s:${PV}:&.0:" -i setup.py || die
30 distutils-r1_python_prepare_all
31 }
32
33
34 diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
35 index 208be0af1b8..321f11ec05b 100644
36 --- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
37 +++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
38 @@ -59,6 +59,9 @@ python_prepare_all() {
39 sed -e 's:import wheel:raise ImportError:' -i setup.py || die
40 # these tests are broken with newer versions of bottle
41 sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
42 + # temporary hack to make setuptools->distutils change less painful
43 + # (suggested by Arfrever)
44 + sed -e "/VERSION/s:${PV}:&.0:" -i setup.py || die
45 distutils-r1_python_prepare_all
46 }