5 files changed, 75 insertions, 34 deletions
diff --git a/app-misc/leave/Manifest b/app-misc/leave/Manifest
index 0630e82769fb..1728cea27f92 100644
--- a/app-misc/leave/Manifest
+++ b/app-misc/leave/Manifest
@@ -1,5 +1,6 @@
 AUX README 455 BLAKE2B 5fbc04499c0fd5b636edf37f54e64025c5ad0bbd13d4639559020f11887c45598343e383206e916eb73f59b581f5c78cdc05fa350be59cbc388002b1c639079b SHA512 86135607b70026c849d0851fe4c9aeadc2385eebe2be93949d519f566810916d26388a191c16a88d451d653cb2f6f6ce896948e9f07b9f994c02403898f28242
-AUX leave-fix-makefile.diff 453 BLAKE2B b3252ac7d1bcd41268dc525469b9a35624a0ad34dc4645ce122e59ef08275dba297960f3497a19570b35af7ccefc65454f697be748964da4b44043aad7fb4241 SHA512 a13da158f33c672c28e9e1b5fd169db9c7fcec55f533874ee237c529a4da21b9c68e400ff0f9a3e604c8b487d0548ed6a8693ebaa50b12b660a989f50b60d83a
+AUX leave-20100918-makefile.patch 101 BLAKE2B 68716b07dbd17003a230290000dd9beac7a953c7aa2b73a8db257ef096ba24108ee9eacc422b99416841da0826d9faf8b77e97b1fa1786201848c55c5c7f34c5 SHA512 05d17b59318b065abf267c7ad22603fc3d29ed88f3310f1159b83f71198a1f980b8389e1fd744eb0f5095300be44f30d068f9c82616f4c8d98656cfa1563ce8f
+AUX leave-20100918-posix.patch 1069 BLAKE2B eaf8d81b3f29143cb8a0c17a090f7b1ffca4c73140674eb905addddbb3ecc28c1b7cc66ab07582d50d2c5d343922ed4500666cb82517d8490485ea835c7e1096 SHA512 d9e0f74bfa6bb15c2f1fe411829cfafd4062821e42570b6a8093ba5d04e4bdbaab872cd14a45cf3d2c8ffab295788c2526f61552eab127d221ba4e8ec3a37f0d
 DIST leave-20100918.tar.gz 3477 BLAKE2B 2a709c653f2f853d50822fe83bb4f7894aea57ad3d0c15fb4ca4b5c3abccf63f0cd3344f379691e7721915e2bb5f6f1c61506f265e9cd6d74175ae4657e72376 SHA512 69df594800159bc80baeb3945aad144ceabe21bdac22ed2cd706b0ec610895dc82e58bae59ed0230eb97e909812bc90237b7c70e965125e7fa6767972a6259d1
