From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8632138AE9 for ; Thu, 28 Dec 2017 15:35:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F33A5E0839; Thu, 28 Dec 2017 15:35:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2CF0E0839 for ; Thu, 28 Dec 2017 15:35:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0605A33BEF8 for ; Thu, 28 Dec 2017 15:35:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 587D7AEC8 for ; Thu, 28 Dec 2017 15:35:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1514475283.5760ed4e60db223c25efdee994c99805648d9d11.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsd/gpsd-3.17-r1.ebuild X-VCS-Directories: sci-geosciences/gpsd/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5760ed4e60db223c25efdee994c99805648d9d11 X-VCS-Branch: master Date: Thu, 28 Dec 2017 15:35:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5fe6ef80-1cf6-4cd0-a034-8414e9bebdbb X-Archives-Hash: 9dd76472c818b6305eb6c2312666ea7c commit: 5760ed4e60db223c25efdee994c99805648d9d11 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 28 15:34:01 2017 +0000 Commit: Andreas Sturmlechner gentoo 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