[gentoo-commits] repo/gentoo:master commit in: media-video/motion/

["Wolfram Schlich" <wschlich@gentoo.org>]

commit:     d4a61c24fdb0a4642b8dbc90292a7c4b128bbf28
Author:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 08:34:27 2017 +0000
Commit:     Wolfram Schlich <wschlich <AT> gentoo <DOT> 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 <svoop <AT> 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
 }