Cleanup; Version bump; Taking temporary maintainership

(Portage version: 2.1.1_pre2-r8)

10 files changed, 126 insertions, 7 deletions

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index cd086745f88b..137ae81b4307 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-apps/watchdog
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.12 2006/06/25 10:50:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.13 2006/07/13 17:16:49 phreak Exp $
+
+*watchdog-5.2.6_p2 (13 Jul 2006)
+
+  13 Jul 2006; Christian Heim <phreak@gentoo.org>
+  -files/watchdog-5.2.4_p5-conf.d, -files/watchdog-5.2.4_p5-init.d,
+  -files/watchdog-5.2.5_p1-conf.d, -files/watchdog-5.2.5_p1-init.d,
+  +files/watchdog-5.2.6-sundries.patch, +files/watchdog-5.2.6-uclibc.patch,
+  -files/watchdog-5.2.6_p1-conf.d, -files/watchdog-5.2.6_p1-init.d,
+  -files/watchdog-5.2.6_p1-sundries.patch,
+  -files/watchdog-5.2.6_p1-uclibc.patch, +files/watchdog-conf.d,
+  +files/watchdog-init.d, metadata.xml, watchdog-5.2.4_p5.ebuild,
+  watchdog-5.2.5_p1.ebuild, +watchdog-5.2.6_p2.ebuild:
+  Cleanup; Version bump; Taking temporary maintainership
 
 *watchdog-5.2.6_p1 (25 Jun 2006)
 
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.6_p2 b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p2
new file mode 100644
index 000000000000..ad75b1c04462
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p2
@@ -0,0 +1,6 @@
+MD5 a5637591ac64039c4c45b60266c9f62c watchdog_5.2.6-2.diff.gz 1791
+RMD160 99c4162cda72ec7b4d3714bdeb9afcf0a1d3ed36 watchdog_5.2.6-2.diff.gz 1791
+SHA256 65d6b4a109972be2e569b9553acaafc7b6c1f6b095a0b56122ada5fa60f35152 watchdog_5.2.6-2.diff.gz 1791
+MD5 43c33708ac07d458bdbd416812481bab watchdog_5.2.6.orig.tar.gz 138446
+RMD160 accd68437bb986583f02ec9fe7af0c996a7dcaaf watchdog_5.2.6.orig.tar.gz 138446
+SHA256 84f08d17eebb052e165ce69cf4bbf86ff3da8ec2c3f078391a6d999f90b66baf watchdog_5.2.6.orig.tar.gz 138446
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6-sundries.patch b/sys-apps/watchdog/files/watchdog-5.2.6-sundries.patch
new file mode 100644
index 000000000000..2d3d0a1f2986
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6-sundries.patch
@@ -0,0 +1,19 @@
+--- include/sundries.h.orig	2004-08-06 01:33:43.525091352 -0400
++++ include/sundries.h	2004-08-06 01:33:58.254852088 -0400
+@@ -46,16 +46,7 @@
+ char *xstrconcat3 (const char *, const char *, const char *);
+ char *xstrconcat4 (const char *, const char *, const char *, const char *);
+ 
+-/* Here is some serious cruft.  */
+-#ifdef __GNUC__
+-#if defined(__GNUC_MINOR__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 5
+ void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn));
+-#else /* GNUC < 2.5 */
+-void die (int errcode, const char *fmt, ...);
+-#endif /* GNUC < 2.5 */
+-#else /* !__GNUC__ */
+-void die (int errcode, const char *fmt, ...);
+-#endif /* !__GNUC__ */
+ 
+ #ifdef HAVE_NFS
+ int nfsmount (const char *spec, const char *node, int *flags,
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch
new file mode 100644
index 000000000000..1986ed88774a
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch
@@ -0,0 +1,11 @@
+--- src/fstab.c.orig	2004-08-23 15:32:22 +0000
++++ src/fstab.c	2004-08-23 15:32:36 +0000
+@@ -237,7 +237,7 @@
+ /* Ensure that the lock is released if we are interrupted.  */
+ static void
+ handler (int sig) {
+-     die (EX_USER, "%s", sys_siglist[sig]);
++     die (EX_USER, "%s", strsignal(sig));
+ }
+
+ static void
diff --git a/sys-apps/watchdog/files/watchdog-conf.d b/sys-apps/watchdog/files/watchdog-conf.d
new file mode 100644
index 000000000000..552f87ae7647
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-conf.d,v 1.1 2006/07/13 17:16:49 phreak Exp $
+
+# for more info, see watchdog(8)
+WATCHDOG_OPTS=""
diff --git a/sys-apps/watchdog/files/watchdog-init.d b/sys-apps/watchdog/files/watchdog-init.d
new file mode 100644
index 000000000000..03cd7c2cb110
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-init.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-init.d,v 1.1 2006/07/13 17:16:49 phreak Exp $
+
+depend() {
+	need localmount
+	use logger
+}
+
+start() {
+	ebegin "Starting watchdog"
+	start-stop-daemon --start --quiet --exec /usr/sbin/watchdog \
+		-- ${WATCHDOG_OPTS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping watchdog"
+	start-stop-daemon --stop --retry 5 --quiet --exec /usr/sbin/watchdog
+	eend ${?}
+}
diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
index 5f2325513c1b..e242c9124114 100644
--- a/sys-apps/watchdog/metadata.xml
+++ b/sys-apps/watchdog/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>kernel</herd>
 	<maintainer>
 		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild b/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild
index e6ba159540b7..74a7140f4bfc 100644
--- a/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild
+++ b/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild,v 1.5 2006/02/07 21:01:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild,v 1.6 2006/07/13 17:16:49 phreak Exp $
 
 inherit eutils
 
@@ -36,8 +36,8 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newconfd ${FILESDIR}/${P}-conf.d ${PN}
-	newinitd ${FILESDIR}/${P}-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 
 	dodoc AUTHORS README TODO
 	docinto examples
diff --git a/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild b/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild
index edf2a59ce545..d696cd768512 100644
--- a/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild,v 1.5 2006/07/02 20:31:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild,v 1.6 2006/07/13 17:16:49 phreak Exp $
 
 inherit eutils
 
@@ -32,8 +32,8 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newconfd "${FILESDIR}"/${P}-conf.d ${PN}
-	newinitd "${FILESDIR}"/${P}-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 
 	dodoc AUTHORS README TODO
 	docinto examples
diff --git a/sys-apps/watchdog/watchdog-5.2.6_p2.ebuild b/sys-apps/watchdog/watchdog-5.2.6_p2.ebuild
new file mode 100644
index 000000000000..e8edc3f9cd3d
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.2.6_p2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.6_p2.ebuild,v 1.1 2006/07/13 17:16:49 phreak Exp $
+
+inherit eutils
+
+MY_P=${PN}_${PV/_p*/}
+S="${WORKDIR}"/${P/_p*/}.orig
+PATCH_LEVEL=${PV##*_p}
+
+DESCRIPTION="A software watchdog"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/"
+SRC_URI="mirror://debian/pool/main/w/watchdog/${MY_P}.orig.tar.gz
+		mirror://debian/pool/main/w/watchdog/${MY_P}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sh ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-${PV/_p*/}-sundries.patch
+	epatch "${FILESDIR}"/${PN}-${PV/_p*/}-uclibc.patch
+	epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+
+	dodoc AUTHORS README TODO
+	docinto examples
+	dodoc examples/*
+}