Attachment #633560 for bug #704580

(-)a/acct-user/gpsd/Manifest (+1 lines)

Line 0 Link Here

EBUILD gpsd-0.ebuild 226 BLAKE2B a9c69f5afe0ff9c2ebe4739c5ed5d0bb9b9d9c6ca8141968cbf31d7d44a612e0dee4c1667d21bac88fee413666e56838b23c34263af9d05f3f999072d4df75a0 SHA512 2fab41e8276be3d350eba291c9451cfa83316a9abb5da7e66635ccb2b32a7826579c887422819680a0eda51de704f7449997c006197041eaedc332c63a0c4da1




# 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




# Copyright 1999-2020 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

RESTRICT="!test? ( test )"

RDEPEND="
	acct-user/gpsd
	>=net-misc/pps-tools-0.0.20120407
	bluetooth? ( net-wireless/bluez )
	dbus? (

		=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 $(

		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' \


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 ; }

}

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
}


	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

}

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"
}




# 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

}




# Copyright 1999-2020 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

RESTRICT="!test? ( test )"

RDEPEND="
	acct-user/gpsd
	>=net-misc/pps-tools-0.0.20120407
	bluetooth? ( net-wireless/bluez )
	dbus? (

		=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 $(

		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' \


python_prepare_all() {
	python_setup
	python_export

	# Extract python info out of SConstruct so we can use saner distribute
	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=$(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)|" \

}

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
}


	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

}

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"
}
- 

Return to bug 704580

Line 0 Link Here

(-)a/acct-user/gpsd/gpsd-0.ebuild (+12 lines)
	1	# Copyright 2019 Gentoo Authors
	2	# Distributed under the terms of the GNU General Public License v2
	3
	4	EAPI=7
	5
	6	inherit acct-user
	7
	8	DESCRIPTION="user for gpsd"
	9	ACCT_USER_ID=413
	10	ACCT_USER_GROUPS=( gpsd dialout )
	11
	12	acct-user_add_deps

Lines 1-10 Link Here

