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 240E81382C5 for ; Fri, 9 Apr 2021 12:53:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 757E2E0923; Fri, 9 Apr 2021 12:53:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5E739E0928 for ; Fri, 9 Apr 2021 12:53:12 +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 7D949340DDE for ; Fri, 9 Apr 2021 12:53:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DFC964D for ; Fri, 9 Apr 2021 12:53:00 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1617952309.1730a6fdb876bbf1588c0bf790296dde4c0135a3.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/can-utils/, net-misc/can-utils/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/can-utils/can-utils-2020.12.0-r1.ebuild net-misc/can-utils/can-utils-2020.12.0.ebuild net-misc/can-utils/files/slcand.initd X-VCS-Directories: net-misc/can-utils/files/ net-misc/can-utils/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 1730a6fdb876bbf1588c0bf790296dde4c0135a3 X-VCS-Branch: master Date: Fri, 9 Apr 2021 12:53:00 +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: f83d2260-e123-4735-a2a2-8922e4d84d54 X-Archives-Hash: 09d3d5d7ea5f0dbb8c722d7f82ed6a1e commit: 1730a6fdb876bbf1588c0bf790296dde4c0135a3 Author: Hans Fredrik Nordhaug gmail com> AuthorDate: Fri Apr 9 07:11:49 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Fri Apr 9 07:11:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1730a6fd net-misc/can-utils: Fixed shebang for /etc/init.d/slcand Closes: https://bugs.gentoo.org/781686 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Hans Fredrik Nordhaug gmail.com> net-misc/can-utils/can-utils-2020.12.0-r1.ebuild | 4 +-- net-misc/can-utils/can-utils-2020.12.0.ebuild | 39 ------------------------ net-misc/can-utils/files/slcand.initd | 4 +-- 3 files changed, 3 insertions(+), 44 deletions(-) diff --git a/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild b/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild index 631346910..2dafd5871 100644 --- a/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild +++ b/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild @@ -5,8 +5,8 @@ EAPI=7 inherit autotools systemd -DESCRIPTION="CAN userspace utilities and tools" -HOMEPAGE="https://github.com/linux-can/" +DESCRIPTION="SocketCAN userspace utilities and tools" +HOMEPAGE="https://github.com/linux-can/can-utils" SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/net-misc/can-utils/can-utils-2020.12.0.ebuild b/net-misc/can-utils/can-utils-2020.12.0.ebuild deleted file mode 100644 index a1eb63c7d..000000000 --- a/net-misc/can-utils/can-utils-2020.12.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="CAN userspace utilities and tools" -HOMEPAGE="https://github.com/linux-can/" -SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="systemd" - -DEPEND="" - -src_prepare() { - default - - eautoreconf -} - -# Default src_install + newconfd and newinitd -src_install() { - - emake DESTDIR="${D}" install - - einstalldocs - - if use systemd ; then - systemd_dounit "${FILESDIR}/slcan.service" - systemd_install_serviced "${FILESDIR}/slcan.service.conf" - else - newconfd "${FILESDIR}/slcand.confd" slcand - newinitd "${FILESDIR}/slcand.initd" slcand - fi -} diff --git a/net-misc/can-utils/files/slcand.initd b/net-misc/can-utils/files/slcand.initd index ffe08a9bf..d4b6d92f6 100644 --- a/net-misc/can-utils/files/slcand.initd +++ b/net-misc/can-utils/files/slcand.initd @@ -1,6 +1,4 @@ -#!/sbin/runscript -# Copyright 2013 Brunvoll AS - +#!/sbin/openrc-run start() {