commit: 5760ed4e60db223c25efdee994c99805648d9d11 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 28 15:34:01 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 28 15:34:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5760ed4e
sci-geosciences/gpsd: Drop USE=cxx, fix USE=qt5 Closes: https://bugs.gentoo.org/642154 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-geosciences/gpsd/gpsd-3.17-r1.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild index cb88e5860ea..7c7318b7d1f 100644 --- a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild @@ -30,7 +30,7 @@ GPSD_PROTOCOLS=( tripmate tsip ublox ) IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" +IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth 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} )" @@ -115,11 +115,10 @@ src_configure() { gpsd_group=uucp nostrip=True python=False - qt_versioned=5 + 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) @@ -127,12 +126,14 @@ src_configure() { $(use_scons ncurses) $(use_scons ntp ntpshm) $(use_scons ntp pps) + $(use_scons qt5 libQgpsmm) $(use_scons shm shm_export) $(use_scons sockets socket_export) - $(use_scons qt5 libQgpsmm) $(use_scons usb) ) + use qt5 && myesconsargs+=( qt_versioned=5 ) + # enable specified protocols local protocol for protocol in ${GPSD_PROTOCOLS[@]} ; do
