[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/

[Sam James]

commit:     e278ee90b09436b6beaf4de20ab3d671692e6428
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 22:02:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 22:04:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e278ee90

sci-geosciences/gpsd: add scons dependency, sync live

Reported-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsd/gpsd-3.23.ebuild |  5 +++++
 sci-geosciences/gpsd/gpsd-9999.ebuild | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsd/gpsd-3.23.ebuild 
b/sci-geosciences/gpsd/gpsd-3.23.ebuild
index fa8c1276e64..f21d1e6662f 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
        acct-user/gpsd
        acct-group/dialout
        >=net-misc/pps-tools-0.0.20120407
+       $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
        bluetooth? ( net-wireless/bluez )
        dbus? (
                sys-apps/dbus
@@ -73,6 +74,10 @@ if [[ ${PV} == *9999* ]] ; then
        BDEPEND+=" dev-ruby/asciidoctor"
 fi
 
+python_check_deps() {
+       has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
+}
+
 src_prepare() {
        # Make sure our list matches the source.
        local src_protocols=$(echo $(

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild 
b/sci-geosciences/gpsd/gpsd-9999.ebuild
index b6f5d935d70..f21d1e6662f 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
        acct-user/gpsd
        acct-group/dialout
        >=net-misc/pps-tools-0.0.20120407
+       $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
        bluetooth? ( net-wireless/bluez )
        dbus? (
                sys-apps/dbus
@@ -73,6 +74,10 @@ if [[ ${PV} == *9999* ]] ; then
        BDEPEND+=" dev-ruby/asciidoctor"
 fi
 
+python_check_deps() {
+       has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
+}
+
 src_prepare() {
        # Make sure our list matches the source.
        local src_protocols=$(echo $(
@@ -85,6 +90,9 @@ src_prepare() {
                die "please sync ebuild & source"
        fi
 
+       # bug #807661
+       sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript 
|| die
+
        default
 
        use python && distutils-r1_src_prepare
@@ -183,7 +191,7 @@ src_compile() {
 }
 
 src_install() {
-       DESTDIR="${D}" escons install "${scons_opts[@]}" $(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