From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42A8D158F58 for ; Mon, 16 Aug 2021 20:48:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53666E0AE2; Sun, 15 Aug 2021 22:05:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39C23E0AE2 for ; Sun, 15 Aug 2021 22:05:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FE82344296 for ; Sun, 15 Aug 2021 22:04:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 168BD7C1 for ; Sun, 15 Aug 2021 22:04:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1629065089.e278ee90b09436b6beaf4de20ab3d671692e6428.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsd/gpsd-3.23.ebuild sci-geosciences/gpsd/gpsd-9999.ebuild X-VCS-Directories: sci-geosciences/gpsd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e278ee90b09436b6beaf4de20ab3d671692e6428 X-VCS-Branch: master Date: Sun, 15 Aug 2021 22:04:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11debb56-49e6-4623-a338-96b4bf7734fb X-Archives-Hash: 3b6695eb57864acf68c5e38b2c5023ae commit: e278ee90b09436b6beaf4de20ab3d671692e6428 Author: Sam James gentoo org> AuthorDate: Sun Aug 15 22:02:07 2021 +0000 Commit: Sam James gentoo 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 gentoo.org> Signed-off-by: Sam James 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