No point in duplicating patches.

(Portage version: 2.1.2.3)

5 files changed, 13 insertions, 155 deletions

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 6c4f971cf748..fc6ece8566a0 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/watchdog
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.16 2007/04/11 19:41:39 phreak Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.17 2007/04/13 09:26:07 vapier Exp $
+
+  13 Apr 2007; Mike Frysinger <vapier@gentoo.org>
+  -files/watchdog-5.3.1-headers.patch, -files/watchdog-5.3.1-sundries.patch,
+  -files/watchdog-5.3.1-uclibc.patch, watchdog-5.3.1_p2.ebuild:
+  No point in duplicating patches.
 
   11 Apr 2007; Christian Heim <phreak@gentoo.org> watchdog-5.2.6_p2.ebuild:
   Fixing ebuild.badheader.
diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch
deleted file mode 100644
index 0ad75afadf2e..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Index: watchdog-5.3.1/src/fstab.c
-===================================================================
---- watchdog-5.3.1.orig/src/fstab.c
-+++ watchdog-5.3.1/src/fstab.c
-@@ -4,6 +4,7 @@
- #include "config.h"
- #endif
- 
-+#define _GNU_SOURCE /* for strsignal() */
- #include <unistd.h>
- #include <errno.h>
- #include <stdio.h>
-Index: watchdog-5.3.1/src/nfsmount.c
-===================================================================
---- watchdog-5.3.1.orig/src/nfsmount.c
-+++ watchdog-5.3.1/src/nfsmount.c
-@@ -43,6 +43,7 @@
- #include <rpc/pmap_prot.h>
- #include <rpc/pmap_clnt.h>
- #include <sys/socket.h>
-+#include <time.h>
- #include <sys/time.h>
- #include <sys/utsname.h>
- #include <sys/stat.h>
-Index: watchdog-5.3.1/src/pidfile.c
-===================================================================
---- watchdog-5.3.1.orig/src/pidfile.c
-+++ watchdog-5.3.1/src/pidfile.c
-@@ -6,6 +6,10 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <signal.h>
- #include "extern.h"
- #include "watch_err.h"
- 
-Index: watchdog-5.3.1/src/shutdown.c
-===================================================================
---- watchdog-5.3.1.orig/src/shutdown.c
-+++ watchdog-5.3.1/src/shutdown.c
-@@ -4,6 +4,8 @@
- #include "config.h"
- #endif
- 
-+#define _GNU_SOURCE /* for getsid() */
-+
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -14,6 +16,7 @@
- #include <signal.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <time.h>
- #include <utmp.h>
- #include <sys/mman.h>
- #include <sys/param.h>
-Index: watchdog-5.3.1/src/test_binary.c
-===================================================================
---- watchdog-5.3.1.orig/src/test_binary.c
-+++ watchdog-5.3.1/src/test_binary.c
-@@ -8,6 +8,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/wait.h>
-+#include <time.h>
- #include "extern.h"
- #include "watch_err.h"
- 
-Index: watchdog-5.3.1/src/watchdog.c
-===================================================================
---- watchdog-5.3.1.orig/src/watchdog.c
-+++ watchdog-5.3.1/src/watchdog.c
-@@ -13,6 +13,8 @@
- 
- #include "extern.h"
- 
-+#include <sys/stat.h>
-+#include <libgen.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <getopt.h>
-@@ -23,7 +25,6 @@
- #include <arpa/inet.h>
- #include <sys/mman.h>
- #include <sys/wait.h>
--#define __USE_GNU
- #include <string.h>
- 
- #if !defined(__GLIBC__)		/* __GLIBC__ */
-Index: watchdog-5.3.1/src/wd_keepalive.c
-===================================================================
---- watchdog-5.3.1.orig/src/wd_keepalive.c
-+++ watchdog-5.3.1/src/wd_keepalive.c
-@@ -14,6 +14,7 @@
- #include "config.h"
- #endif
- 
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <fcntl.h>
- #include <sched.h>
-@@ -22,7 +23,7 @@
- #include <stdlib.h>
- #include <sys/mman.h>
- #include <sys/wait.h>
--#define __USE_GNU
-+#include <unistd.h>
- #include <string.h>
- #include <syslog.h>
- 
diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch
deleted file mode 100644
index cec4fb1f3502..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: watchdog-5.3.1/include/sundries.h
-===================================================================
---- watchdog-5.3.1.orig/include/sundries.h
-+++ watchdog-5.3.1/include/sundries.h
-@@ -46,16 +46,7 @@ char *xstrconcat2 (const char *, const c
- 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.3.1-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch
deleted file mode 100644
index fac3f0bde54a..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: watchdog-5.3.1/src/fstab.c
-===================================================================
---- watchdog-5.3.1.orig/src/fstab.c
-+++ watchdog-5.3.1/src/fstab.c
-@@ -240,7 +240,7 @@ static int old_lockfile = 1;
- /* 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/watchdog-5.3.1_p2.ebuild b/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild
index 11cd041fcf3c..e7d260a41934 100644
--- a/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild
+++ b/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild,v 1.1 2007/04/11 19:40:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild,v 1.2 2007/04/13 09:26:07 vapier Exp $
 
 inherit eutils
 
@@ -24,14 +24,14 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-${PV/_p*/}-sundries.patch
-	epatch "${FILESDIR}"/${PN}-${PV/_p*/}-headers.patch
-	epatch "${FILESDIR}"/${PN}-${PV/_p*/}-uclibc.patch
+	epatch "${FILESDIR}"/${PN}-5.2.6-sundries.patch
+	epatch "${FILESDIR}"/${PN}-5.2.6-headers.patch
+	epatch "${FILESDIR}"/${PN}-5.2.6-uclibc.patch
 	epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
 	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
@@ -40,3 +40,4 @@ src_install() {
 	docinto examples
 	dodoc examples/*
 }
+