diff options
author | Mike Gilbert <floppym@gentoo.org> | 2021-11-07 22:20:52 -0500 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2021-11-07 22:21:58 -0500 |
commit | 6ed2df2112818a2df25878f2a065140419c327d9 (patch) | |
tree | 2ff897ae6c8563098eac73512423bdf5d8123db6 /sci-geosciences | |
parent | sci-geosciences/gpsd: fix systemd unit path (diff) | |
download | gentoo-6ed2df2112818a2df25878f2a065140419c327d9.tar.gz gentoo-6ed2df2112818a2df25878f2a065140419c327d9.tar.bz2 gentoo-6ed2df2112818a2df25878f2a065140419c327d9.zip |
sci-geosciences/gpsd: drop 3.21, 3.23-r2
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/gpsd/Manifest | 2 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.21-scons_conditional_python_scripts.patch | 64 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.3-setup.py | 17 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.21.ebuild | 200 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.23-r2.ebuild | 212 |
5 files changed, 0 insertions, 495 deletions
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 9dd813f65557..bd4e7460877b 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,3 +1 @@ -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 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:\<STAGING_PREFIX\>: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 -} |