diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2011-10-03 03:24:02 +0400 |
---|---|---|
committer | Andrew Savchenko <bircoph@gmail.com> | 2011-10-03 03:24:02 +0400 |
commit | 29eaabb01aa2ca1f86534ccb896fe0fc8cd0ff09 (patch) | |
tree | 047c6ccc92f4f7f444a6308d0945485d9df475ed /media-video | |
parent | xloadimage: sync with portage (diff) | |
download | bircoph-29eaabb01aa2ca1f86534ccb896fe0fc8cd0ff09.tar.gz bircoph-29eaabb01aa2ca1f86534ccb896fe0fc8cd0ff09.tar.bz2 bircoph-29eaabb01aa2ca1f86534ccb896fe0fc8cd0ff09.zip |
motion: sync with upstream and cleanup
- sync with upstream initd changes;
- remove stray hack variable;
- remove unused patches.
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/motion/Manifest | 5 | ||||
-rw-r--r-- | media-video/motion/files/motion.init-r1 | 29 | ||||
-rw-r--r-- | media-video/motion/files/motion.initd-r2 (renamed from media-video/motion/files/motion.initd) | 6 | ||||
-rw-r--r-- | media-video/motion/motion-9999.ebuild | 5 |
4 files changed, 7 insertions, 38 deletions
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest index 5f3f344..23d319b 100644 --- a/media-video/motion/Manifest +++ b/media-video/motion/Manifest @@ -1,6 +1,5 @@ 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 -EBUILD motion-9999.ebuild 1526 RMD160 3ef18e329ee12348f3aa5320a71953b080d0ba00 SHA1 97bda8cb3c3f9f265d07a892ca1637d78bb3ca0e SHA256 1d2e6f90e4365fbb3baccaca7a5970ec56ca64cfd7f3037f0bdf7f606443698e +AUX motion.initd-r2 904 RMD160 b7bf54ceab0848ddb3b04176e0c9f29501004c6e SHA1 b8a27c19e92b2bbc3ec627a70cecac4db877d84f SHA256 a862507d2b0096efca041768a21ebeaac1733211aa008ebacc73fd4c214be6e0 +EBUILD motion-9999.ebuild 1517 RMD160 4f134da85012935d351bc448fd4f98dde340314c SHA1 b1365a0d148484ea5514f7308e04d6773fa8e205 SHA256 6561ad2b743c5f2e4e7fff152dc856b208ed02d8897d79b491d2ee477300fe06 MISC ChangeLog 5089 RMD160 e4c31bccabb7205e1ae442116c9afc9143783149 SHA1 d8e7bd293e86d6a432b75b1a078f5d168b77b2eb SHA256 41fe3db5fe4ba415c8218bef46c8329aafb53428758c43793c65ac73f72b0894 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 diff --git a/media-video/motion/files/motion.init-r1 b/media-video/motion/files/motion.init-r1 deleted file mode 100644 index a45d3ae..0000000 --- a/media-video/motion/files/motion.init-r1 +++ /dev/null @@ -1,29 +0,0 @@ -#!/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.init-r1,v 1.2 2011/05/19 18:51:26 ssuominen Exp $ - -opts="${opts} reload" - -depend() { - need modules - after mysql -} - -start() { - 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/files/motion.initd b/media-video/motion/files/motion.initd-r2 index de13ed9..2e0b120 100644 --- a/media-video/motion/files/motion.initd +++ b/media-video/motion/files/motion.initd-r2 @@ -1,9 +1,9 @@ #!/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 $ +# $Header: /var/cvsroot/gentoo-x86/media-video/motion/files/motion.initd-r2,v 1.1 2011/10/02 18:48:35 ssuominen Exp $ -opts="${opts} reload" +extra_started_commands="reload" _create_motion_run_dir() { local dir="/var/run/motion" @@ -22,7 +22,7 @@ start() { _create_motion_run_dir ebegin "Starting motion detection" - start-stop-daemon --start -c ${MOTION_USER} -g ${MOTION_GROUP} --quiet --exec /usr/bin/motion + start-stop-daemon --start -u ${MOTION_USER} -g ${MOTION_GROUP} --quiet --exec /usr/bin/motion eend $? } diff --git a/media-video/motion/motion-9999.ebuild b/media-video/motion/motion-9999.ebuild index bd51ee0..4900cf7 100644 --- a/media-video/motion/motion-9999.ebuild +++ b/media-video/motion/motion-9999.ebuild @@ -37,8 +37,7 @@ src_configure() { $(use_with ffmpeg) \ $(use_with mysql) \ $(use_with postgres pgsql) \ - --without-optimizecpu \ - ${hack} + --without-optimizecpu } src_install() { @@ -52,7 +51,7 @@ src_install() { dohtml *.html - newinitd "${FILESDIR}"/motion.initd motion + newinitd "${FILESDIR}"/motion.initd-r2 motion newconfd "${FILESDIR}"/motion.confd motion mv -vf "${D}"/etc/motion{-dist,}.conf || die |