Use more recent s-s-d syntax wrt #380279 by Tom Hendrikx

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

4 files changed, 117 insertions, 12 deletions

diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index b5ff1872045d..247acf6338a1 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/motion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.33 2011/05/19 18:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.34 2011/10/02 18:48:35 ssuominen Exp $
+
+*motion-3.2.12-r1 (02 Oct 2011)
+
+  02 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +motion-3.2.12-r1.ebuild,
+  +files/motion.initd-r2:
+  Use more recent s-s-d syntax wrt #380279 by Tom Hendrikx
 
 *motion-3.2.12 (19 May 2011)
 
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 217fea38462b..77a25dc66029 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX motion.confd 99 RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 SHA1 f66f2f685044e26d5fa61bed8fa47340003c3c24 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060
 AUX motion.init-r1 709 RMD160 9f6429be76b9ac47fa157286f1e67d81fffcb35e SHA1 2b5729864ec42bd1504b6932be6e91b6e1e54fde SHA256 84cbbe5b52c1484afb42ef0915f681f3b054adc55677cb6321522a5e3a8fdd34
 AUX motion.initd 891 RMD160 81a3a17c1ae536811699283c2163612962bce3eb SHA1 db373beb37ca6786836e7cfa7205dbcb42e0552a SHA256 4ef71fe2702504820b871a03ffe8827dc4ee0ef0550bda198a2a209254a1dfbe
+AUX motion.initd-r2 904 RMD160 b7bf54ceab0848ddb3b04176e0c9f29501004c6e SHA1 b8a27c19e92b2bbc3ec627a70cecac4db877d84f SHA256 a862507d2b0096efca041768a21ebeaac1733211aa008ebacc73fd4c214be6e0
 DIST motion-3.2.11.1.tar.gz 417246 RMD160 dfaa27b73599e375288d9758108c302f3db089a1 SHA1 6e7acea3b27a9e24301e57e066ad5603d41598b2 SHA256 73973e723c39c05cbfc5c2a90357c5dea3078c3162dfc41f303fbf40cda9e403
 DIST motion-3.2.12.tar.gz 425729 RMD160 7d53e19524c535075be57776c0a15414e0beeca4 SHA1 dc59b36e45e7626baa65ce62c961af918fea76bd SHA256 a597f8d7ec0bf3c5fb62722c4eead59717fe01c2ae0d256c642027cea74b2f0a
 EBUILD motion-3.2.11.1.ebuild 1798 RMD160 e789b59f323c6d02bd7dc9b322fffa32b45635c4 SHA1 92f588fa03ebb2d0ed768d10cd085c674de60379 SHA256 90528abf3f06d6d8f3fbf3272d4d3716606dc56f351b4a17bf8304890e0edcc4
+EBUILD motion-3.2.12-r1.ebuild 1696 RMD160 c66586761b75425ba57c533edac9c206566b85b8 SHA1 fa86d3017d33c0e39f1d3777c9b6b41d8e0efd84 SHA256 1334d54cbea2b287607da6aad63cbde3c77a7b9a4cba730edc224c768ef6b69f
 EBUILD motion-3.2.12.ebuild 1563 RMD160 3141f950243a1b1cbf47317c619619c9ed668d9e SHA1 13292939324d1f89d036909a0b28ade69c634355 SHA256 4f50a8b6ed6eb90d9870fd92eaba3fd6a723bb08726ede96b6b99a7c4f053e63
-MISC ChangeLog 5089 RMD160 e4c31bccabb7205e1ae442116c9afc9143783149 SHA1 d8e7bd293e86d6a432b75b1a078f5d168b77b2eb SHA256 41fe3db5fe4ba415c8218bef46c8329aafb53428758c43793c65ac73f72b0894
+MISC ChangeLog 5288 RMD160 10f93b288b2b3e87c138b45760016400ad53b567 SHA1 6340a57fca67af2e362dc7d77fa44496ae6baf60 SHA256 a88261ed23279455925b4de8211e4421cf85b0669b7912d8fe5263680323013e
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3VZmYACgkQXkR9YqOcLPHiYAEAiPNQgfzDclfzsOnaOj+nDckr
-Dpe4M05cTXNoZQrZW1IA/ibOsGclEQopvFzG5Qv4Ke3fhj3Sx1YwHjTEQkJGMaBb
-=lMKj
------END PGP SIGNATURE-----
diff --git a/media-video/motion/files/motion.initd-r2 b/media-video/motion/files/motion.initd-r2
new file mode 100644
index 000000000000..2e0b120feaf7
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r2
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/files/motion.initd-r2,v 1.1 2011/10/02 18:48:35 ssuominen Exp $
+
+extra_started_commands="reload"
+
+_create_motion_run_dir() {
+	local dir="/var/run/motion"
+	if ! [ -d "$dir" ]; then
+		mkdir -p -m750 "$dir"
+		chown ${MOTION_USER}:${MOTION_GROUP} "$dir"
+	fi
+}
+
+depend() {
+	need modules
+	after mysql
+}
+
+start() {
+	_create_motion_run_dir
+
+	ebegin "Starting motion detection"
+	start-stop-daemon --start -u ${MOTION_USER} -g ${MOTION_GROUP} --quiet --exec /usr/bin/motion
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping motion detection"
+	start-stop-daemon --stop --quiet --exec /usr/bin/motion
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading motion detection configuration"
+	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion
+	eend $?
+}
diff --git a/media-video/motion/motion-3.2.12-r1.ebuild b/media-video/motion/motion-3.2.12-r1.ebuild
new file mode 100644
index 000000000000..e0d6fde5695f
--- /dev/null
+++ b/media-video/motion/motion-3.2.12-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.12-r1.ebuild,v 1.1 2011/10/02 18:48:35 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="ffmpeg mysql postgres v4l"
+
+RDEPEND="sys-libs/zlib
+	virtual/jpeg
+	ffmpeg? ( virtual/ffmpeg )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers )"
+
+pkg_setup() {
+	enewuser motion -1 -1 -1 video
+}
+
+src_configure() {
+	local hack
+	if has_version '>=sys-kernel/linux-headers-2.6.38'; then
+		hack="--without-v4l" #361509
+		ewarn "Disabling video4linux support because of too new"
+		ewarn "linux-headers. See bug 376225 for new motion."
+	fi
+
+	econf \
+		$(use_with v4l) \
+		$(use_with ffmpeg) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		--without-optimizecpu \
+		${hack}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOC='CHANGELOG CODE_STANDARD CREDITS FAQ README' \
+		docdir=/usr/share/doc/${PF} \
+		EXAMPLES='thread*.conf' \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/motion.initd-r2 motion
+	newconfd "${FILESDIR}"/motion.confd motion
+
+	mv -vf "${D}"/etc/motion{-dist,}.conf || die
+}
+
+pkg_postinst() {
+	elog "You need to setup /etc/motion.conf before running"
+	elog "motion for the first time."
+	elog "You can install motion detection as a service, use:"
+	elog "rc-update add motion default"
+}