[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-25 17:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2020-09-25 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3ba27f0f9ee0806702b6a42d9fad028a75ac6b5c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 17:52:13 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 17:52:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba27f0f

sci-geosciences/gpsd: Stabilize 3.21 arm, #743556

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 427bd9baf5c..c5109b205bd 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-08-12 12:33 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-08-12 12:33 UTC (permalink / raw
  To: gentoo-commits

commit:     5aac1340ca4fbc0c59d111b860688e63f6a9a1cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 12:31:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 12:32:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aac1340

sci-geosciences/gpsd: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 75899a3a66c3..9a4ff1315e67 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -213,10 +213,11 @@ python_test() {
 	:;
 }
 
-python_install(){
-	mkdir "${T}/scripts" || die
-	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts"
-	python_doscript "${T}"/scripts/*
+python_install() {
+	while read -d '' -r file ; do
+		grep -q "#!/usr/bin/env python" "${file}" && python_doscript "${file}"
+	done < <(find "${T}"/scripts -type f -print0)
+
 	distutils-r1_python_install
 }
 
@@ -232,6 +233,9 @@ src_install() {
 
 	# Install correct multi-python copy
 	pushd "${PN}"-* || die
+	mkdir -p "${T}/scripts" || die
+	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs cp -t "${T}/scripts"
+	assert "Moving Python scripts failed"
 	distutils-r1_src_install
 	popd || die
 }


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-08-12 12:33 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-08-12 12:33 UTC (permalink / raw
  To: gentoo-commits

commit:     91b1222f17bb1f28e3151b1e00d2ddb22645e00a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 12:29:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 12:32:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b1222f

sci-geosciences/gpsd: fix USE=python install

* Add missing `assert` which reveals one problem where the directory
is trashed after one impl, which is a problem given the package
is multi impl.

* grep for the known-bad shebang before fixing so we don't try to touch ELF.

Closes: https://bugs.gentoo.org/937612
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gpsd/{gpsd-3.25-r1.ebuild => gpsd-3.25-r2.ebuild}   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r2.ebuild
similarity index 94%
rename from sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
rename to sci-geosciences/gpsd/gpsd-3.25-r2.ebuild
index f7f785b3ea35..615d6bafd6f9 100644
--- a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25-r2.ebuild
@@ -213,10 +213,11 @@ python_test() {
 	:;
 }
 
-python_install(){
-	mkdir -p "${T}/scripts" || die
-	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts"
-	python_doscript "${T}"/scripts/*
+python_install() {
+	while read -d '' -r file ; do
+		grep -q "#!/usr/bin/env python" "${file}" && python_doscript "${file}"
+	done < <(find "${T}"/scripts -type f -print0)
+
 	distutils-r1_python_install
 }
 
@@ -231,7 +232,13 @@ src_install() {
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
 	pushd "${P}" || die
-	use python && distutils-r1_src_install
+	if use python ; then
+		mkdir -p "${T}/scripts" || die
+		grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs cp -t "${T}/scripts"
+		assert "Moving Python scripts failed"
+
+		distutils-r1_src_install
+	fi
 	popd || die
 }
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-07-15  4:35 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-07-15  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     99c3cb4e27ccc12628b59fde7aba068cb703511a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 04:34:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 04:34:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c3cb4e

sci-geosciences/gpsd: Stabilize 3.25-r1 arm, #936081

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
index bbc8c829c5bd..1371d6954f40 100644
--- a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-07-15  4:35 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-07-15  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     4d782b08863744ca894b5c6d612af35d05c2b4b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 04:35:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 04:35:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d782b08

sci-geosciences/gpsd: Stabilize 3.25-r1 ppc64, #936081

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
index ab51e430d8cb..f7f785b3ea35 100644
--- a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-07-15  4:35 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-07-15  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     fe9a4c29e5e05f871e59200ce1015908a502e87f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 04:35:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 04:35:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9a4c29

sci-geosciences/gpsd: Stabilize 3.25-r1 amd64, #936081

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
index 1371d6954f40..ab51e430d8cb 100644
--- a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-06-02  0:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-06-02  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     776da4fc64d94f8c2bf2dbc50328d76b35288156
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 00:48:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:48:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776da4fc

sci-geosciences/gpsd: drop 3.23.1-r2, 3.24

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest              |   2 -
 sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild | 212 ---------------------------
 sci-geosciences/gpsd/gpsd-3.24.ebuild      | 227 -----------------------------
 3 files changed, 441 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 2aa15502e89e..414afcc71bb3 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1 @@
-DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d
-DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d
 DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
deleted file mode 100644
index 2bca9fbe4d3c..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_10 )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit udev distutils-r1 scons-utils systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD-2"
-SLOT="0/29"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
-	superstar2 tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/gpsd
-	acct-group/dialout
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez:= )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
-	test? ( app-alternatives/bc )"
-
-# asciidoctor package is for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	BDEPEND+=" dev-ruby/asciidoctor"
-fi
-
-python_check_deps() {
-	has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
-}
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
-	) )
-
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	# bug #807661
-	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-
-	# Extract python info out of SConscript so we can use saner distribute
-	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
-	local pyprogs=$(pyarray python_progs)
-	local pybins=$("${PYTHON}" -c "${pyprogs}; \
-		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(pyarray packet_ffi_extension)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
-
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
-	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-
-	# Post 3.19 the clienthelpers were merged into gps.packet
-
-	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
-	sed \
-		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
-		-e "s|@URL@|https://gpsd.io/|" \
-		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@DOWNLOAD@|$(pyvar download)|" \
-		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
-		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
-		-e "s|@MAILMAN@|$(pyvar mailman)|" \
-		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
-		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
-		-e "s|@WEBSITE@|https://gpsd.io/|" \
-		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	scons_opts=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		rundir="/run"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=dialout
-		nostrip=True
-		systemd=$(usex systemd)
-		unitdir="$(systemd_get_systemunitdir)"
-		shared=$(usex !static True False)
-		bluez=$(usex bluetooth)
-		libgpsmm=$(usex cxx)
-		clientdebug=$(usex debug)
-		dbus_export=$(usex dbus)
-		ipv6=$(usex ipv6)
-		timing=$(usex latency-timing)
-		ncurses=$(usex ncurses)
-		ntpshm=$(usex ntp)
-		pps=$(usex ntp)
-		python=$(usex python)
-		# force a predictable python libdir because lib vs. lib64 usage differs
-		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
-		qt=$(usex qt5)
-		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
-		usb=$(usex usb)
-	)
-
-	if [[ ${PV} != *9999* ]] ; then
-		scons_opts+=( manbuild=False )
-	fi
-
-	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
-	use qt5 && scons_opts+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
-	done
-
-	# bug #809260
-	python_setup
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons "${scons_opts[@]}"
-
-	pushd "${P}" || die
-	ln -sf ../setup.py . || die
-	use python && distutils-r1_src_compile
-	popd || die
-}
-
-src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
-	find "${D}"/python-discard/ -type d -delete
-	# Install correct multi-python copy
-	pushd "${P}" || die
-	use python && distutils-r1_src_install
-	popd || die
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
deleted file mode 100644
index 3bb6d0703574..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_10 )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit distutils-r1 scons-utils systemd toolchain-funcs udev
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD-2"
-SLOT="0/29"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
-	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/gpsd
-	acct-group/dialout
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez:= )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
-	test? ( app-alternatives/bc )"
-
-# asciidoctor package is for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	BDEPEND+=" dev-ruby/asciidoctor"
-fi
-
-python_check_deps() {
-	has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
-}
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
-	) )
-
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	# bug #807661
-	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-
-	# bug #796476
-	python_export_utf8_locale
-
-	# Extract python info out of SConscript so we can use saner distribute
-	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
-	local pyprogs=$(pyarray python_progs)
-	local pybins=$("${PYTHON}" -c "${pyprogs}; \
-		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(pyarray packet_ffi_extension)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
-
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
-	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-
-	# Post 3.19 the clienthelpers were merged into gps.packet
-
-	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
-	sed \
-		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
-		-e "s|@URL@|https://gpsd.io/|" \
-		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@DOWNLOAD@|$(pyvar download)|" \
-		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
-		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
-		-e "s|@MAILMAN@|$(pyvar mailman)|" \
-		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
-		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
-		-e "s|@WEBSITE@|https://gpsd.io/|" \
-		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	scons_opts=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		rundir="/run"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=dialout
-		nostrip=True
-		systemd=$(usex systemd)
-		unitdir="$(systemd_get_systemunitdir)"
-		shared=$(usex !static True False)
-		bluez=$(usex bluetooth)
-		libgpsmm=$(usex cxx)
-		clientdebug=$(usex debug)
-		dbus_export=$(usex dbus)
-		ipv6=$(usex ipv6)
-		timing=$(usex latency-timing)
-		ncurses=$(usex ncurses)
-		ntpshm=$(usex ntp)
-		pps=$(usex ntp)
-		python=$(usex python)
-		# force a predictable python libdir because lib vs. lib64 usage differs
-		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
-		qt=$(usex qt5)
-		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
-		usb=$(usex usb)
-	)
-
-	if [[ ${PV} != *9999* ]] ; then
-		scons_opts+=( manbuild=False )
-	fi
-
-	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
-	use qt5 && scons_opts+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
-	done
-
-	# bug #809260
-	python_setup
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons "${scons_opts[@]}"
-
-	pushd "${P}" || die
-	ln -sf ../setup.py . || die
-	use python && distutils-r1_src_compile
-	popd || die
-}
-
-src_test() {
-	escons "${scons_opts[@]}" check
-}
-
-python_test() {
-	# Silence QA check which gets confused by layout(?). We do run the tests.
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
-	find "${D}"/python-discard/ -type d -delete
-	# Install correct multi-python copy
-	pushd "${P}" || die
-	use python && distutils-r1_src_install
-	popd || die
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-06-02  0:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-06-02  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a0cad067d3e13f52f9ca54c37910d3fe2a0455ba
Author:     Kyle Elbert <kcelbert <AT> gmail <DOT> com>
AuthorDate: Fri May 31 12:15:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:47:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0cad067

sci-geosciences/gpsd: 3.25-r1: many cleanups, python 3.12 bump

Switched to PEP517 Build
Python 3.12 bump
Made sockets mandatory
Corrected License
Added missing BDEPEND DISTUTILS_DEPS
Added missing PYTHON_USEDEP for pyserial
Ensured python scripts were correctly wrapped

Closes: https://bugs.gentoo.org/900891
Closes: https://bugs.gentoo.org/910024
Closes: https://bugs.gentoo.org/912732
Closes: https://bugs.gentoo.org/929766
Closes: https://bugs.gentoo.org/923315
Signed-off-by: Kyle Elbert <kcelbert <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25-r1.ebuild | 240 +++++++++++++++++++++++++++++++
 1 file changed, 240 insertions(+)

diff --git a/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
new file mode 100644
index 000000000000..bbc8c829c5bd
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit distutils-r1 scons-utils systemd toolchain-funcs udev
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
+
+LICENSE="BSD-2"
+SLOT="0/30"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
+	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm static systemd test udev usb X"
+REQUIRED_USE="
+	X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/gpsd
+	acct-group/dialout
+	>=net-misc/pps-tools-0.0.20120407
+	bluetooth? ( net-wireless/bluez:= )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	gpsd_protocols_greis? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
+	python? ( ${DISTUTILS_DEPS} )
+	test? ( app-alternatives/bc )"
+RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
+
+# asciidoctor package is for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	BDEPEND+=" dev-ruby/asciidoctor"
+fi
+
+python_check_deps() {
+	python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
+}
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' \
+		 "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+	) )
+
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	# bug #807661
+	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
+
+	default
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_setup
+
+	# bug #796476
+	python_export_utf8_locale
+
+	# Extract python info out of SConscript so we can use saner distribute
+	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
+	local pyprogs=$(pyarray python_progs)
+	local pybins=$("${PYTHON}" -c "${pyprogs}; \
+		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
+	local pysrcs=$(pyarray packet_ffi_extension)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
+
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
+	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+
+	# Post 3.19 the clienthelpers were merged into gps.packet
+
+	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
+	sed \
+		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
+		-e "s|@URL@|https://gpsd.io/|" \
+		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@DOWNLOAD@|$(pyvar download)|" \
+		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
+		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
+		-e "s|@MAILMAN@|$(pyvar mailman)|" \
+		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
+		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
+		-e "s|@WEBSITE@|https://gpsd.io/|" \
+		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	scons_opts=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		rundir="/run"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=dialout
+		nostrip=True
+		systemd=$(usex systemd)
+		unitdir="$(systemd_get_systemunitdir)"
+		shared=$(usex !static True False)
+		bluez=$(usex bluetooth)
+		libgpsmm=$(usex cxx)
+		clientdebug=$(usex debug)
+		dbus_export=$(usex dbus)
+		ipv6=$(usex ipv6)
+		timing=$(usex latency-timing)
+		ncurses=$(usex ncurses)
+		ntpshm=$(usex ntp)
+		pps=$(usex ntp)
+		python=$(usex python)
+		# force a predictable python libdir because lib vs. lib64 usage differs
+		# from 3.5 to 3.6+
+		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		qt=$(usex qt5)
+		shm_export=$(usex shm)
+		socket_export=True # Required, see bug #900891
+		usb=$(usex usb)
+	)
+
+	if [[ ${PV} != *9999* ]] ; then
+		scons_opts+=( manbuild=False )
+	fi
+
+	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
+	use qt5 && scons_opts+=( qt_versioned=5 )
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
+	done
+
+	# bug #809260
+	python_setup
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons "${scons_opts[@]}"
+
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
+	use python && distutils-r1_src_compile
+	popd || die
+}
+
+src_test() {
+	escons "${scons_opts[@]}" check
+}
+
+python_test() {
+	# Silence QA check which gets confused by layout(?). We do run the tests.
+	:;
+}
+
+python_install(){
+	mkdir -p "${T}/scripts" || die
+	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts"
+	python_doscript "${T}"/scripts/*
+	distutils-r1_python_install
+}
+
+src_install() {
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install)
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	# Cleanup bad alt copy due to Scons
+	rm -rf "${D}"/python-discard/gps*
+	find "${D}"/python-discard/ -type d -delete
+	# Install correct multi-python copy
+	pushd "${P}" || die
+	use python && distutils-r1_src_install
+	popd || die
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-06-02  0:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-06-02  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     10a2d9a6e29e8d8128e92aed715bd48e041a68a7
Author:     Kyle Elbert <kcelbert <AT> gmail <DOT> com>
AuthorDate: Fri May 31 20:47:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:47:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a2d9a6

sci-geosciences/gpsd: update live ebuild

Resynced protocols.
Some like ublox are no longer optional making python required.

Signed-off-by: Kyle Elbert <kcelbert <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36916
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 55 ++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index bb0f0f7fdcc9..f89f4b416914 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit distutils-r1 scons-utils systemd toolchain-funcs udev
@@ -25,18 +26,14 @@ SLOT="0/30"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
-	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
+	gpsclock greis isync itrax navcom nmea2000 oncore
+	sirf skytraq superstar2 tnt tripmate tsip
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp qt5 selinux +shm static systemd test udev usb X"
 REQUIRED_USE="
-	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
+	 ${PYTHON_REQUIRED_USE}
 	qt5? ( cxx )
 "
 RESTRICT="!test? ( test )"
@@ -60,14 +57,14 @@ RDEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtnetwork:5
 	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
+	${PYTHON_DEPS}
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	usb? ( virtual/libusb:1 )
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]')
+	${DISTUTILS_DEPS}
 	test? ( app-alternatives/bc )"
 RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
@@ -77,13 +74,14 @@ if [[ ${PV} == *9999* ]] ; then
 fi
 
 python_check_deps() {
-	has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1
 }
 
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' \
+		 "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
 	) )
 
 	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
@@ -97,7 +95,7 @@ src_prepare() {
 
 	default
 
-	use python && distutils-r1_src_prepare
+	distutils-r1_src_prepare
 }
 
 python_prepare_all() {
@@ -113,7 +111,7 @@ python_prepare_all() {
 		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
 	# Handle conditional tools manually. #666734
 	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	pybins+="+ ['ubxtool']"
 	use gpsd_protocols_greis && pybins+="+ ['zerk']"
 	local pysrcs=$(pyarray packet_ffi_extension)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
@@ -137,6 +135,10 @@ python_prepare_all() {
 		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
 		-e "s|@WEBSITE@|https://gpsd.io/|" \
 		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+	if [[ "${PV}" == *9999* ]]; then
+		# Distutils doesn't like the tilde
+		sed -i s/~dev/-dev/ setup.py
+	fi
 	distutils-r1_python_prepare_all
 }
 
@@ -162,13 +164,12 @@ src_configure() {
 		ncurses=$(usex ncurses)
 		ntpshm=$(usex ntp)
 		pps=$(usex ntp)
-		python=$(usex python)
 		# force a predictable python libdir because lib vs. lib64 usage differs
 		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		python_libdir="${EPREFIX}"/python-discard
 		qt=$(usex qt5)
 		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
+		socket_export=True # Required, see bug #900891
 		usb=$(usex usb)
 	)
 
@@ -195,9 +196,9 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons "${scons_opts[@]}"
 
-	pushd "${P}" || die
+	pushd "${PN}"-* || die
 	ln -sf ../setup.py . || die
-	use python && distutils-r1_src_compile
+	distutils-r1_src_compile
 	popd || die
 }
 
@@ -210,6 +211,13 @@ python_test() {
 	:;
 }
 
+python_install(){
+	mkdir "${T}/scripts" || die
+	grep -Rl "${D}/usr/bin" -e "/usr/bin/env python" | xargs mv -t "${T}/scripts"
+	python_doscript "${T}"/scripts/*
+	distutils-r1_python_install
+}
+
 src_install() {
 	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install)
 
@@ -219,9 +227,10 @@ src_install() {
 	# Cleanup bad alt copy due to Scons
 	rm -rf "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
+
 	# Install correct multi-python copy
-	pushd "${P}" || die
-	use python && distutils-r1_src_install
+	pushd "${PN}"-* || die
+	distutils-r1_src_install
 	popd || die
 }
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-06-02  0:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-06-02  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e14e5ec437e7908c9a4bd1b0269f12f9833935f2
Author:     Kyle Elbert <kcelbert <AT> gmail <DOT> com>
AuthorDate: Fri May 31 20:34:36 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:47:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14e5ec4

sci-geosciences/gpsd: update LICENSE

Signed-off-by: Kyle Elbert <kcelbert <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-3.24.ebuild      | 2 +-
 sci-geosciences/gpsd/gpsd-3.25.ebuild      | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index e2deae1550a1..2bca9fbe4d3c 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
@@ -20,7 +20,7 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0/29"
 
 GPSD_PROTOCOLS=(

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index ea6badcf72b1..3bb6d0703574 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -20,7 +20,7 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0/29"
 
 GPSD_PROTOCOLS=(

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index c617497e8672..93bbf3abe0f0 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -20,7 +20,7 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0/30"
 
 GPSD_PROTOCOLS=(

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 5e2024d52363..bb0f0f7fdcc9 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -20,7 +20,7 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0/30"
 
 GPSD_PROTOCOLS=(


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-06-02  0:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-06-02  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8545c830e0410af2117c0a955db162a0f571aab0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 00:49:38 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:49:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8545c830

sci-geosciences/gpsd: add missing die, fix indentation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f89f4b416914..75899a3a66c3 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -33,7 +33,7 @@ IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp qt5 selinux +shm static systemd test udev usb X"
 REQUIRED_USE="
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	 ${PYTHON_REQUIRED_USE}
+	${PYTHON_REQUIRED_USE}
 	qt5? ( cxx )
 "
 RESTRICT="!test? ( test )"
@@ -135,10 +135,12 @@ python_prepare_all() {
 		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
 		-e "s|@WEBSITE@|https://gpsd.io/|" \
 		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+
 	if [[ "${PV}" == *9999* ]]; then
 		# Distutils doesn't like the tilde
-		sed -i s/~dev/-dev/ setup.py
+		sed -i s/~dev/-dev/ setup.py || die
 	fi
+
 	distutils-r1_python_prepare_all
 }
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2024-01-08  9:48 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2024-01-08  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     eafa1557aaec61ee6a18a2f3d5869122a18cc727
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 09:39:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 09:42:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eafa1557

sci-geosciences/gpsd: sys-devel/bc -> app-alternatives/bc

All of these will be using app-alternatives/bc anyway as they're not calling

bc-reference, so make the dep reflect reality.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild | 4 ++--
 sci-geosciences/gpsd/gpsd-3.24.ebuild      | 4 ++--
 sci-geosciences/gpsd/gpsd-3.25.ebuild      | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index 65b0b1bf3424..b27d658a8811 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -67,7 +67,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	test? ( sys-devel/bc )"
+	test? ( app-alternatives/bc )"
 
 # asciidoctor package is for man page generation
 if [[ ${PV} == *9999* ]] ; then

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index b53f262d6c8e..ed42e9440986 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,7 +66,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	test? ( sys-devel/bc )"
+	test? ( app-alternatives/bc )"
 
 # asciidoctor package is for man page generation
 if [[ ${PV} == *9999* ]] ; then

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 85c4b3064c90..6f1915f25cb3 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -68,7 +68,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	test? ( sys-devel/bc )"
+	test? ( app-alternatives/bc )"
 RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
 # asciidoctor package is for man page generation

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 721ac25f08f4..68f8c0cfc864 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -68,7 +68,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	test? ( sys-devel/bc )"
+	test? ( app-alternatives/bc )"
 RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
 # asciidoctor package is for man page generation


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-09-29  7:27 WANG Xuerui
  0 siblings, 0 replies; 105+ messages in thread
From: WANG Xuerui @ 2023-09-29  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     481c063b2b119a2fbb28eee566d9143c4e4b7afd
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 07:27:06 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 07:27:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481c063b

sci-geosciences/gpsd: forward ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 166b426d8ec9..721ac25f08f4 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-09-29  7:27 WANG Xuerui
  0 siblings, 0 replies; 105+ messages in thread
From: WANG Xuerui @ 2023-09-29  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1bbab2d2dff6b1e218f778c02d4e62eda67a277e
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 07:27:02 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 07:27:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbab2d2

sci-geosciences/gpsd: keyword 3.25 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 1f0b0d395e3a..85c4b3064c90 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-06-28  7:19 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2023-06-28  7:19 UTC (permalink / raw
  To: gentoo-commits

commit:     8f09b674ef26a4e58a0734fd9cdfea97107feb41
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 07:10:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 07:16:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f09b674

sci-geosciences/gpsd: add missing selinux policy dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 3 ++-
 sci-geosciences/gpsd/gpsd-9999.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 95012f056712..1f0b0d395e3a 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -29,7 +29,7 @@ GPSD_PROTOCOLS=(
 	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X"
 REQUIRED_USE="
 	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	test? ( sys-devel/bc )"
+RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
 # asciidoctor package is for man page generation
 if [[ ${PV} == *9999* ]] ; then

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 53bc8d53f9fd..166b426d8ec9 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -29,7 +29,7 @@ GPSD_PROTOCOLS=(
 	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X"
 REQUIRED_USE="
 	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
@@ -69,6 +69,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	test? ( sys-devel/bc )"
+RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )"
 
 # asciidoctor package is for man page generation
 if [[ ${PV} == *9999* ]] ; then


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-05-01  9:22 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2023-05-01  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8fca037ec5d6ebe80cbbe62bae374a89144538fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 09:18:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 09:18:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fca037e

sci-geosciences/gpsd: Stabilize 3.25 x86, #904597

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index c3ea65f11329..282f9aa71c12 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-05-01  5:39 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2023-05-01  5:39 UTC (permalink / raw
  To: gentoo-commits

commit:     640c6880f23343c0e2cdc4fd296eaee8dab54595
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 05:36:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 05:39:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640c6880

sci-geosciences/gpsd: Stabilize 3.25 ppc, #904597

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 95012f056712..c3ea65f11329 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-04-22  8:47 Arthur Zamarin
  0 siblings, 0 replies; 105+ messages in thread
From: Arthur Zamarin @ 2023-04-22  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     0c8843a7f4d08abbde21e1e44dc29f80bccb95ac
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 08:46:57 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 08:46:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8843a7

sci-geosciences/gpsd: Stabilize 3.25 amd64, #904597

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 621e11994f93..95012f056712 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-04-19 10:16 Arthur Zamarin
  0 siblings, 0 replies; 105+ messages in thread
From: Arthur Zamarin @ 2023-04-19 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     b63eefa8a9a4e931bf0858b473f83ab2f92fe56f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 10:15:48 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 10:15:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63eefa8

sci-geosciences/gpsd: Stabilize 3.25 arm, #904597

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index c64de005aeb5..621e11994f93 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-04-19  9:49 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2023-04-19  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     afe8f9c7f727e17eba1c7c852abb025dd07632c7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 09:48:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 09:48:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe8f9c7

sci-geosciences/gpsd: Stabilize 3.25 ppc64, #904597

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 53bc8d53f9fd..c64de005aeb5 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2023-01-15  1:41 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2023-01-15  1:41 UTC (permalink / raw
  To: gentoo-commits

commit:     73b07b4309f865a043ccbab7cb0e9c4b361b9d4c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 01:40:23 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 01:41:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b07b43

sci-geosciences/gpsd: add 3.25

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest                          |  1 +
 .../gpsd/{gpsd-9999.ebuild => gpsd-3.25.ebuild}        | 18 ++++++++++--------
 sci-geosciences/gpsd/gpsd-9999.ebuild                  | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 19ecf289fc4f..2aa15502e89e 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,2 +1,3 @@
 DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d
 DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d
+DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
similarity index 96%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.25.ebuild
index 9bf817942858..53bc8d53f9fd 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit distutils-r1 scons-utils systemd toolchain-funcs udev
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
 	inherit git-r3
 else
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
 LICENSE="BSD"
-SLOT="0/29"
+SLOT="0/30"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
@@ -30,13 +30,15 @@ GPSD_PROTOCOLS=(
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
+REQUIRED_USE="
+	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )
 	gpsd_protocols_ublox? ( python )
 	gpsd_protocols_greis? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
+	qt5? ( cxx )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -208,13 +210,13 @@ python_test() {
 }
 
 src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install)
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
+	rm -rf "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
 	pushd "${P}" || die

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 9bf817942858..53bc8d53f9fd 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit distutils-r1 scons-utils systemd toolchain-funcs udev
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
 	inherit git-r3
 else
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
 LICENSE="BSD"
-SLOT="0/29"
+SLOT="0/30"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
@@ -30,13 +30,15 @@ GPSD_PROTOCOLS=(
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
-REQUIRED_USE="X? ( python )
+REQUIRED_USE="
+	X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )
 	gpsd_protocols_ublox? ( python )
 	gpsd_protocols_greis? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
+	qt5? ( cxx )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -208,13 +210,13 @@ python_test() {
 }
 
 src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install)
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
+	rm -rf "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
 	pushd "${P}" || die


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-09-04 18:21 Arthur Zamarin
  0 siblings, 0 replies; 105+ messages in thread
From: Arthur Zamarin @ 2022-09-04 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c17cef25246e2585c09979ab47c901306176a94b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 18:18:59 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 18:21:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17cef25

sci-geosciences/gpsd: Stabilize 3.24 ppc64, #868309

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index c4bac570ff5c..2e8bae41e241 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-09-04 18:21 Arthur Zamarin
  0 siblings, 0 replies; 105+ messages in thread
From: Arthur Zamarin @ 2022-09-04 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     0ed8cfd8c21abffaf0fb0993d7e217c985c92cd8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 18:19:00 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 18:21:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed8cfd8

sci-geosciences/gpsd: Stabilize 3.24 ppc, #868309

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index 57cdc120ea05..c4bac570ff5c 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-09-04 17:46 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2022-09-04 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     9377c650a24e178658eaeb9c2a7b54124e6183f8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 17:46:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 17:46:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9377c650

sci-geosciences/gpsd: Stabilize 3.24 arm, #868309

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index 064d624ce1dd..57cdc120ea05 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-09-04 10:51 Agostino Sarubbo
  0 siblings, 0 replies; 105+ messages in thread
From: Agostino Sarubbo @ 2022-09-04 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d1ebce0dc9b401c0165ab096f5d669b2aad74128
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 10:51:23 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 10:51:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ebce0d

sci-geosciences/gpsd: x86 stable wrt bug #868309

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index a552131dd834..064d624ce1dd 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-09-04 10:49 Agostino Sarubbo
  0 siblings, 0 replies; 105+ messages in thread
From: Agostino Sarubbo @ 2022-09-04 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7a2db1c7d783594e4d1b3584d48806f34f10af0c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 10:49:46 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 10:49:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2db1c7

sci-geosciences/gpsd: amd64 stable wrt bug #868309

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index 7c4fb91cc9fa..a552131dd834 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-04-28  2:58 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2022-04-28  2:58 UTC (permalink / raw
  To: gentoo-commits

commit:     04f90be30d7dd8beca5fb491dc2a79fd81ed7000
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 02:47:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 02:58:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f90be3

sci-geosciences/gpsd: add 3.24

Closes: https://bugs.gentoo.org/658836
Closes: https://bugs.gentoo.org/796476
Closes: https://bugs.gentoo.org/833128
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest                      |  1 +
 .../gpsd/{gpsd-9999.ebuild => gpsd-3.24.ebuild}    | 23 ++++++++++++++++++----
 sci-geosciences/gpsd/gpsd-9999.ebuild              | 23 ++++++++++++++++++----
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 7b1027aafbd0..19ecf289fc4f 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1 +1,2 @@
 DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d
+DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
similarity index 93%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.24.ebuild
index 48a28860d3c8..7c4fb91cc9fa 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev distutils-r1 scons-utils systemd toolchain-funcs
+inherit distutils-r1 scons-utils systemd toolchain-funcs udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -25,9 +25,8 @@ SLOT="0/29"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
-	superstar2 tnt tripmate tsip ublox
+	gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
+	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
@@ -101,6 +100,9 @@ src_prepare() {
 python_prepare_all() {
 	python_setup
 
+	# bug #796476
+	python_export_utf8_locale
+
 	# Extract python info out of SConscript so we can use saner distribute
 	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
 	local pyprogs=$(pyarray python_progs)
@@ -196,6 +198,15 @@ src_compile() {
 	popd || die
 }
 
+src_test() {
+	escons "${scons_opts[@]}" check
+}
+
+python_test() {
+	# Silence QA check which gets confused by layout(?). We do run the tests.
+	:;
+}
+
 src_install() {
 	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
 
@@ -210,3 +221,7 @@ src_install() {
 	use python && distutils-r1_src_install
 	popd || die
 }
+
+pkg_postinst() {
+	use udev && udev_reload
+}

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 48a28860d3c8..7c4fb91cc9fa 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev distutils-r1 scons-utils systemd toolchain-funcs
+inherit distutils-r1 scons-utils systemd toolchain-funcs udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -25,9 +25,8 @@ SLOT="0/29"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
-	superstar2 tnt tripmate tsip ublox
+	gpsclock greis isync itrax navcom nmea2000 oceanserver oncore
+	rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
@@ -101,6 +100,9 @@ src_prepare() {
 python_prepare_all() {
 	python_setup
 
+	# bug #796476
+	python_export_utf8_locale
+
 	# Extract python info out of SConscript so we can use saner distribute
 	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
 	local pyprogs=$(pyarray python_progs)
@@ -196,6 +198,15 @@ src_compile() {
 	popd || die
 }
 
+src_test() {
+	escons "${scons_opts[@]}" check
+}
+
+python_test() {
+	# Silence QA check which gets confused by layout(?). We do run the tests.
+	:;
+}
+
 src_install() {
 	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
 
@@ -210,3 +221,7 @@ src_install() {
 	use python && distutils-r1_src_install
 	popd || die
 }
+
+pkg_postinst() {
+	use udev && udev_reload
+}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-04-12 21:04 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2022-04-12 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0f67d54acf6de7d5a649d5a510fa16ed8adbc6e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 12:16:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 21:03:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f67d54a

sci-geosciences/gpsd: switch to xz

Smaller tarballs.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest              | 2 +-
 sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index bd4e7460877b..7b1027aafbd0 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1 +1 @@
-DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
+DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index 111be4c72237..c8d9754abd36 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 33f0500a28da..48a28860d3c8 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2022-02-11 12:51 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2022-02-11 12:51 UTC (permalink / raw
  To: gentoo-commits

commit:     2a44e9e5ef42619ec72e13764a692f78028e178f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 12:50:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 12:50:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a44e9e5

sci-geosciences/gpsd: scons is only BDEPEND

... nor is gen_any useful in RDEPEND anyway.

Closes: https://bugs.gentoo.org/833125
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/{gpsd-3.23.1-r1.ebuild => gpsd-3.23.1-r2.ebuild} | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild                                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
similarity index 99%
rename from sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild
rename to sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index d602376843ef..111be4c72237 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,6 @@ RDEPEND="
 	acct-user/gpsd
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
-	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
@@ -67,6 +66,7 @@ RDEPEND="
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	test? ( sys-devel/bc )"
 
 # asciidoctor package is for man page generation

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 4e8c7af4c741..33f0500a28da 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,6 @@ RDEPEND="
 	acct-user/gpsd
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
-	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
@@ -67,6 +66,7 @@ RDEPEND="
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	test? ( sys-devel/bc )"
 
 # asciidoctor package is for man page generation


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-11-08  3:22 Mike Gilbert
  0 siblings, 0 replies; 105+ messages in thread
From: Mike Gilbert @ 2021-11-08  3:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ecdbe4d5889f29da10e7ae49a8d9fc330700de6d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 03:08:04 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 03:21:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdbe4d5

sci-geosciences/gpsd: fix systemd unit path

Closes: https://bugs.gentoo.org/822327
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sci-geosciences/gpsd/{gpsd-3.23.1.ebuild => gpsd-3.23.1-r1.ebuild} | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild
similarity index 98%
rename from sci-geosciences/gpsd/gpsd-3.23.1.ebuild
rename to sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild
index 04c23389ed2..d602376843e 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev distutils-r1 scons-utils toolchain-funcs
+inherit udev distutils-r1 scons-utils systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -146,7 +146,7 @@ src_configure() {
 		gpsd_group=dialout
 		nostrip=True
 		systemd=$(usex systemd)
-		unitdir="\$prefix/$(get_libdir)"
+		unitdir="$(systemd_get_systemunitdir)"
 		shared=$(usex !static True False)
 		bluez=$(usex bluetooth)
 		libgpsmm=$(usex cxx)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 456c84a9790..4e8c7af4c74 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev distutils-r1 scons-utils toolchain-funcs
+inherit udev distutils-r1 scons-utils systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -146,7 +146,7 @@ src_configure() {
 		gpsd_group=dialout
 		nostrip=True
 		systemd=$(usex systemd)
-		unitdir="\$prefix/$(get_libdir)"
+		unitdir="$(systemd_get_systemunitdir)"
 		shared=$(usex !static True False)
 		bluez=$(usex bluetooth)
 		libgpsmm=$(usex cxx)


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-30 17:24 Agostino Sarubbo
  0 siblings, 0 replies; 105+ messages in thread
From: Agostino Sarubbo @ 2021-10-30 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b26d10df75472a1178141d9d0fcc2caa51eb071c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 17:23:26 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 17:24:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26d10df

sci-geosciences/gpsd: x86 stable wrt bug #820455

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index e3c7544898a..04c23389ed2 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-29 18:32 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-29 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b3e4220b00c0d8fcc641e804c2c95e069bf9711e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 18:31:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 18:31:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e4220b

sci-geosciences/gpsd: Stabilize 3.23.1 ppc, #820455

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index 5f6dbd1e157..258dff8313b 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-29 18:32 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-29 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     00de860511821c4ffb0d137596e6fa63654bd80f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 18:31:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 18:31:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00de8605

sci-geosciences/gpsd: Stabilize 3.23.1 ppc64, #820455

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index 258dff8313b..e3c7544898a 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-29 18:30 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-29 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     8ef46ec08c266ad7323cdb3f870b0602fbaea364
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 18:28:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 18:28:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef46ec0

sci-geosciences/gpsd: Stabilize 3.23.1 amd64, #820455

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index d36e25cc764..5f6dbd1e157 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-29  8:58 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-29  8:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8a2945bc46a39d30b02b6c00173242b9a7ff0d11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 08:51:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 08:51:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2945bc

sci-geosciences/gpsd: enable +python by default (fix RequiredUseDefaults)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index 86ef018d30a..d36e25cc764 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
 	superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static systemd test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 41d26755b6a..456c84a9790 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
 	superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static systemd test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-29  2:24 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-29  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     fa09e21d915f72466742c06796a83eb87d20f8a2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 02:23:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 02:23:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa09e21d

sci-geosciences/gpsd: Stabilize 3.23.1 arm, #820455

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index 41d26755b6a..86ef018d30a 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-08  0:55 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-08  0:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b1661e345a920fa1424c7e21464a84a008f82dc4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  8 00:55:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  8 00:55:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1661e34

sci-geosciences/gpsd: Stabilize 3.23-r2 ppc64, #813168

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index d48bc4ad6df..79a48722e97 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-04  1:26 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-04  1:26 UTC (permalink / raw
  To: gentoo-commits

commit:     941b2867f862f64b0f1fc9e7cb011e350324663e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  4 01:25:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  4 01:25:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941b2867

sci-geosciences/gpsd: Stabilize 3.23-r2 x86, #813168

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index f47447a0934..d48bc4ad6df 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-03  0:34 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-03  0:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b6e11a7f96c2c5d1a52dd4ce247b583448f36785
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  3 00:34:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 00:34:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e11a7f

sci-geosciences/gpsd: Stabilize 3.23-r2 ppc, #813168

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index 25dfad30b0e..f47447a0934 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-10-02 23:54 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-10-02 23:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f1dd160bdc765ae3f3297a35d57e053ae104740d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  2 23:54:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  2 23:54:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1dd160b

sci-geosciences/gpsd: Stabilize 3.23-r2 arm, #813168

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index ef5c01d69fe..25dfad30b0e 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-09-25  0:05 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-09-25  0:05 UTC (permalink / raw
  To: gentoo-commits

commit:     6bbc1cd0bf6905b4fd8e12f8abcc3e5bf602c293
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 00:05:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 00:05:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbc1cd0

sci-geosciences/gpsd: drop unused multilib inherit

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
index 550576d658a..41d26755b6a 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit udev distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 550576d658a..41d26755b6a 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit udev distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-09-25  0:04 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-09-25  0:04 UTC (permalink / raw
  To: gentoo-commits

commit:     d673be236a637169ef74f8a4d6520c4b48059958
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 00:04:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 00:04:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d673be23

sci-geosciences/gpsd: Stabilize 3.23-r2 amd64, #813168

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index 550576d658a..ef5c01d69fe 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-09-25  0:04 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-09-25  0:04 UTC (permalink / raw
  To: gentoo-commits

commit:     eb168717fae4bf7dc26fe75a08255fb78925535c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 00:03:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 00:03:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb168717

sci-geosciences/gpsd: add 3.23.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest           |   1 +
 sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 212 ++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index cfa2ee6fc84..9dd813f6555 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,2 +1,3 @@
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
+DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
 DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b

diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
new file mode 100644
index 00000000000..550576d658a
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/29"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
+	superstar2 tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static systemd test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/gpsd
+	acct-group/dialout
+	>=net-misc/pps-tools-0.0.20120407
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
+	bluetooth? ( net-wireless/bluez:= )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial )
+	gpsd_protocols_greis? ( dev-python/pyserial )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# asciidoctor package is for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	BDEPEND+=" dev-ruby/asciidoctor"
+fi
+
+python_check_deps() {
+	has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
+}
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+	) )
+
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	# bug #807661
+	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
+
+	default
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_setup
+
+	# Extract python info out of SConscript so we can use saner distribute
+	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
+	local pyprogs=$(pyarray python_progs)
+	local pybins=$("${PYTHON}" -c "${pyprogs}; \
+		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
+	local pysrcs=$(pyarray packet_ffi_extension)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
+
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
+	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+
+	# Post 3.19 the clienthelpers were merged into gps.packet
+
+	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
+	sed \
+		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
+		-e "s|@URL@|https://gpsd.io/|" \
+		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@DOWNLOAD@|$(pyvar download)|" \
+		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
+		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
+		-e "s|@MAILMAN@|$(pyvar mailman)|" \
+		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
+		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
+		-e "s|@WEBSITE@|https://gpsd.io/|" \
+		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	scons_opts=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		rundir="/run"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=dialout
+		nostrip=True
+		systemd=$(usex systemd)
+		unitdir="\$prefix/$(get_libdir)"
+		shared=$(usex !static True False)
+		bluez=$(usex bluetooth)
+		libgpsmm=$(usex cxx)
+		clientdebug=$(usex debug)
+		dbus_export=$(usex dbus)
+		ipv6=$(usex ipv6)
+		timing=$(usex latency-timing)
+		ncurses=$(usex ncurses)
+		ntpshm=$(usex ntp)
+		pps=$(usex ntp)
+		python=$(usex python)
+		# force a predictable python libdir because lib vs. lib64 usage differs
+		# from 3.5 to 3.6+
+		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		qt=$(usex qt5)
+		shm_export=$(usex shm)
+		socket_export=$(usex sockets)
+		usb=$(usex usb)
+	)
+
+	if [[ ${PV} != *9999* ]] ; then
+		scons_opts+=( manbuild=False )
+	fi
+
+	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
+	use qt5 && scons_opts+=( qt_versioned=5 )
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
+	done
+
+	# bug #809260
+	python_setup
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons "${scons_opts[@]}"
+
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
+	use python && distutils-r1_src_compile
+	popd || die
+}
+
+src_install() {
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	# Cleanup bad alt copy due to Scons
+	rm -rf  "${D}"/python-discard/gps*
+	find "${D}"/python-discard/ -type d -delete
+	# Install correct multi-python copy
+	pushd "${P}" || die
+	use python && distutils-r1_src_install
+	popd || die
+}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-09-11 21:34 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-09-11 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     14b3db2254b1cdf743ee4e9f7e9d627941236d1c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 21:34:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 21:34:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b3db22

sci-geosciences/gpsd: Stabilize 3.21 ppc, #810589

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index da56869cb2d..b37701583b4 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-27 20:06 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-27 20:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f3a74258e2243d57d9153b6dc425d34872decaba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 20:06:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 20:06:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a74258

sci-geosciences/gpsd: Stabilize 3.21 ppc64, #810589

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index d5be3ad7ddb..da56869cb2d 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-22  2:50 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-22  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     6f55fa1f0aca3381e745b6a21c69bb982bb477d4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 02:47:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 02:47:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f55fa1f

sci-geosciences/gpsd: fix build with USE=-python

Closes: https://bugs.gentoo.org/809260
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 3 +++
 sci-geosciences/gpsd/gpsd-9999.ebuild    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index 96a5705d5db..550576d658a 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -179,6 +179,9 @@ src_configure() {
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
 		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
 	done
+
+	# bug #809260
+	python_setup
 }
 
 src_compile() {

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 96a5705d5db..550576d658a 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -179,6 +179,9 @@ src_configure() {
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
 		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
 	done
+
+	# bug #809260
+	python_setup
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-18 19:42 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-18 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e8a3e59397bb45330541dddef334e5e3390f4761
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 19:42:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 19:42:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a3e593

sci-geosciences/gpsd: add missing blue subslot dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild                             | 2 +-
 sci-geosciences/gpsd/{gpsd-3.23-r1.ebuild => gpsd-3.23-r2.ebuild} | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 628cd0ae3c9..d5be3ad7ddb 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -42,7 +42,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-user/gpsd
 	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib

diff --git a/sci-geosciences/gpsd/gpsd-3.23-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
similarity index 99%
rename from sci-geosciences/gpsd/gpsd-3.23-r1.ebuild
rename to sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index c7a6204d919..96a5705d5db 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index c7a6204d919..96a5705d5db 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
 	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( net-wireless/bluez:= )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-18 19:39 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-18 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f268b9b67d24bcf1f6d6e376ffa9c5d30bc758f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 18:39:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 19:22:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f268b9b6

sci-geosciences/gpsd: fix Python modules

Thanks-to: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>
Closes: https://bugs.gentoo.org/808805
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/{gpsd-3.23.ebuild => gpsd-3.23-r1.ebuild} | 6 +++++-
 sci-geosciences/gpsd/gpsd-9999.ebuild                          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r1.ebuild
similarity index 98%
rename from sci-geosciences/gpsd/gpsd-3.23.ebuild
rename to sci-geosciences/gpsd/gpsd-3.23-r1.ebuild
index f21d1e6662f..c7a6204d919 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r1.ebuild
@@ -187,7 +187,10 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons "${scons_opts[@]}"
 
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
 	use python && distutils-r1_src_compile
+	popd || die
 }
 
 src_install() {
@@ -200,6 +203,7 @@ src_install() {
 	rm -rf  "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
+	pushd "${P}" || die
 	use python && distutils-r1_src_install
-
+	popd || die
 }

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f21d1e6662f..c7a6204d919 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -187,7 +187,10 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons "${scons_opts[@]}"
 
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
 	use python && distutils-r1_src_compile
+	popd || die
 }
 
 src_install() {
@@ -200,6 +203,7 @@ src_install() {
 	rm -rf  "${D}"/python-discard/gps*
 	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
+	pushd "${P}" || die
 	use python && distutils-r1_src_install
-
+	popd || die
 }


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-15 22:04 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-15 22:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e278ee90b09436b6beaf4de20ab3d671692e6428
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 22:02:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 22:04:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e278ee90

sci-geosciences/gpsd: add scons dependency, sync live

Reported-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.ebuild |  5 +++++
 sci-geosciences/gpsd/gpsd-9999.ebuild | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23.ebuild
index fa8c1276e64..f21d1e6662f 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 	acct-user/gpsd
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus
@@ -73,6 +74,10 @@ if [[ ${PV} == *9999* ]] ; then
 	BDEPEND+=" dev-ruby/asciidoctor"
 fi
 
+python_check_deps() {
+	has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
+}
+
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index b6f5d935d70..f21d1e6662f 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 	acct-user/gpsd
 	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus
@@ -73,6 +74,10 @@ if [[ ${PV} == *9999* ]] ; then
 	BDEPEND+=" dev-ruby/asciidoctor"
 fi
 
+python_check_deps() {
+	has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
+}
+
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
@@ -85,6 +90,9 @@ src_prepare() {
 		die "please sync ebuild & source"
 	fi
 
+	# bug #807661
+	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
+
 	default
 
 	use python && distutils-r1_src_prepare
@@ -183,7 +191,7 @@ src_compile() {
 }
 
 src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-11 23:57 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-11 23:57 UTC (permalink / raw
  To: gentoo-commits

commit:     358d4384de7945f07a338d54129c31d755a90b2f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 23:56:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 23:56:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358d4384

sci-geosciences/gpsd: fix installation of udev/hotplug files

Closes: https://bugs.gentoo.org/807661
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23.ebuild
index b6f5d935d70..fa8c1276e64 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.ebuild
@@ -85,6 +85,9 @@ src_prepare() {
 		die "please sync ebuild & source"
 	fi
 
+	# bug #807661
+	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
+
 	default
 
 	use python && distutils-r1_src_prepare
@@ -183,7 +186,7 @@ src_compile() {
 }
 
 src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-10 23:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-10 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ac6aec9da84b5b721c0587056f3587a11343d8c8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 23:52:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 23:52:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6aec9d

sci-geosciences/gpsd: restore ~arm64

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23.ebuild
index 316786473e7..b6f5d935d70 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 316786473e7..b6f5d935d70 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-10 23:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-10 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     82e0c0ea184a60062250520ced7bf6e319a2e609
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 23:50:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 23:50:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e0c0ea

sci-geosciences/gpsd: adjust udev rule based on USE=systemd

Closes: https://bugs.gentoo.org/682226
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.ebuild | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23.ebuild
index d42188087c8..316786473e7 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.ebuild
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
 	superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx 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 systemd test udev usb X"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )
@@ -137,7 +137,7 @@ src_configure() {
 		gpsd_user=gpsd
 		gpsd_group=dialout
 		nostrip=True
-		systemd=yes
+		systemd=$(usex systemd)
 		unitdir="\$prefix/$(get_libdir)"
 		shared=$(usex !static True False)
 		bluez=$(usex bluetooth)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index d42188087c8..316786473e7 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
 	superstar2 tnt tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx 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 systemd test udev usb X"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	gpsd_protocols_isync? ( gpsd_protocols_ublox )
@@ -137,7 +137,7 @@ src_configure() {
 		gpsd_user=gpsd
 		gpsd_group=dialout
 		nostrip=True
-		systemd=yes
+		systemd=$(usex systemd)
 		unitdir="\$prefix/$(get_libdir)"
 		shared=$(usex !static True False)
 		bluez=$(usex bluetooth)


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-10 23:52 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-10 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     124eafc31d0d6fdf24f1dfe53f7c27c2a8cfc08d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 23:48:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 23:48:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124eafc3

sci-geosciences/gpsd: add 3.23

Bug: https://bugs.gentoo.org/806770
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest         |   1 +
 sci-geosciences/gpsd/gpsd-3.23.ebuild | 197 ++++++++++++++++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index cb4314ceceb..cfa2ee6fc84 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1 +1,2 @@
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
+DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild b/sci-geosciences/gpsd/gpsd-3.23.ebuild
new file mode 100644
index 00000000000..d42188087c8
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.23.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/29"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
+	superstar2 tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
+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 )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/gpsd
+	acct-group/dialout
+	>=net-misc/pps-tools-0.0.20120407
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial )
+	gpsd_protocols_greis? ( dev-python/pyserial )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# asciidoctor package is for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	BDEPEND+=" dev-ruby/asciidoctor"
+fi
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+	) )
+
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	default
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_setup
+
+	# Extract python info out of SConscript so we can use saner distribute
+	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
+	local pyprogs=$(pyarray python_progs)
+	local pybins=$("${PYTHON}" -c "${pyprogs}; \
+		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
+	local pysrcs=$(pyarray packet_ffi_extension)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
+
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
+	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+
+	# Post 3.19 the clienthelpers were merged into gps.packet
+
+	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
+	sed \
+		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
+		-e "s|@URL@|https://gpsd.io/|" \
+		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@DOWNLOAD@|$(pyvar download)|" \
+		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
+		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
+		-e "s|@MAILMAN@|$(pyvar mailman)|" \
+		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
+		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
+		-e "s|@WEBSITE@|https://gpsd.io/|" \
+		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	scons_opts=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		rundir="/run"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=dialout
+		nostrip=True
+		systemd=yes
+		unitdir="\$prefix/$(get_libdir)"
+		shared=$(usex !static True False)
+		bluez=$(usex bluetooth)
+		libgpsmm=$(usex cxx)
+		clientdebug=$(usex debug)
+		dbus_export=$(usex dbus)
+		ipv6=$(usex ipv6)
+		timing=$(usex latency-timing)
+		ncurses=$(usex ncurses)
+		ntpshm=$(usex ntp)
+		pps=$(usex ntp)
+		python=$(usex python)
+		# force a predictable python libdir because lib vs. lib64 usage differs
+		# from 3.5 to 3.6+
+		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		qt=$(usex qt5)
+		shm_export=$(usex shm)
+		socket_export=$(usex sockets)
+		usb=$(usex usb)
+	)
+
+	if [[ ${PV} != *9999* ]] ; then
+		scons_opts+=( manbuild=False )
+	fi
+
+	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
+	use qt5 && scons_opts+=( qt_versioned=5 )
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons "${scons_opts[@]}"
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	# Cleanup bad alt copy due to Scons
+	rm -rf  "${D}"/python-discard/gps*
+	find "${D}"/python-discard/ -type d -delete
+	# Install correct multi-python copy
+	use python && distutils-r1_src_install
+
+}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-10  0:16 Marek Szuba
  0 siblings, 0 replies; 105+ messages in thread
From: Marek Szuba @ 2021-08-10  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     c7b86a1c083893cafbea2e562689ab54882264db
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 00:09:11 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 00:09:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b86a1c

sci-geosciences/gpsd: keyword 3.21 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 8d563919cfa..628cd0ae3c9 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 6eba1d409bc..d42188087c8 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-09 23:53 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-09 23:53 UTC (permalink / raw
  To: gentoo-commits

commit:     f1948c44c7075a345594b231b5399a1b6fdab7c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  9 23:53:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 23:53:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1948c44

sci-geosciences/gpsd: add acct-group/dialout dependency

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 6ff3dbd3190..6eba1d409bc 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -42,6 +42,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/gpsd
+	acct-group/dialout
 	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-08-09 23:46 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-08-09 23:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c463a4eec44195855da8647e54fc47cf6639cbfd
Author:     James Browning <jamesb.fe80 <AT> gmail <DOT> com>
AuthorDate: Mon Aug  9 23:45:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 23:46:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c463a4ee

sci-geosciences/gpsd: update 9999 with upstream changes

2.23 will follow soon. Will cut it based on the 9999
ebuild.

[Small rebasing changes by sam@].

Bug: https://bugs.gentoo.org/806770
Closes: https://bugs.gentoo.org/777960
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: James Browning <jamesb.fe80 <AT> gmail.com>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 61 ++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 0424345e875..6ff3dbd3190 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit udev multilib distutils-r1 scons-utils toolchain-funcs
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
 LICENSE="BSD"
-SLOT="0/27"
+SLOT="0/29"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
@@ -63,37 +63,27 @@ RDEPEND="
 	gpsd_protocols_greis? ( dev-python/pyserial )
 	usb? ( virtual/libusb:1 )
 	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	test? ( sys-devel/bc )"
 
-# xml packages are for man page generation
+# asciidoctor package is for man page generation
 if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
+	BDEPEND+=" dev-ruby/asciidoctor"
 fi
 
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
 	) )
+
 	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
 		eerror "Detected protocols: ${src_protocols}"
 		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
 		die "please sync ebuild & source"
 	fi
 
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	#Fix systemd binary paths
-	sed -i -e 's/local\///' 'systemd/gpsd.service'
-	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
-
 	default
 
 	use python && distutils-r1_src_prepare
@@ -102,8 +92,8 @@ src_prepare() {
 python_prepare_all() {
 	python_setup
 
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConstruct ; }
+	# Extract python info out of SConscript so we can use saner distribute
+	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
 	local pyprogs=$(pyarray python_progs)
 	local pybins=$("${PYTHON}" -c "${pyprogs}; \
 		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
@@ -114,17 +104,25 @@ python_prepare_all() {
 	local pysrcs=$(pyarray packet_ffi_extension)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
 
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
+	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+
 	# Post 3.19 the clienthelpers were merged into gps.packet
+
+	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
 	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "/@GPS_CLIENT_SOURCES@/d" \
+		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
+		-e "s|@URL@|https://gpsd.io/|" \
+		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
 		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+		-e "s|@DOWNLOAD@|$(pyvar download)|" \
+		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
+		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
+		-e "s|@MAILMAN@|$(pyvar mailman)|" \
+		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
+		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
+		-e "s|@WEBSITE@|https://gpsd.io/|" \
+		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
 	distutils-r1_python_prepare_all
 }
 
@@ -138,7 +136,8 @@ src_configure() {
 		gpsd_user=gpsd
 		gpsd_group=dialout
 		nostrip=True
-		manbuild=False
+		systemd=yes
+		unitdir="\$prefix/$(get_libdir)"
 		shared=$(usex !static True False)
 		bluez=$(usex bluetooth)
 		libgpsmm=$(usex cxx)
@@ -159,6 +158,10 @@ src_configure() {
 		usb=$(usex usb)
 	)
 
+	if [[ ${PV} != *9999* ]] ; then
+		scons_opts+=( manbuild=False )
+	fi
+
 	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
 	use qt5 && scons_opts+=( qt_versioned=5 )
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2021-06-01 12:06 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2021-06-01 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     4eb96e8ec17886c75d2288719eb376abd7e040c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 12:06:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 12:06:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb96e8e

sci-geosciences/gpsd: add Python 3.9 to live too

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index fd54dc05ae2..0424345e875 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit udev multilib distutils-r1 scons-utils toolchain-funcs


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-10-06 14:23 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2020-10-06 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e57046992b3c35950cd42472605d49b263218be0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 14:21:09 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 14:23:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5704699

sci-geosciences/gpsd: Keyword 3.21 arm64, #739562

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index c5109b205bd..adb5b777c2b 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-25 17:51 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2020-09-25 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0b7a6ea689c896fa26dbc857f5e8c13628596a0d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 17:46:55 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 17:46:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7a6ea6

sci-geosciences/gpsd: call python_setup uncondiitonally

python_setup is called by the distutils machinery
when USE=python, but wasn't in the USE=-python case
until now.

We need this because we're using (e)scons to build.

Closes: https://bugs.gentoo.org/734352
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 12d81cded2b..8083dc4252b 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -100,7 +100,12 @@ src_prepare() {
 
 	default
 
-	use python && distutils-r1_src_prepare
+	if use python ; then
+		distutils-r1_src_prepare
+	else
+		# We're using escons, bug #734352
+		python_setup
+	fi
 }
 
 python_prepare_all() {


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-25 17:51 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2020-09-25 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     7a670969b8e815cc1919e0d5734544ef0a55174d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 17:51:48 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 17:51:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a670969

sci-geosciences/gpsd: misc fixes

- Add missing || dies
- Guard python-bindings build system workaround with USE=python
  (issue uncovered by added || die)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 8083dc4252b..427bd9baf5c 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit distutils-r1 scons-utils toolchain-funcs udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -94,9 +94,9 @@ src_prepare() {
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
 		SConstruct || die
 
-	#Fix systemd binary paths
-	sed -i -e 's/local\///' 'systemd/gpsd.service'
-	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
+	# Fix systemd binary paths
+	sed -i -e 's/local\///' 'systemd/gpsd.service' || die
+	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' || die
 
 	default
 
@@ -190,8 +190,11 @@ src_install() {
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
-	find "${D}"/python-discard/ -type d -delete
+	if use python ; then
+		rm -rf "${ED}"/python-discard/gps* || die
+		find "${ED}"/python-discard/ -type d -delete || die
+	fi
+
 	# Install correct multi-python copy
 	use python && distutils-r1_src_install
 }


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-25 16:01 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2020-09-25 16:01 UTC (permalink / raw
  To: gentoo-commits

commit:     a1edef4b754f6f71c3f2783baa68ca650d257774
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 16:00:21 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 16:00:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1edef4b

sci-geosciences/gpsd: Stabilize 3.21 x86, #743556

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 21b03503679..12d81cded2b 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-25 16:00 Sam James
  0 siblings, 0 replies; 105+ messages in thread
From: Sam James @ 2020-09-25 16:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0563646ebc744960935b1ec2291f1ec22e2725ce
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 15:59:23 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 16:00:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0563646e

sci-geosciences/gpsd: Stabilize 3.21 amd64, #743556

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 6cbd9be5a86..21b03503679 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-24 19:53 Aaron Bauman
  0 siblings, 0 replies; 105+ messages in thread
From: Aaron Bauman @ 2020-09-24 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     387a37b27f26bfb4a83cb942a0e6205a5c817733
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 19:06:29 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 19:53:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387a37b2

sci-geosciences/gpsd: drop old EAPI=5

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest           |   2 -
 sci-geosciences/gpsd/gpsd-3.18.1.ebuild | 192 --------------------------------
 sci-geosciences/gpsd/gpsd-3.19.ebuild   | 192 --------------------------------
 3 files changed, 386 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 595d071ea61..432a2de36b3 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,5 +1,3 @@
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
-DIST gpsd-3.18.1.tar.gz 9031595 BLAKE2B 170863740c7281ea111c3f4db2dfeb67f4366da7e9e8d2f7f3bbddacbc9d2083558379b1fe60c9293c31a6428288d205aba565694fedde6f1dfe67999a6782c6 SHA512 b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
-DIST gpsd-3.19.tar.gz 10581777 BLAKE2B 0801919c968b8027c357047dabdc8587e1d5950cb0d80f89d6d62678a11b3dfc76a6a89ae59123680dac3188a695d0c37618d3f83280f5e584e10c1fa9a5dc03 SHA512 c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814
 DIST gpsd-3.20.tar.gz 3600835 BLAKE2B 6c9a3540de1be9191a601d6666c18c79e8e8913a3b4455448bafd0fa81e3a1859bd4851d42c3d06aed48fd0910060919f87a661d02fec44c001e9a393d8658e6 SHA512 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e

diff --git a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
deleted file mode 100644
index 466deda4514..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/24"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
-	superstar2 tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-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 )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
-	# Merged upstream
-	#epatch "${FILESDIR}"/${P}-scons-print.patch
-	#epatch "${FILESDIR}"/${P}-scons-py3.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-	python_export
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=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)
-		$(use_scons latency-timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
-	)
-
-	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
-	use qt5 && myesconsargs+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
-	find "${D}"/usr/local/ -type d -delete
-	# Install correct multi-python copy
-	use python && distutils-r1_src_install
-
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild
deleted file mode 100644
index 881256686bc..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.19.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/24"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
-	superstar2 tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
-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 )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/ntpsec
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
-	# Merged upstream
-	#epatch "${FILESDIR}"/${P}-scons-print.patch
-	#epatch "${FILESDIR}"/${P}-scons-py3.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-	python_export
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	# Handle conditional tools manually. #666734
-	use X && pybins+="+ ['xgps', 'xgpsspeed']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=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)
-		$(use_scons latency-timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
-	)
-
-	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
-	use qt5 && myesconsargs+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
-	find "${D}"/usr/local/ -type d -delete
-	# Install correct multi-python copy
-	use python && distutils-r1_src_install
-
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-09-10 15:31 Marek Szuba
  0 siblings, 0 replies; 105+ messages in thread
From: Marek Szuba @ 2020-09-10 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     9dbd9daa0fe5f0ab875365df77d79e50eb009706
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 15:30:14 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 15:30:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbd9daa

sci-geosciences/gpsd-3.21: add GPL-2 to LICENSE

It's the first time I heard about it but it turns out we do have to
include the licence of our own init scripts and suchlike in LICENSE...
If it has to be this way, it has to be this way.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index ff88fc9a160..6cbd9be5a86 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="https://gpsd.io/"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0/27"
 
 GPSD_PROTOCOLS=(


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-29  1:07 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-29  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     dd3f62804794fef03c5055f38a4e3f7b14b978e9
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 01:07:30 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 01:07:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3f6280

sci-geosciences/gpsd: keywords for 3.20

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
index 867831ceebf..8953467697c 100644
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-28 18:12 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-28 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f81a694f88ebe8eb0775acb044574fe49fc29e66
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 18:11:55 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81a694f

sci-geosciences/gpsd: pull keywords on 3.20

pending review by the geosciences team

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
index 8953467697c..867831ceebf 100644
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-28 18:12 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-28 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     7158269938d3357d60b205354369cbc6c405d00b
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 17:12:42 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71582699

sci-geosciences/gpsd: fix systemd units

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.20.ebuild | 5 +++++
 sci-geosciences/gpsd/gpsd-9999.ebuild | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
index 14a77077867..5b207643d5d 100644
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -89,6 +89,10 @@ src_prepare() {
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
 		SConstruct || die
 
+	#Fix systemd binary paths
+	sed -i -e 's/local\///' 'systemd/gpsd.service'
+	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
+
 	default
 
 	use python && distutils-r1_src_prepare
@@ -124,6 +128,7 @@ src_configure() {
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
+		rundir="/run"
 		chrpath=False
 		gpsd_user=gpsd
 		gpsd_group=uucp

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index cd96667f22e..73c52f149eb 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -89,6 +89,10 @@ src_prepare() {
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
 		SConstruct || die
 
+	#Fix systemd binary paths
+	sed -i -e 's/local\///' 'systemd/gpsd.service'
+	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
+
 	default
 
 	use python && distutils-r1_src_prepare
@@ -128,6 +132,7 @@ src_configure() {
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
+		rundir="/run"
 		chrpath=False
 		gpsd_user=gpsd
 		gpsd_group=uucp


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-28 18:12 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-28 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     8cf177c62fc32e0564439b007ed4ffd68ccec1cd
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 16:48:04 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf177c6

sci-geosciences/gpsd: bumpity bump

bumping eapi
bumping version
various cleanups for same
Much work contributed by michael AT weiser.dinsnail.net
Significant work on bug #704580 which I am still going through all of

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/Manifest                      |  1 +
 .../gpsd/{gpsd-9999.ebuild => gpsd-3.20.ebuild}    | 57 +++++++++---------
 sci-geosciences/gpsd/gpsd-9999.ebuild              | 69 +++++++++++-----------
 3 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 02f03645cf4..d7ad2e03d2c 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1,4 @@
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
 DIST gpsd-3.18.1.tar.gz 9031595 BLAKE2B 170863740c7281ea111c3f4db2dfeb67f4366da7e9e8d2f7f3bbddacbc9d2083558379b1fe60c9293c31a6428288d205aba565694fedde6f1dfe67999a6782c6 SHA512 b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
 DIST gpsd-3.19.tar.gz 10581777 BLAKE2B 0801919c968b8027c357047dabdc8587e1d5950cb0d80f89d6d62678a11b3dfc76a6a89ae59123680dac3188a695d0c37618d3f83280f5e584e10c1fa9a5dc03 SHA512 c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814
+DIST gpsd-3.20.tar.gz 3600835 BLAKE2B 6c9a3540de1be9191a601d6666c18c79e8e8913a3b4455448bafd0fa81e3a1859bd4851d42c3d06aed48fd0910060919f87a661d02fec44c001e9a393d8658e6 SHA512 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
similarity index 82%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.20.ebuild
index 76b0f95ce73..1da8c9d4b80 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -84,11 +84,6 @@ src_prepare() {
 		die "please sync ebuild & source"
 	fi
 
-	epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
-	# Merged upstream
-	#epatch "${FILESDIR}"/${P}-scons-print.patch
-	#epatch "${FILESDIR}"/${P}-scons-py3.patch
-
 	# Avoid useless -L paths to the install dir
 	sed -i \
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
@@ -101,7 +96,6 @@ src_prepare() {
 
 python_prepare_all() {
 	python_setup
-	python_export
 
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
@@ -126,7 +120,7 @@ python_prepare_all() {
 }
 
 src_configure() {
-	myesconsargs=(
+	scons_opts=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
@@ -136,29 +130,32 @@ src_configure() {
 		nostrip=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)
-		$(use_scons latency-timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
+		bluez=$(usex bluetooth)
+		libgpsmm=$(usex cxx)
+		clientdebug=$(usex debug)
+		dbus_export=$(usex dbus)
+		ipv6=$(usex ipv6)
+		timing=$(usex latency-timing)
+		ncurses=$(usex ncurses)
+		ntpshm=$(usex ntp)
+		pps=$(usex ntp)
+		python=$(usex python)
+		# force a predictable python libdir because lib vs. lib64 usage differs
+		# from 3.5 to 3.6+
+		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		qt=$(usex qt5)
+		shm_export=$(usex shm)
+		socket_export=$(usex sockets)
+		usb=$(usex usb)
 	)
 
-	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
-	use qt5 && myesconsargs+=( qt_versioned=5 )
+	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
+	use qt5 && scons_opts+=( qt_versioned=5 )
 
 	# enable specified protocols
 	local protocol
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
 	done
 }
 
@@ -166,20 +163,20 @@ src_compile() {
 	export CHRPATH=
 	tc-export CC CXX PKG_CONFIG
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
+	escons "${scons_opts[@]}"
 
 	use python && distutils-r1_src_compile
 }
 
 src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
-	find "${D}"/usr/local/ -type d -delete
+	rm -rf  "${D}"/python-discard/gps*
+	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
 	use python && distutils-r1_src_install
 

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 76b0f95ce73..cd96667f22e 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -84,11 +84,6 @@ src_prepare() {
 		die "please sync ebuild & source"
 	fi
 
-	epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
-	# Merged upstream
-	#epatch "${FILESDIR}"/${P}-scons-print.patch
-	#epatch "${FILESDIR}"/${P}-scons-py3.patch
-
 	# Avoid useless -L paths to the install dir
 	sed -i \
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
@@ -101,17 +96,20 @@ src_prepare() {
 
 python_prepare_all() {
 	python_setup
-	python_export
 
 	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
+	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConstruct ; }
+	local pyprogs=$(pyarray python_progs)
+	local pybins=$("${PYTHON}" -c "${pyprogs}; \
+		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
 	# Handle conditional tools manually. #666734
 	use X && pybins+="+ ['xgps', 'xgpsspeed']"
 	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
 	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local pysrcs=$(pyarray packet_ffi_extension)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
+
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	# Post 3.19 the clienthelpers were merged into gps.packet
 	sed \
 		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
@@ -126,7 +124,7 @@ python_prepare_all() {
 }
 
 src_configure() {
-	myesconsargs=(
+	scons_opts=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
@@ -136,29 +134,32 @@ src_configure() {
 		nostrip=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)
-		$(use_scons latency-timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
+		bluez=$(usex bluetooth)
+		libgpsmm=$(usex cxx)
+		clientdebug=$(usex debug)
+		dbus_export=$(usex dbus)
+		ipv6=$(usex ipv6)
+		timing=$(usex latency-timing)
+		ncurses=$(usex ncurses)
+		ntpshm=$(usex ntp)
+		pps=$(usex ntp)
+		python=$(usex python)
+		# force a predictable python libdir because lib vs. lib64 usage differs
+		# from 3.5 to 3.6+
+		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		qt=$(usex qt5)
+		shm_export=$(usex shm)
+		socket_export=$(usex sockets)
+		usb=$(usex usb)
 	)
 
-	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
-	use qt5 && myesconsargs+=( qt_versioned=5 )
+	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
+	use qt5 && scons_opts+=( qt_versioned=5 )
 
 	# enable specified protocols
 	local protocol
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
 	done
 }
 
@@ -166,20 +167,20 @@ src_compile() {
 	export CHRPATH=
 	tc-export CC CXX PKG_CONFIG
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
+	escons "${scons_opts[@]}"
 
 	use python && distutils-r1_src_compile
 }
 
 src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
-	find "${D}"/usr/local/ -type d -delete
+	rm -rf  "${D}"/python-discard/gps*
+	find "${D}"/python-discard/ -type d -delete
 	# Install correct multi-python copy
 	use python && distutils-r1_src_install
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-28 18:12 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-28 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d4f93d20d40bf8023603f9f3df5e9dd3e0a7214f
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 18:04:47 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f93d20

sci-geosciences/gpsd: adjust subslots

match solib version

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.20.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
index 22ad7bf0704..8953467697c 100644
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f0fcb09fdae..88e6bfa164e 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/27"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-28 18:12 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-28 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     52d0dd930929ebc49804bd4a8ecfe674e8cff3cc
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 17:59:40 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d0dd93

sci-geosciences/gpsd: migrate to glep 81

add acct-user/gpsd and use it
migrate from uucp/gpsd groups to dialout
Interestingly I can't actually find gpsd group ever being created, but I
find it being used.  As such, I simply dropped it.
https://bugs.gentoo.org/704580
https://bugs.gentoo.org/691746
https://bugs.gentoo.org/667410

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.20.ebuild | 11 +++--------
 sci-geosciences/gpsd/gpsd-9999.ebuild | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
index 5b207643d5d..22ad7bf0704 100644
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{6,7,8} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -41,6 +41,7 @@ REQUIRED_USE="X? ( python )
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-user/gpsd
 	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
@@ -131,7 +132,7 @@ src_configure() {
 		rundir="/run"
 		chrpath=False
 		gpsd_user=gpsd
-		gpsd_group=uucp
+		gpsd_group=dialout
 		nostrip=True
 		manbuild=False
 		shared=$(usex !static True False)
@@ -186,9 +187,3 @@ src_install() {
 	use python && distutils-r1_src_install
 
 }
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 73c52f149eb..f0fcb09fdae 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{6,7,8} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
@@ -41,6 +41,7 @@ REQUIRED_USE="X? ( python )
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-user/gpsd
 	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
@@ -135,7 +136,7 @@ src_configure() {
 		rundir="/run"
 		chrpath=False
 		gpsd_user=gpsd
-		gpsd_group=uucp
+		gpsd_group=dialout
 		nostrip=True
 		manbuild=False
 		shared=$(usex !static True False)
@@ -190,9 +191,3 @@ src_install() {
 	use python && distutils-r1_src_install
 
 }
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-07-28 18:12 Rick Farina
  0 siblings, 0 replies; 105+ messages in thread
From: Rick Farina @ 2020-07-28 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     18e93fe766ac0d02896b8c547ad1b036d918125f
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 16:50:35 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e93fe7

sci-geosciences/gpsd: more die

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
index 1da8c9d4b80..14a77077867 100644
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -105,7 +105,7 @@ python_prepare_all() {
 	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
 	use gpsd_protocols_greis && pybins+="+ ['zerk']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])" || die "Unable to extract packet types")
 	# Post 3.19 the clienthelpers were merged into gps.packet
 	sed \
 		-e "s|@VERSION@|$(pyvar gpsd_version)|" \


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-05-12  6:22 Matthias Maier
  0 siblings, 0 replies; 105+ messages in thread
From: Matthias Maier @ 2020-05-12  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1d07a615424c9725a453f2bfe0beebeced723c5e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 06:19:08 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue May 12 06:19:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d07a615

sci-geosciences/gpsd: update python compat

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild
index 466deda4514..881256686bc 100644
--- a/sci-geosciences/gpsd/gpsd-3.19.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2020-05-07 15:17 Michał Górny
  0 siblings, 0 replies; 105+ messages in thread
From: Michał Górny @ 2020-05-07 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1f7943a0edd724a6dc55eb13999685b20ca4cc34
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  7 15:14:24 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  7 15:14:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7943a0

sci-geosciences/gpsd: Remove py2.7

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.18.1.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-3.19.ebuild   | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
index 0a1a978ddb2..466deda4514 100644
--- a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs

diff --git a/sci-geosciences/gpsd/gpsd-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild
index 0a1a978ddb2..466deda4514 100644
--- a/sci-geosciences/gpsd/gpsd-3.19.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 5356c904205..76b0f95ce73 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2019-11-29  8:17 Michał Górny
  0 siblings, 0 replies; 105+ messages in thread
From: Michał Górny @ 2019-11-29  8:17 UTC (permalink / raw
  To: gentoo-commits

commit:     8a8cfca457e3cf3058d7007df0deb882ef6a82f4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 17:33:04 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 08:14:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8cfca4

sci-geosciences/gpsd: python_export_best → python_setup

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-3.17-r4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 8999e495cd4..bf7ad731887 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
index 78e26cfd798..cd0378d90c4 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -91,7 +91,7 @@ src_prepare() {
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2019-10-04 19:23 Robin H. Johnson
  0 siblings, 0 replies; 105+ messages in thread
From: Robin H. Johnson @ 2019-10-04 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 19:18:35 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 19:21:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c30c4b5

sci-geosciences/gpsd: update 9999 bugs

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/658834
Fixes: https://bugs.gentoo.org/693136
Fixes: https://bugs.gentoo.org/695110
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f07d1e12062..5c66058b8ce 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -112,14 +112,14 @@ python_prepare_all() {
 	use gpsd_protocols_greis && pybins+="+ ['zerk']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	# Post 3.19 the clienthelpers were merged into gps.packet
 	sed \
 		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
 		-e "s|@URL@|$(pyvar website)|" \
 		-e "s|@EMAIL@|$(pyvar devmail)|" \
 		-e "s|@SCRIPTS@|${pybins}|" \
 		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "/@GPS_CLIENT_SOURCES@/d" \
 		-e "s|@SCRIPTS@|${pybins}|" \
 		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
 	distutils-r1_python_prepare_all


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2019-10-04 18:59 Robin H. Johnson
  0 siblings, 0 replies; 105+ messages in thread
From: Robin H. Johnson @ 2019-10-04 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7a980171372cebfda8166decb7052739156e869e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 18:49:18 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 18:59:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a980171

sci-geosciences/gpsd: sync 9999 ebuild

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-9999.ebuild | 57 ++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 3fcb84a3d95..6cba45913e0 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,37 +4,41 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
 
 LICENSE="BSD"
-SLOT="0/23"
+SLOT="0/24"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
-	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
-	tripmate tsip ublox
+	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
+	superstar2 tnt tripmate tsip ublox
 )
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
 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 )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( cxx )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-misc/pps-tools-0.0.20120407
@@ -54,8 +58,10 @@ RDEPEND="
 		dev-qt/qtnetwork:5
 	)
 	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial )
+	gpsd_protocols_greis? ( dev-python/pyserial )
 	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 )"
@@ -79,22 +85,31 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+	# Merged upstream
+	#epatch "${FILESDIR}"/${P}-scons-print.patch
+	#epatch "${FILESDIR}"/${P}-scons-py3.patch
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
 		SConstruct || die
 
+	default
+
 	use python && distutils-r1_src_prepare
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
+	python_export
+
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
 	# Handle conditional tools manually. #666734
 	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
 	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
@@ -119,7 +134,6 @@ src_configure() {
 		gpsd_user=gpsd
 		gpsd_group=uucp
 		nostrip=True
-		python=False
 		manbuild=False
 		shared=$(usex !static True False)
 		$(use_scons bluetooth bluez)
@@ -131,12 +145,14 @@ src_configure() {
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
+		$(use_scons python)
 		$(use_scons qt5 qt)
 		$(use_scons shm shm_export)
 		$(use_scons sockets socket_export)
 		$(use_scons usb)
 	)
 
+	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
 	use qt5 && myesconsargs+=( qt_versioned=5 )
 
 	# enable specified protocols
@@ -161,13 +177,12 @@ 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
+	# Cleanup bad alt copy due to Scons
+	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
+	find "${D}"/usr/local/ -type d -delete
+	# Install correct multi-python copy
+	use python && distutils-r1_src_install
+
 }
 
 pkg_preinst() {


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2019-10-04 18:59 Robin H. Johnson
  0 siblings, 0 replies; 105+ messages in thread
From: Robin H. Johnson @ 2019-10-04 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     97afb18a8c98e504aef9e68fe983b95949be08c3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 05:15:18 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 18:59:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97afb18a

sci-geosciences/gpsd: cleanup USE=latency_timing

Cleanup USE flag s/latency_timing/latency-timing/

Reference: https://bugs.gentoo.org/695110
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 4 ++--
 sci-geosciences/gpsd/gpsd-3.17-r4.ebuild | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild    | 4 ++--
 sci-geosciences/gpsd/metadata.xml        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index ecc199ad940..8999e495cd4 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
 	tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx 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} )
@@ -124,7 +124,7 @@ src_configure() {
 		$(use_scons debug clientdebug)
 		$(use_scons dbus dbus_export)
 		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
+		$(use_scons latency-timing timing)
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
index 5ffc9c07ef3..78e26cfd798 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
 	tripmate tsip ublox
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx 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} )
@@ -128,7 +128,7 @@ src_configure() {
 		$(use_scons debug clientdebug)
 		$(use_scons dbus dbus_export)
 		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
+		$(use_scons latency-timing timing)
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 5b3bca138d4..3fcb84a3d95 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 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} )
@@ -127,7 +127,7 @@ src_configure() {
 		$(use_scons debug clientdebug)
 		$(use_scons dbus dbus_export)
 		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
+		$(use_scons latency-timing timing)
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)

diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index cb80bead87d..e37603bc069 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -15,7 +15,7 @@
   </slots>
   <use>
     <flag name="dbus">export gpsd data over dbus connections</flag>
-    <flag name="latency_timing">support latency timing information</flag>
+    <flag name="latency-timing">support latency timing information</flag>
     <flag name="ntp">Enable <pkg>net-misc/ntp</pkg> shared memory interface
     and PPS kernel support for GPS time</flag>
     <flag name="sockets">export gpsd over unix sockets</flag>


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2019-09-12  3:57 Mike Frysinger
  0 siblings, 0 replies; 105+ messages in thread
From: Mike Frysinger @ 2019-09-12  3:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b9459744e9345aec8bd0e8fdbc857c1e13838618
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 19:27:38 2019 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 03:46:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9459744

sci-geosciences/gpsd: fix xgps python shebangs

The logic to pull the python scripts out misses the dynamic xps
scripts leading them to not be wrapped as Python 2-specific.

Closes: https://bugs.gentoo.org/666734
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 .../gpsd/{gpsd-9999.ebuild => gpsd-3.17-r4.ebuild}      | 17 +++++++----------
 sci-geosciences/gpsd/gpsd-9999.ebuild                   |  2 ++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
similarity index 93%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
index 84668fd1c77..dc6247feaeb 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -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 ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
@@ -55,7 +55,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 )"
@@ -93,6 +93,8 @@ python_prepare_all() {
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
 	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
@@ -117,7 +119,6 @@ src_configure() {
 		gpsd_user=gpsd
 		gpsd_group=uucp
 		nostrip=True
-		python=False
 		manbuild=False
 		shared=$(usex !static True False)
 		$(use_scons bluetooth bluez)
@@ -129,12 +130,14 @@ src_configure() {
 		$(use_scons ncurses)
 		$(use_scons ntp ntpshm)
 		$(use_scons ntp pps)
+		$(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
@@ -159,13 +162,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 84668fd1c77..5b3bca138d4 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -93,6 +93,8 @@ python_prepare_all() {
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
 	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2019-01-19 19:14 Robin H. Johnson
  0 siblings, 0 replies; 105+ messages in thread
From: Robin H. Johnson @ 2019-01-19 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     72f717e700d8a2de4287da126a62024614008a4c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 19:13:58 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 19:14:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f717e7

sci-geosciences/gpsd: permit net-misc/ntpsec for USE=ntp

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 3 ++-
 sci-geosciences/gpsd/gpsd-9999.ebuild    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 67bbed4914e..ecc199ad940 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -46,6 +46,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
 	ntp? ( || (
 		net-misc/ntp
+		net-misc/ntpsec
 		net-misc/chrony
 	) )
 	qt5? (

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 445bb73cc6e..84668fd1c77 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -46,6 +46,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
 	ntp? ( || (
 		net-misc/ntp
+		net-misc/ntpsec
 		net-misc/chrony
 	) )
 	qt5? (


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-10-04  7:28 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2018-10-04  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     09d6e2d07c08302b659c937a808fd656979137f6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 06:30:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 07:27:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d6e2d0

sci-geosciences/gpsd: Drop 3.17-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 sci-geosciences/gpsd/gpsd-3.17-r2.ebuild | 168 -------------------------------
 1 file changed, 168 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
deleted file mode 100644
index d8f331c91ab..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/23"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
-	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
-	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"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=net-misc/pps-tools-0.0.20120407
-	bluetooth? ( net-wireless/bluez )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=True
-		libgpsmm=True
-		manbuild=False
-		shared=$(usex !static True False)
-		$(use_scons bluetooth bluez)
-		$(use_scons debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons X python)
-		$(use_scons qt5 libQgpsmm)
-		$(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
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	use python && distutils-r1_src_install
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-10-04  6:26 Sergei Trofimovich
  0 siblings, 0 replies; 105+ messages in thread
From: Sergei Trofimovich @ 2018-10-04  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     18292730dec8290fd2c2fa53237dbd91b86b0264
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Oct  3 09:41:11 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 06:26:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18292730

sci-geosciences/gpsd-3.17-r3: keyword for sparc

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 925c4b5fe33..67bbed4914e 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -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 ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-09-30 23:10 Robin H. Johnson
  0 siblings, 0 replies; 105+ messages in thread
From: Robin H. Johnson @ 2018-09-30 23:10 UTC (permalink / raw
  To: gentoo-commits

commit:     e203348b24cabb9d694d8451a9e40dcaa3144636
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 19:42:50 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 23:10:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e203348b

sci-geosciences/gpsd: missing automagic dep on timepps.h from pps-tools

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-geosciences/gpsd/gpsd-3.17-r2.ebuild | 1 +
 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 1 +
 sci-geosciences/gpsd/gpsd-9999.ebuild    | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
index 6b0e491c7b7..d8f331c91ab 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
@@ -36,6 +36,7 @@ REQUIRED_USE="X? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 4a84dbffcc3..925c4b5fe33 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -37,6 +37,7 @@ REQUIRED_USE="X? ( python )
 	qt5? ( cxx )"
 
 RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index e3db55c44b0..445bb73cc6e 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.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
@@ -37,6 +37,7 @@ REQUIRED_USE="X? ( python )
 	qt5? ( cxx )"
 
 RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
 		sys-apps/dbus


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-09-04 20:49 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2018-09-04 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     64b3191d12885b12923680de6f943476cad70a2f
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Aug 12 17:43:32 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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)


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-04-15 17:19 Mikle Kolyada
  0 siblings, 0 replies; 105+ messages in thread
From: Mikle Kolyada @ 2018-04-15 17:19 UTC (permalink / raw
  To: gentoo-commits

commit:     8ff55036e33c09c6c7ffb91f6ea6d0b2b37076fa
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 17:19:24 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 17:19:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff55036

sci-geosciences/gpsd: arm stable wrt bug #632372

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-geosciences/gpsd/gpsd-3.17-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
index 7f2eb654ad0..6b0e491c7b7 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-01-29  1:06 Thomas Deutschmann
  0 siblings, 0 replies; 105+ messages in thread
From: Thomas Deutschmann @ 2018-01-29  1:06 UTC (permalink / raw
  To: gentoo-commits

commit:     924657c9a71cf20258821fd14cee91515c90976a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 00:44:35 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 00:44:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924657c9

sci-geosciences/gpsd: x86 stable (bug #632372)

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 sci-geosciences/gpsd/gpsd-3.17-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
index 13be867bc3d..7f2eb654ad0 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-01-12 15:55 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2018-01-12 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     80cd95d84632cc83878b72ea2a350c3e1ad44e5a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 15:52:32 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 15:54:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cd95d8

sci-geosciences/gpsd: Fix USE=X DEPEND, add missing xgps switch

Closes: https://bugs.gentoo.org/642326
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/gpsd/gpsd-3.17-r2.ebuild | 167 +++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
new file mode 100644
index 00000000000..39652c21d11
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+	inherit git-2
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/23"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
+	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
+	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"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	DEPEND+="
+		app-text/xmlto
+		=app-text/docbook-xml-dtd-4.1*"
+fi
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_export_best
+	# Extract python info out of SConstruct so we can use saner distribute
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+	local pybins=$(pyvar python_progs | tail -1)
+	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	sed \
+		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
+		-e "s|@URL@|$(pyvar website)|" \
+		-e "s|@EMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		nostrip=True
+		libgpsmm=True
+		manbuild=False
+		shared=$(usex !static True False)
+		$(use_scons bluetooth bluez)
+		$(use_scons debug clientdebug)
+		$(use_scons dbus dbus_export)
+		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
+		$(use_scons ncurses)
+		$(use_scons ntp ntpshm)
+		$(use_scons ntp pps)
+		$(use_scons X python)
+		$(use_scons qt5 libQgpsmm)
+		$(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
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	use python && distutils-r1_src_install
+}
+
+pkg_preinst() {
+	# Run the gpsd daemon as gpsd and group uucp; create it here
+	# as it doesn't seem to be needed during compile/install ...
+	enewuser gpsd -1 -1 -1 "uucp"
+}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2018-01-12 15:55 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2018-01-12 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     f5cf75073f46664e96e5df189da6bf9e085dbe13
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 15:53:32 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 15:54:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cf7507

sci-geosciences/gpsd: Drop 3.17-r1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/gpsd/gpsd-3.17-r1.ebuild | 172 -------------------------------
 1 file changed, 172 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
deleted file mode 100644
index 98fba863a5a..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/23"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
-	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
-	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"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	ntp? ( || (
-		net-misc/ntp
-		net-misc/chrony
-	) )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-	python? ( ${PYTHON_DEPS} )
-	usb? ( virtual/libusb:1 )
-	X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == *9999* ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		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 debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
-		$(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 usb)
-	)
-
-	use qt5 && myesconsargs+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-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
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-12-28 21:20 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2017-12-28 21:20 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-12-28 21:20 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2017-12-28 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     d276308209fe1c81e3a3d4fbc05787d02dd2b7d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 21:17:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 21:20:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2763082

sci-geosciences/gpsd: Fix install with USE=-X,python

Thanks-to: Philippe Trottier <tchiwam <AT> gmail.com>
Bug: https://bugs.gentoo.org/640998
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-geosciences/gpsd/gpsd-3.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
index 7c7318b7d1f..98fba863a5a 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
@@ -159,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


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-12-28 15:35 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2017-12-28 15:35 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-12-21 18:23 Andreas Sturmlechner
  0 siblings, 0 replies; 105+ messages in thread
From: Andreas Sturmlechner @ 2017-12-21 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     044faa018977cda20c4311ff5651f246df232370
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 18:19:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 18:23:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=044faa01

sci-geosciences/gpsd: Switch USE qt4 to qt5

See also: https://savannah.nongnu.org/bugs/?52299

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../gpsd/{gpsd-9999.ebuild => gpsd-3.17-r1.ebuild} | 28 ++++++++++++++--------
 sci-geosciences/gpsd/gpsd-9999.ebuild              | 28 ++++++++++++++--------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
similarity index 92%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
index cd3ef4ffa06..cb88e5860ea 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
@@ -30,28 +30,35 @@ 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 qt4 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus 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} )"
 
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses:= )
+RDEPEND="
 	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
 	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )
-	python? ( ${PYTHON_DEPS} )"
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( sys-devel/bc )"
 
 # xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	DEPEND+="
 		app-text/xmlto
 		=app-text/docbook-xml-dtd-4.1*"
@@ -108,6 +115,7 @@ src_configure() {
 		gpsd_group=uucp
 		nostrip=True
 		python=False
+		qt_versioned=5
 		manbuild=False
 		shared=$(usex !static True False)
 		$(use_scons bluetooth bluez)
@@ -121,7 +129,7 @@ src_configure() {
 		$(use_scons ntp pps)
 		$(use_scons shm shm_export)
 		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
+		$(use_scons qt5 libQgpsmm)
 		$(use_scons usb)
 	)
 

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index cd3ef4ffa06..cb88e5860ea 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
@@ -30,28 +30,35 @@ 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 qt4 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus 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} )"
 
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses:= )
+RDEPEND="
 	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
 	dbus? (
 		sys-apps/dbus
 		dev-libs/dbus-glib
 	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )
-	python? ( ${PYTHON_DEPS} )"
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( sys-devel/bc )"
 
 # xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	DEPEND+="
 		app-text/xmlto
 		=app-text/docbook-xml-dtd-4.1*"
@@ -108,6 +115,7 @@ src_configure() {
 		gpsd_group=uucp
 		nostrip=True
 		python=False
+		qt_versioned=5
 		manbuild=False
 		shared=$(usex !static True False)
 		$(use_scons bluetooth bluez)
@@ -121,7 +129,7 @@ src_configure() {
 		$(use_scons ntp pps)
 		$(use_scons shm shm_export)
 		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
+		$(use_scons qt5 libQgpsmm)
 		$(use_scons usb)
 	)
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-12-16 10:31 Tobias Klausmann
  0 siblings, 0 replies; 105+ messages in thread
From: Tobias Klausmann @ 2017-12-16 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     0e5ffa10fe854888a75a9c0f53b8f0f810db61d5
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 10:29:42 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 10:31:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5ffa10

sci-geosciences/gpsd-3.17-r0: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/632372

 sci-geosciences/gpsd/gpsd-3.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild
index d0f831adc6e..3bc87135257 100644
--- a/sci-geosciences/gpsd/gpsd-3.17.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-12-08 20:39 Thomas Deutschmann
  0 siblings, 0 replies; 105+ messages in thread
From: Thomas Deutschmann @ 2017-12-08 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e1e808e72636b743e58b948b390b4a8e40034fea
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 20:07:31 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 20:07:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e808e7

sci-geosciences/gpsd: x86 stable (bug #632372)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sci-geosciences/gpsd/Manifest         | 2 +-
 sci-geosciences/gpsd/gpsd-3.17.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 4462ea235cc..68f2f14928a 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1,3 @@
 DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
 DIST gpsd-3.16.tar.gz 8587490 SHA256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543 WHIRLPOOL 67d6db04593d6df62c64848965fd2c72d806003df9ad8a3623665ecf73a165e12c977d1d3988e46f7aec3c1cdee8bc026c515fd3be855b6da282def4e32498be
-DIST gpsd-3.17.tar.gz 8755304 SHA256 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 WHIRLPOOL 373c3f5f69696013b9af247bb929bd9019d39440d758d79a9c4f5797b36c69af0085fed79c3a5c42ca9412bd0b754d574afc48e44567b029b789dccf8589a17e
+DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1

diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild
index cd3ef4ffa06..d0f831adc6e 100644
--- a/sci-geosciences/gpsd/gpsd-3.17.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-09-24 15:10 Thomas Deutschmann
  0 siblings, 0 replies; 105+ messages in thread
From: Thomas Deutschmann @ 2017-09-24 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     740a8f7924d5035d70f9077b38ab0149c3d50b04
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 15:08:10 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 15:08:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740a8f79

sci-geosciences/gpsd: Expose SONAME major version as subslot

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 sci-geosciences/gpsd/gpsd-3.16.ebuild |  2 +-
 sci-geosciences/gpsd/gpsd-3.17.ebuild |  2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild |  2 +-
 sci-geosciences/gpsd/metadata.xml     | 12 ++++++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 1fbfe4ba335..bf36c89f403 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/22"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt

diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild
index d431599bc0a..cd3ef4ffa06 100644
--- a/sci-geosciences/gpsd/gpsd-3.17.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/23"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index d431599bc0a..cd3ef4ffa06 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/23"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar

diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index 2082a787a8f..cb80bead87d 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -5,10 +5,14 @@
     <email>sci-geosciences@gentoo.org</email>
     <name>Gentoo Geosciences Project</name>
   </maintainer>
-  <longdescription>Unbundled GPS daemon and library to support USB and serial
- GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and
- pygps.
-</longdescription>
+  <longdescription>
+    Unbundled GPS daemon and library to support USB and serial
+    GPS devices and various GPS/mapping clients, such as GPSDrive,
+    kismet, and pygps.
+  </longdescription>
+  <slots>
+    <subslots>Reflect major ABI of libgps.so.</subslots>
+  </slots>
   <use>
     <flag name="dbus">export gpsd data over dbus connections</flag>
     <flag name="latency_timing">support latency timing information</flag>


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-08-20 16:59 Thomas Deutschmann
  0 siblings, 0 replies; 105+ messages in thread
From: Thomas Deutschmann @ 2017-08-20 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d02f21cf75eb74bc058d4e62de935a7094cb5afe
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 16:32:06 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 16:59:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02f21cf

sci-geosciences/gpsd: x86 stable (bug #576006)

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/gpsd/gpsd-3.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 6d7b35a68ff..1fbfe4ba335 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-07-15 15:17 Tobias Klausmann
  0 siblings, 0 replies; 105+ messages in thread
From: Tobias Klausmann @ 2017-07-15 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     fa3cd1e849c92897cdd0029e349897087ed11366
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 14:39:20 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 15:16:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3cd1e8

sci-geosciences/gpsd-3.16-r0: add amd64 keyword

Gentoo-Bug: 576006

 sci-geosciences/gpsd/gpsd-3.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index a8377c94215..6d7b35a68ff 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-03-01  7:55 Michael Weber
  0 siblings, 0 replies; 105+ messages in thread
From: Michael Weber @ 2017-03-01  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     610d6a5e52e9684ffbfe882bf665518c91474b88
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 01:23:20 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 07:54:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610d6a5e

sci-geosciences/gpsd: arm stable (bug 593174).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/gpsd/gpsd-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
index 5ccf378f59a..e7b5410cc43 100644
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.10.ebuild
@@ -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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-02-10 12:29 Michael Weber
  0 siblings, 0 replies; 105+ messages in thread
From: Michael Weber @ 2017-02-10 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     063aa91faec1a4b25a159b2e7d425b1edf73a02d
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 12:26:39 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 12:29:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063aa91f

sci-geosciences/gpsd: arm ppc ppc64 stable (bug 576006).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/gpsd/gpsd-3.16.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 18ad0f640b..ab7d3df084 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2017-01-15 11:20 Pacho Ramos
  0 siblings, 0 replies; 105+ messages in thread
From: Pacho Ramos @ 2017-01-15 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e00a9fca21b050a3d714320912daf2f561dee74a
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 11:03:23 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:20:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00a9fca

sci-geosciences/gpsd: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/gpsd/Manifest         |   2 -
 sci-geosciences/gpsd/gpsd-3.11.ebuild | 167 ---------------------------------
 sci-geosciences/gpsd/gpsd-3.15.ebuild | 171 ----------------------------------
 3 files changed, 340 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index d760097..d0afd60 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,5 +1,3 @@
 DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
-DIST gpsd-3.11.tar.gz 1579600 SHA256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee SHA512 bf600ea99635d415916c2a3043f56e61bda023ba320a15f33cd47b375c772dbec69aa941c4729914ccd6a868488cd6bd9f35d4067af9e353def743f45636e6f4 WHIRLPOOL 12a9fde832d611d129f48919d10c4a48f7da1e664d49844d4317e3b9511dee9810884f4b23036ebf576e7870b56091767a4f6c0237a8091643abb637642ee2b8
-DIST gpsd-3.15.tar.gz 1410534 SHA256 81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea SHA512 2be83cac52b5034bca44374cf7e17917270fe50495014f424d46a171bc77b58f9c5eb8ea38fe0cff9a28a6c2b6b8e5bf17a5a141eb9243962319a1ae9da2ea04 WHIRLPOOL 323dc3336372d318ade9549ad401fa588e9abd3d01add750892fa028bf8f6837342ba76f6f85ebf715329517d314f9fe63429460ea1a639000124437f761fb8c
 DIST gpsd-3.16.tar.gz 8587490 SHA256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543 WHIRLPOOL 67d6db04593d6df62c64848965fd2c72d806003df9ad8a3623665ecf73a165e12c977d1d3988e46f7aec3c1cdee8bc026c515fd3be855b6da282def4e32498be
 DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f WHIRLPOOL 1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1

diff --git a/sci-geosciences/gpsd/gpsd-3.11.ebuild b/sci-geosciences/gpsd/gpsd-3.11.ebuild
deleted file mode 100644
index 4fb5430..00000000
--- a/sci-geosciences/gpsd/gpsd-3.11.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
-	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
-	tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses:= )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
-	epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch
-	epatch "${FILESDIR}"/${PN}-3.11-no-ntpshm.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		strip=False
-		python=False
-		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)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-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 ; then
-			rm "${ED%/}"/usr/bin/xgps* || die
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
deleted file mode 100644
index bc6e7eb..00000000
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
-	tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses:= )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
-	epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
-	epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
-	epatch "${FILESDIR}"/${PN}-3.15-timebase.patch
-	epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=True
-		python=False
-		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)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-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 ; then
-			rm "${ED%/}"/usr/bin/xgps* || die
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2016-12-20 15:34 Tobias Klausmann
  0 siblings, 0 replies; 105+ messages in thread
From: Tobias Klausmann @ 2016-12-20 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6c52c78017af9b4175c9ccb7afc959edf7cdd176
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 15:33:35 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 15:34:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c52c780

sci-geosciences/gpsd-3.10-r0: stable on amd64

Gentoo-Bug: 593174

 sci-geosciences/gpsd/gpsd-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
index 6662e5a..a0e60cf 100644
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.10.ebuild
@@ -15,7 +15,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"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2016-03-27 12:02 Sam Jorna
  0 siblings, 0 replies; 105+ messages in thread
From: Sam Jorna @ 2016-03-27 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     becb25ac83256fc8382128ca7985f73bb4699206
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 11:38:48 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 11:57:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=becb25ac

sci-geosciences/gpsd: bump to 3.16

Package-Manager: portage-2.2.28

 sci-geosciences/gpsd/Manifest         |   1 +
 sci-geosciences/gpsd/gpsd-3.16.ebuild | 171 ++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 502bd1c..d760097 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,4 +1,5 @@
 DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
 DIST gpsd-3.11.tar.gz 1579600 SHA256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee SHA512 bf600ea99635d415916c2a3043f56e61bda023ba320a15f33cd47b375c772dbec69aa941c4729914ccd6a868488cd6bd9f35d4067af9e353def743f45636e6f4 WHIRLPOOL 12a9fde832d611d129f48919d10c4a48f7da1e664d49844d4317e3b9511dee9810884f4b23036ebf576e7870b56091767a4f6c0237a8091643abb637642ee2b8
 DIST gpsd-3.15.tar.gz 1410534 SHA256 81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea SHA512 2be83cac52b5034bca44374cf7e17917270fe50495014f424d46a171bc77b58f9c5eb8ea38fe0cff9a28a6c2b6b8e5bf17a5a141eb9243962319a1ae9da2ea04 WHIRLPOOL 323dc3336372d318ade9549ad401fa588e9abd3d01add750892fa028bf8f6837342ba76f6f85ebf715329517d314f9fe63429460ea1a639000124437f761fb8c
+DIST gpsd-3.16.tar.gz 8587490 SHA256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543 WHIRLPOOL 67d6db04593d6df62c64848965fd2c72d806003df9ad8a3623665ecf73a165e12c977d1d3988e46f7aec3c1cdee8bc026c515fd3be855b6da282def4e32498be
 DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f WHIRLPOOL 1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
new file mode 100644
index 0000000..4602b53
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+	inherit git-2
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+	geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
+	tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	ncurses? ( sys-libs/ncurses:= )
+	bluetooth? ( net-wireless/bluez )
+	usb? ( virtual/libusb:1 )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+	qt4? ( dev-qt/qtgui:4 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == "9999" ]] ; then
+	DEPEND+="
+		app-text/xmlto
+		=app-text/docbook-xml-dtd-4.1*"
+fi
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
+	epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
+	epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die
+
+	eapply_user
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_export_best
+	# Extract python info out of SConstruct so we can use saner distribute
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+	local pybins=$(pyvar python_progs | tail -1)
+	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	sed \
+		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
+		-e "s|@URL@|$(pyvar website)|" \
+		-e "s|@EMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		nostrip=True
+		python=False
+		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)
+		$(use_scons latency_timing timing)
+		$(use_scons ncurses)
+		$(use_scons ntp ntpshm)
+		$(use_scons ntp pps)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons qt4 libQgpsmm)
+		$(use_scons usb)
+	)
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install $(usex udev udev-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 ; then
+			rm "${ED%/}"/usr/bin/xgps* || die
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Run the gpsd daemon as gpsd and group uucp; create it here
+	# as it doesn't seem to be needed during compile/install ...
+	enewuser gpsd -1 -1 -1 "uucp"
+}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2016-03-18 15:46 Sam Jorna
  0 siblings, 0 replies; 105+ messages in thread
From: Sam Jorna @ 2016-03-18 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     34c2a32567f48b0d4a993b3c04d9ab042ddbf198
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 15:45:49 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 15:45:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c2a325

sci-geosciences/gpsd: fix broken include

Package-Manager: portage-2.2.28

 sci-geosciences/gpsd/gpsd-3.15.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index bc687ae..3505460 100644
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -79,6 +79,8 @@ src_prepare() {
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
 		SConstruct || die
 
+	sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die
+
 	use python && distutils-r1_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2016-02-29 14:48 Amy Winston
  0 siblings, 0 replies; 105+ messages in thread
From: Amy Winston @ 2016-02-29 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6a721a5dde1a005f06229089fe6f36685d5d81f1
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 14:43:29 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 14:43:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a721a5d

sci-geosciences/gpsd: Description and copyright changed

Package-Manager: portage-2.2.26

 sci-geosciences/gpsd/gpsd-3.10.ebuild   | 4 ++--
 sci-geosciences/gpsd/gpsd-3.11.ebuild   | 4 ++--
 sci-geosciences/gpsd/gpsd-3.15.ebuild   | 4 ++--
 sci-geosciences/gpsd/gpsd-3.9-r1.ebuild | 4 ++--
 sci-geosciences/gpsd/gpsd-9999.ebuild   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
index 804c9be..cff8cae 100644
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"

diff --git a/sci-geosciences/gpsd/gpsd-3.11.ebuild b/sci-geosciences/gpsd/gpsd-3.11.ebuild
index 21233f8..0551768 100644
--- a/sci-geosciences/gpsd/gpsd-3.11.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"

diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index 9249bcc..72d4a77 100644
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"

diff --git a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
index ae73424..0c4dc52 100644
--- a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ else
 	KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index c0b11a9..338edff 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
 HOMEPAGE="http://catb.org/gpsd/"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2016-02-29 14:48 Amy Winston
  0 siblings, 0 replies; 105+ messages in thread
From: Amy Winston @ 2016-02-29 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     26050b32180f5b88216af9f1f4c4312e9ba48dbe
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 14:45:48 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 14:45:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26050b32

sci-geosciences/gpsd: Slot specified

Package-Manager: portage-2.2.26

 sci-geosciences/gpsd/gpsd-3.10.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-3.11.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-3.15.ebuild | 2 +-
 sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
index cff8cae..6662e5a 100644
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.10.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="X? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:= )
 	bluetooth? ( net-wireless/bluez )
 	usb? ( virtual/libusb:1 )
 	dbus? (

diff --git a/sci-geosciences/gpsd/gpsd-3.11.ebuild b/sci-geosciences/gpsd/gpsd-3.11.ebuild
index 0551768..4fb5430 100644
--- a/sci-geosciences/gpsd/gpsd-3.11.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.11.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="X? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:= )
 	bluetooth? ( net-wireless/bluez )
 	usb? ( virtual/libusb:1 )
 	dbus? (

diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index 72d4a77..bc687ae 100644
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="X? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:= )
 	bluetooth? ( net-wireless/bluez )
 	usb? ( virtual/libusb:1 )
 	dbus? (

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 338edff..97ef209 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="X? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:= )
 	bluetooth? ( net-wireless/bluez )
 	usb? ( virtual/libusb:1 )
 	dbus? (


^ permalink raw reply related	[flat|nested] 105+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/
@ 2016-02-29 14:36 Amy Winston
  0 siblings, 0 replies; 105+ messages in thread
From: Amy Winston @ 2016-02-29 14:36 UTC (permalink / raw
  To: gentoo-commits

commit:     7fc35b205e210936f0828ab48b4e79f719624952
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 14:34:32 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 14:35:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc35b20

sci-geosciences/gpsd: Drop old

Package-Manager: portage-2.2.26

 sci-geosciences/gpsd/Manifest            |   6 -
 sci-geosciences/gpsd/gpsd-2.95-r1.ebuild | 109 ------------------
 sci-geosciences/gpsd/gpsd-2.96-r1.ebuild | 117 --------------------
 sci-geosciences/gpsd/gpsd-3.13.ebuild    | 166 ----------------------------
 sci-geosciences/gpsd/gpsd-3.6.ebuild     | 163 ---------------------------
 sci-geosciences/gpsd/gpsd-3.7.ebuild     | 168 ----------------------------
 sci-geosciences/gpsd/gpsd-3.8.ebuild     | 184 -------------------------------
 sci-geosciences/gpsd/gpsd-3.9.ebuild     | 180 ------------------------------
 8 files changed, 1093 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index ecc11bc..502bd1c 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,10 +1,4 @@
-DIST gpsd-2.95.tar.gz 1385681 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae SHA512 f48dd0a2942e39de0b1d38a8979e123edbd39de05e2786419433826dfbf9de579fcb9b2c179385bc84313817a4266fd76560253b4e67e2daf419618699abbf98 WHIRLPOOL e9da24e45efee327f8849a4f52e39ebd7d2ce06a0d7372a3b11baee68129e72be62bfd4a5b0ed181cae1b693722bd551ab1337fcdce9dbfc80a091df283329ac
-DIST gpsd-2.96bis.tar.gz 1554605 SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690 SHA512 a6ba88b3907293d13032bb623de321b36dfc3fec25502cafa22924c4d0ff187b46f192d27effa9b4214cba3de16dd3c7c0a0fc6d5ba411e2799acb8b3e832aa4 WHIRLPOOL 0fd1471e819759f055ec389d0236c7894f107062331325cb520d60c16431339eabc616019e96270ed54f9defc34a5ed45927977e6e62a16730a0b0decf6552ed
 DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
 DIST gpsd-3.11.tar.gz 1579600 SHA256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee SHA512 bf600ea99635d415916c2a3043f56e61bda023ba320a15f33cd47b375c772dbec69aa941c4729914ccd6a868488cd6bd9f35d4067af9e353def743f45636e6f4 WHIRLPOOL 12a9fde832d611d129f48919d10c4a48f7da1e664d49844d4317e3b9511dee9810884f4b23036ebf576e7870b56091767a4f6c0237a8091643abb637642ee2b8
-DIST gpsd-3.13.tar.gz 1382857 SHA256 d30bbe31ef9f89d2c281197c64204bcff255883462318250f913444ae00874c1 SHA512 339e752ae6a06272082e8a4f97915001aeee4deecd956ace1be862f9e3734b7663407c4a6a41ac00e7de195771da55fb26b93ec152abd8251a0d7a13cb8ad51e WHIRLPOOL 94da0e11c7a0c33f3215f5de836f8739c394a03c561933abff9ce325e4238f4d85e29f664f592e7c09ba16d35e92b5e275a75090e5600a01d983fa81f12fa3af
 DIST gpsd-3.15.tar.gz 1410534 SHA256 81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea SHA512 2be83cac52b5034bca44374cf7e17917270fe50495014f424d46a171bc77b58f9c5eb8ea38fe0cff9a28a6c2b6b8e5bf17a5a141eb9243962319a1ae9da2ea04 WHIRLPOOL 323dc3336372d318ade9549ad401fa588e9abd3d01add750892fa028bf8f6837342ba76f6f85ebf715329517d314f9fe63429460ea1a639000124437f761fb8c
-DIST gpsd-3.6.tar.gz 1449822 SHA256 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc SHA512 a31114f68e9481d68bfb45d90286181eb47083c58a1e1cfae78b73ead36b448050b97a0b31131a58197f32adba4eeb6f798f3c4e55e928536cd68648d5860e18 WHIRLPOOL ef4f569ed32cba0e6c39726dfd6636292f38f4fe45b95035b4c20fd03eb569d12f228b468ba00e35dfd5e3bf4eda84cf3506d418cc553b55b882fa4e15277350
-DIST gpsd-3.7.tar.gz 1460424 SHA256 7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac SHA512 fc6edad8694a62ead2018e78ba5f3033dcc960b89fea7fbc781493b951ff8a3024cfa56a18c96cca747a3394885cdb24e5fce358e8f6a1a17fd4a3248228937f WHIRLPOOL 592908b39f248e68ceb6d2a1b14fa62401388e674aa5cdc901aa8e7caaf6fe5da742cd77530ddb00c5789e2372fdb8a46af9d946af89d6e560457c4eaa5cd92f
-DIST gpsd-3.8.tar.gz 1516959 SHA256 5f9add9a378a3cd1c0f641e0def49fc3f14fb700c9fca573e07d17b3e5957c23 SHA512 9df968db33346852c9779ce4670d97c77f018c3254661cc709a30b693f1a10602f5f08eb1d2c19dab46747a6f88f9d8be7464d3ea854f3bfc760cc94c3b2e57a WHIRLPOOL 64feb051b2aa637d6da978221f84f046078c29f43f1b68429cd617fb773b8b539a34948e215f18b372050b9e50c0f9c68d22f2b9ec20207899bebb9048e30270
 DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f WHIRLPOOL 1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1

diff --git a/sci-geosciences/gpsd/gpsd-2.95-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.95-r1.ebuild
deleted file mode 100644
index e920f0d..0000000
--- a/sci-geosciences/gpsd/gpsd-2.95-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-
-inherit python autotools user eutils
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://gpsd.berlios.de/"
-#SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-GPSD_PROTOCOLS="ashtech aivdm clientdebug earthmate evermore fv18 garmin
-	garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
-	oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
-	tripmate tnt ubx"
-for protocol in ${GPSD_PROTOCOLS}; do
-	IUSE_GPSD_PROTOCOLS+=" gpsd_protocols_${protocol}"
-done
-
-IUSE="${IUSE_GPSD_PROTOCOLS} dbus ipv6 ntp qt4"
-
-# those harddeps are de-facto automagicall
-RDEPEND="
-	dev-python/pygtk:2
-	sys-libs/ncurses
-	virtual/libusb:1
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( net-misc/ntp )
-	qt4? ( dev-qt/qtgui:4 )"
-
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	=app-text/docbook-xml-dtd-4.1*"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-disable-strip.patch"
-	"${FILESDIR}/${PV}-fix-ldflags.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-
-	# Run the gpsd daemon as gpsd and group uucp
-	enewuser gpsd -1 -1 -1 "uucp"
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	# enable specified protocols
-	for protocol in ${GPSD_PROTOCOLS}; do
-		myopts+=" $(use_enable gpsd_protocols_${protocol} ${protocol})"
-	done
-
-	if ! use qt4 ;  then
-		myopts+=" --disable-libQgpsmm --disable-libgpsmm ${myopts}"
-	fi
-
-	# --disable-bluetooth: considered experimental -> disable
-	# --enable-static is required for tests, see bug 355071
-	# Hack to make it not generate docs on the fly; xmlto is
-	# needed for man pages (xsltproc is only needed for web pages)
-	econf WITH_XMLTO=yes WITH_XSLTPROC=no \
-		--build=${CBUILD} \
-		--disable-dependency-tracking \
-		--disable-bluetooth \
-		--enable-static \
-		--enable-gpsd-user=gpsd \
-		--enable-gpsd-group=uucp \
-		$(use_enable dbus) \
-		$(use_enable ipv6) \
-		$(use_enable ntp ntpshm) \
-		$(use_enable ntp pps) \
-		${myopts}
-}
-
-src_install() {
-	# no it can't be done using emake cause it is non-compliant
-	make DESTDIR="${D}" install || die
-
-	# needs this header for libQgpsmm
-	if use qt4 ; then
-		insinto /usr/include
-		doins libQgpsmm/libQgpsmm_global.h
-	fi
-
-	# no need for .la files here
-	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd || die
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd || die
-}

diff --git a/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild
deleted file mode 100644
index d87b67e..0000000
--- a/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-
-inherit python autotools user eutils
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://gpsd.berlios.de/"
-#SRC_URI="mirror://berlios/gpsd/${P}bis.tar.gz"
-SRC_URI="mirror://gentoo/${P}bis.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-GPSD_PROTOCOLS="ashtech aivdm clientdebug earthmate evermore fv18 garmin
-	garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
-	oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
-	tripmate tnt ubx"
-for protocol in ${GPSD_PROTOCOLS}; do
-	IUSE_GPSD_PROTOCOLS+=" gpsd_protocols_${protocol}"
-done
-
-IUSE="${IUSE_GPSD_PROTOCOLS} dbus ipv6 ntp qt4 test udev"
-
-# those harddeps are de-facto automagicall
-RDEPEND="
-	dev-python/pygtk:2
-	sys-libs/ncurses
-	virtual/libusb:1
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( net-misc/ntp )
-	qt4? ( dev-qt/qtgui:4 )"
-
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	=app-text/docbook-xml-dtd-4.1*
-	test? ( sys-devel/bc )"
-
-PATCHES=(
-	"${FILESDIR}/2.95-disable-strip.patch"
-	"${FILESDIR}/${PV}-fix-ldflags.patch"
-	"${FILESDIR}/${PV}-fix-tests.patch"
-	"${FILESDIR}/${PV}-pkgconfig.patch"
-)
-
-pkg_setup() {
-	python_set_active_version 2
-
-	# Run the gpsd daemon as gpsd and group uucp
-	enewuser gpsd -1 -1 -1 "uucp"
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	# enable specified protocols
-	for protocol in ${GPSD_PROTOCOLS}; do
-		myopts+=" $(use_enable gpsd_protocols_${protocol} ${protocol})"
-	done
-
-	if ! use qt4 ; then
-		myopts+=" --disable-libQgpsmm --disable-libgpsmm"
-	fi
-
-	# --disable-bluetooth: considered experimental -> disable
-	# Hack to make it not generate docs on the fly; xmlto is
-	# needed for man pages (xsltproc is only needed for web pages)
-	WITH_XMLTO=yes WITH_XSLTPROC=no econf \
-		--disable-dependency-tracking \
-		--disable-bluetooth \
-		--disable-static \
-		--enable-gpsd-user=gpsd \
-		--enable-gpsd-group=uucp \
-		$(use_enable dbus) \
-		$(use_enable ipv6) \
-		$(use_enable ntp ntpshm) \
-		$(use_enable ntp pps) \
-		${myopts}
-}
-
-src_install() {
-	# no it can't be done using emake cause it is non-compliant
-	make DESTDIR="${D}" install || die
-
-	if use udev ; then
-		insinto /lib/udev/rules.d/
-		newins gpsd.rules 25-gpsd.rules
-		exeinto /lib/udev/
-		doexe gpsd.hotplug{,.wrapper}
-	fi
-
-	# needs this header for libQgpsmm
-	if use qt4 ; then
-		insinto /usr/include
-		doins libQgpsmm/libQgpsmm_global.h
-	fi
-
-	# no need for .la files here
-	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd || die
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd || die
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.13.ebuild b/sci-geosciences/gpsd/gpsd-3.13.ebuild
deleted file mode 100644
index 94c09c3..0000000
--- a/sci-geosciences/gpsd/gpsd-3.13.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
-	tnt tripmate tsip ublox
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	ncurses? ( sys-libs/ncurses )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-src_prepare() {
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
-	epatch "${FILESDIR}"/${PN}-3.13-ntpshm.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_export_best
-	# Extract python info out of SConstruct so we can use saner distribute
-	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-	local pybins=$(pyvar python_progs | tail -1)
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
-	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-	sed \
-		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-		-e "s|@URL@|$(pyvar website)|" \
-		-e "s|@EMAIL@|$(pyvar devmail)|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		nostrip=True
-		python=False
-		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)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-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 ; then
-			rm "${ED%/}"/usr/bin/xgps* || die
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.6.ebuild b/sci-geosciences/gpsd/gpsd-3.6.ebuild
deleted file mode 100644
index 2e3655e..0000000
--- a/sci-geosciences/gpsd/gpsd-3.6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils user multilib distutils scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	ashtech aivdm clientdebug earthmate evermore fv18 garmin
-	garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
-	oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
-	tripmate tnt ubx
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
-REQUIRED_USE="X? ( python )"
-
-RDEPEND="X? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
-	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
-	epatch "${FILESDIR}"/${PN}-3.6-debug.patch
-	epatch "${FILESDIR}"/${PN}-3.6-rpath.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	if use python ; then
-		pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-		local pybins=$(pyvar python_progs)
-		local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-		local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])")
-		local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-		sed \
-			-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-			-e "s|@URL@|$(pyvar website)|" \
-			-e "s|@EMAIL@|$(pyvar devmail)|" \
-			-e "s|@SCRIPTS@|${pybins}|" \
-			-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-			-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-			-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
-			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-		distutils_src_prepare
-	fi
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		strip=False
-		python=False
-		$(use_scons bluetooth bluez)
-		$(use_scons cxx libgpsmm)
-		$(use_scons debug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	if use python ; then
-		distutils_src_install
-		# Delete all X related packages if user doesn't want them
-		if ! use X ; then
-			local p
-			for p in $(grep -Il 'import .*pygtk' *) ; do
-				find "${D}"/usr/bin -name "${p}*" -delete
-			done
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.7.ebuild b/sci-geosciences/gpsd/gpsd-3.7.ebuild
deleted file mode 100644
index d6dd080..0000000
--- a/sci-geosciences/gpsd/gpsd-3.7.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	ashtech aivdm clientdebug earthmate evermore fv18 garmin
-	garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
-	oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
-	tripmate tnt ubx
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
-REQUIRED_USE="X? ( python )"
-
-RDEPEND="X? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
-	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
-	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
-	epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
-	epatch "${FILESDIR}"/${PN}-3.7-no-export-t.patch #463850
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	if use python ; then
-		pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-		local pybins=$(pyvar python_progs)
-		local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-		local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])")
-		local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-		sed \
-			-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-			-e "s|@URL@|$(pyvar website)|" \
-			-e "s|@EMAIL@|$(pyvar devmail)|" \
-			-e "s|@SCRIPTS@|${pybins}|" \
-			-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-			-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-			-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
-			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-		distutils_src_prepare
-	fi
-
-	sed -i -e "s:/lib/udev:$(get_udevdir):" gpsd.rules SConstruct || die
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		strip=False
-		python=False
-		$(use_scons bluetooth bluez)
-		$(use_scons cxx libgpsmm)
-		$(use_scons debug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	if use python ; then
-		distutils_src_install
-		# Delete all X related packages if user doesn't want them
-		if ! use X ; then
-			local p
-			for p in $(grep -Il 'import .*pygtk' *) ; do
-				find "${D}"/usr/bin -name "${p}*" -delete
-			done
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.8.ebuild b/sci-geosciences/gpsd/gpsd-3.8.ebuild
deleted file mode 100644
index 6fa713d..0000000
--- a/sci-geosciences/gpsd/gpsd-3.8.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
-	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
-	tripmate tsip ubx
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
-
-RDEPEND="X? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
-	epatch "${FILESDIR}"/${PN}-3.8-udev.patch
-	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
-	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
-	epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
-	epatch "${FILESDIR}"/${PN}-3.8-no-export-t.patch #463850
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	if use python ; then
-		pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-		local pybins=$(pyvar python_progs)
-		local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-		local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])")
-		local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-		sed \
-			-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-			-e "s|@URL@|$(pyvar website)|" \
-			-e "s|@EMAIL@|$(pyvar devmail)|" \
-			-e "s|@SCRIPTS@|${pybins}|" \
-			-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-			-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-			-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
-			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-		distutils_src_prepare
-	fi
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		strip=False
-		python=False
-		$(use_scons bluetooth bluez)
-		$(use_scons cxx libgpsmm)
-		$(use_scons debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	if use python ; then
-		distutils_src_install
-		# Delete all X related packages if user doesn't want them
-		if ! use X ; then
-			local p
-			for p in $(grep -Il 'import .*pygtk' *) ; do
-				find "${D}"/usr/bin -name "${p}*" -delete
-			done
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}

diff --git a/sci-geosciences/gpsd/gpsd-3.9.ebuild b/sci-geosciences/gpsd/gpsd-3.9.ebuild
deleted file mode 100644
index 9e251de..0000000
--- a/sci-geosciences/gpsd/gpsd-3.9.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
-HOMEPAGE="http://catb.org/gpsd/"
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
-	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
-	tripmate tsip ubx
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
-REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
-
-RDEPEND="X? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses )
-	bluetooth? ( net-wireless/bluez )
-	usb? ( virtual/libusb:1 )
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-	DEPEND+="
-		app-text/xmlto
-		=app-text/docbook-xml-dtd-4.1*"
-fi
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# Make sure our list matches the source.
-	local src_protocols=$(echo $(
-		sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
-	) )
-	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-		eerror "Detected protocols: ${src_protocols}"
-		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-		die "please sync ebuild & source"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
-	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	# Extract python info out of SConstruct so we can use saner distribute
-	if use python ; then
-		pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-		local pybins=$(pyvar python_progs)
-		local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-		local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])")
-		local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
-		sed \
-			-e "s|@VERSION@|$(pyvar gpsd_version)|" \
-			-e "s|@URL@|$(pyvar website)|" \
-			-e "s|@EMAIL@|$(pyvar devmail)|" \
-			-e "s|@SCRIPTS@|${pybins}|" \
-			-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-			-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-			-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
-			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-		distutils_src_prepare
-	fi
-}
-
-src_configure() {
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=uucp
-		strip=False
-		python=False
-		$(use_scons bluetooth bluez)
-		$(use_scons cxx libgpsmm)
-		$(use_scons debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency_timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons qt4 libQgpsmm)
-		$(use_scons usb)
-	)
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
-
-	use python && distutils_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	if use python ; then
-		distutils_src_install
-		# Delete all X related packages if user doesn't want them
-		if ! use X ; then
-			local p
-			for p in $(grep -Il 'import .*pygtk' *) ; do
-				find "${D}"/usr/bin -name "${p}*" -delete
-			done
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# Run the gpsd daemon as gpsd and group uucp; create it here
-	# as it doesn't seem to be needed during compile/install ...
-	enewuser gpsd -1 -1 -1 "uucp"
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 105+ messages in thread

end of thread, other threads:[~2024-08-12 12:33 UTC | newest]

Thread overview: 105+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-25 17:52 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-12 12:33 Sam James
2024-08-12 12:33 Sam James
2024-07-15  4:35 Sam James
2024-07-15  4:35 Sam James
2024-07-15  4:35 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-06-02  0:52 Sam James
2024-01-08  9:48 Sam James
2023-09-29  7:27 WANG Xuerui
2023-09-29  7:27 WANG Xuerui
2023-06-28  7:19 Sam James
2023-05-01  9:22 Sam James
2023-05-01  5:39 Sam James
2023-04-22  8:47 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19  9:49 Sam James
2023-01-15  1:41 Sam James
2022-09-04 18:21 Arthur Zamarin
2022-09-04 18:21 Arthur Zamarin
2022-09-04 17:46 Sam James
2022-09-04 10:51 Agostino Sarubbo
2022-09-04 10:49 Agostino Sarubbo
2022-04-28  2:58 Sam James
2022-04-12 21:04 Sam James
2022-02-11 12:51 Sam James
2021-11-08  3:22 Mike Gilbert
2021-10-30 17:24 Agostino Sarubbo
2021-10-29 18:32 Sam James
2021-10-29 18:32 Sam James
2021-10-29 18:30 Sam James
2021-10-29  8:58 Sam James
2021-10-29  2:24 Sam James
2021-10-08  0:55 Sam James
2021-10-04  1:26 Sam James
2021-10-03  0:34 Sam James
2021-10-02 23:54 Sam James
2021-09-25  0:05 Sam James
2021-09-25  0:04 Sam James
2021-09-25  0:04 Sam James
2021-09-11 21:34 Sam James
2021-08-27 20:06 Sam James
2021-08-22  2:50 Sam James
2021-08-18 19:42 Sam James
2021-08-18 19:39 Sam James
2021-08-15 22:04 Sam James
2021-08-11 23:57 Sam James
2021-08-10 23:52 Sam James
2021-08-10 23:52 Sam James
2021-08-10 23:52 Sam James
2021-08-10  0:16 Marek Szuba
2021-08-09 23:53 Sam James
2021-08-09 23:46 Sam James
2021-06-01 12:06 Sam James
2020-10-06 14:23 Sam James
2020-09-25 17:51 Sam James
2020-09-25 17:51 Sam James
2020-09-25 16:01 Sam James
2020-09-25 16:00 Sam James
2020-09-24 19:53 Aaron Bauman
2020-09-10 15:31 Marek Szuba
2020-07-29  1:07 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-07-28 18:12 Rick Farina
2020-05-12  6:22 Matthias Maier
2020-05-07 15:17 Michał Górny
2019-11-29  8:17 Michał Górny
2019-10-04 19:23 Robin H. Johnson
2019-10-04 18:59 Robin H. Johnson
2019-10-04 18:59 Robin H. Johnson
2019-09-12  3:57 Mike Frysinger
2019-01-19 19:14 Robin H. Johnson
2018-10-04  7:28 Andreas Sturmlechner
2018-10-04  6:26 Sergei Trofimovich
2018-09-30 23:10 Robin H. Johnson
2018-09-04 20:49 Andreas Sturmlechner
2018-04-15 17:19 Mikle Kolyada
2018-01-29  1:06 Thomas Deutschmann
2018-01-12 15:55 Andreas Sturmlechner
2018-01-12 15:55 Andreas Sturmlechner
2017-12-28 21:20 Andreas Sturmlechner
2017-12-28 21:20 Andreas Sturmlechner
2017-12-28 15:35 Andreas Sturmlechner
2017-12-21 18:23 Andreas Sturmlechner
2017-12-16 10:31 Tobias Klausmann
2017-12-08 20:39 Thomas Deutschmann
2017-09-24 15:10 Thomas Deutschmann
2017-08-20 16:59 Thomas Deutschmann
2017-07-15 15:17 Tobias Klausmann
2017-03-01  7:55 Michael Weber
2017-02-10 12:29 Michael Weber
2017-01-15 11:20 Pacho Ramos
2016-12-20 15:34 Tobias Klausmann
2016-03-27 12:02 Sam Jorna
2016-03-18 15:46 Sam Jorna
2016-02-29 14:48 Amy Winston
2016-02-29 14:48 Amy Winston
2016-02-29 14:36 Amy Winston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox