diff options
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.26.1-qt6.patch | 14 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-3.26.1-r1.ebuild | 241 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-9999.ebuild | 17 |
3 files changed, 263 insertions, 9 deletions
diff --git a/sci-geosciences/gpsd/files/gpsd-3.26.1-qt6.patch b/sci-geosciences/gpsd/files/gpsd-3.26.1-qt6.patch new file mode 100644 index 000000000000..1290a5514adb --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.26.1-qt6.patch @@ -0,0 +1,14 @@ +Source: https://gitlab.com/gpsd/gpsd/-/issues/340 +Thanks-to: James Browning + +--- a/libgps/gpsutils.c ++++ b/libgps/gpsutils.c +@@ -833,7 +833,7 @@ timespec_t iso8601_to_timespec(const char *isotime) + if (1 < sl.size()) { + usec = sl[1].toInt() / pow(10., (double)sl[1].size()); + } +- ret.tv_sec = d.toTime_t(); ++ ret.tv_sec = d.toSecsSinceEpoch(); + ret.tv_nsec = usec * 1e9; + #else // USE_QT + double usec = 0; diff --git a/sci-geosciences/gpsd/gpsd-3.26.1-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.26.1-r1.ebuild new file mode 100644 index 000000000000..302812a06e61 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.26.1-r1.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2025 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_{11..13} ) +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/31" + +GPSD_PROTOCOLS=( + aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar + 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 qt6 selinux +shm static systemd test udev usb X" +REQUIRED_USE=" + gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) + ${PYTHON_REQUIRED_USE} + qt6? ( 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 + ) ) + qt6? ( dev-qt/qtbase:6[network] ) + ${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 )" + +# asciidoctor package is for man page generation +if [[ ${PV} == *9999* ]] ; then + BDEPEND+=" dev-ruby/asciidoctor" +fi + +PATCHES=( "${FILESDIR}/${P}-qt6.patch" ) # bug 962118 + +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 + + default + + 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']" + 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 + + if [[ "${PV}" == *9999* ]]; then + # Distutils doesn't like the tilde + sed -i s/~dev/-dev/ setup.py || die + fi + + 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) + # force a predictable python libdir because lib vs. lib64 usage differs + # from 3.5 to 3.6+ + python_libdir="${EPREFIX}"/python-discard + qt=$(usex qt6) + 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 qt6 && scons_opts+=( qt_versioned=6 ) + + # 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 "${PN}"-* || die + ln -sf ../setup.py . || die + 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() { + 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 +} + +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 "${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 +} + +pkg_postinst() { + use udev && udev_reload +} diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 03166bee051e..9cc38e827afb 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) SCONS_MIN_VERSION="2.3.0" inherit distutils-r1 scons-utils systemd toolchain-funcs udev @@ -30,11 +30,11 @@ GPSD_PROTOCOLS=( 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 qt5 selinux +shm static systemd test udev usb X" +IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp qt6 selinux +shm static systemd test udev usb X" REQUIRED_USE=" gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) ${PYTHON_REQUIRED_USE} - qt5? ( cxx ) + qt6? ( cxx ) " RESTRICT="!test? ( test )" @@ -53,10 +53,7 @@ RDEPEND=" net-misc/ntpsec net-misc/chrony ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) + qt6? ( dev-qt/qtbase:6[network] ) ${PYTHON_DEPS} dev-python/pyserial[${PYTHON_USEDEP}] usb? ( virtual/libusb:1 ) @@ -73,6 +70,8 @@ if [[ ${PV} == *9999* ]] ; then BDEPEND+=" dev-ruby/asciidoctor" fi +PATCHES=( "${FILESDIR}/${PN}-3.26.1-qt6.patch" ) # bug 962118 + python_check_deps() { python_has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } @@ -166,7 +165,7 @@ src_configure() { # force a predictable python libdir because lib vs. lib64 usage differs # from 3.5 to 3.6+ python_libdir="${EPREFIX}"/python-discard - qt=$(usex qt5) + qt=$(usex qt6) shm_export=$(usex shm) socket_export=True # Required, see bug #900891 usb=$(usex usb) @@ -177,7 +176,7 @@ src_configure() { fi use X && scons_opts+=( xgps=1 xgpsspeed=1 ) - use qt5 && scons_opts+=( qt_versioned=5 ) + use qt6 && scons_opts+=( qt_versioned=6 ) # enable specified protocols local protocol |