gentoo auto-resync : 18:02:2023 - 20:11:56

7 files changed, 658 insertions, 131 deletions

diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest
index d6b7d0e2b650..17898943fc27 100644
--- a/sys-process/daemontools/Manifest
+++ b/sys-process/daemontools/Manifest
@@ -1,8 +1,8 @@
+AUX 0.76-C99-decls.patch 10397 BLAKE2B 3072b01973ebdf4e12d2d25ac70a953028c360a721b2ca6ef9cd05d6803fb3c9e48d9b7b11112d401e16b5e9dc039500cb2d9b5752000dcaabcc905c70643ad8 SHA512 36695347e98d4dc177f685cddcf9e7331da8630f0632d1fb35a2df1898c9e4a73d8908b56dd218d9b6f06cd3f063e6a946567ab256498bf0d425ea2f06719c58
 AUX 0.76-errno.patch 246 BLAKE2B 10fc1da86bb91657dd9f1709f1f58852d93e6baa61ab89ce56911066677975699af1feff69bda5218afb36f2fbb66af6b810d5a9d8b6938054ff0123172c657a SHA512 76664b71e16ba4dbb081604a1a8c9ddc58a603777dccc0a53b0af9442ff8f0cdfce9ef8b05926dac62b81b2c805262df6a7e4df65920c00583132dbf136ba85e
-AUX 0.76-warnings.patch 1305 BLAKE2B 78714a04aa89f08abde37ad04f24098ac6d6197aa64155ee737a0cdb2ad7b16ac2133410e83fce7f1ac29465e4f9a8a7f08cf8a4b071c191af292002735267c1 SHA512 13288c5d1fc5f775cff9286b5cb4c711c5e6e52ef9c714b377cec0328c887b065385c464ca27b2dbe921e66956c20b5f3205cc36d7d2e81c383b5765cbd554aa
-AUX svscan.init 681 BLAKE2B fbee204b3d8b109bca9912e23487a4ee28fabe3761b7b5fbf6d9fdb3dd120320d7b1f5eed0bb894adf888c9b83691a7a9a6fd0b3f4b65765ee80d1d396e0ba9c SHA512 30fc8685158dfc88542cfce193e5084f7175d57a8297ee12f96578ca85a9112f1af9f1a856cfb530a3dea0552cf481b5afa7cfc88a8bbc9cee34303e0893ba5b
-AUX svscan.init-0.76-r7 688 BLAKE2B f5dcf76ed7c0a4aacabd20c1d2462fdfe5ffc22c5ae1b5eb45e58a238dd7a16c2efe647dfa94a3e014234288919df83b2825a1c63048ba89acd5476fb6085395 SHA512 171ca666fc788c564e1d081e90591e98367c9a9db37d9a05d31aa80c01c9f089360f91fb2b71337f7a046e857548c287df5aef054c43d5c93cc083163d602cc4
+AUX 0.76-makefile.patch 3630 BLAKE2B 777309c2c8d029927e29b1587c751ce9100dbc258d22b6b45d1375b52a15bb0c369086d762e521b4858eaaed432d06f834c7bee3c0de208fbcab05f7712e9a5d SHA512 8df1923e9b3fa84430941c652bf3462e6ce9d4dfee67ccfce36512124aaa7ad364c2a8f2f2c1e4fef2ffb55a60491fe5208df576965d072a3c5c396da711d030
+AUX svscan.init-0.76-r7 685 BLAKE2B eb6caac65f18fa0c617a8e7d4e3474b562ff9a352a343cb24cf08ac29caaf1eff19652839552cc58bcb18ca4f82b5702dcc2828695647c5ce9af15bc63083dd7 SHA512 ba44f4dacd130a6cef6ac6e4cc3ffbd98ed3bcb75eab3441f7c6ee1899bb87f5e3ca491b83393f381f36460a522faf2f171dd4b74a92e9e222dbc1bbd3ff6b4b
 DIST daemontools-0.76-man-20020131.tar.gz 8005 BLAKE2B 0c8f0ae71754516fda772b3771a9e68499aed17f3035dee3c2bb36012fb4e411cac9146eb5889306f00e03a14ef65194e1b6f76d45890175642405797da2201b SHA512 1767fafb2d92902f903637f08363031971bda007d1b7b53059551c740976d1c643229ccc44171796c1dcb43cbd875a17178edc634e140671817e0ef0ba3ad80b
 DIST daemontools-0.76.tar.gz 36975 BLAKE2B cb45c92fc06169b617befe9f9193377a07d31e9e6ae05526c299ce2a63c8009b599384a87f768fbe9283b229083ef74007b85662976cf7add5c855f5018fafa8 SHA512 e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
