| 1 |
commit: 0b7a6ea689c896fa26dbc857f5e8c13628596a0d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 25 17:46:55 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 25 17:46:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7a6ea6 |
| 7 |
|
| 8 |
sci-geosciences/gpsd: call python_setup uncondiitonally |
| 9 |
|
| 10 |
python_setup is called by the distutils machinery |
| 11 |
when USE=python, but wasn't in the USE=-python case |
| 12 |
until now. |
| 13 |
|
| 14 |
We need this because we're using (e)scons to build. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/734352 |
| 17 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
sci-geosciences/gpsd/gpsd-3.21.ebuild | 7 ++++++- |
| 21 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild |
| 24 |
index 12d81cded2b..8083dc4252b 100644 |
| 25 |
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild |
| 26 |
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild |
| 27 |
@@ -100,7 +100,12 @@ src_prepare() { |
| 28 |
|
| 29 |
default |
| 30 |
|
| 31 |
- use python && distutils-r1_src_prepare |
| 32 |
+ if use python ; then |
| 33 |
+ distutils-r1_src_prepare |
| 34 |
+ else |
| 35 |
+ # We're using escons, bug #734352 |
| 36 |
+ python_setup |
| 37 |
+ fi |
| 38 |
} |
| 39 |
|
| 40 |
python_prepare_all() { |
Archives