From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- sci-geosciences/gpsd/Manifest | 10 +- ...psd-3.21-scons_conditional_python_scripts.patch | 64 ------- sci-geosciences/gpsd/files/gpsd-3.3-setup.py | 17 -- sci-geosciences/gpsd/gpsd-3.21.ebuild | 200 ------------------- sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 212 --------------------- sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild | 212 +++++++++++++++++++++ sci-geosciences/gpsd/gpsd-3.23.1.ebuild | 212 --------------------- sci-geosciences/gpsd/gpsd-9999.ebuild | 4 +- 8 files changed, 216 insertions(+), 715 deletions(-) delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch delete mode 100644 sci-geosciences/gpsd/files/gpsd-3.3-setup.py delete mode 100644 sci-geosciences/gpsd/gpsd-3.21.ebuild delete mode 100644 sci-geosciences/gpsd/gpsd-3.23-r2.ebuild create mode 100644 sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild delete mode 100644 sci-geosciences/gpsd/gpsd-3.23.1.ebuild (limited to 'sci-geosciences/gpsd') diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 8de59aaf8f53..167bbfa63e16 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,12 +1,6 @@ -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 -DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388 -DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b -EBUILD gpsd-3.21.ebuild 5672 BLAKE2B bacb23a4e962beec3d3a600c1a289e9f31af31b66529a1f5ea541e67bfa4d248b301de3e3d3436257d84f42c2fd006e65a49bfde782f47b753bb24a89a1ac7c4 SHA512 936b99bf2ef3b6a8e651898cf02144f2a76ba50753ce20693e6a7280af1f61b4da348a31567fae226fc28024606b353b77386fd86fbb54465921e899805ca46f -EBUILD gpsd-3.23-r2.ebuild 6108 BLAKE2B adda5e87941411d7fa59536d97eab0da52d13891d95776fb961f9cbf92bf8b62e8e28d424a217a8c5c6755fbcbb5f5a9714334581a41301674d4fca5e411ac82 SHA512 e477eee040b75e5eaacca80c7e03dd69ca526a8e2ea0f861c7b54342fa9b8118f171ed25450c4239f7b6458d817009cff668c70ea7e17c2adc4e08b5a766d794 -EBUILD gpsd-3.23.1.ebuild 6100 BLAKE2B 7a92a6260b9f30c8af69d84dd1194333cf11b6ac02d9023e77284eafab9bcbcefcb4b31cec7fa9028c1e59b99437b6a6bc8d3d65b3ec93d7c7b604016055ad8b SHA512 d73c2806eea4423c78a5cad9b8d1ed8faef1d387a7846b30a9fce602a6349d69be5f38834a7a34990a452c759d262127c6552914bdebab14b4f1907d863b999d -EBUILD gpsd-9999.ebuild 6105 BLAKE2B 149d024a9c52735be1c8895c7b1213e943da3d6fd8708f5eac1af6c76cfc2be3f7c37b497980fb9fda0df29f3eff54cf5bb4044a95c663783587e0cd20c47c45 SHA512 5e3f1bfa7e15e46efc749b7762c4c23ee279985c5985dbdc75678a83bb85689e6ebc23663f049b6def6d6503a9db222a86ddfbb97d4d03c0ff28621c48a951f5 +EBUILD gpsd-3.23.1-r1.ebuild 6114 BLAKE2B 776b1bf301a0b0bd510b29154a4c15911bb9e19193b12a0e4a3facf4be163b3ac936c43245dcf9af7bc1b399a6c381d6a594731e5d000fd4cc51441fc8572a5b SHA512 2857c86eff24148bff73467f48c4cb34f1a203f170e24a594f41554d8b8cea6ae4908e7495a4c320ae4ed536dbe92976345098c5c4167db58c4fa541352dec6b +EBUILD gpsd-9999.ebuild 6119 BLAKE2B d3bbdc0e2e1efdcaab7ece8c41a3e15d2324ca4b7127e64c23e62ccd92acbe00220f5603c095a8a0824328adfeda4398397d9323ec4cb906aa811cbb519e799d SHA512 6a66ab64970f63cbf5a362a4a7eb127b7babfcc88af112dc13192402b6f968548c0d357bb02d515ef6dfa3f8d8247ad7fe0df67004305356f6ec227725ae5b4d MISC metadata.xml 951 BLAKE2B 81e95d95a4ecd4ea59dd5c8c187bdb53cf32f6334e628b77986fc300d3380c310d1c77cafb113de2b260796db735752d2c7012fd7753504804208f4cc29302d0 SHA512 4383074eaeb476dcc84f38f2c2e68afb956f54c9fc4e0837e09e2d498e02fe59fd31351a11bf886da875c8e08aa84bfb09b1252dbd68ccf171f3c57c5fe1c883 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 deleted file mode 100644 index 00fe5ad2b81b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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/files/gpsd-3.3-setup.py b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py deleted file mode 100644 index 93cc5e8f2149..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py +++ /dev/null @@ -1,17 +0,0 @@ -from distutils.core import setup, Extension - -setup( - name = "gps", - version = @VERSION@, - description = 'Python libraries for the gpsd service daemon', - url = @URL@, - author = 'the GPSD project', - author_email = @EMAIL@, - license = "BSD", - ext_modules=[ - Extension("gps.packet", @GPS_PACKET_SOURCES@, include_dirs=["."]), - Extension("gps.clienthelpers", @GPS_CLIENT_SOURCES@, include_dirs=["."]), - ], - packages = ['gps'], - scripts = @SCRIPTS@, -) diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild deleted file mode 100644 index b37701583b4a..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.21.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 scons-utils 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 ppc ppc64 ~riscv ~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' || die - sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' || die - - default - - if use python ; then - distutils-r1_src_prepare - else - # We're using escons, bug #734352 - python_setup - fi -} - -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 - if use python ; then - rm -rf "${ED}"/python-discard/gps* || die - find "${ED}"/python-discard/ -type d -delete || die - fi - - # Install correct multi-python copy - use python && distutils-r1_src_install -} diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild deleted file mode 100644 index 79a48722e972..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8,9,10} ) -SCONS_MIN_VERSION="2.3.0" - -inherit 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.gz" - 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 - $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') - 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 - test? ( sys-devel/bc )" - -# asciidoctor package is for man page generation -if [[ ${PV} == *9999* ]] ; then - BDEPEND+=" dev-ruby/asciidoctor" -fi - -python_check_deps() { - has_version -b "dev-util/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="\$prefix/$(get_libdir)" - 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.23.1-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild new file mode 100644 index 000000000000..d602376843ef --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.23.1-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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 + +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 ~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 + $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') + 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 + test? ( sys-devel/bc )" + +# asciidoctor package is for man page generation +if [[ ${PV} == *9999* ]] ; then + BDEPEND+=" dev-ruby/asciidoctor" +fi + +python_check_deps() { + has_version -b "dev-util/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.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild deleted file mode 100644 index 04c23389ed2b..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8,9,10} ) -SCONS_MIN_VERSION="2.3.0" - -inherit udev 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 ~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 - $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') - 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 - test? ( sys-devel/bc )" - -# asciidoctor package is for man page generation -if [[ ${PV} == *9999* ]] ; then - BDEPEND+=" dev-ruby/asciidoctor" -fi - -python_check_deps() { - has_version -b "dev-util/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="\$prefix/$(get_libdir)" - 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-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 456c84a9790f..4e8c7af4c741 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 toolchain-funcs +inherit udev distutils-r1 scons-utils systemd toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" @@ -146,7 +146,7 @@ src_configure() { gpsd_group=dialout nostrip=True systemd=$(usex systemd) - unitdir="\$prefix/$(get_libdir)" + unitdir="$(systemd_get_systemunitdir)" shared=$(usex !static True False) bluez=$(usex bluetooth) libgpsmm=$(usex cxx) -- cgit v1.2.3