From 8cf177c62fc32e0564439b007ed4ffd68ccec1cd Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Tue, 28 Jul 2020 12:48:04 -0400 Subject: 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 --- sci-geosciences/gpsd/Manifest | 1 + sci-geosciences/gpsd/gpsd-3.20.ebuild | 189 ++++++++++++++++++++++++++++++++++ sci-geosciences/gpsd/gpsd-9999.ebuild | 69 +++++++------ 3 files changed, 225 insertions(+), 34 deletions(-) create mode 100644 sci-geosciences/gpsd/gpsd-3.20.ebuild (limited to 'sci-geosciences/gpsd') diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 02f03645cf41..d7ad2e03d2ca 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-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild new file mode 100644 index 000000000000..1da8c9d4b80f --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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 + +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 + + # Avoid useless -L paths to the install dir + sed -i \ + -e 's:\:SYSROOT:g' \ + SConstruct || die + + default + + use python && distutils-r1_src_prepare +} + +python_prepare_all() { + 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) + # 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'])") + # 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 "/@GPS_CLIENT_SOURCES@/d" \ + -e "s|@SCRIPTS@|${pybins}|" \ + "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die + distutils-r1_python_prepare_all +} + +src_configure() { + scons_opts=( + 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) + 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 && 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 + +} + +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 76b0f95ce737..cd96667f22ed 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:\: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 -- cgit v1.2.3-65-gdbad