From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
Date: Tue, 4 Sep 2018 20:49:52 +0000 (UTC) [thread overview]
Message-ID: <1536094157.64b3191d12885b12923680de6f943476cad70a2f.asturm@gentoo> (raw)
commit: 64b3191d12885b12923680de6f943476cad70a2f
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Aug 12 17:43:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 20:49:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b3191d
sci-geosciences/gpsd: fix USE=qt5, add USE=cxx
Closes: https://bugs.gentoo.org/663458
Closes: https://github.com/gentoo/gentoo/pull/9551
.../gpsd/{gpsd-9999.ebuild => gpsd-3.17-r3.ebuild} | 26 +++++++++-------------
sci-geosciences/gpsd/gpsd-9999.ebuild | 9 ++++----
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
similarity index 88%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 98fba863a5a..4a84dbffcc3 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
fi
DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
@@ -30,10 +30,11 @@ GPSD_PROTOCOLS=(
tripmate tsip ublox
)
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
REQUIRED_USE="X? ( python )
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
- python? ( ${PYTHON_REQUIRED_USE} )"
+ python? ( ${PYTHON_REQUIRED_USE} )
+ qt5? ( cxx )"
RDEPEND="
bluetooth? ( net-wireless/bluez )
@@ -52,7 +53,7 @@ RDEPEND="
)
python? ( ${PYTHON_DEPS} )
usb? ( virtual/libusb:1 )
- X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
+ X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( sys-devel/bc )"
@@ -114,11 +115,10 @@ src_configure() {
gpsd_user=gpsd
gpsd_group=uucp
nostrip=True
- python=False
- libgpsmm=True
manbuild=False
shared=$(usex !static True False)
$(use_scons bluetooth bluez)
+ $(use_scons cxx libgpsmm)
$(use_scons debug clientdebug)
$(use_scons dbus dbus_export)
$(use_scons ipv6)
@@ -126,12 +126,14 @@ src_configure() {
$(use_scons ncurses)
$(use_scons ntp ntpshm)
$(use_scons ntp pps)
- $(use_scons qt5 libQgpsmm)
+ $(use_scons X python)
+ $(use_scons qt5 qt)
$(use_scons shm shm_export)
$(use_scons sockets socket_export)
$(use_scons usb)
)
+ use X && myesconsargs+=( xgps=1 )
use qt5 && myesconsargs+=( qt_versioned=5 )
# enable specified protocols
@@ -156,13 +158,7 @@ src_install() {
newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
newinitd "${FILESDIR}"/gpsd.init-2 gpsd
- if use python ; then
- distutils-r1_src_install
- # Delete all X related packages if user doesn't want them
- if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then
- rm "${ED%/}"/usr/bin/xgps* || die
- fi
- fi
+ use python && distutils-r1_src_install
}
pkg_preinst() {
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 98fba863a5a..e3db55c44b0 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -30,10 +30,11 @@ GPSD_PROTOCOLS=(
tripmate tsip ublox
)
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
REQUIRED_USE="X? ( python )
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
- python? ( ${PYTHON_REQUIRED_USE} )"
+ python? ( ${PYTHON_REQUIRED_USE} )
+ qt5? ( cxx )"
RDEPEND="
bluetooth? ( net-wireless/bluez )
@@ -115,10 +116,10 @@ src_configure() {
gpsd_group=uucp
nostrip=True
python=False
- libgpsmm=True
manbuild=False
shared=$(usex !static True False)
$(use_scons bluetooth bluez)
+ $(use_scons cxx libgpsmm)
$(use_scons debug clientdebug)
$(use_scons dbus dbus_export)
$(use_scons ipv6)
@@ -126,7 +127,7 @@ src_configure() {
$(use_scons ncurses)
$(use_scons ntp ntpshm)
$(use_scons ntp pps)
- $(use_scons qt5 libQgpsmm)
+ $(use_scons qt5 qt)
$(use_scons shm shm_export)
$(use_scons sockets socket_export)
$(use_scons usb)
next reply other threads:[~2018-09-04 20:50 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 20:49 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-02 21:02 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ Andreas Sturmlechner
2025-01-02 20:35 Andreas Sturmlechner
2024-08-12 12:33 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 19:23 Robin H. Johnson
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-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=1536094157.64b3191d12885b12923680de6f943476cad70a2f.asturm@gentoo \
--to=asturm@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