1 |
commit: 7a670969b8e815cc1919e0d5734544ef0a55174d |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 25 17:51:48 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 25 17:51:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a670969 |
7 |
|
8 |
sci-geosciences/gpsd: misc fixes |
9 |
|
10 |
- Add missing || dies |
11 |
- Guard python-bindings build system workaround with USE=python |
12 |
(issue uncovered by added || die) |
13 |
|
14 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
sci-geosciences/gpsd/gpsd-3.21.ebuild | 15 +++++++++------ |
18 |
1 file changed, 9 insertions(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild |
21 |
index 8083dc4252b..427bd9baf5c 100644 |
22 |
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild |
23 |
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild |
24 |
@@ -6,7 +6,7 @@ EAPI=7 |
25 |
DISTUTILS_OPTIONAL=1 |
26 |
PYTHON_COMPAT=( python3_{6..9} ) |
27 |
|
28 |
-inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs |
29 |
+inherit distutils-r1 scons-utils toolchain-funcs udev |
30 |
|
31 |
if [[ ${PV} == "9999" ]] ; then |
32 |
EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" |
33 |
@@ -94,9 +94,9 @@ src_prepare() { |
34 |
-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ |
35 |
SConstruct || die |
36 |
|
37 |
- #Fix systemd binary paths |
38 |
- sed -i -e 's/local\///' 'systemd/gpsd.service' |
39 |
- sed -i -e 's/local\///' 'systemd/gpsdctl@××××××××.in' |
40 |
+ # Fix systemd binary paths |
41 |
+ sed -i -e 's/local\///' 'systemd/gpsd.service' || die |
42 |
+ sed -i -e 's/local\///' 'systemd/gpsdctl@××××××××.in' || die |
43 |
|
44 |
default |
45 |
|
46 |
@@ -190,8 +190,11 @@ src_install() { |
47 |
newinitd "${FILESDIR}"/gpsd.init-2 gpsd |
48 |
|
49 |
# Cleanup bad alt copy due to Scons |
50 |
- rm -rf "${D}"/python-discard/gps* |
51 |
- find "${D}"/python-discard/ -type d -delete |
52 |
+ if use python ; then |
53 |
+ rm -rf "${ED}"/python-discard/gps* || die |
54 |
+ find "${ED}"/python-discard/ -type d -delete || die |
55 |
+ fi |
56 |
+ |
57 |
# Install correct multi-python copy |
58 |
use python && distutils-r1_src_install |
59 |
} |