From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sci-geosciences/gpsd/Manifest | 3 + ...psd-3.21-scons_conditional_python_scripts.patch | 64 +++++++ sci-geosciences/gpsd/gpsd-3.21.ebuild | 192 +++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch create mode 100644 sci-geosciences/gpsd/gpsd-3.21.ebuild (limited to 'sci-geosciences/gpsd') diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 9364844190f1..b2122f3216e8 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -3,6 +3,7 @@ AUX gpsd-3.17-scons-print.patch 2793 BLAKE2B 6b475dced3a034ee28d4b85c5897f598af0 AUX gpsd-3.17-scons-py3.patch 5575 BLAKE2B 7c666c5cc155a95c93e9c871d6233db698cea37a8dde64de39dfdf1fa1a166224d5ed5e72a664c98a363717084a22c9d7359eaa7e13f8fcb11c1225127b7c421 SHA512 091cf7b6c3b283cb5ccdf293f50df639358c7c7ca501cab813cc8439285fc54fd6adcf6b4ae557c1ceeed07dc96e762ec4a8ca703988289885c6a06c205c1859 AUX gpsd-3.18.1-do_not_rm_library.patch 629 BLAKE2B 21add51d3bceccedf6a9f4f210d608c5fdfb61406484b640ba24aae1f63b38943157f4e6164e39bb30d631ff22870715929f626ecd21fa13426eb7dabcd78ee8 SHA512 91f1a4b9301f220b7d21b446886cfdd0ec67b0568712bb8c82101d10b2d7da6ce142d06c42803a4e611fb039386e092628986db80fa60838d7aac3387e255eed AUX gpsd-3.19-do_not_rm_library.patch 623 BLAKE2B 340fe4d4f05feea02d087ff069500dfa747f2441aee65e02568955cda5397fa57a44adde03cf8a4f03893dc413eabd79243b478bba1f4b1d149540de2a248126 SHA512 44f3efef561bbc9b3f974699da0f4183d5b7693c7c1651957b285fc541f517b56c95562fa401c4ee030241b9c6ef43a530b4964871f38ba9412d2777640eb28c +AUX gpsd-3.21-scons_conditional_python_scripts.patch 1629 BLAKE2B 7011d0bc1dd2062ad8cd0ab7e009039184e66c2b72c99d77fb43d296359e52b5e3d202df698640a305462437ed124c46876a7661793facfefc65cad71072648c SHA512 6b33ea7b13ef2a3ddcf534acb827f2da592eb585535b6d6b3f9d2c3fa9edafc4c5cc577c5e3f0d1fe1afd44aeea9618b3f839fadeb2b630379fb3dfb9d71d2d5 AUX gpsd-3.3-setup.py 448 BLAKE2B 159a212afe7600a9835a03bd87130820a154147aab83c32500108df1d81726d571c7d21e3ac7729c0054859297b71ab42f6cb6c6e487242a46f8d0d91f7c5b0f SHA512 4036bac7c095ba89795b565461bda8f282b7e1476867437db2beabeb1ba3a2a1b5a5b748acaa9ee1a2df693d854654e07f86610f387995abd0b057d3684b651b AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea @@ -10,10 +11,12 @@ DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729 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 +DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e EBUILD gpsd-3.17-r3.ebuild 4707 BLAKE2B 856de5c3f6f684e1777ade59ad372d8fdf2e0c43824f3a9303f1f6be2cbbdf74cbb01f7348d9fe77511b979d97ef7e2cdad0b8b9bb84863e80d5ed225aade9ff SHA512 f55bdf4ed92208d488e71b94e2edd562427ae495d07f609be88a6c5c172a89cdedf76199eb4d136d4f81917ba874bbec0caf5f4abf1b5732d8ab7520932864ec EBUILD gpsd-3.17-r4.ebuild 4888 BLAKE2B 0e9f549feb461ef812e823c310604967f12482bcd03f569f7146a254bcc8e422ec2d3dcb444af4f989b42caaca8fc027504287b26564e0551e055f7bb1fac349 SHA512 18746122b46198d686a1a19d78b51ea489b9a20e3838438c383a96eec1b351080e03d38f6cd647781915818ee5270c9cfb1bb255dc4f246b57ac5aae9a52a19f EBUILD gpsd-3.18.1.ebuild 5449 BLAKE2B 8c05e5183d169603b61d8329ae794cb98b24b805cfdfe1ac32407d644a77049ebec31f31074c33bc189179c4cb3370eb826bff5a540a593c876f588ad0a7a9fa SHA512 16ec24d6b3b5f6a709aa68c5a69c675fe961ad0fbc6e7ed0c8cf1eef0a8288cfe2d602a08e6d53cb423c470810b7567ba76c2013526bf36078c767077d1d33e3 EBUILD gpsd-3.19.ebuild 5455 BLAKE2B f432f96eeae1cca54265927e5ea431d489bbee690048fb9f423ca29176e5aa56d0e1d60d9a82694b4da2911ba63105b2f71ba32f1c757435a33d5d2d7224892e SHA512 bcb17fd87f8ecdc0047a4990d34bc730a67b5bdba8571a0d4a37f3f654283576bc7bcbd746e41373eefdd06041f478993b2acb4030f081cb5aacc01e1b9b973d EBUILD gpsd-3.20.ebuild 5374 BLAKE2B c82108bce746e73568011f7dc8c9c042a86151ac47a28566fbd3b5a6054fb2af3128c3fb928139d590797f5d11a05390bdfa4b0f728574634b03406dcfc8d7b5 SHA512 cdc68b867abfb9e60afba81471f045d9ad80a36469229f3bbcb4bd3c4124fc9b3c31aca880651be78d4131f251d897a7d458b2d96cad3e396216f66586c937d4 +EBUILD gpsd-3.21.ebuild 5548 BLAKE2B fb31544edb5a91d65c29745ca7d9cd5679b496e25f1d3f3c019f3d2488f375dd83e5fc674b808bb4a7bc0d11455e2c69fbf372854e29e292f0b442f7ea925559 SHA512 85548df1afaa3d8325427cbebf167238228e39adb850a9efbf3e83e12c009b02460fadf4a2c87c080a9b42a537a20daf1c8cf39416ce52c79b75374088af414d EBUILD gpsd-9999.ebuild 5522 BLAKE2B 9127fcc0421eabd1eca09f8bbd6494a008a0990aa4669d80d87024df6f421638a9662b937a12ea03cae4c7e189c00bdbe4a3fc78fe4529634ef4ff12cd8b11e0 SHA512 8375fdb71754aeecb7c58fe02e8082db4a0f57c9b04809d4fdf88756cf35c7c6a2eff34ed6e806b6843c88b662362441a98d7d20529d2aa0e1ad64bbce5178cf MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a diff --git a/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch b/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch new file mode 100644 index 000000000000..00fe5ad2b81b --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch @@ -0,0 +1,64 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -150,10 +150,6 @@ + 'packaging/rpm/gpsd.spec', + 'packet_names.h', + 'Qgpsmm.pc', +- 'ubxtool', +- 'xgps', +- 'xgpsspeed', +- 'zerk', + ] + + generated_www = [ +@@ -172,10 +168,6 @@ + "gpscat", + "gpsfake", + "gpsprof", +- "ubxtool", +- "xgps", +- "xgpsspeed", +- "zerk", + ] + + # All man pages. Always build them all. +@@ -205,10 +197,6 @@ + "man/ntpshmmon.1": "man/ntpshmmon.xml", + "man/ppscheck.8": "man/ppscheck.xml", + "man/srec.5": "man/srec.xml", +- "man/ubxtool.1": "man/ubxtool.xml", +- "man/xgps.1": "man/gps.xml", +- "man/xgpsspeed.1": "man/gps.xml", +- "man/zerk.1": "man/zerk.xml", + } + + # doc files to install in share/gpsd/doc +@@ -1964,6 +1952,28 @@ + "valgrind-audit.py" + ] + ++ if env['greis']: ++ generated_sources.extend(["zerk"]) ++ python_progs.extend(["zerk"]) ++ all_manpages.update({ ++ "man/zerk.1": "man/zerk.xml", ++ }) ++ ++ if env['ublox']: ++ generated_sources.extend(["ubxtool"]) ++ python_progs.extend(["ubxtool"]) ++ all_manpages.update({ ++ "man/ubxtool.1": "man/ubxtool.xml", ++ }) ++ ++ if env['xgps']: ++ generated_sources.extend(["xgps", "xgpsspeed"]) ++ python_progs.extend(["xgps", "xgpsspeed"]) ++ all_manpages.update({ ++ "man/xgps.1": "man/xgps.xml", ++ "man/xgpsspeed.1": "man/xgps.xml", ++ }) ++ + # Dependencies for imports in test programs + env.Depends('tests/test_clienthelpers.py', + ['gps/__init__.py', 'gps/clienthelpers.py', 'gps/misc.py']) diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild new file mode 100644 index 000000000000..6cbd9be5a865 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild @@ -0,0 +1,192 @@ +# 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..9} ) + +inherit eutils udev 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.xz" + 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.io/" + +LICENSE="BSD GPL-2" +SLOT="0/27" + +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=" + acct-user/gpsd + >=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} + test? ( sys-devel/bc )" +BDEPEND="virtual/pkgconfig + $(python_gen_any_dep ">=dev-util/scons-2.3.0[\${PYTHON_USEDEP}]")" + +# xml packages are for man page generation +if [[ ${PV} == *9999* ]] ; then + DEPEND+=" + app-text/xmlto + =app-text/docbook-xml-dtd-4.1*" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-3.21-scons_conditional_python_scripts.patch +) + +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 + + #Fix systemd binary paths + sed -i -e 's/local\///' 'systemd/gpsd.service' + sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' + + 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 pyprogs=$(sed -n '/^ *python_progs = \[/,/\]/{s:^ *::p}' SConstruct) + local pybins=$("${PYTHON}" -c "${pyprogs}; print(python_progs)" || die "Unable to extract core Python tools") + # 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 '/^ *packet_ffi_extension = \[/,/\]/{s:^ *::p}' SConstruct) + local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types") + # Post 3.19 the clienthelpers were merged into gps.packet + sed \ + -e "s|@VERSION@|$(pyvar gpsd_version)|" \ + -e "s|@URL@|'${HOMEPAGE}'|" \ + -e "s|@EMAIL@|$(pyvar devmail)|" \ + -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)" + rundir="/run" + chrpath=False + gpsd_user=gpsd + gpsd_group=dialout + 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) + xgps=$(usex X) + ) + + 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 +} -- cgit v1.2.3