* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2016-05-09 19:45 Mike Frysinger
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger @ 2016-05-09 19:45 UTC (permalink / raw
To: gentoo-commits
commit: c806f3c116e0bcd4aae79ad074eeec981ee963a9
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 18:47:31 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May 9 19:44:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c806f3c1
sci-geosciences/gpsd: fix parallel build #577432
sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch | 7 ++++---
sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch | 12 ++++++++++++
sci-geosciences/gpsd/gpsd-3.15.ebuild | 1 +
sci-geosciences/gpsd/gpsd-3.16.ebuild | 3 +--
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
index b8d2cf0..77ba8a7 100644
--- a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
@@ -24,7 +24,7 @@ index a050f38..53f697d 100644
else:
obj_list.append(s)
return env.SharedLibrary(target=target,
-@@ -925,9 +925,11 @@ static_gpslib = env.StaticLibrary("gps_static",
+@@ -925,9 +925,12 @@ static_gpslib = env.StaticLibrary("gps_static",
[env.StaticObject(s) for s in libgps_sources],
rtlibs)
@@ -36,6 +36,7 @@ index a050f38..53f697d 100644
+ sources=libgpsd_sources,
+ version=libgps_version,
+ parse_flags=usbflags + rtlibs + bluezflags + ["-lgps"])
++env.Depends(compiled_gpsdlib, [compiled_gpslib])
libraries = [compiled_gpslib, compiled_gpsdlib]
@@ -58,12 +59,12 @@ index a050f38..53f697d 100644
gpsctl = env.Program('gpsctl', ['gpsctl.c'],
LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
-env.Depends(gpsctl, [compiled_gpslib])
-+env.Depends(gpsctl, [compiled_gpslib, compiled_gpslib])
++env.Depends(gpsctl, [compiled_gpsdlib, compiled_gpslib])
gpsmon = env.Program('gpsmon', gpsmon_sources,
LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs)
-env.Depends(gpsmon, [compiled_gpslib])
-+env.Depends(gpsmon, [compiled_gpslib, compiled_gpslib])
++env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib])
gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
env.Depends(gpsdctl, compiled_gpslib)
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch
new file mode 100644
index 0000000..2477d30
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-timebase.patch
@@ -0,0 +1,12 @@
+don't always rebuild this header as it won't change between compile & install
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -1174,7 +1174,6 @@
+ f.close()
+ timebase = env.Command(target="timebase.h",
+ source=["leapseconds.cache"], action=timebase_h)
+-env.AlwaysBuild(timebase)
+
+ env.Textfile(target="gpsd_config.h", source=confdefs)
+ env.Textfile(target="gpsd.h", source=[File("gpsd.h-head"), File("gpsd_config.h"), File("gpsd.h-tail")])
diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index e6f3172..bc6e7eb 100644
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+ epatch "${FILESDIR}"/${PN}-3.15-timebase.patch
epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
# Avoid useless -L paths to the install dir
diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 5928f17..18ad0f6 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+ epatch "${FILESDIR}"/${PN}-3.15-timebase.patch
epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
# Avoid useless -L paths to the install dir
@@ -82,8 +83,6 @@ src_prepare() {
sed -e 's:libusb.h:libusb-1.0/libusb.h:' -i driver_garmin.c || die
- eapply_user
-
use python && distutils-r1_src_prepare
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2017-01-24 5:29 Matthias Maier
0 siblings, 0 replies; 8+ messages in thread
From: Matthias Maier @ 2017-01-24 5:29 UTC (permalink / raw
To: gentoo-commits
commit: d37ceef5003b9da9a94c435fafe72bfc39334cf4
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 05:27:07 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 05:29:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37ceef5
sci-geosciences/gpsd: update live ebuild, bug #602336
Package-Manager: Portage-2.3.0, Repoman-2.3.1
.../gpsd/files/gpsd-9999-do_not_rm_library.patch | 12 ++++++++++++
sci-geosciences/gpsd/gpsd-9999.ebuild | 13 ++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch
new file mode 100644
index 00000000..83e2907
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch
@@ -0,0 +1,12 @@
+diff --git a/SConstruct b/SConstruct
+index c0f083a..4a98580 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))
+ binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
+ # Work around a minor bug in InstallSharedLib() link handling
+-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
+
+ if qt_env:
+ binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 97ef209..22f6781 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,10 +25,10 @@ LICENSE="BSD"
SLOT="0"
GPSD_PROTOCOLS=(
- aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
- geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
- oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
- tnt tripmate tsip ublox
+ 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 debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
@@ -69,8 +69,7 @@ src_prepare() {
die "please sync ebuild & source"
fi
- epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
- epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
+ epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
# Avoid useless -L paths to the install dir
sed -i \
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2017-02-17 22:33 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2017-02-17 22:33 UTC (permalink / raw
To: gentoo-commits
commit: 1d8732755a29efa19662b24b56fea99398071199
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 22:23:42 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 22:33:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d873275
sci-geosciences/gpsd: Clean old version up
sci-geosciences/gpsd/Manifest | 1 -
.../gpsd/files/gpsd-3.4-no-man-gen.patch | 13 --
sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch | 17 --
sci-geosciences/gpsd/gpsd-3.9-r1.ebuild | 187 ---------------------
4 files changed, 218 deletions(-)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index d0afd60418..30c2e14007 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1,2 @@
DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
DIST gpsd-3.16.tar.gz 8587490 SHA256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543 WHIRLPOOL 67d6db04593d6df62c64848965fd2c72d806003df9ad8a3623665ecf73a165e12c977d1d3988e46f7aec3c1cdee8bc026c515fd3be855b6da282def4e32498be
-DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f WHIRLPOOL 1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch b/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch
deleted file mode 100644
index 20a3b707a4..0000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-the scons logic is dumb and will always regenerate the man pages.
-forcibly disable that as the releases contain the man pages.
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -575,6 +575,7 @@
- manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET"
- else:
- announce("Neither xsltproc nor xmlto found, documentation cannot be built.")
-+manbuilder = htmlbuilder = False
- if manbuilder:
- env['BUILDERS']["Man"] = Builder(action=manbuilder)
- env['BUILDERS']["HTML"] = Builder(action=htmlbuilder,
diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
deleted file mode 100644
index 5419cd31f6..0000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-don't set the -rpath/-L flags to the install dir as this breaks DESTDIR
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -268,11 +268,7 @@
- return wrapped
-
- # Honor the specified installation prefix in link paths.
--if not env["sysroot"]:
-- env.Prepend(LIBPATH=[installdir('libdir')])
--else:
-- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
--if env["shared"]:
-+if env["shared"] and env["chrpath"]:
- env.Prepend(RPATH=[installdir('libdir')])
-
- # Give deheader a way to set compiler flags
diff --git a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
deleted file mode 100644
index 0c4dc52f5c..0000000000
--- a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils scons-utils systemd 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"
-
-GPSD_PROTOCOLS=(
- aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
- geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
- oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
- tripmate tsip ubx
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets systemd test udev usb X"
-REQUIRED_USE="X? ( python )
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
-
-RDEPEND="X? ( dev-python/pygtk:2 )
- ncurses? ( sys-libs/ncurses )
- bluetooth? ( net-wireless/bluez )
- usb? ( virtual/libusb:1 )
- dbus? (
- sys-apps/dbus
- dev-libs/dbus-glib
- )
- ntp? ( || ( net-misc/ntp net-misc/chrony ) )
- systemd? ( sys-apps/systemd )
- qt4? ( dev-qt/qtgui:4 )"
-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
-
-pkg_setup() {
- use python && python_pkg_setup
-}
-
-src_unpack() {
- default
-
- # 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
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
- epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
- epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
-
- # Avoid useless -L paths to the install dir
- sed -i \
- -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
- -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
- SConstruct || die
-
- # Extract python info out of SConstruct so we can use saner distribute
- if use python ; then
- pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
- local pybins=$(pyvar python_progs)
- 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@|$(pyvar python_progs)|" \
- "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
- distutils_src_prepare
- fi
-}
-
-src_configure() {
- myesconsargs=(
- prefix="${EPREFIX}/usr"
- libdir="\$prefix/$(get_libdir)"
- udevdir="$(get_udevdir)"
- chrpath=False
- gpsd_user=gpsd
- gpsd_group=uucp
- strip=False
- python=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 shm shm_export)
- $(use_scons sockets socket_export)
- $(use_scons systemd)
- $(use_scons qt4 libQgpsmm)
- $(use_scons usb)
- )
-
- # 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_src_compile
-}
-
-src_install() {
- DESTDIR="${D}" escons install $(usex udev udev-install "")
-
- newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
- newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
- if use systemd; then
- systemd_dounit "${S}"/systemd/gpsd.service
- systemd_dounit "${S}"/systemd/gpsd.socket
- fi
-
- if use python ; then
- distutils_src_install
- # Delete all X related packages if user doesn't want them
- if ! use X ; then
- local p
- for p in $(grep -Il 'import .*pygtk' *) ; do
- find "${D}"/usr/bin -name "${p}*" -delete
- done
- fi
- fi
-}
-
-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"
-}
-
-pkg_postinst() {
- use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use python && distutils_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2017-09-21 11:58 Andreas Hüttel
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Hüttel @ 2017-09-21 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 9f111456c2e367663292aa9fcc379c7ad4dfc336
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 11:57:20 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 11:57:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f111456
sci-geosciences/gpsd: Version bump. Fixes build with gcc-6, bug 595382.
Closes: https://bugs.gentoo.org/595382
Package-Manager: Portage-2.3.10, Repoman-2.3.3
sci-geosciences/gpsd/Manifest | 1 +
.../gpsd/files/gpsd-3.17-do_not_rm_library.patch | 12 ++
sci-geosciences/gpsd/gpsd-3.17.ebuild | 163 +++++++++++++++++++++
3 files changed, 176 insertions(+)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 30c2e140075..4462ea235cc 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,2 +1,3 @@
DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
DIST gpsd-3.16.tar.gz 8587490 SHA256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 SHA512 a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543 WHIRLPOOL 67d6db04593d6df62c64848965fd2c72d806003df9ad8a3623665ecf73a165e12c977d1d3988e46f7aec3c1cdee8bc026c515fd3be855b6da282def4e32498be
+DIST gpsd-3.17.tar.gz 8755304 SHA256 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 WHIRLPOOL 373c3f5f69696013b9af247bb929bd9019d39440d758d79a9c4f5797b36c69af0085fed79c3a5c42ca9412bd0b754d574afc48e44567b029b789dccf8589a17e
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
new file mode 100644
index 00000000000..83e2907fca5
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
@@ -0,0 +1,12 @@
+diff --git a/SConstruct b/SConstruct
+index c0f083a..4a98580 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))
+ binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
+ # Work around a minor bug in InstallSharedLib() link handling
+-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
+
+ if qt_env:
+ binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild
new file mode 100644
index 00000000000..d431599bc0a
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.17.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 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"
+
+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 debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ ncurses? ( sys-libs/ncurses:= )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
+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:\<STAGING_PREFIX\>: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
+ python=False
+ 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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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
+
+ if use python ; then
+ distutils-r1_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ rm "${ED%/}"/usr/bin/xgps* || die
+ fi
+ fi
+}
+
+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"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2019-09-12 3:57 Mike Frysinger
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger @ 2019-09-12 3:57 UTC (permalink / raw
To: gentoo-commits
commit: 71fdf613a9ffa9be6b2189bb0b91f2288b7f8bf6
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 19:29:00 2019 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 03:46:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fdf613
sci-geosciences/gpsd: fix building with Python 3 as default
Pull in upstream fixes for running scons when Python 3 is default.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
.../gpsd/files/gpsd-3.17-scons-print.patch | 73 +++++++++++
.../gpsd/files/gpsd-3.17-scons-py3.patch | 143 +++++++++++++++++++++
sci-geosciences/gpsd/gpsd-3.17-r4.ebuild | 2 +
3 files changed, 218 insertions(+)
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
new file mode 100644
index 00000000000..4d94d05f428
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
@@ -0,0 +1,73 @@
+From ed205512dd05a7dd4b0dab8af760d13e9efbbb25 Mon Sep 17 00:00:00 2001
+From: Fred Wright <fw@fwright.net>
+Date: Sat, 7 Oct 2017 19:54:55 -0700
+Subject: [PATCH] Fixes SConstruct for SCons 3.0.0.
+
+SCons 3.0.0 introduced a bug where the print_funtion future import is
+inflicted on the SConstruct script, making 'print' as a statement
+illegal. This is expected to be fixed in SCons 3.0.1, but in the
+meantime it's necessary to switch to the print_function mode for
+compatibility. Fortunately, there were only three print statements in
+the whole file.
+
+This is not a complete Python 3 fix; it simply restores correct
+operation when running SCons under Python 2.
+
+TESTED:
+Arraged to test all three print() instances under OSX.
+Tested "scons build-all check" under OSX, Ubuntu, CentOS, Fedora,
+FreeBSD, OpenBSD, and NetBSD.
+---
+ SConstruct | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4923ad8cdae3..040103cff387 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -23,6 +23,13 @@
+ # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir
+ # * Coveraging mode: gcc "-coverage" flag requires a hack
+ # for building the python bindings
++# * Python 3 compatibility in this recipe
++
++# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional.
++# This is recognized to be a bug in SCons, but we need to live with it for now,
++# and we'll need this for eventual Python 3 compatibility, anyway.
++# Python requires this to precede any non-comment code.
++from __future__ import print_function
+
+ # Release identification begins here
+ gpsd_version = "3.18~dev"
+@@ -375,7 +382,7 @@ if env.GetOption("silent"):
+
+ def announce(msg):
+ if not env.GetOption("silent"):
+- print msg
++ print(msg)
+
+ # DESTDIR environment variable means user prefix the installation root.
+ DESTDIR = os.environ.get('DESTDIR', '')
+@@ -1546,8 +1553,8 @@ def substituter(target, source, env):
+ content = content.replace(s, t)
+ m = re.search("@[A-Z]+@", content)
+ if m and m.group(0) not in map(lambda x: x[0], substmap):
+- print >>sys.stderr, "Unknown subst token %s in %s." \
+- % (m.group(0), sfp.name)
++ print("Unknown subst token %s in %s." % (m.group(0), sfp.name),
++ file=sys.stderr)
+ tfp = open(str(target[0]), "w")
+ tfp.write(content)
+ tfp.close()
+@@ -2191,7 +2198,7 @@ def validation_list(target, source, env):
+ if '-head' not in page:
+ fp = open(page)
+ if "Valid HTML" in fp.read():
+- print os.path.join(website, os.path.basename(page))
++ print(os.path.join(website, os.path.basename(page)))
+ fp.close()
+ Utility("validation-list", [www], validation_list)
+
+--
+2.19.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
new file mode 100644
index 00000000000..d6154c47687
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
@@ -0,0 +1,143 @@
+From b2ba8d5ade0f9d55c2b51ca41d9c9604662452ad Mon Sep 17 00:00:00 2001
+From: Robert Norris <rw_norris@hotmail.com>
+Date: Mon, 12 Feb 2018 14:16:17 -0800
+Subject: [PATCH] SConstruct: Allow building for Python 3
+
+Still usable with Python 2
+
+Tested:
+scons build-all check
+
+Debian Unstable with python 2.7.14
+OpenSUSE Tumbleweed with python 3.6.4
+---
+ SConstruct | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index c6a309ec3c30..17b47e21342f 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -370,7 +370,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+
+
+ # Keep scan-build options in the environment
+-for key, value in os.environ.iteritems():
++for key, value in os.environ.items():
+ if key.startswith('CCC_'):
+ env.Append(ENV={key: value})
+
+@@ -476,6 +476,8 @@ if env['sysroot']:
+ env.MergeFlags({"LINKFLAGS": ["--sysroot=%s" % env['sysroot']]})
+
+ # Build help
++def cmp(a, b):
++ return (a > b) - (a < b)
+
+ Help("""Arguments may be a mixture of switches and targets in any order.
+ Switches apply to the entire build regardless of where they are in the order.
+@@ -859,9 +861,9 @@ else:
+ "dbus_export": ["libdbus-1"],
+ }
+
+- keys = map(lambda x: (x[0], x[2]), boolopts) \
+- + map(lambda x: (x[0], x[2]), nonboolopts) \
+- + map(lambda x: (x[0], x[2]), pathopts)
++ keys = list(map(lambda x: (x[0], x[2]), boolopts)) \
++ + list(map(lambda x: (x[0], x[2]), nonboolopts)) \
++ + list(map(lambda x: (x[0], x[2]), pathopts))
+ keys.sort()
+ for (key, help) in keys:
+ value = env[key]
+@@ -998,7 +1000,7 @@ else:
+ if env['python']: # May have been turned off by error
+ env['PYTHON'] = target_python_path
+ env['ENV']['PYTHON'] = target_python_path # For regress-driver
+- py_config_vars = ast.literal_eval(py_config_text)
++ py_config_vars = ast.literal_eval(py_config_text.decode())
+ py_config_vars = [[] if x is None else x for x in py_config_vars]
+ python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars))
+
+@@ -1387,7 +1389,7 @@ else:
+
+ python_objects = {}
+ python_compiled_libs = {}
+- for ext, sources in python_extensions.iteritems():
++ for ext, sources in python_extensions.items():
+ python_objects[ext] = []
+ for src in sources:
+ python_objects[ext].append(
+@@ -1417,7 +1419,7 @@ Platform: UNKNOWN
+ python_egg_info = python_env.Textfile(target="gps-%s.egg-info"
+ % (gpsd_version, ),
+ source=python_egg_info_source)
+- python_built_extensions = python_compiled_libs.values()
++ python_built_extensions = list(python_compiled_libs.values())
+ python_targets = python_built_extensions + [python_egg_info]
+
+ env.Command(target="packet_names.h", source="packet_states.h", action="""
+@@ -1624,14 +1626,14 @@ if env['xgps']:
+ "xgpsspeed.1": "gps.xml",
+ "xgps.1": "gps.xml",
+ })
+-all_manpages = base_manpages.keys() + python_manpages.keys()
++all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
+
+ man_env = env.Clone()
+ if man_env.GetOption('silent'):
+ man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter
+ manpage_targets = []
+ if manbuilder:
+- for (man, xml) in base_manpages.items() + python_manpages.items():
++ for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()):
+ manpage_targets.append(man_env.Man(source=xml, target=man))
+
+ # Where it all comes together
+@@ -1682,7 +1684,7 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip']
+ if not env['python']:
+ python_install = []
+ else:
+- python_module_dir = python_libdir + os.sep + 'gps'
++ python_module_dir = str(python_libdir) + os.sep + 'gps'
+ python_extensions_install = python_env.Install(DESTDIR + python_module_dir,
+ python_built_extensions)
+ if ((not env['debug'] and not env['profiling']
+@@ -1695,7 +1697,7 @@ else:
+ python_progs_install = python_env.Install(installdir('bindir'),
+ python_progs)
+
+- python_egg_info_install = python_env.Install(DESTDIR + python_libdir,
++ python_egg_info_install = python_env.Install(DESTDIR + str(python_libdir),
+ python_egg_info)
+ python_install = [python_extensions_install,
+ python_modules_install,
+@@ -1712,7 +1714,7 @@ if qt_env:
+
+
+ maninstall = []
+-for manpage in base_manpages.keys() + python_manpages.keys():
++for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
+ if not manbuilder and not os.path.exists(manpage):
+ continue
+ section = manpage.split(".")[1]
+@@ -2198,7 +2200,7 @@ htmlpages = Split('''
+ www/writing-a-driver.html
+ ''')
+
+-webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in"))
++webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in")))
+
+ www = env.Alias('www', webpages)
+
+@@ -2376,7 +2378,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
+ if ".gitignore" in distfiles:
+ distfiles.remove(".gitignore")
+ distfiles += generated_sources
+- distfiles += base_manpages.keys() + python_manpages.keys()
++ distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
+ if "packaging/rpm/gpsd.spec" not in distfiles:
+ distfiles.append("packaging/rpm/gpsd.spec")
+
+--
+2.19.1
+
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
index dc6247feaeb..5ffc9c07ef3 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -79,6 +79,8 @@ src_prepare() {
fi
epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+ epatch "${FILESDIR}"/${P}-scons-print.patch
+ epatch "${FILESDIR}"/${P}-scons-py3.patch
# Avoid useless -L paths to the install dir
sed -i \
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2019-10-04 19:23 Robin H. Johnson
0 siblings, 0 replies; 8+ messages in thread
From: Robin H. Johnson @ 2019-10-04 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 2042baf7257140c13cd6f217ce75908e8ba1aada
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 19:03:05 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 19:21:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2042baf7
sci-geosciences/gpsd: fix DuplicateFiles
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch | 12 ------------
sci-geosciences/gpsd/gpsd-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch
deleted file mode 100644
index 83e2907fca5..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index c0f083a..4a98580 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
- # Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
-
- if qt_env:
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 6cba45913e0..f07d1e12062 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -84,7 +84,7 @@ src_prepare() {
die "please sync ebuild & source"
fi
- epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+ epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
# Merged upstream
#epatch "${FILESDIR}"/${P}-scons-print.patch
#epatch "${FILESDIR}"/${P}-scons-py3.patch
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2020-09-10 15:27 Marek Szuba
0 siblings, 0 replies; 8+ messages in thread
From: Marek Szuba @ 2020-09-10 15:27 UTC (permalink / raw
To: gentoo-commits
commit: d2e1501ab7f3f8353b92edc95d586273a5c01900
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 15:12:54 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 15:27:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e1501a
sci-geosciences/gpsd: bump to 3.21
Also fixes a few of the outstanding bugs.
Invoking maintainer timeout.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=734364
Closes: https://bugs.gentoo.org/show_bug.cgi?id=735554
Closes: https://bugs.gentoo.org/show_bug.cgi?id=735964
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sci-geosciences/gpsd/Manifest | 1 +
...psd-3.21-scons_conditional_python_scripts.patch | 64 +++++++
sci-geosciences/gpsd/gpsd-3.21.ebuild | 192 +++++++++++++++++++++
3 files changed, 257 insertions(+)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index d7ad2e03d2c..595d071ea61 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -2,3 +2,4 @@ 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
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 00000000000..00fe5ad2b81
--- /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 00000000000..ff88fc9a160
--- /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"
+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'
+ 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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/
@ 2020-09-25 17:56 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2020-09-25 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 65805a58b1c7920eeaf78b5ea6ec07d958ddc312
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 17:55:55 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 17:55:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65805a58
sci-geosciences/gpsd: cleanup old
Bug: https://bugs.gentoo.org/743766
Bug: https://bugs.gentoo.org/743556
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/gpsd/Manifest | 2 -
.../gpsd/files/gpsd-3.17-do_not_rm_library.patch | 12 --
.../gpsd/files/gpsd-3.17-scons-print.patch | 73 --------
.../gpsd/files/gpsd-3.17-scons-py3.patch | 143 ----------------
.../gpsd/files/gpsd-3.18.1-do_not_rm_library.patch | 11 --
.../gpsd/files/gpsd-3.19-do_not_rm_library.patch | 11 --
sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 171 -------------------
sci-geosciences/gpsd/gpsd-3.17-r4.ebuild | 175 -------------------
sci-geosciences/gpsd/gpsd-3.20.ebuild | 189 ---------------------
9 files changed, 787 deletions(-)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 432a2de36b3..cb4314ceceb 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1 @@
-DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
-DIST gpsd-3.20.tar.gz 3600835 BLAKE2B 6c9a3540de1be9191a601d6666c18c79e8e8913a3b4455448bafd0fa81e3a1859bd4851d42c3d06aed48fd0910060919f87a661d02fec44c001e9a393d8658e6 SHA512 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9
DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
deleted file mode 100644
index 83e2907fca5..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index c0f083a..4a98580 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
- # Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
-
- if qt_env:
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
deleted file mode 100644
index 4d94d05f428..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ed205512dd05a7dd4b0dab8af760d13e9efbbb25 Mon Sep 17 00:00:00 2001
-From: Fred Wright <fw@fwright.net>
-Date: Sat, 7 Oct 2017 19:54:55 -0700
-Subject: [PATCH] Fixes SConstruct for SCons 3.0.0.
-
-SCons 3.0.0 introduced a bug where the print_funtion future import is
-inflicted on the SConstruct script, making 'print' as a statement
-illegal. This is expected to be fixed in SCons 3.0.1, but in the
-meantime it's necessary to switch to the print_function mode for
-compatibility. Fortunately, there were only three print statements in
-the whole file.
-
-This is not a complete Python 3 fix; it simply restores correct
-operation when running SCons under Python 2.
-
-TESTED:
-Arraged to test all three print() instances under OSX.
-Tested "scons build-all check" under OSX, Ubuntu, CentOS, Fedora,
-FreeBSD, OpenBSD, and NetBSD.
----
- SConstruct | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 4923ad8cdae3..040103cff387 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -23,6 +23,13 @@
- # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir
- # * Coveraging mode: gcc "-coverage" flag requires a hack
- # for building the python bindings
-+# * Python 3 compatibility in this recipe
-+
-+# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional.
-+# This is recognized to be a bug in SCons, but we need to live with it for now,
-+# and we'll need this for eventual Python 3 compatibility, anyway.
-+# Python requires this to precede any non-comment code.
-+from __future__ import print_function
-
- # Release identification begins here
- gpsd_version = "3.18~dev"
-@@ -375,7 +382,7 @@ if env.GetOption("silent"):
-
- def announce(msg):
- if not env.GetOption("silent"):
-- print msg
-+ print(msg)
-
- # DESTDIR environment variable means user prefix the installation root.
- DESTDIR = os.environ.get('DESTDIR', '')
-@@ -1546,8 +1553,8 @@ def substituter(target, source, env):
- content = content.replace(s, t)
- m = re.search("@[A-Z]+@", content)
- if m and m.group(0) not in map(lambda x: x[0], substmap):
-- print >>sys.stderr, "Unknown subst token %s in %s." \
-- % (m.group(0), sfp.name)
-+ print("Unknown subst token %s in %s." % (m.group(0), sfp.name),
-+ file=sys.stderr)
- tfp = open(str(target[0]), "w")
- tfp.write(content)
- tfp.close()
-@@ -2191,7 +2198,7 @@ def validation_list(target, source, env):
- if '-head' not in page:
- fp = open(page)
- if "Valid HTML" in fp.read():
-- print os.path.join(website, os.path.basename(page))
-+ print(os.path.join(website, os.path.basename(page)))
- fp.close()
- Utility("validation-list", [www], validation_list)
-
---
-2.19.1
-
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
deleted file mode 100644
index d6154c47687..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From b2ba8d5ade0f9d55c2b51ca41d9c9604662452ad Mon Sep 17 00:00:00 2001
-From: Robert Norris <rw_norris@hotmail.com>
-Date: Mon, 12 Feb 2018 14:16:17 -0800
-Subject: [PATCH] SConstruct: Allow building for Python 3
-
-Still usable with Python 2
-
-Tested:
-scons build-all check
-
-Debian Unstable with python 2.7.14
-OpenSUSE Tumbleweed with python 3.6.4
----
- SConstruct | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index c6a309ec3c30..17b47e21342f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -370,7 +370,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
-
-
- # Keep scan-build options in the environment
--for key, value in os.environ.iteritems():
-+for key, value in os.environ.items():
- if key.startswith('CCC_'):
- env.Append(ENV={key: value})
-
-@@ -476,6 +476,8 @@ if env['sysroot']:
- env.MergeFlags({"LINKFLAGS": ["--sysroot=%s" % env['sysroot']]})
-
- # Build help
-+def cmp(a, b):
-+ return (a > b) - (a < b)
-
- Help("""Arguments may be a mixture of switches and targets in any order.
- Switches apply to the entire build regardless of where they are in the order.
-@@ -859,9 +861,9 @@ else:
- "dbus_export": ["libdbus-1"],
- }
-
-- keys = map(lambda x: (x[0], x[2]), boolopts) \
-- + map(lambda x: (x[0], x[2]), nonboolopts) \
-- + map(lambda x: (x[0], x[2]), pathopts)
-+ keys = list(map(lambda x: (x[0], x[2]), boolopts)) \
-+ + list(map(lambda x: (x[0], x[2]), nonboolopts)) \
-+ + list(map(lambda x: (x[0], x[2]), pathopts))
- keys.sort()
- for (key, help) in keys:
- value = env[key]
-@@ -998,7 +1000,7 @@ else:
- if env['python']: # May have been turned off by error
- env['PYTHON'] = target_python_path
- env['ENV']['PYTHON'] = target_python_path # For regress-driver
-- py_config_vars = ast.literal_eval(py_config_text)
-+ py_config_vars = ast.literal_eval(py_config_text.decode())
- py_config_vars = [[] if x is None else x for x in py_config_vars]
- python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars))
-
-@@ -1387,7 +1389,7 @@ else:
-
- python_objects = {}
- python_compiled_libs = {}
-- for ext, sources in python_extensions.iteritems():
-+ for ext, sources in python_extensions.items():
- python_objects[ext] = []
- for src in sources:
- python_objects[ext].append(
-@@ -1417,7 +1419,7 @@ Platform: UNKNOWN
- python_egg_info = python_env.Textfile(target="gps-%s.egg-info"
- % (gpsd_version, ),
- source=python_egg_info_source)
-- python_built_extensions = python_compiled_libs.values()
-+ python_built_extensions = list(python_compiled_libs.values())
- python_targets = python_built_extensions + [python_egg_info]
-
- env.Command(target="packet_names.h", source="packet_states.h", action="""
-@@ -1624,14 +1626,14 @@ if env['xgps']:
- "xgpsspeed.1": "gps.xml",
- "xgps.1": "gps.xml",
- })
--all_manpages = base_manpages.keys() + python_manpages.keys()
-+all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
-
- man_env = env.Clone()
- if man_env.GetOption('silent'):
- man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter
- manpage_targets = []
- if manbuilder:
-- for (man, xml) in base_manpages.items() + python_manpages.items():
-+ for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()):
- manpage_targets.append(man_env.Man(source=xml, target=man))
-
- # Where it all comes together
-@@ -1682,7 +1684,7 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip']
- if not env['python']:
- python_install = []
- else:
-- python_module_dir = python_libdir + os.sep + 'gps'
-+ python_module_dir = str(python_libdir) + os.sep + 'gps'
- python_extensions_install = python_env.Install(DESTDIR + python_module_dir,
- python_built_extensions)
- if ((not env['debug'] and not env['profiling']
-@@ -1695,7 +1697,7 @@ else:
- python_progs_install = python_env.Install(installdir('bindir'),
- python_progs)
-
-- python_egg_info_install = python_env.Install(DESTDIR + python_libdir,
-+ python_egg_info_install = python_env.Install(DESTDIR + str(python_libdir),
- python_egg_info)
- python_install = [python_extensions_install,
- python_modules_install,
-@@ -1712,7 +1714,7 @@ if qt_env:
-
-
- maninstall = []
--for manpage in base_manpages.keys() + python_manpages.keys():
-+for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
- if not manbuilder and not os.path.exists(manpage):
- continue
- section = manpage.split(".")[1]
-@@ -2198,7 +2200,7 @@ htmlpages = Split('''
- www/writing-a-driver.html
- ''')
-
--webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in"))
-+webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in")))
-
- www = env.Alias('www', webpages)
-
-@@ -2376,7 +2378,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
- if ".gitignore" in distfiles:
- distfiles.remove(".gitignore")
- distfiles += generated_sources
-- distfiles += base_manpages.keys() + python_manpages.keys()
-+ distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
- if "packaging/rpm/gpsd.spec" not in distfiles:
- distfiles.append("packaging/rpm/gpsd.spec")
-
---
-2.19.1
-
diff --git a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
deleted file mode 100644
index 0500f385d79..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpsd-3.18.1/SConstruct.orig 2018-10-19 12:45:40.000000000 -0700
-+++ gpsd-3.18.1/SConstruct 2019-10-02 11:49:00.848685223 -0700
-@@ -1796,8 +1796,6 @@ # third-party client programs should not
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib,
- libgps_version))
--# Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
-
- if qt_env:
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),
diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
deleted file mode 100644
index 8008dd54fe9..00000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpsd-3.19/SConstruct.orig 2019-07-01 19:00:17.000000000 -0700
-+++ gpsd-3.19/SConstruct 2019-10-02 11:49:06.080655901 -0700
-@@ -1980,8 +1980,6 @@ # third-party client programs should not
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared,
- libgps_version))
--# Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
-
- if qt_env:
- binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
deleted file mode 100644
index 98c43cc1ab7..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~sparc 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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="X? ( python )
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
- python? ( ${PYTHON_REQUIRED_USE} )
- qt5? ( cxx )"
-
-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} )
- 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:\<STAGING_PREFIX\>:SYSROOT:g' \
- SConstruct || die
-
- 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)
- 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-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
deleted file mode 100644
index 814c85acb35..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 ~sparc ~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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="X? ( python )
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
- python? ( ${PYTHON_REQUIRED_USE} )
- qt5? ( cxx )"
-
-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} )
- 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
- epatch "${FILESDIR}"/${P}-scons-print.patch
- epatch "${FILESDIR}"/${P}-scons-py3.patch
-
- # Avoid useless -L paths to the install dir
- sed -i \
- -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
- SConstruct || die
-
- 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']"
- 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-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
deleted file mode 100644
index 8953467697c..00000000000
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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 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/25"
-
-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}
- 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:\<STAGING_PREFIX\>: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 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'])" || 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@|$(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)"
- 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)
- )
-
- 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
-
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-25 17:56 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-09 19:45 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/files/, sci-geosciences/gpsd/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 5:29 Matthias Maier
2017-02-17 22:33 Michał Górny
2017-09-21 11:58 Andreas Hüttel
2019-09-12 3:57 Mike Frysinger
2019-10-04 19:23 Robin H. Johnson
2020-09-10 15:27 Marek Szuba
2020-09-25 17:56 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox