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
