From 64b3191d12885b12923680de6f943476cad70a2f Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Sun, 12 Aug 2018 19:43:32 +0200 Subject: sci-geosciences/gpsd: fix USE=qt5, add USE=cxx Closes: https://bugs.gentoo.org/663458 Closes: https://github.com/gentoo/gentoo/pull/9551 --- sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 168 +++++++++++++++++++++++++++++++ sci-geosciences/gpsd/gpsd-9999.ebuild | 9 +- 2 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 sci-geosciences/gpsd/gpsd-3.17-r3.ebuild (limited to 'sci-geosciences/gpsd') diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild new file mode 100644 index 000000000000..4a84dbffcc3a --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python2_7 ) +SCONS_MIN_VERSION="1.2.1" + +inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" + inherit git-2 +else + SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + KEYWORDS="amd64 arm ~ppc ~ppc64 x86" +fi + +DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" +HOMEPAGE="http://catb.org/gpsd/" + +LICENSE="BSD" +SLOT="0/23" + +GPSD_PROTOCOLS=( + aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar + gpsclock 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 ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( cxx )" + +RDEPEND=" + bluetooth? ( net-wireless/bluez ) + dbus? ( + sys-apps/dbus + dev-libs/dbus-glib + ) + ncurses? ( sys-libs/ncurses:= ) + ntp? ( || ( + net-misc/ntp + net-misc/chrony + ) ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + ) + python? ( ${PYTHON_DEPS} ) + 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 + + epatch "${FILESDIR}"/${P}-do_not_rm_library.patch + + # Avoid useless -L paths to the install dir + sed -i \ + -e 's:\:SYSROOT:g' \ + SConstruct || die + + use python && distutils-r1_src_prepare +} + +python_prepare_all() { + python_export_best + # 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) + local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) + local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") + local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") + 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 "s|@GPS_CLIENT_SOURCES@|${client}|" \ + -e "s|@SCRIPTS@|${pybins}|" \ + "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die + distutils-r1_python_prepare_all +} + +src_configure() { + myesconsargs=( + 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) + $(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 X python) + $(use_scons qt5 qt) + $(use_scons shm shm_export) + $(use_scons sockets socket_export) + $(use_scons usb) + ) + + use X && myesconsargs+=( xgps=1 ) + use qt5 && myesconsargs+=( qt_versioned=5 ) + + # enable specified protocols + local protocol + for protocol in ${GPSD_PROTOCOLS[@]} ; do + myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) + done +} + +src_compile() { + export CHRPATH= + tc-export CC CXX PKG_CONFIG + export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} + escons + + use python && distutils-r1_src_compile +} + +src_install() { + DESTDIR="${D}" escons install $(usex udev udev-install "") + + newconfd "${FILESDIR}"/gpsd.conf-2 gpsd + newinitd "${FILESDIR}"/gpsd.init-2 gpsd + + 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 98fba863a5a6..e3db55c44b07 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -30,10 +30,11 @@ GPSD_PROTOCOLS=( tripmate tsip ublox ) IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X" +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 ) - python? ( ${PYTHON_REQUIRED_USE} )" + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( cxx )" RDEPEND=" bluetooth? ( net-wireless/bluez ) @@ -115,10 +116,10 @@ src_configure() { gpsd_group=uucp nostrip=True python=False - libgpsmm=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) @@ -126,7 +127,7 @@ src_configure() { $(use_scons ncurses) $(use_scons ntp ntpshm) $(use_scons ntp pps) - $(use_scons qt5 libQgpsmm) + $(use_scons qt5 qt) $(use_scons shm shm_export) $(use_scons sockets socket_export) $(use_scons usb) -- cgit v1.2.3-65-gdbad