-EBUILD daemontools-0.76-r8.ebuild 1382 BLAKE2B f4224b06d3ba57a8127f73ccddce458d83c5d8396d7a7633df840643db55b7ceb52de424671275cfb82e9e36a7901fefb9b1eea09cc41c94e4276e32fe86055d SHA512 cca4fba015eb53be5737575ca97e39c41b58e0b1fd1131bb2c95a5ade80080c1c32543c93e5495d1f150020b97e213f264cbdc2950e7a200e1f755a980bde7a3
+EBUILD daemontools-0.76-r10.ebuild 1343 BLAKE2B b34581ec22e8be4c29b76995d351aa559c6aa5471b8aa38adf8500493088639724cf66e7c19e1cbc7a06f589b60eefddb58c22fa05e1178b0083e163597c16f0 SHA512 6293cf98ed25b886e80013b07e98117073f03d6f0a4f2a186e74fd4a1fe152ce490ecad31192903681be1ef04182db3d7171236d69b0758a99ca86194eab5f13
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild b/sys-process/daemontools/daemontools-0.76-r10.ebuild
index 75d4085cc155..5bf42bc7b17d 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r10.ebuild
@@ -1,43 +1,35 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit fixheadtails flag-o-matic qmail
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="http://cr.yp.to/daemontools.html"
-SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
+HOMEPAGE="https://cr.yp.to/daemontools.html"
+SRC_URI="
+	https://cr.yp.to/daemontools/${P}.tar.gz
 	http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
 
-LICENSE="public-domain"
+LICENSE="public-domain GPL-2"	# GPL-2 for init script
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux static"
 
-DEPEND=""
-RDEPEND="selinux? ( sec-policy/selinux-daemontools )
-	!app-doc/daemontools-man"
-
-S="${WORKDIR}/admin/${P}/src"
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-errno.patch
-	"${FILESDIR}"/${PV}-warnings.patch
+	"${FILESDIR}"/${PV}-C99-decls.patch
+	"${FILESDIR}"/${PV}-makefile.patch
 )
 
