| 1 |
commit: 5760ed4e60db223c25efdee994c99805648d9d11 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 28 15:34:01 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 28 15:34:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5760ed4e |
| 7 |
|
| 8 |
sci-geosciences/gpsd: Drop USE=cxx, fix USE=qt5 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642154 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
sci-geosciences/gpsd/gpsd-3.17-r1.ebuild | 9 +++++---- |
| 14 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild |
| 17 |
index cb88e5860ea..7c7318b7d1f 100644 |
| 18 |
--- a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild |
| 19 |
+++ b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild |
| 20 |
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=( |
| 21 |
tripmate tsip ublox |
| 22 |
) |
| 23 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
| 24 |
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" |
| 25 |
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" |
| 26 |
REQUIRED_USE="X? ( python ) |
| 27 |
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
| 28 |
python? ( ${PYTHON_REQUIRED_USE} )" |
| 29 |
@@ -115,11 +115,10 @@ src_configure() { |
| 30 |
gpsd_group=uucp |
| 31 |
nostrip=True |
| 32 |
python=False |
| 33 |
- qt_versioned=5 |
| 34 |
+ libgpsmm=True |
| 35 |
manbuild=False |
| 36 |
shared=$(usex !static True False) |
| 37 |
$(use_scons bluetooth bluez) |
| 38 |
- $(use_scons cxx libgpsmm) |
| 39 |
$(use_scons debug clientdebug) |
| 40 |
$(use_scons dbus dbus_export) |
| 41 |
$(use_scons ipv6) |
| 42 |
@@ -127,12 +126,14 @@ src_configure() { |
| 43 |
$(use_scons ncurses) |
| 44 |
$(use_scons ntp ntpshm) |
| 45 |
$(use_scons ntp pps) |
| 46 |
+ $(use_scons qt5 libQgpsmm) |
| 47 |
$(use_scons shm shm_export) |
| 48 |
$(use_scons sockets socket_export) |
| 49 |
- $(use_scons qt5 libQgpsmm) |
| 50 |
$(use_scons usb) |
| 51 |
) |
| 52 |
|
| 53 |
+ use qt5 && myesconsargs+=( qt_versioned=5 ) |
| 54 |
+ |
| 55 |
# enable specified protocols |
| 56 |
local protocol |
| 57 |
for protocol in ${GPSD_PROTOCOLS[@]} ; do |
Archives