public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
Date: Fri,  4 Oct 2019 19:23:53 +0000 (UTC)	[thread overview]
Message-ID: <1570216864.7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff.robbat2@gentoo> (raw)

commit:     7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 19:18:35 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 19:21:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c30c4b5

sci-geosciences/gpsd: update 9999 bugs

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/658834
Fixes: https://bugs.gentoo.org/693136
Fixes: https://bugs.gentoo.org/695110
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f07d1e12062..5c66058b8ce 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -112,14 +112,14 @@ python_prepare_all() {
 	use gpsd_protocols_greis && pybins+="+ ['zerk']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	# Post 3.19 the clienthelpers were merged into gps.packet
 	sed \
 		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
 		-e "s|@URL@|$(pyvar website)|" \
 		-e "s|@EMAIL@|$(pyvar devmail)|" \
 		-e "s|@SCRIPTS@|${pybins}|" \
 		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "/@GPS_CLIENT_SOURCES@/d" \
 		-e "s|@SCRIPTS@|${pybins}|" \
 		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
 	distutils-r1_python_prepare_all


             reply	other threads:[~2019-10-04 19:23 UTC|newest]

Thread overview: 105+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-04 19:23 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-12 12:33 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ Sam James
2024-08-12 12:33 Sam James
2024-07-15  4:35 Sam James
2024-07-15  4:35 Sam James
2024-07-15  4:35 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-01-08  9:48 Sam James
2023-09-29  7:27 WANG Xuerui
2023-09-29  7:27 WANG Xuerui
2023-06-28  7:19 Sam James
2023-05-01  9:22 Sam James
2023-05-01  5:39 Sam James
2023-04-22  8:47 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19  9:49 Sam James
2023-01-15  1:41 Sam James
2022-09-04 18:21 Arthur Zamarin
2022-09-04 18:21 Arthur Zamarin
2022-09-04 17:46 Sam James
2022-09-04 10:51 Agostino Sarubbo
2022-09-04 10:49 Agostino Sarubbo
2022-04-28  2:58 Sam James
2022-04-12 21:04 Sam James
2022-02-11 12:51 Sam James
2021-11-08  3:22 Mike Gilbert
2021-10-30 17:24 Agostino Sarubbo
2021-10-29 18:32 Sam James
2021-10-29 18:32 Sam James
2021-10-29 18:30 Sam James
2021-10-29  8:58 Sam James
2021-10-29  2:24 Sam James
2021-10-08  0:55 Sam James
2021-10-04  1:26 Sam James
2021-10-03  0:34 Sam James
2021-10-02 23:54 Sam James
2021-09-25  0:05 Sam James
2021-09-25  0:04 Sam James
2021-09-25  0:04 Sam James
2021-09-11 21:34 Sam James
2021-08-27 20:06 Sam James
2021-08-22  2:50 Sam James
2021-08-18 19:42 Sam James
2021-08-18 19:39 Sam James
2021-08-15 22:04 Sam James
2021-08-11 23:57 Sam James
2021-08-10 23:52 Sam James
2021-08-10 23:52 Sam James
2021-08-10 23:52 Sam James
2021-08-10  0:16 Marek Szuba
2021-08-09 23:53 Sam James
2021-08-09 23:46 Sam James
2021-06-01 12:06 Sam James
2020-10-06 14:23 Sam James
2020-09-25 17:52 Sam James
2020-09-25 17:51 Sam James
2020-09-25 17:51 Sam James
2020-09-25 16:01 Sam James
2020-09-25 16:00 Sam James
2020-09-24 19:53 Aaron Bauman
2020-09-10 15:31 Marek Szuba
2020-07-29  1:07 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-05-12  6:22 Matthias Maier
2020-05-07 15:17 Michał Górny
2019-11-29  8:17 Michał Górny
2019-10-04 18:59 Robin H. Johnson
2019-10-04 18:59 Robin H. Johnson
2019-09-12  3:57 Mike Frysinger
2019-01-19 19:14 Robin H. Johnson
2018-10-04  7:28 Andreas Sturmlechner
2018-10-04  6:26 Sergei Trofimovich
2018-09-30 23:10 Robin H. Johnson
2018-09-04 20:49 Andreas Sturmlechner
2018-04-15 17:19 Mikle Kolyada
2018-01-29  1:06 Thomas Deutschmann
2018-01-12 15:55 Andreas Sturmlechner
2018-01-12 15:55 Andreas Sturmlechner
2017-12-28 21:20 Andreas Sturmlechner
2017-12-28 21:20 Andreas Sturmlechner
2017-12-28 15:35 Andreas Sturmlechner
2017-12-21 18:23 Andreas Sturmlechner
2017-12-16 10:31 Tobias Klausmann
2017-12-08 20:39 Thomas Deutschmann
2017-09-24 15:10 Thomas Deutschmann
2017-08-20 16:59 Thomas Deutschmann
2017-07-15 15:17 Tobias Klausmann
2017-03-01  7:55 Michael Weber
2017-02-10 12:29 Michael Weber
2017-01-15 11:20 Pacho Ramos
2016-12-20 15:34 Tobias Klausmann
2016-03-27 12:02 Sam Jorna
2016-03-18 15:46 Sam Jorna
2016-02-29 14:48 Amy Winston
2016-02-29 14:48 Amy Winston
2016-02-29 14:36 Amy Winston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1570216864.7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff.robbat2@gentoo \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox