summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2014-04-12 19:38:12 +0200
committerBertrand Jacquin <beber@meleeweb.net>2014-04-12 20:17:34 +0200
commit9c1285a00f7d7285ab529df5938a930dc0b8807f (patch)
treee75ae24a856633887b931e6acd078d96a75ed2d0
parentprofiles/desktop: KEYWORD www-plugins/chrome-binary-plugins and adjust (diff)
downloadportage-9c1285a00f7d7285ab529df5938a930dc0b8807f.tar.xz
flx/wdd: Revbump to fix init script and make stop only when it should
Package-Manager: portage-2.2.10 RepoMan-Options: --force
-rw-r--r--flx/wdd/ChangeLog6
-rw-r--r--flx/wdd/Manifest6
-rwxr-xr-xflx/wdd/files/wdd.initd24
-rw-r--r--flx/wdd/wdd-0.1.34-r1.ebuild (renamed from flx/wdd/wdd-0.1.34.ebuild)0
-rw-r--r--metadata/md5-cache/flx/wdd-0.1.34-r1 (renamed from metadata/md5-cache/flx/wdd-0.1.34)0
5 files changed, 24 insertions, 12 deletions
diff --git a/flx/wdd/ChangeLog b/flx/wdd/ChangeLog
index a9808ce1..37871759 100644
--- a/flx/wdd/ChangeLog
+++ b/flx/wdd/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*wdd-0.1.34-r1 (12 Apr 2014)
+
+ 12 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> +wdd-0.1.34-r1.ebuild,
+ -wdd-0.1.34.ebuild, files/wdd.initd:
+ flx/wdd: Revbump to fix init script and make stop only when it should
+
31 Mar 2014; Bertrand Jacquin <beber@meleeweb.net> wdd-0.1.34.ebuild,
wdd-9999.ebuild:
flx/wdd: Move to git-r3
diff --git a/flx/wdd/Manifest b/flx/wdd/Manifest
index a3d1902b..0c0811d1 100644
--- a/flx/wdd/Manifest
+++ b/flx/wdd/Manifest
@@ -7,8 +7,8 @@ AUX 9999-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6
AUX 9999-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a
AUX 9999-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9
AUX wdd.confd 63 SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 WHIRLPOOL ff4487a3e0c178de715361eb7be56899d1614e211751b041a529ed9f7d01519d164b67cb0a26c47a129bbeeafccc634f007c50706e67bc19e630e6caf46cd15c
-AUX wdd.initd 413 SHA256 41b52446d2b513a945e84a12fc303d2b2c75e1f31c8ce33e1dde23d395947d17 WHIRLPOOL d5dddf3b9dc4eb3ca779eff408861de85fcfd57f2f3f3233d97fb9292a97ecacb6243988b9a73582faeed9084c3f9e595a4ae143dd5d3bed529437bc0b37cde5
-EBUILD wdd-0.1.34.ebuild 821 SHA256 56bc747e5d93b5cb254214efbfef1ff83338aefdc783ae22a2109d5b6e40ff4a WHIRLPOOL 8c788edb9fcb38daf351693888da23d7dc8a47c4064fed50dfb6e05f67098d7da09b8d0753c4ff4741220957e761d00152243d075737070bb5b6348e66d70cda
+AUX wdd.initd 636 SHA256 bde8301066e28f829592cdfa7e4e254b51f7b212cc135905ec05635e0fba0eb1 WHIRLPOOL eda9e167cb7f4a5faf22b852e88f137327ea3ca9044de22610f8aab284c0a99da2058cf42af1fdfe323c02fb61d2a5b2587491c215d74174f3e760bfbaef6682
+EBUILD wdd-0.1.34-r1.ebuild 821 SHA256 56bc747e5d93b5cb254214efbfef1ff83338aefdc783ae22a2109d5b6e40ff4a WHIRLPOOL 8c788edb9fcb38daf351693888da23d7dc8a47c4064fed50dfb6e05f67098d7da09b8d0753c4ff4741220957e761d00152243d075737070bb5b6348e66d70cda
EBUILD wdd-9999.ebuild 782 SHA256 3c1499cdf7556486aedb596945dd136d9e987436546b3c8a44ae431863c6443e WHIRLPOOL 6ba0ba1d359a4fb56595868024761777277a3496769fa0fc744e7fe58f5a5249d95bf0fd0823ed696de945b663247dc1fe522e04a54b7bedab62252461c7ee87
-MISC ChangeLog 1432 SHA256 45e327a31a729a9cfd7507f4a4e4547bc5e60de895c82f0b87b4d0e85bdab342 WHIRLPOOL ee05634d181a55f880dacf5611a4e8384fbb84cd155838510c575eaabf725af56bcd03d2fbc859d65d74f3e74c1e7c10da9194dd39a9138ef7a12386b11c4989
+MISC ChangeLog 1650 SHA256 b15bb99bc8423f4128b85f4485d0c040a410846b71636f8e65638946d1ed1218 WHIRLPOOL 8d844198273dee253a26ef810a3384f00307f9f317c2a261099d19b51c6a49512d495997c2a8c6dc70a2cf5ab85ee03bb22a6132123cea8df7f3a090c3717fef
MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/flx/wdd/files/wdd.initd b/flx/wdd/files/wdd.initd
index b7b531aa..71633a2d 100755
--- a/flx/wdd/files/wdd.initd
+++ b/flx/wdd/files/wdd.initd
@@ -1,21 +1,27 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
depend() {
- need localmount
+ before localmount
+ use dev
}
start() {
- ebegin "Starting wdd"
- start-stop-daemon --start --quiet --nicelevel ${NICE:-10} \
- --exec /sbin/wdd -- ${WATCH_FILES}
- eend ${?}
+ ebegin "Starting ${RC_SVCNAME}"
+ start-stop-daemon --start --quiet --nicelevel "${NICE:-10}" \
+ --exec "/sbin/${RC_SVCNAME}" -- ${WATCH_FILES}
+ eend $?
}
stop() {
- ebegin "Stopping wdd"
- start-stop-daemon --stop --retry 5 --exec /sbin/wdd
- eend ${?}
+ # Do not stop ${RC_SVCNAME} on reboot/shutdown
+ if [ "${RC_RUNLEVEL}" = "shutdown" ] ; then
+ ewarn "Skip stopping ${RC_SVCNAME} (runlevel ${RC_SVCNAME})"
+ else
+ ebegin "Stopping ${RC_SVCNAME}"
+ start-stop-daemon --stop --retry 5 --exec "/sbin/${RC_SVCNAME}"
+ eend $?
+ fi
}
diff --git a/flx/wdd/wdd-0.1.34.ebuild b/flx/wdd/wdd-0.1.34-r1.ebuild
index b64b95a3..b64b95a3 100644
--- a/flx/wdd/wdd-0.1.34.ebuild
+++ b/flx/wdd/wdd-0.1.34-r1.ebuild
diff --git a/metadata/md5-cache/flx/wdd-0.1.34 b/metadata/md5-cache/flx/wdd-0.1.34-r1
index 977b85ea..977b85ea 100644
--- a/metadata/md5-cache/flx/wdd-0.1.34
+++ b/metadata/md5-cache/flx/wdd-0.1.34-r1