Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
Date: Thu, 28 Apr 2022 02:58:39
Message-Id: 1651114703.04f90be30d7dd8beca5fb491dc2a79fd81ed7000.sam@gentoo
1 commit: 04f90be30d7dd8beca5fb491dc2a79fd81ed7000
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 28 02:47:33 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 02:58:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f90be3
7
8 sci-geosciences/gpsd: add 3.24
9
10 Closes: https://bugs.gentoo.org/658836
11 Closes: https://bugs.gentoo.org/796476
12 Closes: https://bugs.gentoo.org/833128
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 sci-geosciences/gpsd/Manifest | 1 +
16 .../gpsd/{gpsd-9999.ebuild => gpsd-3.24.ebuild} | 23 ++++++++++++++++++----
17 sci-geosciences/gpsd/gpsd-9999.ebuild | 23 ++++++++++++++++++----
18 3 files changed, 39 insertions(+), 8 deletions(-)
19
20 diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
21 index 7b1027aafbd0..19ecf289fc4f 100644
22 --- a/sci-geosciences/gpsd/Manifest
23 +++ b/sci-geosciences/gpsd/Manifest
24 @@ -1 +1,2 @@
25 DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d
26 +DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d
27
28 diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
29 similarity index 93%
30 copy from sci-geosciences/gpsd/gpsd-9999.ebuild
31 copy to sci-geosciences/gpsd/gpsd-3.24.ebuild
32 index 48a28860d3c8..7c4fb91cc9fa 100644
33 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild
34 +++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
35 @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
36 PYTHON_COMPAT=( python3_{8,9,10} )
37 SCONS_MIN_VERSION="2.3.0"
38
39 -inherit udev distutils-r1 scons-utils systemd toolchain-funcs
40 +inherit distutils-r1 scons-utils systemd toolchain-funcs udev
41
42 if [[ ${PV} == "9999" ]] ; then
43 EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
44 @@ -25,9 +25,8 @@ SLOT="0/29"
45
46 GPSD_PROTOCOLS=(
47 aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
48 - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
49 - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
50 - superstar2 tnt tripmate tsip ublox
51 + gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
52 + rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
53 )
54 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
55 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
56 @@ -101,6 +100,9 @@ src_prepare() {
57 python_prepare_all() {
58 python_setup
59
60 + # bug #796476
61 + python_export_utf8_locale
62 +
63 # Extract python info out of SConscript so we can use saner distribute
64 pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
65 local pyprogs=$(pyarray python_progs)
66 @@ -196,6 +198,15 @@ src_compile() {
67 popd || die
68 }
69
70 +src_test() {
71 + escons "${scons_opts[@]}" check
72 +}
73 +
74 +python_test() {
75 + # Silence QA check which gets confused by layout(?). We do run the tests.
76 + :;
77 +}
78 +
79 src_install() {
80 DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
81
82 @@ -210,3 +221,7 @@ src_install() {
83 use python && distutils-r1_src_install
84 popd || die
85 }
86 +
87 +pkg_postinst() {
88 + use udev && udev_reload
89 +}
90
91 diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
92 index 48a28860d3c8..7c4fb91cc9fa 100644
93 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild
94 +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
95 @@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
96 PYTHON_COMPAT=( python3_{8,9,10} )
97 SCONS_MIN_VERSION="2.3.0"
98
99 -inherit udev distutils-r1 scons-utils systemd toolchain-funcs
100 +inherit distutils-r1 scons-utils systemd toolchain-funcs udev
101
102 if [[ ${PV} == "9999" ]] ; then
103 EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
104 @@ -25,9 +25,8 @@ SLOT="0/29"
105
106 GPSD_PROTOCOLS=(
107 aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
108 - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
109 - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
110 - superstar2 tnt tripmate tsip ublox
111 + gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
112 + rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
113 )
114 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
115 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
116 @@ -101,6 +100,9 @@ src_prepare() {
117 python_prepare_all() {
118 python_setup
119
120 + # bug #796476
121 + python_export_utf8_locale
122 +
123 # Extract python info out of SConscript so we can use saner distribute
124 pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
125 local pyprogs=$(pyarray python_progs)
126 @@ -196,6 +198,15 @@ src_compile() {
127 popd || die
128 }
129
130 +src_test() {
131 + escons "${scons_opts[@]}" check
132 +}
133 +
134 +python_test() {
135 + # Silence QA check which gets confused by layout(?). We do run the tests.
136 + :;
137 +}
138 +
139 src_install() {
140 DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
141
142 @@ -210,3 +221,7 @@ src_install() {
143 use python && distutils-r1_src_install
144 popd || die
145 }
146 +
147 +pkg_postinst() {
148 + use udev && udev_reload
149 +}