ver bump

9 files changed, 100 insertions, 13 deletions

diff --git a/app-admin/watchdog/ChangeLog b/app-admin/watchdog/ChangeLog
index d0b028738cf9..865a8f5c0695 100644
--- a/app-admin/watchdog/ChangeLog
+++ b/app-admin/watchdog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/watchdog
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/ChangeLog,v 1.7 2004/06/24 21:42:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/ChangeLog,v 1.8 2004/08/06 05:39:21 vapier Exp $
+
+*watchdog-5.2.4 (06 Aug 2004)
+
+  06 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/5.2.4-sundries.patch, +watchdog-5.2.4.ebuild:
+  Add mysterious 5.2.4 version from debian.
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> watchdog-5.2.ebuild:
   Add die following econf for bug 48950
diff --git a/app-admin/watchdog/Manifest b/app-admin/watchdog/Manifest
index 7e337a327ad1..ada611b7de19 100644
--- a/app-admin/watchdog/Manifest
+++ b/app-admin/watchdog/Manifest
@@ -1,6 +1,19 @@
-MD5 a35191662d5749ef135323d4b8f412eb watchdog-5.2.ebuild 1265
-MD5 7b0c769cf4b854ec94e76e8eaa190d03 ChangeLog 979
-MD5 96232179b747a1bcacf83442f9217ec4 files/watchdog-5.2-alpha.diff 329
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c371758f4f4b2031f28c883681bf306a ChangeLog 1158
+MD5 6d599cb9a1e9c7cf0e0b071276dbce3b watchdog-5.2.ebuild 1266
+MD5 25aa8903d92dd8a8726b76bf21329fea watchdog-5.2.4.ebuild 1242
 MD5 b8a1e49beda941e07c53020b8fb7a1a9 files/digest-watchdog-5.2 64
-MD5 a9e8cf348af5828fbdc72e8c1a3bb730 files/sundries.diff 874
-MD5 bcf6d5f98678f639a7fdebd27dfa73d2 files/5.2/watchdog 646
+MD5 96232179b747a1bcacf83442f9217ec4 files/5.2-alpha.patch 329
+MD5 3b459c4fbb5ecd7ae24968d9adccb8de files/watchdog 640
+MD5 a9e8cf348af5828fbdc72e8c1a3bb730 files/5.2-sundries.patch 874
+MD5 0f333f39bc92c0a210e813ee338da9e7 files/digest-watchdog-5.2.4 71
+MD5 ba2c02768a2e772c14e6332dd6b2e65e files/5.2.4-sundries.patch 752
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFBExmvHTu7gpaalycRAqmuAJ4pMB2inmGVsXtgzxHrOpmZO9p7KgCgyiDr
+Ipk9Ojhz1UVA/YrCWmp6HQo=
+=GUZQ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/watchdog/files/watchdog-5.2-alpha.diff b/app-admin/watchdog/files/5.2-alpha.patch
index 1762e87329f9..1762e87329f9 100644
--- a/app-admin/watchdog/files/watchdog-5.2-alpha.diff
+++ b/app-admin/watchdog/files/5.2-alpha.patch
diff --git a/app-admin/watchdog/files/sundries.diff b/app-admin/watchdog/files/5.2-sundries.patch
index e018571a4d00..e018571a4d00 100644
--- a/app-admin/watchdog/files/sundries.diff
+++ b/app-admin/watchdog/files/5.2-sundries.patch
diff --git a/app-admin/watchdog/files/5.2.4-sundries.patch b/app-admin/watchdog/files/5.2.4-sundries.patch
new file mode 100644
index 000000000000..2d3d0a1f2986
--- /dev/null
+++ b/app-admin/watchdog/files/5.2.4-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/app-admin/watchdog/files/digest-watchdog-5.2.4 b/app-admin/watchdog/files/digest-watchdog-5.2.4
new file mode 100644
index 000000000000..7b72645ec9a8
--- /dev/null
+++ b/app-admin/watchdog/files/digest-watchdog-5.2.4
@@ -0,0 +1 @@
+MD5 c6ac132d92110eb2c4670d4f684105c3 watchdog_5.2.4.orig.tar.gz 127791
diff --git a/app-admin/watchdog/files/5.2/watchdog b/app-admin/watchdog/files/watchdog
index 07ec57a0dc91..f86aad917932 100644
--- a/app-admin/watchdog/files/5.2/watchdog
+++ b/app-admin/watchdog/files/watchdog
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/files/5.2/watchdog,v 1.5 2004/07/14 21:21:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/files/watchdog,v 1.1 2004/08/06 05:39:21 vapier Exp $
 
 depend() {
 	need localmount
diff --git a/app-admin/watchdog/watchdog-5.2.4.ebuild b/app-admin/watchdog/watchdog-5.2.4.ebuild
new file mode 100644
index 000000000000..d2a2c2fd8a31
--- /dev/null
+++ b/app-admin/watchdog/watchdog-5.2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.4.ebuild,v 1.1 2004/08/06 05:39:21 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A software watchdog"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/"
+SRC_URI="mirror://debian/pool/main/w/watchdog/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~arm ~amd64"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/${P}.orig
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-sundries.patch
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/watchdog \
+		--with-configfile=/etc/watchdog/watchdog.conf \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dodir /etc/watchdog
+	make DESTDIR="${D}" install || die
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/watchdog
+}
+
+pkg_postinst() {
+	einfo "To enable the start-up script run \"rc-update add watchdog boot\"."
+	if [ ! -e ${ROOT}/dev/watchdog ]
+	then
+		ewarn "No /dev/watchdog found! Make sure your kernel has watchdog support"
+		ewarn "compiled in or the kernel module is loaded. The watchdog service"
+		ewarn "will not start at boot until your kernel is configured properly."
+	fi
+}
diff --git a/app-admin/watchdog/watchdog-5.2.ebuild b/app-admin/watchdog/watchdog-5.2.ebuild
index 80f4fbc4501e..410dee50b916 100644
--- a/app-admin/watchdog/watchdog-5.2.ebuild
+++ b/app-admin/watchdog/watchdog-5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.ebuild,v 1.20 2004/07/04 16:36:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.ebuild,v 1.21 2004/08/06 05:39:21 vapier Exp $
 
 inherit eutils
 
@@ -18,8 +18,8 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/sundries.diff
-	epatch ${FILESDIR}/${P}-alpha.diff
+	epatch ${FILESDIR}/${PV}-sundries.patch
+	epatch ${FILESDIR}/${PV}-alpha.patch
 }
 
 src_compile() {
@@ -34,13 +34,12 @@ src_install() {
 	dodir /etc/watchdog
 	make DESTDIR="${D}" install || die
 	exeinto /etc/init.d
-	doexe "${FILESDIR}/${PVR}/watchdog"
+	doexe ${FILESDIR}/watchdog
 }
 
 pkg_postinst() {
 	einfo "To enable the start-up script run \"rc-update add watchdog boot\"."
-	if [ ! -e ${ROOT}/dev/watchdog ]
-	then
+	if [ ! -e ${ROOT}/dev/watchdog ] ; then
 		ewarn "No /dev/watchdog found! Make sure your kernel has watchdog support"
 		ewarn "compiled in or the kernel module is loaded. The watchdog service"
 		ewarn "will not start at boot until your kernel is configured properly."