(-)a/sci-geosciences/gpsd/gpsd-3.19.ebuild (-37 / +36 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=5	4	EAPI=7
5		5
6	DISTUTILS_OPTIONAL=1	6	DISTUTILS_OPTIONAL=1
7	PYTHON_COMPAT=( python2_7 python3_6 )	7	PYTHON_COMPAT=( python2_7 python3_{6..8} )
8	SCONS_MIN_VERSION="2.3.0"	8	SCONS_MIN_VERSION="2.3.0"
9		9
10	inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs	10	inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
Lines 41-46 REQUIRED_USE="X? ( python ) Link Here
41	RESTRICT="!test? ( test )"	41	RESTRICT="!test? ( test )"
42		42
43	RDEPEND="	43	RDEPEND="
		44	acct-user/gpsd
44	>=net-misc/pps-tools-0.0.20120407	45	>=net-misc/pps-tools-0.0.20120407
45	bluetooth? ( net-wireless/bluez )	46	bluetooth? ( net-wireless/bluez )
46	dbus? (	47	dbus? (
Lines 73-78 if [[ ${PV} == 9999 ]] ; then Link Here
73	=app-text/docbook-xml-dtd-4.1*"	74	=app-text/docbook-xml-dtd-4.1*"
74	fi	75	fi
75		76
		77	PATCHES=(
		78	"${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
		79	# Merged upstream
		80	#"${FILESDIR}"/${P}-scons-print.patch
		81	#"${FILESDIR}"/${P}-scons-py3.patch
		82	)
		83
76	src_prepare() {	84	src_prepare() {
77	# Make sure our list matches the source.	85	# Make sure our list matches the source.
78	local src_protocols=$(echo $(	86	local src_protocols=$(echo $(
Lines 84-94 src_prepare() { Link Here
84	die "please sync ebuild & source"	92	die "please sync ebuild & source"
85	fi	93	fi
86		94
87	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
88	# Merged upstream
89	#epatch "${FILESDIR}"/${P}-scons-print.patch
90	#epatch "${FILESDIR}"/${P}-scons-py3.patch
91
92	# Avoid useless -L paths to the install dir	95	# Avoid useless -L paths to the install dir
93	sed -i \	96	sed -i \
94	-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \	97	-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
Lines 101-107 src_prepare() { Link Here
101		104
102	python_prepare_all() {	105	python_prepare_all() {
103	python_setup	106	python_setup
104	python_export
105		107
106	# Extract python info out of SConstruct so we can use saner distribute	108	# Extract python info out of SConstruct so we can use saner distribute
107	pyvar() { sed -n "/^ $1 =/s:.= ::p" SConstruct ; }	109	pyvar() { sed -n "/^ $1 =/s:.= ::p" SConstruct ; }
Lines 126-164 python_prepare_all() { Link Here
126	}	128	}
127		129
128	src_configure() {	130	src_configure() {
129	myesconsargs=(	131	scons_opts=(
130	prefix="${EPREFIX}/usr"	132	prefix="${EPREFIX}/usr"
131	libdir="\$prefix/$(get_libdir)"	133	libdir="\$prefix/$(get_libdir)"
132	udevdir="$(get_udevdir)"	134	udevdir="$(get_udevdir)"
133	chrpath=False	135	chrpath=False
134	gpsd_user=gpsd	136	gpsd_user=gpsd
135	gpsd_group=uucp	137	gpsd_group=dialout
136	nostrip=True	138	nostrip=True
137	manbuild=False	139	manbuild=False
138	shared=$(usex !static True False)	140	shared=$(usex !static True False)
139	$(use_scons bluetooth bluez)	141	bluez=$(usex bluetooth)
140	$(use_scons cxx libgpsmm)	142	libgpsmm=$(usex cxx)
141	$(use_scons debug clientdebug)	143	clientdebug=$(usex debug)
142	$(use_scons dbus dbus_export)	144	dbus_export=$(usex dbus)
143	$(use_scons ipv6)	145	ipv6=$(usex ipv6)
144	$(use_scons latency-timing timing)	146	timing=$(usex latency-timing)
145	$(use_scons ncurses)	147	ncurses=$(usex ncurses)
146	$(use_scons ntp ntpshm)	148	ntpshm=$(usex ntp)
147	$(use_scons ntp pps)	149	pps=$(usex ntp)
148	$(use_scons python)	150	python=$(usex python)
149	$(use_scons qt5 qt)	151	# force a predictable python libdir because lib vs. lib64 usage differs
150	$(use_scons shm shm_export)	152	# from 3.5 to 3.6+
151	$(use_scons sockets socket_export)	153	$(usex python python_libdir="${EPREFIX}"/python-discard "")
152	$(use_scons usb)	154	qt=$(usex qt5)
		155	shm_export=$(usex shm)
		156	socket_export=$(usex sockets)
		157	usb=$(usex usb)
153	)	158	)
154		159
155	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )	160	use X && scons_opts+=( xgps=yes xgpsspeed=yes )
156	use qt5 && myesconsargs+=( qt_versioned=5 )	161	use qt5 && scons_opts+=( qt_versioned=5 )
157		162
158	# enable specified protocols	163	# enable specified protocols
159	local protocol	164	local protocol
160	for protocol in ${GPSD_PROTOCOLS[@]} ; do	165	for protocol in ${GPSD_PROTOCOLS[@]} ; do
161	myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )	166	scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
162	done	167	done
163	}	168	}
164		169
Lines 166-192 src_compile() { Link Here
166	export CHRPATH=	171	export CHRPATH=
167	tc-export CC CXX PKG_CONFIG	172	tc-export CC CXX PKG_CONFIG
168	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}	173	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
169	escons	174	escons "${scons_opts[@]}"
170		175
171	use python && distutils-r1_src_compile	176	use python && distutils-r1_src_compile
172	}	177	}
173		178
174	src_install() {	179	src_install() {
175	DESTDIR="${D}" escons install $(usex udev udev-install "")	180	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
176		181
177	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd	182	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
178	newinitd "${FILESDIR}"/gpsd.init-2 gpsd	183	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
179		184
180	# Cleanup bad alt copy due to Scons	185	# Cleanup bad alt copy due to Scons
181	rm -rf "${D}"/usr/local/$(get_libdir)/python/site-packages/gps	186	rm -rf "${D}"/python-discard/gps*
182	find "${D}"/usr/local/ -type d -delete	187	find "${D}"/python-discard/ -type d -delete
183	# Install correct multi-python copy	188	# Install correct multi-python copy
184	use python && distutils-r1_src_install	189	use python && distutils-r1_src_install
185		190
186	}	191	}
187
188	pkg_preinst() {
189	# Run the gpsd daemon as gpsd and group uucp; create it here
190	# as it doesn't seem to be needed during compile/install ...
191	enewuser gpsd -1 -1 -1 "uucp"
192	}

Line 0 Link Here

(-)a/sci-geosciences/gpsd/gpsd-3.20.ebuild (+191 lines)
		1	# Copyright 1999-2019 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=7
		5
		6	DISTUTILS_OPTIONAL=1
		7	PYTHON_COMPAT=( python2_7 python3_{6..8} )
		8	SCONS_MIN_VERSION="2.3.0"
		9
		10	inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
		11
		12	if [[ ${PV} == "9999" ]] ; then
		13	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
		14	inherit git-r3
		15	else
		16	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
		17	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
		18	fi
		19
		20	DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
		21	HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
		22
		23	LICENSE="BSD"
		24	SLOT="0/24"
		25
		26	GPSD_PROTOCOLS=(
		27	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
		28	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
		29	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
		30	superstar2 tnt tripmate tsip ublox
		31	)
		32	IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
		33	IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
		34	REQUIRED_USE="X? ( python )
		35	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
		36	gpsd_protocols_isync? ( gpsd_protocols_ublox )
		37	gpsd_protocols_ublox? ( python )
		38	gpsd_protocols_greis? ( python )
		39	python? ( ${PYTHON_REQUIRED_USE} )
		40	qt5? ( cxx )"
		41	RESTRICT="!test? ( test )"
		42
		43	RDEPEND="
		44	acct-user/gpsd
		45	>=net-misc/pps-tools-0.0.20120407
		46	bluetooth? ( net-wireless/bluez )
		47	dbus? (
		48	sys-apps/dbus
		49	dev-libs/dbus-glib
		50	)
		51	ncurses? ( sys-libs/ncurses:= )
		52	ntp? ( \|\| (
		53	net-misc/ntp
		54	net-misc/ntpsec
		55	net-misc/chrony
		56	) )
		57	qt5? (
		58	dev-qt/qtcore:5
		59	dev-qt/qtnetwork:5
		60	)
		61	python? ( ${PYTHON_DEPS} )
		62	gpsd_protocols_ublox? ( dev-python/pyserial )
		63	gpsd_protocols_greis? ( dev-python/pyserial )
		64	usb? ( virtual/libusb:1 )
65	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
66	DEPEND="${RDEPEND}
67	virtual/pkgconfig
68	test? ( sys-devel/bc )"
69
70	# xml packages are for man page generation
71	if [[ ${PV} == 9999 ]] ; then
72	DEPEND+="
73	app-text/xmlto
74	=app-text/docbook-xml-dtd-4.1*"
75	fi
76
77	PATCHES=(
78	"${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
79	# Merged upstream
80	#"${FILESDIR}"/${P}-scons-print.patch
81	#"${FILESDIR}"/${P}-scons-py3.patch
82	)
83
84	src_prepare() {
85	# Make sure our list matches the source.
86	local src_protocols=$(echo $(
87	sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct \| awk '{print $1}' \| LC_ALL=C sort
88	) )
89	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
90	eerror "Detected protocols: ${src_protocols}"
91	eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}"
92	die "please sync ebuild & source"
93	fi
94
95	# Avoid useless -L paths to the install dir
96	sed -i \
97	-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
98	SConstruct \|\| die
99
100	default
101
102	use python && distutils-r1_src_prepare
103	}
104
105	python_prepare_all() {
106	python_setup
107
108	# Extract python info out of SConstruct so we can use saner distribute
109	pyvar() { sed -n "/^ $1 =/s:.= ::p" SConstruct ; }
110	local pybins=$(pyvar python_progs \| tail -1)
111	# Handle conditional tools manually. #666734
112	use X && pybins+="+ ['xgps', 'xgpsspeed']"
113	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
114	use gpsd_protocols_greis && pybins+="+ ['zerk']"
115	local pysrcs=$(sed -n '/^ python_extensions = {/,/}/{s:^ ::;s:os[.]sep:"/":g;p}' SConstruct)
116	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
117	# Post 3.19 the clienthelpers were merged into gps.packet
118	sed \
119	-e "s\|@VERSION@\|$(pyvar gpsd_version)\|" \
120	-e "s\|@URL@\|$(pyvar website)\|" \
121	-e "s\|@EMAIL@\|$(pyvar devmail)\|" \
122	-e "s\|@SCRIPTS@\|${pybins}\|" \
123	-e "s\|@GPS_PACKET_SOURCES@\|${packet}\|" \
124	-e "/@GPS_CLIENT_SOURCES@/d" \
125	-e "s\|@SCRIPTS@\|${pybins}\|" \
126	"${FILESDIR}"/${PN}-3.3-setup.py > setup.py \|\| die
127	distutils-r1_python_prepare_all
128	}
129
130	src_configure() {
131	scons_opts=(
132	prefix="${EPREFIX}/usr"
133	libdir="\$prefix/$(get_libdir)"
134	udevdir="$(get_udevdir)"
135	chrpath=False
136	gpsd_user=gpsd
137	gpsd_group=dialout
138	nostrip=True
139	manbuild=False
140	shared=$(usex !static True False)
141	bluez=$(usex bluetooth)
142	libgpsmm=$(usex cxx)
143	clientdebug=$(usex debug)
144	dbus_export=$(usex dbus)
145	ipv6=$(usex ipv6)
146	timing=$(usex latency-timing)
147	ncurses=$(usex ncurses)
148	ntpshm=$(usex ntp)
149	pps=$(usex ntp)
150	python=$(usex python)
151	# force a predictable python libdir because lib vs. lib64 usage differs
152	# from 3.5 to 3.6+
153	$(usex python python_libdir="${EPREFIX}"/python-discard "")
154	qt=$(usex qt5)
155	shm_export=$(usex shm)
156	socket_export=$(usex sockets)
157	usb=$(usex usb)
158	)
159
160	use X && scons_opts+=( xgps=yes xgpsspeed=yes )
161	use qt5 && scons_opts+=( qt_versioned=5 )
162
163	# enable specified protocols
164	local protocol
165	for protocol in ${GPSD_PROTOCOLS[@]} ; do
166	scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
167	done
168	}
169
170	src_compile() {
171	export CHRPATH=
172	tc-export CC CXX PKG_CONFIG
173	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
174	escons "${scons_opts[@]}"
175
176	use python && distutils-r1_src_compile
177	}
178
179	src_install() {
180	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
181
182	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
183	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
184
185	# Cleanup bad alt copy due to Scons
186	rm -rf "${D}"/python-discard/gps*
187	find "${D}"/python-discard/ -type d -delete
188	# Install correct multi-python copy
189	use python && distutils-r1_src_install
190
191	}

Lines 1-10 Link Here

(-)a/sci-geosciences/gpsd/gpsd-9999.ebuild (-42 / +44 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2020 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=5	4	EAPI=7
5		5
6	DISTUTILS_OPTIONAL=1	6	DISTUTILS_OPTIONAL=1
7	PYTHON_COMPAT=( python2_7 python3_6 )	7	PYTHON_COMPAT=( python2_7 python3_{6..8} )
8	SCONS_MIN_VERSION="2.3.0"	8	SCONS_MIN_VERSION="2.3.0"
9		9
10	inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs	10	inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
Lines 41-46 REQUIRED_USE="X? ( python ) Link Here
41	RESTRICT="!test? ( test )"	41	RESTRICT="!test? ( test )"
42		42
43	RDEPEND="	43	RDEPEND="
		44	acct-user/gpsd
44	>=net-misc/pps-tools-0.0.20120407	45	>=net-misc/pps-tools-0.0.20120407
45	bluetooth? ( net-wireless/bluez )	46	bluetooth? ( net-wireless/bluez )
46	dbus? (	47	dbus? (
Lines 73-78 if [[ ${PV} == 9999 ]] ; then Link Here
73	=app-text/docbook-xml-dtd-4.1*"	74	=app-text/docbook-xml-dtd-4.1*"
74	fi	75	fi
75		76
		77	PATCHES=(
		78	"${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
		79	# Merged upstream
		80	#"${FILESDIR}"/${P}-scons-print.patch
		81	#"${FILESDIR}"/${P}-scons-py3.patch
		82	)
		83
76	src_prepare() {	84	src_prepare() {
77	# Make sure our list matches the source.	85	# Make sure our list matches the source.
78	local src_protocols=$(echo $(	86	local src_protocols=$(echo $(
Lines 84-94 src_prepare() { Link Here
84	die "please sync ebuild & source"	92	die "please sync ebuild & source"
85	fi	93	fi
86		94
87	epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
88	# Merged upstream
89	#epatch "${FILESDIR}"/${P}-scons-print.patch
90	#epatch "${FILESDIR}"/${P}-scons-py3.patch
91
92	# Avoid useless -L paths to the install dir	95	# Avoid useless -L paths to the install dir
93	sed -i \	96	sed -i \
94	-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \	97	-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
Lines 101-117 src_prepare() { Link Here
101		104
102	python_prepare_all() {	105	python_prepare_all() {
103	python_setup	106	python_setup
104	python_export
105		107
106	# Extract python info out of SConstruct so we can use saner distribute	108	# Extract python info out of SConstruct so we can use saner distribute
107	pyvar() { sed -n "/^ $1 =/s:.= ::p" SConstruct ; }	109	pyarray() { sed -n "/^ $1 = *\\[/,/\\]/p" SConstruct ; }
108	local pybins=$(pyvar python_progs \| tail -1)	110	local pyprogs=$(pyarray python_progs)
		111	local pybins=$("${PYTHON}" -c "${pyprogs}; \
		112	print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))")
109	# Handle conditional tools manually. #666734	113	# Handle conditional tools manually. #666734
110	use X && pybins+="+ ['xgps', 'xgpsspeed']"	114	use X && pybins+="+ ['xgps', 'xgpsspeed']"
111	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"	115	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
112	use gpsd_protocols_greis && pybins+="+ ['zerk']"	116	use gpsd_protocols_greis && pybins+="+ ['zerk']"
113	local pysrcs=$(sed -n '/^ python_extensions = {/,/}/{s:^ ::;s:os[.]sep:"/":g;p}' SConstruct)	117	local pysrcs=$(pyarray packet_ffi_extension)
114	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")	118	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)")
		119
		120	pyvar() { sed -n "/^ $1 =/s:.= ::p" SConstruct ; }
115	# Post 3.19 the clienthelpers were merged into gps.packet	121	# Post 3.19 the clienthelpers were merged into gps.packet
116	sed \	122	sed \
117	-e "s\|@VERSION@\|$(pyvar gpsd_version)\|" \	123	-e "s\|@VERSION@\|$(pyvar gpsd_version)\|" \
Lines 126-164 python_prepare_all() { Link Here
126	}	132	}
127		133
128	src_configure() {	134	src_configure() {
129	myesconsargs=(	135	scons_opts=(
130	prefix="${EPREFIX}/usr"	136	prefix="${EPREFIX}/usr"
131	libdir="\$prefix/$(get_libdir)"	137	libdir="\$prefix/$(get_libdir)"
132	udevdir="$(get_udevdir)"	138	udevdir="$(get_udevdir)"
133	chrpath=False	139	chrpath=False
134	gpsd_user=gpsd	140	gpsd_user=gpsd
135	gpsd_group=uucp	141	gpsd_group=dialout
136	nostrip=True	142	nostrip=True
137	manbuild=False	143	manbuild=False
138	shared=$(usex !static True False)	144	shared=$(usex !static True False)
139	$(use_scons bluetooth bluez)	145	bluez=$(usex bluetooth)
140	$(use_scons cxx libgpsmm)	146	libgpsmm=$(usex cxx)
141	$(use_scons debug clientdebug)	147	clientdebug=$(usex debug)
142	$(use_scons dbus dbus_export)	148	dbus_export=$(usex dbus)
143	$(use_scons ipv6)	149	ipv6=$(usex ipv6)
144	$(use_scons latency-timing timing)	150	timing=$(usex latency-timing)
145	$(use_scons ncurses)	151	ncurses=$(usex ncurses)
146	$(use_scons ntp ntpshm)	152	ntpshm=$(usex ntp)
147	$(use_scons ntp pps)	153	pps=$(usex ntp)
148	$(use_scons python)	154	python=$(usex python)
149	$(use_scons qt5 qt)	155	# force a predictable python libdir because lib vs. lib64 usage differs
150	$(use_scons shm shm_export)	156	# from 3.5 to 3.6+
151	$(use_scons sockets socket_export)	157	$(usex python python_libdir="${EPREFIX}"/python-discard "")
152	$(use_scons usb)	158	qt=$(usex qt5)
		159	shm_export=$(usex shm)
		160	socket_export=$(usex sockets)
		161	usb=$(usex usb)
153	)	162	)
154		163
155	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )	164	use X && scons_opts+=( xgps=yes xgpsspeed=yes )
156	use qt5 && myesconsargs+=( qt_versioned=5 )	165	use qt5 && scons_opts+=( qt_versioned=5 )
157		166
158	# enable specified protocols	167	# enable specified protocols
159	local protocol	168	local protocol
160	for protocol in ${GPSD_PROTOCOLS[@]} ; do	169	for protocol in ${GPSD_PROTOCOLS[@]} ; do
161	myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )	170	scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
162	done	171	done
163	}	172	}
164		173
Lines 166-192 src_compile() { Link Here
166	export CHRPATH=	175	export CHRPATH=
167	tc-export CC CXX PKG_CONFIG	176	tc-export CC CXX PKG_CONFIG
168	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}	177	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
169	escons	178	escons "${scons_opts[@]}"
170		179
171	use python && distutils-r1_src_compile	180	use python && distutils-r1_src_compile
172	}	181	}
173		182
174	src_install() {	183	src_install() {
175	DESTDIR="${D}" escons install $(usex udev udev-install "")	184	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
176		185
177	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd	186	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
178	newinitd "${FILESDIR}"/gpsd.init-2 gpsd	187	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
179		188
180	# Cleanup bad alt copy due to Scons	189	# Cleanup bad alt copy due to Scons
181	rm -rf "${D}"/usr/local/$(get_libdir)/python/site-packages/gps	190	rm -rf "${D}"/python-discard/gps*
182	find "${D}"/usr/local/ -type d -delete	191	find "${D}"/python-discard/ -type d -delete
183	# Install correct multi-python copy	192	# Install correct multi-python copy
184	use python && distutils-r1_src_install	193	use python && distutils-r1_src_install
185		194
186	}	195	}
187
188	pkg_preinst() {
189	# Run the gpsd daemon as gpsd and group uucp; create it here
190	# as it doesn't seem to be needed during compile/install ...
191	enewuser gpsd -1 -1 -1 "uucp"
192	}
193	-