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 +}
