Merge with git+ssh://git.meleeweb.net/var/git/distros/gentoo/portage.git

4 files changed, 44 insertions, 0 deletions

diff --git a/sys-apps/wdd/Manifest b/sys-apps/wdd/Manifest
index 931073f1..25221304 100644
--- a/sys-apps/wdd/Manifest
+++ b/sys-apps/wdd/Manifest
@@ -2,8 +2,17 @@ AUX warning.patch 774 RMD160 4c7147c373d8872cf35ddd4eb4b67f50b52749ac SHA1 6c84a
 MD5 10641dd22905c30de48a8ff564a01431 files/warning.patch 774
 RMD160 4c7147c373d8872cf35ddd4eb4b67f50b52749ac files/warning.patch 774
 SHA256 918e0fcd1acadbc574f5bdb4e90e1a62a4f607497ec2a689498d0d89254ae7d6 files/warning.patch 774
+AUX wdd.confd 63 RMD160 0c72c3dc55da3c82231ecd4fc479fe64a1b49a66 SHA1 fe35c35f956e38f1ff18277838cb8741998af56a SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88
+MD5 733c74d72f7c0c8474fefe4038d741c2 files/wdd.confd 63
+RMD160 0c72c3dc55da3c82231ecd4fc479fe64a1b49a66 files/wdd.confd 63
+SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 files/wdd.confd 63
+AUX wdd.initd 421 RMD160 f42dd9c91bbd1efe38253db237b7fee70f303c67 SHA1 36b4ef136e32ea9de5f837e4c08672128025dec6 SHA256 9d123e1ea41d90404520f33922d12cb2622cc4b913f62277d4b11bdfe0d3b684
+MD5 935d64b6fa23c3afff19abf2756b7c0e files/wdd.initd 421
+RMD160 f42dd9c91bbd1efe38253db237b7fee70f303c67 files/wdd.initd 421
+SHA256 9d123e1ea41d90404520f33922d12cb2622cc4b913f62277d4b11bdfe0d3b684 files/wdd.initd 421
 DIST wdd.8 3198 RMD160 34aa288bd79e0f15229ca75f8567bde8d45f76a1 SHA1 1f83bdc0fd2f8aaeb439ac60f1d79487a8e88f88 SHA256 7129d465b7fa4c96dd488f22a4dc265a0d2d343e1c40ac0aa6827e53dd8aec2b
 DIST wdd.c 2841 RMD160 f4555a2132545e371d7325bc71755c48f64a57b9 SHA1 b68d654ec1511bbce66a1a07d40bf9b7c3272243 SHA256 66be5e748b6199f7afbdbc7b6aaed6cbbfa2e0634aa90d3c0aefa743756ae6a7
+<<<<<<< master
 EBUILD wdd-0.ebuild 686 RMD160 daa4c86d9a64d990b06a11ec1179ded165e1784e SHA1 25bae85d0b0961cc05c5e5ccfe9f3a375975f766 SHA256 96b94172c62b2c126b401cc5f4aa837a4d4b268c3ad1f8de0f5e4670a968f5aa
 MD5 4fda60dac245add9de418d0579ed3031 wdd-0.ebuild 686
 RMD160 daa4c86d9a64d990b06a11ec1179ded165e1784e wdd-0.ebuild 686
@@ -11,3 +20,12 @@ SHA256 96b94172c62b2c126b401cc5f4aa837a4d4b268c3ad1f8de0f5e4670a968f5aa wdd-0.eb
 MD5 fb7f1f6d3fb445ac0d3615885d5574bc files/digest-wdd-0 284
 RMD160 b234d844c53139ee925a02df7391a8b40f14ee92 files/digest-wdd-0 284
 SHA256 4c27a04299038d35a3a0a8fbb02de8f50c8eb014298bfe4b56bfe74a63ddb927 files/digest-wdd-0 284
+=======
+EBUILD wdd-0.ebuild 752 RMD160 04f16d8ca59c2f61c15595c2879607362ddbc168 SHA1 0949ee55942787a46959bee0365d169436514b3d SHA256 2233dcdeebc1c9a8294b2fd0bdeeaf8784238e549062a52bed2f5c55c7727ac4
+MD5 7137ec752cae8f193cd1dbfa5112176c wdd-0.ebuild 752
+RMD160 04f16d8ca59c2f61c15595c2879607362ddbc168 wdd-0.ebuild 752
+SHA256 2233dcdeebc1c9a8294b2fd0bdeeaf8784238e549062a52bed2f5c55c7727ac4 wdd-0.ebuild 752
+MD5 daf370de16bb7113a86e207d54e19b78 files/digest-wdd-0 380
+RMD160 710fd022e21ffbba48307977288272fdeed7d8a4 files/digest-wdd-0 380
+SHA256 6e41671e09cefce5f0cc7b22630bb8b31eaa4b11e723822913b75c710b5c79ad files/digest-wdd-0 380
+>>>>>>> origin
diff --git a/sys-apps/wdd/files/wdd.confd b/sys-apps/wdd/files/wdd.confd
new file mode 100644
index 00000000..29635f06
--- /dev/null
+++ b/sys-apps/wdd/files/wdd.confd
@@ -0,0 +1,2 @@
+NICE="10"
+WATCH_FILES="/ /dev/watchdog /proc/self/root /tmp/."
diff --git a/sys-apps/wdd/files/wdd.initd b/sys-apps/wdd/files/wdd.initd
new file mode 100755
index 00000000..fd23e755
--- /dev/null
+++ b/sys-apps/wdd/files/wdd.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+}
+
+start() {
+	ebegin "Starting wdd"
+	start-stop-daemon --start --quiet --nicelevel ${NICE:-10} \
+		--exec /usr/sbin/wdd -- ${WATCH_FILES}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping wdd"
+	start-stop-daemon --stop --retry 5 --exec /usr/sbin/wdd
+	eend ${?}
+}
diff --git a/sys-apps/wdd/wdd-0.ebuild b/sys-apps/wdd/wdd-0.ebuild
index 06674416..56f3a1ec 100644
--- a/sys-apps/wdd/wdd-0.ebuild
+++ b/sys-apps/wdd/wdd-0.ebuild
@@ -33,5 +33,8 @@ src_compile () {
 src_install () {
 	dosbin wdd
 	doman wdd.8
+
+	newinitd ${FILESDIR}/wdd.initd wdd
+	newconfd ${FILESDIR}/wdd.confd wdd
 }