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 23EBE139085 for ; Fri, 20 Jan 2017 08:35:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 545A9E0E15; Fri, 20 Jan 2017 08:35:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E6F5E0E15 for ; Fri, 20 Jan 2017 08:35:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E0D23411D7 for ; Fri, 20 Jan 2017 08:35:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3411E2A00 for ; Fri, 20 Jan 2017 08:35:01 +0000 (UTC) From: "Wolfram Schlich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wolfram Schlich" Message-ID: <1484901293.d4a61c24fdb0a4642b8dbc90292a7c4b128bbf28.wschlich@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/motion/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/motion/motion-4.0.1-r1.ebuild media-video/motion/motion-4.0.1.ebuild X-VCS-Directories: media-video/motion/ X-VCS-Committer: wschlich X-VCS-Committer-Name: Wolfram Schlich X-VCS-Revision: d4a61c24fdb0a4642b8dbc90292a7c4b128bbf28 X-VCS-Branch: master Date: Fri, 20 Jan 2017 08:35:01 +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-Archives-Salt: ebb66145-500c-4ae8-9e20-d54de579cc9d X-Archives-Hash: 889c4b3bf034547992c5de2d1eb45a2c commit: d4a61c24fdb0a4642b8dbc90292a7c4b128bbf28 Author: Wolfram Schlich gentoo org> AuthorDate: Fri Jan 20 08:34:27 2017 +0000 Commit: Wolfram Schlich gentoo org> CommitDate: Fri Jan 20 08:34:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a61c24 media-video/motion: fix reference to wrong init script, thanks to Sven Schwyn delirium.ch> for the headsup. Package-Manager: portage-2.3.0 .../motion/{motion-4.0.1.ebuild => motion-4.0.1-r1.ebuild} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/media-video/motion/motion-4.0.1.ebuild b/media-video/motion/motion-4.0.1-r1.ebuild similarity index 86% rename from media-video/motion/motion-4.0.1.ebuild rename to media-video/motion/motion-4.0.1-r1.ebuild index e820993..b866f05 100644 --- a/media-video/motion/motion-4.0.1.ebuild +++ b/media-video/motion/motion-4.0.1-r1.ebuild @@ -30,7 +30,11 @@ DEPEND="${RDEPEND} DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="You need to setup /etc/${PN}/${PN}.conf before running -${PN} for the first time. +${PN} for the first time. You can use /etc/${PN}/${PN}-dist.conf as a +template. Please note that the 'daemon' and 'process_id_file' settings +are overridden by the bundled OpenRC init script and systemd unit where +appropriate. + To install ${PN} as a service, use: rc-update add ${PN} default # with OpenRC systemctl enable ${PN}.service # with systemd @@ -64,7 +68,7 @@ src_install() { examplesdir=/usr/share/doc/${PF}/examples \ install - newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} systemd_dounit "${FILESDIR}"/${PN}.service @@ -75,7 +79,5 @@ src_install() { fowners motion:video /var/lib/motion fperms 0750 /var/lib/motion - mv -vf "${D}"/etc/${PN}/${PN}{-dist,}.conf || die - readme.gentoo_create_doc }