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 6CAC3138334 for ; Tue, 4 Sep 2018 20:50:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E631E08C8; Tue, 4 Sep 2018 20:49:58 +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 15868E08C8 for ; Tue, 4 Sep 2018 20:49:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 57EB8335C95 for ; Tue, 4 Sep 2018 20:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA0B63CC for ; Tue, 4 Sep 2018 20:49:52 +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: <1536094157.64b3191d12885b12923680de6f943476cad70a2f.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-r3.ebuild 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: 64b3191d12885b12923680de6f943476cad70a2f X-VCS-Branch: master Date: Tue, 4 Sep 2018 20:49:52 +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: 546bbc99-4da3-4d63-90fa-b54fe0f1bf5c X-Archives-Hash: 1bd875eb5686b938b1d3fac8eaed2ed8 commit: 64b3191d12885b12923680de6f943476cad70a2f Author: Rolf Eike Beer sf-mail de> AuthorDate: Sun Aug 12 17:43:32 2018 +0000 Commit: Andreas Sturmlechner gentoo 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)