[patch] Updated ebuilds for 3.19, 3.20 and 9999

0001-sci-geosciences-gpsd-Update-to-EAPI-7.patch (text/plain), 17.56 KB, created by Michael Weiser on 2020-04-18 10:19:01 UTC

From bd743875aa599c99b8d9c3ab72ca8af6e1803c94 Mon Sep 17 00:00:00 2001
From: Michael Weiser <[e-mail]>
Date: Wed, 15 Apr 2020 20:36:02 +0200
Subject: [PATCH 1/2] sci-geosciences/gpsd: Update to EAPI 7

Switch the 3.19 and 9999 ebuilds to EAPI7 and add one for 3.20
(#704580):

- Switch from epatch to PATCHES variable.
- Switch from myesconsargs to scons_opts array and pass it explicitly.
- Switch from use_scons to usex.
- Remove usage of python_export because it causes a QA warning and is
  not necessary.

Not strictly necessary for the switch but triggered by related
developments:

- Extend list of supported python versions to 2.7 and 3.5-3.8.
- Install scons-compiled python module into predictable patch because
  the previous pattern would no longer work for python 3.6+ but still
  with 3.5.
- Work around recent upstream updates to the way python module and
  binaries are built so our information extraction works again.
  (#716182).
- Switch to and provide acct-user/gpsd with dialout group instead of
  uucp (#691746).

Bug: https://bugs.gentoo.org/704580
Bug: https://bugs.gentoo.org/716182
Bug: https://bugs.gentoo.org/691746
Signed-off-by: Michael Weiser <[e-mail]>
---
 acct-user/gpsd/Manifest               |   1 +
 acct-user/gpsd/gpsd-0.ebuild          |  12 ++
 sci-geosciences/gpsd/gpsd-3.19.ebuild |  73 +++++-----
 sci-geosciences/gpsd/gpsd-3.20.ebuild | 191 ++++++++++++++++++++++++++
 sci-geosciences/gpsd/gpsd-9999.ebuild |  85 ++++++------
 5 files changed, 284 insertions(+), 78 deletions(-)
 create mode 100644 acct-user/gpsd/Manifest
 create mode 100644 acct-user/gpsd/gpsd-0.ebuild
 create mode 100644 sci-geosciences/gpsd/gpsd-3.20.ebuild

diff --git a/acct-user/gpsd/Manifest b/acct-user/gpsd/Manifest
new file mode 100644
index 00000000000..e05375a2561
--- /dev/null
+++ b/acct-user/gpsd/Manifest
@@ -0,0 +1 @@
+EBUILD gpsd-0.ebuild 226 BLAKE2B a9c69f5afe0ff9c2ebe4739c5ed5d0bb9b9d9c6ca8141968cbf31d7d44a612e0dee4c1667d21bac88fee413666e56838b23c34263af9d05f3f999072d4df75a0 SHA512 2fab41e8276be3d350eba291c9451cfa83316a9abb5da7e66635ccb2b32a7826579c887422819680a0eda51de704f7449997c006197041eaedc332c63a0c4da1
diff --git a/acct-user/gpsd/gpsd-0.ebuild b/acct-user/gpsd/gpsd-0.ebuild
new file mode 100644
index 00000000000..c5e8be54c4b
--- /dev/null
+++ b/acct-user/gpsd/gpsd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for gpsd"
+ACCT_USER_ID=413
+ACCT_USER_GROUPS=( gpsd dialout )
+
+acct-user_add_deps
diff --git a/sci-geosciences/gpsd/gpsd-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild
index 0a1a978ddb2..b27571a1349 100644
--- a/sci-geosciences/gpsd/gpsd-3.19.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.19.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..8} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -41,6 +41,7 @@ REQUIRED_USE="X? ( python )
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-user/gpsd
 	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
@@ -73,6 +74,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 +92,6 @@ src_prepare() {
 		die "please sync ebuild & source"
 	fi
 
-	epatch "${FILESDIR}"/${P}-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 +104,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,39 +128,42 @@ python_prepare_all() {
 }
 
 src_configure() {
-	myesconsargs=(
+	scons_opts=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
 		chrpath=False
 		gpsd_user=gpsd
-		gpsd_group=uucp
+		gpsd_group=dialout
 		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=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
 }
 
@@ -166,27 +171,21 @@ 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
 
 }
-
-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
new file mode 100644
index 00000000000..5697883b144
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.20.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit eutils udev user 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/24"
+
+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
+
+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 $(
+		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
+
+	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'])")
+	# 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)"
+		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=yes xgpsspeed=yes )
+	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
+
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 5356c904205..a700c9fdd94 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..8} )
 SCONS_MIN_VERSION="2.3.0"
 
 inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
@@ -41,6 +41,7 @@ REQUIRED_USE="X? ( python )
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-user/gpsd
 	>=net-misc/pps-tools-0.0.20120407
 	bluetooth? ( net-wireless/bluez )
 	dbus? (
@@ -73,6 +74,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 +92,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 +104,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'}))")
 	# 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)")
+
+	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,39 +132,42 @@ python_prepare_all() {
 }
 
 src_configure() {
-	myesconsargs=(
+	scons_opts=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
 		udevdir="$(get_udevdir)"
 		chrpath=False
 		gpsd_user=gpsd
-		gpsd_group=uucp
+		gpsd_group=dialout
 		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=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
 }
 
@@ -166,27 +175,21 @@ 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
 
 }
-
-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"
-}
-- 
2.26.0