From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-993695-garchives=archives.gentoo.org@lists.gentoo.org>
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 E4D8E138AE9
for <garchives@archives.gentoo.org>; Thu, 28 Dec 2017 21:20:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B2B5CE0DD0;
Thu, 28 Dec 2017 21:20:28 +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 92989E0DD0
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Dec 2017 21:20:27 +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 17AE733BF51
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Dec 2017 21:20:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 65985AFB9
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Dec 2017 21:20:23 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1514496011.74e63cac3705cd9efb3add3e787d4073bc6ee046.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-9999.ebuild
X-VCS-Directories: sci-geosciences/gpsd/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 74e63cac3705cd9efb3add3e787d4073bc6ee046
X-VCS-Branch: master
Date: Thu, 28 Dec 2017 21:20:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dd008f62-dbf0-4f06-a5a6-0500717ef54a
X-Archives-Hash: 11f16c324cfc7047d7e09f0085151974
commit: 74e63cac3705cd9efb3add3e787d4073bc6ee046
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 21:18:56 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 21:20:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e63cac
sci-geosciences/gpsd: Sync live
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-geosciences/gpsd/gpsd-9999.ebuild | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index cb88e5860ea..98fba863a5a 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.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
@@ -158,7 +159,7 @@ src_install() {
if use python ; then
distutils-r1_src_install
# Delete all X related packages if user doesn't want them
- if ! use X ; then
+ if ! use X && [[ -f "${ED%/}"/usr/bin/xgps ]]; then
rm "${ED%/}"/usr/bin/xgps* || die
fi
fi