summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-03 00:07:26 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-03 00:07:26 +0100
commita3bb28551df94028000fb72308a9e9baa01458b0 (patch)
tree33b14c7bf0dffbd5bb04dbd5b395514ebdda4896 /sci-geosciences
parent6657c680376cedf378fcf328e5fa03ed3b41d580 (diff)
gentoo auto-resync : 03:06:2024 - 00:07:25
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin11589 -> 11592 bytes
-rw-r--r--sci-geosciences/gpsd/Manifest9
-rw-r--r--sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild212
-rw-r--r--sci-geosciences/gpsd/gpsd-3.25-r1.ebuild (renamed from sci-geosciences/gpsd/gpsd-3.24.ebuild)45
-rw-r--r--sci-geosciences/gpsd/gpsd-3.25.ebuild2
-rw-r--r--sci-geosciences/gpsd/gpsd-9999.ebuild59
6 files changed, 68 insertions, 259 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index efb35d27a819..7ebfb64a5f8d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index e78c396654da..d3f66f2d73bc 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,10 +1,7 @@
AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef
AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
-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
-EBUILD gpsd-3.23.1-r2.ebuild 6119 BLAKE2B f9624333fbd42a3f1c375f1778380c0415b19434b80df98d57166f388dae4d5608a9b1a941be6858c0aa57ce2903e6b30625766a5cea51ab7201e709f13b62a0 SHA512 4946929dc431a202f462fa3d72157f4da91c0ab27fa1c76406af73c0ae0ae408f5114df41256263ec77803ff31005e87b9563c8b495fdee8ac088697d3f36642
-EBUILD gpsd-3.24.ebuild 6325 BLAKE2B ea92cef7cce12c5d4ecbafb8293c5035eaafc3bc8a6c37ed43eee3f4de1d3a3412c0a57cc9ffbe782cdf77ac1c6a93beeebd3b6264fd6f5810302efd53b55ad0 SHA512 70a34f121b96ceca4d81d2e4081fc1d32ed3e141ae67427f54cbf3ae9048efecc6a4f86d6fbd226c7664a677281b47eace6491d5a6b6aa9522f9fc62084e167f
-EBUILD gpsd-3.25.ebuild 6385 BLAKE2B 8734efef57a8fcd80043a92411f13460122d251a5529e9728b8bb4d30ee0588899aecdcd5c358f855f2a1e00da0944ed94cf65e36b3f06284ff8d4495a8aafa3 SHA512 cb943f26603bf5dea6272118bda108eb5c1dc997ff966375ead0d54e1e19b0b19f92922bf0053be3250de86c2c85bb3bf0e5049b19a3ff0d587ef096fd6854b0
-EBUILD gpsd-9999.ebuild 6388 BLAKE2B 16b4828c24b1513c1b502f73f946266d2a517fd67424353beb23d1765f96fbf905c0a051a0bd8181342457cf4b76cf0a01a0ade43f8b6bbdcfb0c050a8fce1de SHA512 69f7b5cb7849290fa20545e9de14e860d2b2ee4fc18a30cfb95b32733b092a8fc55dafbb0ad3fa23ef994e4e4a927804fd8d683f5a9b0b5857e05905a91fcec7
+EBUILD gpsd-3.25-r1.ebuild 6704 BLAKE2B b62640bae0826558343a7b8c9d64b3c0a27efd61d0bc5db78589d125a3e17e52c1530d33d5679ae514e071cf9017730a1b8fb181611f67d2fec9326700279f49 SHA512 b2e628b4748342eabea0af2e814e81658e95ee720700ce9b97fd4810379b97ad3de2985fd90cc6f5c1f25c6aedc3733b3751ea0d6d34c349a955b50351b1a2c2
+EBUILD gpsd-3.25.ebuild 6387 BLAKE2B 70c809b4536acf564cef0e28c9f16ce170d1730f279c485017a4ebc6f840f59816ceaaa56f9faea7b804a4563a8449e0e02c46cdba092405396b6c2fd80890bb SHA512 c433d934a992ce2d75ea711d86b77d1ca7cdb6e988153dc9939f70c9dbb0766af88d3bd49f49b80ee4ab3cfff3e1efc7a2f6317f3a2bb1aafc3a7435cbb6a947
+EBUILD gpsd-9999.ebuild 6407 BLAKE2B 018bbb85f5bb580360715e36b7d1e48db34064c79886bd03a69d18201170a2ec831ae559c2dff3e379fe05ff3fc53634ced7465dc07e26965606025c2aaef3c1 SHA512 a5b75b0b6c4f2a6b431ff97d7a2f82ebb8ec58d806081677c00c62212de881e5c6741bf774a5c24574586805ba1833333139081525917e6c4ddfb44613288a50
MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397
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 e2deae1550a1..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"
-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.25-r1.ebuild
index ea6badcf72b1..bbc8c829c5bd 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25-r1.ebuild
@@ -1,27 +1,28 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_10 )
+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
+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"
+ 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"
-SLOT="0/29"
+LICENSE="BSD-2"
+SLOT="0/30"
GPSD_PROTOCOLS=(
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
@@ -29,14 +30,16 @@ 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"
-REQUIRED_USE="X? ( python )
+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 )"
+ qt5? ( cxx )
+"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -59,14 +62,16 @@ RDEPEND="
dev-qt/qtnetwork:5
)
python? ( ${PYTHON_DEPS} )
- gpsd_protocols_ublox? ( dev-python/pyserial )
- gpsd_protocols_greis? ( dev-python/pyserial )
+ 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
@@ -74,13 +79,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
@@ -165,7 +171,7 @@ src_configure() {
$(usex python 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)
)
@@ -207,14 +213,21 @@ 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/*
+ distutils-r1_python_install
+}
+
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-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..75899a3a66c3 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
@@ -20,23 +21,19 @@ 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=(
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,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 || die
+ fi
+
distutils-r1_python_prepare_all
}
@@ -162,13 +166,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 +198,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 +213,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 +229,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
}