[patch] sci-geosciences/gpsd: Update v9999 to EAPI 7

sci-geosciences-gpsd-Update-v9999-to-EAPI-7.patch (text/plain), 3.87 KB, created by Edward Kigwana on 2020-03-06 22:49:14 UTC

From 8567405c93f438ec43d62c66610e58ebc0e1135e Mon Sep 17 00:00:00 2001
From: Edward Kigwana <[e-mail]>
Date: Fri, 6 Mar 2020 22:37:48 +0000
Subject: [PATCH 2/2] sci-geosciences/gpsd: Update v9999 to EAPI 7

Without this patch merging is only possible when the ublox greis and
isync GPSD_PROTOCOLS are disabled due to EAPI 5 requiring python 2_7.
This makes it possible to merge on a system without python2.

Signed-off-by: Edward Kigwana <[e-mail]>
---
 sci-geosciences/gpsd/gpsd-9999.ebuild | 58 ++++++++++++++-------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 5356c904205..e3ef9405502 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=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -73,6 +73,13 @@ if [[ ${PV} == *9999* ]] ; then
 		=app-text/docbook-xml-dtd-4.1*"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19-do_not_rm_library.patch"
+	# Merged upstream
+	#"${FILESDIR}/${P}-scons-print.patch"
+	#"${FILESDIR}/${P}-scons-py3.patch"
+)
+
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
@@ -84,11 +91,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' \
@@ -126,7 +128,7 @@ python_prepare_all() {
 }
 
 src_configure() {
-	myesconsargs=(
+	scons_opts=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
@@ -136,37 +138,37 @@ 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)
+		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=yes xgpsspeed=yes )
+	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
 }
 
 src_compile() {
 	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
+	tc-export PKG_CONFIG
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons
+	escons "${scons_opts[@]}"
 
 	use python && distutils-r1_src_compile
 }
@@ -178,7 +180,7 @@ src_install() {
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
+	rm -rf  "${D}"/usr/local/lib/python*/site-packages/gps* || die
 	find "${D}"/usr/local/ -type d -delete
 	# Install correct multi-python copy
 	use python && distutils-r1_src_install
-- 
2.25.1