-EBUILD leave-20100918-r1.ebuild 622 BLAKE2B 59509c209b25c9417556ae3a5d15e05dc1ee928b4593c179728107a91ee48cdf4ce081fb2988a613dd7a6e05958eaa2c0be102ee4b1bcdb0f270840dac1d4aea SHA512 84ad71cc3eee6df07ef37a19786a6833c02f137e5013ce552638ba50ce32e748ea1a98d7fab73fbee9c0d71149ce39d43038d54e0c71e0c52a29978534306f86
+EBUILD leave-20100918-r2.ebuild 563 BLAKE2B 633e76071c80ce2a8363346bf0925ceb1fa07ec82592d81f79f92c7f54c08f95e7e0e91dafa04e9346cdf59b59b18784528f61e85f54b169a264d66d585e788e SHA512 447c602b25fae36290e92c3e7a85345389bd42dfefcb9edec343247605c43c8022c67c573e621c6e4ea24676a8fe1706f7972d87f2ee5f20b90574dbad99a2f1
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/leave/files/leave-20100918-makefile.patch b/app-misc/leave/files/leave-20100918-makefile.patch
new file mode 100644
index 000000000000..464795a2732b
--- /dev/null
+++ b/app-misc/leave/files/leave-20100918-makefile.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,4 +3,4 @@
+ 
+ PROG=	leave
+ 
+-.include <bsd.prog.mk>
++all: $(PROG)
diff --git a/app-misc/leave/files/leave-20100918-posix.patch b/app-misc/leave/files/leave-20100918-posix.patch
new file mode 100644
index 000000000000..3ce788d86343
--- /dev/null
+++ b/app-misc/leave/files/leave-20100918-posix.patch
@@ -0,0 +1,55 @@
+--- a/leave.c
++++ b/leave.c
+@@ -42,7 +42,6 @@
+ static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
+ #endif
+ #endif /* not lint */
+-#include <sys/cdefs.h>
+ 
+ #include <err.h>
+ #include <ctype.h>
+@@ -52,7 +51,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-void doalarm(u_int);
++void doalarm(unsigned);
+ static void usage(void);
+ 
+ /*
+@@ -65,7 +64,7 @@
+ int
+ main(int argc, char **argv)
+ {
+-	u_int secs;
++	unsigned secs;
+ 	int hours, minutes;
+ 	char c, *cp = NULL;
+ 	struct tm *t;
+@@ -136,7 +135,7 @@
+ }
+ 
+ void
+-doalarm(u_int secs)
++doalarm(unsigned secs)
+ {
+ 	int bother;
+ 	time_t daytime;
+@@ -150,7 +149,7 @@
+ 		printf("Alarm set for %s. (pid %d)\n", tb, pid);
+ 		exit(0);
+ 	}
+-	sleep((u_int)2);		/* let parent print set message */
++	sleep((unsigned)2);		/* let parent print set message */
+ 	if (secs >= 2)
+ 		secs -= 2;
+ 
+@@ -177,7 +176,7 @@
+ 
+ #define	MSG4	"\07\07Time to leave!\n"
+ 	for (bother = 10; bother--;) {
+-		sleep((u_int)ONEMIN);
++		sleep((unsigned)ONEMIN);
+ 		if (write(STDOUT_FILENO, MSG4, sizeof(MSG4) - 1) != sizeof(MSG4) - 1)
+ 			exit(0);
+ 	}
diff --git a/app-misc/leave/files/leave-fix-makefile.diff b/app-misc/leave/files/leave-fix-makefile.diff
deleted file mode 100644
index 772add57d6fb..000000000000
--- a/app-misc/leave/files/leave-fix-makefile.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.orig	2004-10-16 23:04:50.144563171 -0400
-+++ b/Makefile	2004-10-16 23:57:27.639495962 -0400
-@@ -2,5 +2,16 @@
- # $FreeBSD: /repoman/r/ncvs/src/usr.bin/leave/Makefile,v 1.5 2002/02/08 22:31:41 markm Exp $
- 
- PROG=	leave
-+CC ?= gcc
-+CFLAGS=
-+LDFLAGS=
- 
--.include <bsd.prog.mk>
-+#.include <bsd.prog.mk>
-+
-+all: $(PROG)
-+$(PROG): leave.o
-+	$(CC) $(LDFLAGS) leave.o -o $(PROG)
-+leave.o:
-+	$(CC) $(CFLAGS) -c leave.c
-+clean:
-+	rm -f $(PROG) *.o
diff --git a/app-misc/leave/leave-20100918-r1.ebuild b/app-misc/leave/leave-20100918-r2.ebuild
index b5046a2f965a..d8ba499f34ee 100644
--- a/app-misc/leave/leave-20100918-r1.ebuild
+++ b/app-misc/leave/leave-20100918-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -14,19 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-makefile.diff"
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-posix.patch
 )
 
-src_compile() {
-	cp -v "${FILESDIR}/README" . || die
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
+	dobin leave
+	doman leave.1
+	dodoc "${FILESDIR}"/README
 }