commit: 8cf177c62fc32e0564439b007ed4ffd68ccec1cd
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 16:48:04 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:12:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf177c6
sci-geosciences/gpsd: bumpity bump
bumping eapi
bumping version
various cleanups for same
Much work contributed by michael AT weiser.dinsnail.net
Significant work on bug #704580 which I am still going through all of
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
sci-geosciences/gpsd/Manifest | 1 +
.../gpsd/{gpsd-9999.ebuild => gpsd-3.20.ebuild} | 57 +++++++++---------
sci-geosciences/gpsd/gpsd-9999.ebuild | 69 +++++++++++-----------
3 files changed, 63 insertions(+), 64 deletions(-)
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 02f03645cf4..d7ad2e03d2c 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1,4 @@
DIST gpsd-3.17.tar.gz 8755304 BLAKE2B
d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5
SHA512
71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
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
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild
b/sci-geosciences/gpsd/gpsd-3.20.ebuild
similarity index 82%
copy from sci-geosciences/gpsd/gpsd-9999.ebuild
copy to sci-geosciences/gpsd/gpsd-3.20.ebuild
index 76b0f95ce73..1da8c9d4b80 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
SCONS_MIN_VERSION="2.3.0"
inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -84,11 +84,6 @@ src_prepare() {
die "please sync ebuild & source"
fi
- epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
- # Merged upstream
- #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' \
@@ -101,7 +96,6 @@ src_prepare() {
python_prepare_all() {
python_setup
- python_export
# Extract python info out of SConstruct so we can use saner distribute
pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
@@ -126,7 +120,7 @@ python_prepare_all() {
}
src_configure() {
- myesconsargs=(
+ scons_opts=(
prefix="${EPREFIX}/usr"
libdir="\$prefix/$(get_libdir)"
udevdir="$(get_udevdir)"
@@ -136,29 +130,32 @@ src_configure() {
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 python)
- $(use_scons qt5 qt)
- $(use_scons shm shm_export)
- $(use_scons sockets socket_export)
- $(use_scons usb)
+ 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 && myesconsargs+=( xgps=1 xgpsspeed=1 )
- use qt5 && myesconsargs+=( qt_versioned=5 )
+ 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
- myesconsargs+=( $(use_scons gpsd_protocols_${protocol}
${protocol}) )
+ scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
done
}
@@ -166,20 +163,20 @@ src_compile() {
export CHRPATH=
tc-export CC CXX PKG_CONFIG
export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
- escons
+ escons "${scons_opts[@]}"
use python && distutils-r1_src_compile
}
src_install() {
- DESTDIR="${D}" escons install $(usex udev udev-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}"/usr/local/$(get_libdir)/python*/site-packages/gps*
- find "${D}"/usr/local/ -type d -delete
+ rm -rf "${D}"/python-discard/gps*
+ find "${D}"/python-discard/ -type d -delete
# Install correct multi-python copy
use python && distutils-r1_src_install
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild
b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 76b0f95ce73..cd96667f22e 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
SCONS_MIN_VERSION="2.3.0"
inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -84,11 +84,6 @@ src_prepare() {
die "please sync ebuild & source"
fi
- epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
- # Merged upstream
- #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' \
@@ -101,17 +96,20 @@ src_prepare() {
python_prepare_all() {
python_setup
- python_export
# 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)
+ pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConstruct ; }
+ 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=$(sed -n '/^ *python_extensions = {/,/}/{s:^
*::;s:os[.]sep:"/":g;p}' SConstruct)
- local packet=$("${PYTHON}" -c "${pysrcs};
print(python_extensions['gps/packet'])")
+ 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" SConstruct ; }
# Post 3.19 the clienthelpers were merged into gps.packet
sed \
-e "s|@VERSION@|$(pyvar gpsd_version)|" \
@@ -126,7 +124,7 @@ python_prepare_all() {
}
src_configure() {
- myesconsargs=(
+ scons_opts=(
prefix="${EPREFIX}/usr"
libdir="\$prefix/$(get_libdir)"
udevdir="$(get_udevdir)"
@@ -136,29 +134,32 @@ src_configure() {
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 python)
- $(use_scons qt5 qt)
- $(use_scons shm shm_export)
- $(use_scons sockets socket_export)
- $(use_scons usb)
+ 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 && myesconsargs+=( xgps=1 xgpsspeed=1 )
- use qt5 && myesconsargs+=( qt_versioned=5 )
+ 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
- myesconsargs+=( $(use_scons gpsd_protocols_${protocol}
${protocol}) )
+ scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
done
}
@@ -166,20 +167,20 @@ src_compile() {
export CHRPATH=
tc-export CC CXX PKG_CONFIG
export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
- escons
+ escons "${scons_opts[@]}"
use python && distutils-r1_src_compile
}
src_install() {
- DESTDIR="${D}" escons install $(usex udev udev-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}"/usr/local/$(get_libdir)/python*/site-packages/gps*
- find "${D}"/usr/local/ -type d -delete
+ rm -rf "${D}"/python-discard/gps*
+ find "${D}"/python-discard/ -type d -delete
# Install correct multi-python copy
use python && distutils-r1_src_install