-src_prepare() {
-	default
-
-	ht_fix_file Makefile print-{cc,ld}.sh
-
+src_configure() {
+	tc-export AR CC
 	use static && append-ldflags -static
-	qmail_set_cc
-}
 
-src_compile() {
 	touch home || die
-	emake
 }
 
 src_install() {
diff --git a/sys-process/daemontools/files/0.76-C99-decls.patch b/sys-process/daemontools/files/0.76-C99-decls.patch
new file mode 100644
index 000000000000..2e1d940a2f85
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-C99-decls.patch
@@ -0,0 +1,503 @@
+--- a/alloc.c
++++ b/alloc.c
+@@ -12,8 +12,7 @@
+ #define space ((char *) realspace)
+ static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE */
+ 
+-/*@null@*//*@out@*/char *alloc(n)
+-unsigned int n;
++/*@null@*//*@out@*/char *alloc(unsigned int n)
+ {
+   char *x;
+   n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
+@@ -23,8 +22,7 @@
+   return x;
+ }
+ 
+-void alloc_free(x)
+-char *x;
++void alloc_free(char *x)
+ {
+   if (x >= space)
+     if (x < space + SPACE)
+--- a/alloc.h
++++ b/alloc.h
+@@ -3,8 +3,8 @@
+ #ifndef ALLOC_H
+ #define ALLOC_H
+ 
+-extern /*@null@*//*@out@*/char *alloc();
+-extern void alloc_free();
+-extern int alloc_re();
++/*@null@*//*@out@*/char *alloc(unsigned int n);
++void alloc_free(char *x);
++int alloc_re(char **x, unsigned int m, unsigned int n);
+ 
+ #endif
+--- a/alloc_re.c
++++ b/alloc_re.c
+@@ -3,10 +3,7 @@
+ #include "alloc.h"
+ #include "byte.h"
+ 
+-int alloc_re(x,m,n)
+-char **x;
+-unsigned int m;
+-unsigned int n;
++int alloc_re(char **x, unsigned int m, unsigned int n)
+ {
+   char *y;
+  
+--- a/buffer.c
++++ b/buffer.c
+@@ -2,7 +2,7 @@
+ 
+ #include "buffer.h"
+ 
+-void buffer_init(buffer *s,int (*op)(),int fd,char *buf,unsigned int len)
++void buffer_init(buffer *s,int (*op)(int, char*, int),int fd,char *buf,unsigned int len)
+ {
+   s->x = buf;
+   s->fd = fd;
+--- a/buffer.h
++++ b/buffer.h
+@@ -8,14 +8,14 @@
+   unsigned int p;
+   unsigned int n;
+   int fd;
+-  int (*op)();
++  int (*op)(int, char*, int);
+ } buffer;
+ 
+ #define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
+ #define BUFFER_INSIZE 8192
+ #define BUFFER_OUTSIZE 8192
+ 
+-extern void buffer_init(buffer *,int (*)(),int,char *,unsigned int);
++extern void buffer_init(buffer *, int (*)(int, char*, int), int, char *, unsigned int);
+ 
+ extern int buffer_flush(buffer *);
+ extern int buffer_put(buffer *,const char *,unsigned int);
+@@ -50,7 +50,7 @@
+ extern int buffer_copy(buffer *,buffer *);
+ 
+ extern int buffer_unixread(int,char *,unsigned int);
+-extern int buffer_unixwrite(int,const char *,unsigned int);
++extern int buffer_unixwrite(int, char *, int);
+ 
+ extern buffer *buffer_0;
+ extern buffer *buffer_0small;
+--- a/buffer_0.c
++++ b/buffer_0.c
+@@ -2,7 +2,7 @@
+ 
+ #include "buffer.h"
+ 
+-int buffer_0_read(fd,buf,len) int fd; char *buf; int len;
++int buffer_0_read(int fd, char *buf, int len)
+ {
+   if (buffer_flush(buffer_1) == -1) return -1;
+   return buffer_unixread(fd,buf,len);
+--- a/buffer_get.c
++++ b/buffer_get.c
+@@ -4,7 +4,7 @@
+ #include "byte.h"
+ #include "error.h"
+ 
+-static int oneread(int (*op)(),int fd,char *buf,unsigned int len)
++static int oneread(int (*op)(int, char*, int),int fd,char *buf,unsigned int len)
+ {
+   int r;
+ 
+--- a/buffer_put.c
++++ b/buffer_put.c
+@@ -5,7 +5,7 @@
+ #include "byte.h"
+ #include "error.h"
+ 
+-static int allwrite(int (*op)(),int fd,const char *buf,unsigned int len)
++static int allwrite(int (*op)(int, char*, int),int fd,const char *buf,unsigned int len)
+ {
+   int w;
+ 
+--- a/buffer_write.c
++++ b/buffer_write.c
+@@ -3,7 +3,7 @@
+ #include <unistd.h>
+ #include "buffer.h"
+ 
+-int buffer_unixwrite(int fd,const char *buf,unsigned int len)
++int buffer_unixwrite(int fd, char *buf, int len)
+ {
+   return write(fd,buf,len);
+ }
+--- a/byte.h
++++ b/byte.h
+@@ -3,12 +3,11 @@
+ #ifndef BYTE_H
+ #define BYTE_H
+ 
+-extern unsigned int byte_chr();
+-extern unsigned int byte_rchr();
+-extern void byte_copy();
+-extern void byte_copyr();
+-extern int byte_diff();
+-extern void byte_zero();
++unsigned int byte_chr(char *s, unsigned int n, int c);
++unsigned int byte_rchr(char *s, unsigned int n, int c);
++void byte_copy(char *to, unsigned int n, char *from);
++void byte_copyr(char *to, unsigned int n, char *from);
++int byte_diff(char *s, unsigned int n, char *t);
+ 
+ #define byte_equal(s,n,t) (!byte_diff((s),(n),(t)))
+ 
+--- a/byte_chr.c
++++ b/byte_chr.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-unsigned int byte_chr(s,n,c)
+-char *s;
+-register unsigned int n;
+-int c;
++unsigned int byte_chr(char *s, unsigned int n, int c)
+ {
+   register char ch;
+   register char *t;
+--- a/byte_copy.c
++++ b/byte_copy.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-void byte_copy(to,n,from)
+-register char *to;
+-register unsigned int n;
+-register char *from;
++void byte_copy(char *to, unsigned int n, char *from)
+ {
+   for (;;) {
+     if (!n) return; *to++ = *from++; --n;
+--- a/byte_cr.c
++++ b/byte_cr.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-void byte_copyr(to,n,from)
+-register char *to;
+-register unsigned int n;
+-register char *from;
++void byte_copyr(char *to, unsigned int n, char *from)
+ {
+   to += n;
+   from += n;
+--- a/byte_diff.c
++++ b/byte_diff.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-int byte_diff(s,n,t)
+-register char *s;
+-register unsigned int n;
+-register char *t;
++int byte_diff(char *s, unsigned int n, char *t)
+ {
+   for (;;) {
+     if (!n) return 0; if (*s != *t) break; ++s; ++t; --n;
+--- a/byte_rchr.c
++++ b/byte_rchr.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-unsigned int byte_rchr(s,n,c)
+-char *s;
+-register unsigned int n;
+-int c;
++unsigned int byte_rchr(char *s, unsigned int n, int c)
+ {
+   register char ch;
+   register char *t;
+--- a/chkshsgr.c
++++ b/chkshsgr.c
+@@ -1,10 +1,13 @@
+ /* Public domain. */
+ 
++#include <sys/types.h>
++#include <stdlib.h>
++#include <grp.h>
+ #include <unistd.h>
+ 
+-int main()
++int main(void)
+ {
+-  short x[4];
++  gid_t x[4];
+ 
+   x[0] = x[1] = 0;
+   if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+--- a/matchtest.c
++++ b/matchtest.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "match.h"
+ #include "buffer.h"
+ #include "str.h"
+--- a/multilog.c
++++ b/multilog.c
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -435,12 +436,12 @@
+ int flagforcerotate = 0;
+ int flagnewline = 1;
+ 
+-void exitasap(void)
++void exitasap(int sig)
+ {
+   flagexitasap = 1;
+ }
+ 
+-void forcerotate(void)
++void forcerotate(int sig)
+ {
+   flagforcerotate = 1;
+ }
+--- a/pathexec_run.c
++++ b/pathexec_run.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+--- a/prot.c
++++ b/prot.c
+@@ -1,5 +1,8 @@
+ /* Public domain. */
+ 
++#include <sys/types.h>
++#include <unistd.h>
++#include <grp.h>
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
+--- a/seek_set.c
++++ b/seek_set.c
+@@ -1,6 +1,7 @@
+ /* Public domain. */
+ 
+ #include <sys/types.h>
++#include <unistd.h>
+ #include "seek.h"
+ 
+ #define SET 0 /* sigh */
+--- a/select.h1
++++ b/select.h1
+@@ -7,6 +7,5 @@
+ 
+ #include <sys/types.h>
+ #include <sys/time.h>
+-extern int select();
+ 
+ #endif
+--- a/select.h2
++++ b/select.h2
+@@ -8,6 +8,5 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/select.h>
+-extern int select();
+ 
+ #endif
+--- a/setlock.c
++++ b/setlock.c
+@@ -7,7 +7,7 @@
+ 
+ #define FATAL "setlock: fatal: "
+ 
+-void usage() {
++void usage(void) {
+   strerr_die1x(100,"setlock: usage: setlock [ -nNxX ] file program [ arg ... ]");
+ }
+ 
+--- a/sig.c
++++ b/sig.c
+@@ -11,5 +11,5 @@
+ int sig_pipe = SIGPIPE;
+ int sig_term = SIGTERM;
+ 
+-void (*sig_defaulthandler)() = SIG_DFL;
+-void (*sig_ignorehandler)() = SIG_IGN;
++void (*sig_defaulthandler)(int) = SIG_DFL;
++void (*sig_ignorehandler)(int) = SIG_IGN;
+--- a/sig.h
++++ b/sig.h
+@@ -11,10 +11,10 @@
+ extern int sig_pipe;
+ extern int sig_term;
+ 
+-extern void (*sig_defaulthandler)();
+-extern void (*sig_ignorehandler)();
++extern void (*sig_defaulthandler)(int);
++extern void (*sig_ignorehandler)(int);
+ 
+-extern void sig_catch(int,void (*)());
++extern void sig_catch(int,void (*)(int));
+ #define sig_ignore(s) (sig_catch((s),sig_ignorehandler))
+ #define sig_uncatch(s) (sig_catch((s),sig_defaulthandler))
+ 
+--- a/sig_block.c
++++ b/sig_block.c
+@@ -6,35 +6,23 @@
+ 
+ void sig_block(int sig)
+ {
+-#ifdef HASSIGPROCMASK
+   sigset_t ss;
+   sigemptyset(&ss);
+   sigaddset(&ss,sig);
+   sigprocmask(SIG_BLOCK,&ss,(sigset_t *) 0);
+-#else
+-  sigblock(1 << (sig - 1));
+-#endif
+ }
+ 
+ void sig_unblock(int sig)
+ {
+-#ifdef HASSIGPROCMASK
+   sigset_t ss;
+   sigemptyset(&ss);
+   sigaddset(&ss,sig);
+   sigprocmask(SIG_UNBLOCK,&ss,(sigset_t *) 0);
+-#else
+-  sigsetmask(sigsetmask(~0) & ~(1 << (sig - 1)));
+-#endif
+ }
+ 
+ void sig_blocknone(void)
+ {
+-#ifdef HASSIGPROCMASK
+   sigset_t ss;
+   sigemptyset(&ss);
+   sigprocmask(SIG_SETMASK,&ss,(sigset_t *) 0);
+-#else
+-  sigsetmask(0);
+-#endif
+ }
+--- a/sig_catch.c
++++ b/sig_catch.c
+@@ -4,15 +4,11 @@
+ #include "sig.h"
+ #include "hassgact.h"
+ 
+-void sig_catch(int sig,void (*f)())
++void sig_catch(int sig, void (*f)(int))
+ {
+-#ifdef HASSIGACTION
+   struct sigaction sa;
+   sa.sa_handler = f;
+   sa.sa_flags = 0;
+   sigemptyset(&sa.sa_mask);
+   sigaction(sig,&sa,(struct sigaction *) 0);
+-#else
+-  signal(sig,f); /* won't work under System V, even nowadays---dorks */
+-#endif
+ }
+--- a/supervise.c
++++ b/supervise.c
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -79,7 +80,7 @@
+     strerr_warn4(WARNING,"unable to rename ",dir,"/supervise/status.new to status: ",&strerr_sys);
+ }
+ 
+-void trigger(void)
++void trigger(int sig)
+ {
+   write(selfpipe[1],"",1);
+ }
+@@ -94,7 +95,7 @@
+     case -1:
+       strerr_warn4(WARNING,"unable to fork for ",dir,", sleeping 60 seconds: ",&strerr_sys);
+       deepsleep(60);
+-      trigger();
++      trigger(0);
+       return;
+     case 0:
+       sig_uncatch(sig_child);
+--- a/tai64n.c
++++ b/tai64n.c
+@@ -27,7 +27,7 @@
+ 
+ char stamp[TIMESTAMP + 1];
+ 
+-int main()
++int main(void)
+ {
+   char ch;
+ 
+--- a/tai64nlocal.c
++++ b/tai64nlocal.c
+@@ -28,7 +28,7 @@
+ unsigned long u;
+ struct tm *t;
+ 
+-int main()
++int main(void)
+ {
+   char ch;
+ 
+--- a/wait.h
++++ b/wait.h
+@@ -3,10 +3,8 @@
+ #ifndef WAIT_H
+ #define WAIT_H
+ 
+-extern int wait_pid();
+-extern int wait_nohang();
+-extern int wait_stop();
+-extern int wait_stopnohang();
++int wait_pid(int *wstat, int pid);
++int wait_nohang(int *wstat);
+ 
+ #define wait_crashed(w) ((w) & 127)
+ #define wait_exitcode(w) ((w) >> 8)
+--- a/wait_nohang.c
++++ b/wait_nohang.c
+@@ -4,11 +4,7 @@
+ #include <sys/wait.h>
+ #include "haswaitp.h"
+ 
+-int wait_nohang(wstat) int *wstat;
++int wait_nohang(int *wstat)
+ {
+-#ifdef HASWAITPID
+   return waitpid(-1,wstat,WNOHANG);
+-#else
+-  return wait3(wstat,WNOHANG,(struct rusage *) 0);
+-#endif
+ }
+--- a/wait_pid.c
++++ b/wait_pid.c
+@@ -5,9 +5,9 @@
+ #include "error.h"
+ #include "haswaitp.h"
+ 
+-#ifdef HASWAITPID
++#if 1
+ 
+-int wait_pid(wstat,pid) int *wstat; int pid;
++int wait_pid(int *wstat, int pid)
+ {
+   int r;
+ 
diff --git a/sys-process/daemontools/files/0.76-makefile.patch b/sys-process/daemontools/files/0.76-makefile.patch
new file mode 100644
index 000000000000..3e47f278b82d
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-makefile.patch
@@ -0,0 +1,137 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@
+ 	stralloc_eady.o stralloc_opyb.o stralloc_opys.o stralloc_pend.o \
+ 	strerr_die.o strerr_sys.o subgetopt.o supervise supervise.o svc svc.o \
+ 	svok svok.o svscan svscan.o svscanboot svstat svstat.o sysdeps \
+-	systype tai64n tai64n.o tai64nlocal tai64nlocal.o tai_now.o \
++	tai64n tai64n.o tai64nlocal tai64nlocal.o tai_now.o \
+ 	tai_pack.o tai_sub.o tai_unpack.o taia_add.o taia_approx.o \
+ 	taia_frac.o taia_less.o taia_now.o taia_pack.o taia_sub.o taia_uint.o \
+ 	time.a timestamp.o uint64.h unix.a wait_nohang.o wait_pid.o
+@@ -85,16 +85,16 @@
+ choose: choose.sh home warn-auto.sh
+ 	rm -f choose
+ 	cat warn-auto.sh choose.sh \
+-	| sed s}HOME}"`head -1 home`"}g \
++	| sed s}HOME}"`head -n 1 home`"}g \
+ 	> choose
+ 	chmod 555 choose
+ 
+ coe.o: coe.c coe.h compile
+ 	./compile coe.c
+ 
+-compile: conf-cc print-cc.sh systype warn-auto.sh
++compile: conf-cc print-cc.sh warn-auto.sh
+ 	rm -f compile
+-	sh print-cc.sh > compile
++	cat print-cc.sh > compile
+ 	chmod 555 compile
+ 
+ deepsleep.o: compile deepsleep.c deepsleep.h iopause.h tai.h taia.h \
+@@ -179,9 +179,9 @@
+ 
+ it: rts sysdeps
+ 
+-load: conf-ld print-ld.sh systype warn-auto.sh
++load: conf-ld print-ld.sh warn-auto.sh
+ 	rm -f load
+-	sh print-ld.sh > load
++	cat print-ld.sh > load
+ 	chmod 555 load
+ 
+ lock_ex.o: compile hasflock.h lock.h lock_ex.c
+@@ -190,9 +190,9 @@
+ lock_exnb.o: compile hasflock.h lock.h lock_exnb.c
+ 	./compile lock_exnb.c
+ 
+-makelib: print-ar.sh systype warn-auto.sh
++makelib: print-ar.sh warn-auto.sh
+ 	rm -f makelib
+-	sh print-ar.sh > makelib
++	cat print-ar.sh > makelib
+ 	chmod 555 makelib
+ 
+ match.o: compile match.c match.h
+@@ -390,7 +390,7 @@
+ svscanboot: home svscanboot.sh warn-auto.sh
+ 	rm -f svscanboot
+ 	cat warn-auto.sh svscanboot.sh \
+-	| sed s}HOME}"`head -1 home`"}g \
++	| sed s}HOME}"`head -n 1 home`"}g \
+ 	> svscanboot
+ 	chmod 555 svscanboot
+ 
+@@ -402,10 +402,10 @@
+ 	./compile svstat.c
+ 
+ sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
+-hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h systype \
++hassgprm.h hasshsgr.h haswaitp.h iopause.h load select.h \
+ uint64.h
+ 	rm -f sysdeps
+-	cat systype compile load >> sysdeps
++	cat compile load >> sysdeps
+ 	grep sysdep direntry.h >> sysdeps
+ 	grep sysdep haswaitp.h >> sysdeps
+ 	grep sysdep hassgact.h >> sysdeps
+@@ -417,9 +417,6 @@
+ 	grep sysdep hasflock.h >> sysdeps
+ 	grep sysdep hasshsgr.h >> sysdeps
+ 
+-systype: find-systype.sh trycpp.c x86cpuid.c
+-	sh find-systype.sh > systype
+-
+ tai64n: byte.a load tai64n.o time.a timestamp.o unix.a
+ 	./load tai64n timestamp.o time.a unix.a byte.a 
+ 
+--- a/print-ar.sh
++++ b/print-ar.sh
+@@ -1,14 +1,7 @@
+-cat warn-auto.sh
+-echo 'main="$1"; shift'
+-echo 'rm -f "$main"'
+-echo 'ar cr "$main" ${1+"$@"}'
+-case "`cat systype`" in
+-  sunos-5.*) ;;
+-  unix_sv*) ;;
+-  irix64-*) ;;
+-  irix-*) ;;
+-  dgux-*) ;;
+-  hp-ux-*) ;;
+-  sco*) ;;
+-  *) echo 'ranlib "$main"' ;;
+-esac
++#!/usr/bin/env sh
++
++lib=$1
++shift
++
++echo ${AR} rcs "${lib}" "$@"
++${AR} rcs "${lib}" "$@"
+--- a/print-cc.sh
++++ b/print-cc.sh
+@@ -1,5 +1,4 @@
+-cc="`head -1 conf-cc`"
+-systype="`cat systype`"
++#!/usr/bin/env sh
+ 
+-cat warn-auto.sh
+-echo exec "$cc" '-c ${1+"$@"}'
++echo ${CC} ${CPPFLAGS} ${CFLAGS} -c "$@"
++${CC} ${CPPFLAGS} ${CFLAGS} -c "$@"
+--- a/print-ld.sh
++++ b/print-ld.sh
+@@ -1,6 +1,7 @@
+-ld="`head -1 conf-ld`"
+-systype="`cat systype`"
++#!/usr/bin/env sh
+ 
+-cat warn-auto.sh
+-echo 'main="$1"; shift'
+-echo exec "$ld" '-o "$main" "$main".o ${1+"$@"}'
++exe=$1
++shift
++
++echo ${CC} ${CFLAGS} ${LDFLAGS} -o "${exe}" "${exe}.o" "$@" ${LIBS}
++${CC} ${CFLAGS} ${LDFLAGS} -o "${exe}" "${exe}.o" "$@" ${LIBS}
diff --git a/sys-process/daemontools/files/0.76-warnings.patch b/sys-process/daemontools/files/0.76-warnings.patch
deleted file mode 100644
index f558bb18b1bf..000000000000
--- a/sys-process/daemontools/files/0.76-warnings.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Fixup misc warnings
-
-Patch by RiverRat
-
-http://bugs.gentoo.org/124487
-
---- src/chkshsgr.c
-+++ src/chkshsgr.c
-@@ -1,10 +1,13 @@
- /* Public domain. */
- 
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <grp.h>
- #include <unistd.h>
- 
- int main()
- {
--  short x[4];
-+  gid_t x[4];
- 
-   x[0] = x[1] = 0;
-   if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
---- src/matchtest.c
-+++ src/matchtest.c
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include "match.h"
- #include "buffer.h"
- #include "str.h"
---- src/multilog.c
-+++ src/multilog.c
-@@ -1,3 +1,4 @@
-+#include <stdio.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- src/prot.c
-+++ src/prot.c
-@@ -1,5 +1,8 @@
- /* Public domain. */
- 
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <grp.h>
- #include "hasshsgr.h"
- #include "prot.h"
- 
---- src/seek_set.c
-+++ src/seek_set.c
-@@ -1,6 +1,7 @@
- /* Public domain. */
- 
- #include <sys/types.h>
-+#include <unistd.h>
- #include "seek.h"
- 
- #define SET 0 /* sigh */
---- src/supervise.c
-+++ src/supervise.c
-@@ -1,3 +1,4 @@
-+#include <stdio.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- src/pathexec_run.c
-+++ src/pathexec_run.c
-@@ -1,5 +1,6 @@
- /* Public domain. */
- 
-+#include <unistd.h>
- #include "error.h"
- #include "stralloc.h"
- #include "str.h"
diff --git a/sys-process/daemontools/files/svscan.init b/sys-process/daemontools/files/svscan.init
deleted file mode 100644
index b8217db42d48..000000000000
--- a/sys-process/daemontools/files/svscan.init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	before ntpd ntp-client spamd apache apache2
-}
-
-start() {
-	ebegin "Starting service scan"
-	start-stop-daemon --start --exec /usr/bin/svscan \
-		--background --make-pidfile \
-		--pidfile /var/run/svscan.pid -- /service
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping service scan"
-	start-stop-daemon --stop --exec /usr/bin/svscan \
-		--pidfile /var/run/svscan.pid
-	eend $?
-
-	ebegin "Stopping service scan services"
-	svc -dx /service/* 2>/dev/null
-	eend $?
-
-	ebegin "Stopping service scan logging"
-	svc -dx /service/*/log 2>/dev/null
-	eend $?
-}
diff --git a/sys-process/daemontools/files/svscan.init-0.76-r7 b/sys-process/daemontools/files/svscan.init-0.76-r7
index f05f5d4edfb7..4514f6cd379e 100644
--- a/sys-process/daemontools/files/svscan.init-0.76-r7
+++ b/sys-process/daemontools/files/svscan.init-0.76-r7
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {