Version bump. Create /var/run/motion from init script instead of ebuild wrt #332633. Don't (temporarily) enable v4l if linux-headers >= 2.6.38 wrt #361509. Use virtual/ffmpeg wrt #362145.

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

5 files changed, 124 insertions, 9 deletions

diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index a1ee81c8896e..b5ff1872045d 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,14 @@
 # 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.32 2011/03/30 11:38:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.33 2011/05/19 18:50:35 ssuominen Exp $
+
+*motion-3.2.12 (19 May 2011)
+
+  19 May 2011; Samuli Suominen <ssuominen@gentoo.org> +motion-3.2.12.ebuild,
+  +files/motion.initd:
+  Version bump. Create /var/run/motion from init script instead of ebuild wrt
+  #332633. Don't (temporarily) enable v4l if linux-headers >= 2.6.38 wrt
+  #361509. Use virtual/ffmpeg wrt #362145.
 
   30 Mar 2011; Michael Weber <xmw@gentoo.org> motion-3.2.11.1.ebuild:
   added ~arm (bug 302981)
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index add1ba8f75df..0892454ed3c8 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -3,14 +3,17 @@ Hash: SHA256
 
 AUX motion.confd 99 RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 SHA1 f66f2f685044e26d5fa61bed8fa47340003c3c24 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060
 AUX motion.init-r1 708 RMD160 45f70c3c0d91e9669341e274ff81469a889911ae SHA1 1f73b530683397e04646df01da064ba5a1155095 SHA256 b69a44636c2d091d3e863fcef991b05687001737e5a84a6bb1239234e9e0f857
+AUX motion.initd 891 RMD160 81a3a17c1ae536811699283c2163612962bce3eb SHA1 db373beb37ca6786836e7cfa7205dbcb42e0552a SHA256 4ef71fe2702504820b871a03ffe8827dc4ee0ef0550bda198a2a209254a1dfbe
 DIST motion-3.2.11.1.tar.gz 417246 RMD160 dfaa27b73599e375288d9758108c302f3db089a1 SHA1 6e7acea3b27a9e24301e57e066ad5603d41598b2 SHA256 73973e723c39c05cbfc5c2a90357c5dea3078c3162dfc41f303fbf40cda9e403
-EBUILD motion-3.2.11.1.ebuild 1767 RMD160 b58e98e5853012d30d0f10435878c40f6ddec21f SHA1 a3928a8bb723db83311cff9836fa377f4a80159c SHA256 03ab864360c3188d64d2f814301d2e348387b3d6bf4f30ba7e8df626668d88de
-MISC ChangeLog 4758 RMD160 a3bb5fddec0df148b2e3db154ab0a42064e2d0b5 SHA1 00b33ec6c54915a1fddc1760cc63ea923a80cd10 SHA256 5afb6ef7e0e732aad9457ac7e7cc323b1f4a03fbe98e6b3e813bb084cd1c7ad6
+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.ebuild 1563 RMD160 3141f950243a1b1cbf47317c619619c9ed668d9e SHA1 13292939324d1f89d036909a0b28ade69c634355 SHA256 4f50a8b6ed6eb90d9870fd92eaba3fd6a723bb08726ede96b6b99a7c4f053e63
+MISC ChangeLog 5089 RMD160 e4c31bccabb7205e1ae442116c9afc9143783149 SHA1 d8e7bd293e86d6a432b75b1a078f5d168b77b2eb SHA256 41fe3db5fe4ba415c8218bef46c8329aafb53428758c43793c65ac73f72b0894
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2TFkoACgkQknrdDGLu8JB6pAD9ESjtWVuH0UqSzee05dOKCd3u
-E89HvgSOjNwD+erxUHkBAI83zpTezeCn/mYek8XdFvaX9al6AWKpbrixN9l2B6DY
-=dPmi
+iF4EAREIAAYFAk3VZjMACgkQXkR9YqOcLPHc4AD+JiGg+n93ONXxGVOclJXOcMuT
+1DiOi819yzw+2krJLSsBAKUKWOObUOAuA6gYeNXmiUzvQAk0ai1LkD3IQRr2tN9y
+=xVvw
 -----END PGP SIGNATURE-----
diff --git a/media-video/motion/files/motion.initd b/media-video/motion/files/motion.initd
new file mode 100644
index 000000000000..de13ed9243e6
--- /dev/null
+++ b/media-video/motion/files/motion.initd
@@ -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,v 1.1 2011/05/19 18:50:35 ssuominen Exp $
+
+opts="${opts} 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 -c ${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.11.1.ebuild b/media-video/motion/motion-3.2.11.1.ebuild
index 5858a094bb91..098df2dd0d3c 100644
--- a/media-video/motion/motion-3.2.11.1.ebuild
+++ b/media-video/motion/motion-3.2.11.1.ebuild
@@ -1,6 +1,6 @@
 # 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.11.1.ebuild,v 1.7 2011/03/30 11:38:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.11.1.ebuild,v 1.8 2011/05/19 18:50:35 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -16,10 +16,11 @@ IUSE="ffmpeg mysql postgres v4l"
 
 RDEPEND="sys-libs/zlib
 	virtual/jpeg
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers )"
 
 pkg_setup() {
 	enewuser motion -1 -1 -1 video
diff --git a/media-video/motion/motion-3.2.12.ebuild b/media-video/motion/motion-3.2.12.ebuild
new file mode 100644
index 000000000000..25331ae99db5
--- /dev/null
+++ b/media-video/motion/motion-3.2.12.ebuild
@@ -0,0 +1,64 @@
+# 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.ebuild,v 1.1 2011/05/19 18:50: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
+	has_version '>=sys-kernel/linux-headers-2.6.38' && hack="--without-v4l" #361509
+
+	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 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"
+}