1 |
commit: 0f6504be54b3199f7ed43664f9189be3f9e5d365 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 20:03:27 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 20:03:27 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f6504be |
7 |
|
8 |
app-misc/leave: update EAPI 6 -> 8 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/714020 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
app-misc/leave/files/leave-20100918-makefile.patch | 8 ++++ |
14 |
app-misc/leave/files/leave-20100918-posix.patch | 55 ++++++++++++++++++++++ |
15 |
app-misc/leave/files/leave-fix-makefile.diff | 20 -------- |
16 |
...20100918-r1.ebuild => leave-20100918-r2.ebuild} | 21 ++++----- |
17 |
4 files changed, 72 insertions(+), 32 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/leave/files/leave-20100918-makefile.patch b/app-misc/leave/files/leave-20100918-makefile.patch |
20 |
new file mode 100644 |
21 |
index 000000000000..464795a2732b |
22 |
--- /dev/null |
23 |
+++ b/app-misc/leave/files/leave-20100918-makefile.patch |
24 |
@@ -0,0 +1,8 @@ |
25 |
+--- a/Makefile |
26 |
++++ b/Makefile |
27 |
+@@ -3,4 +3,4 @@ |
28 |
+ |
29 |
+ PROG= leave |
30 |
+ |
31 |
+-.include <bsd.prog.mk> |
32 |
++all: $(PROG) |
33 |
|
34 |
diff --git a/app-misc/leave/files/leave-20100918-posix.patch b/app-misc/leave/files/leave-20100918-posix.patch |
35 |
new file mode 100644 |
36 |
index 000000000000..3ce788d86343 |
37 |
--- /dev/null |
38 |
+++ b/app-misc/leave/files/leave-20100918-posix.patch |
39 |
@@ -0,0 +1,55 @@ |
40 |
+--- a/leave.c |
41 |
++++ b/leave.c |
42 |
+@@ -42,7 +42,6 @@ |
43 |
+ static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93"; |
44 |
+ #endif |
45 |
+ #endif /* not lint */ |
46 |
+-#include <sys/cdefs.h> |
47 |
+ |
48 |
+ #include <err.h> |
49 |
+ #include <ctype.h> |
50 |
+@@ -52,7 +51,7 @@ |
51 |
+ #include <time.h> |
52 |
+ #include <unistd.h> |
53 |
+ |
54 |
+-void doalarm(u_int); |
55 |
++void doalarm(unsigned); |
56 |
+ static void usage(void); |
57 |
+ |
58 |
+ /* |
59 |
+@@ -65,7 +64,7 @@ |
60 |
+ int |
61 |
+ main(int argc, char **argv) |
62 |
+ { |
63 |
+- u_int secs; |
64 |
++ unsigned secs; |
65 |
+ int hours, minutes; |
66 |
+ char c, *cp = NULL; |
67 |
+ struct tm *t; |
68 |
+@@ -136,7 +135,7 @@ |
69 |
+ } |
70 |
+ |
71 |
+ void |
72 |
+-doalarm(u_int secs) |
73 |
++doalarm(unsigned secs) |
74 |
+ { |
75 |
+ int bother; |
76 |
+ time_t daytime; |
77 |
+@@ -150,7 +149,7 @@ |
78 |
+ printf("Alarm set for %s. (pid %d)\n", tb, pid); |
79 |
+ exit(0); |
80 |
+ } |
81 |
+- sleep((u_int)2); /* let parent print set message */ |
82 |
++ sleep((unsigned)2); /* let parent print set message */ |
83 |
+ if (secs >= 2) |
84 |
+ secs -= 2; |
85 |
+ |
86 |
+@@ -177,7 +176,7 @@ |
87 |
+ |
88 |
+ #define MSG4 "\07\07Time to leave!\n" |
89 |
+ for (bother = 10; bother--;) { |
90 |
+- sleep((u_int)ONEMIN); |
91 |
++ sleep((unsigned)ONEMIN); |
92 |
+ if (write(STDOUT_FILENO, MSG4, sizeof(MSG4) - 1) != sizeof(MSG4) - 1) |
93 |
+ exit(0); |
94 |
+ } |
95 |
|
96 |
diff --git a/app-misc/leave/files/leave-fix-makefile.diff b/app-misc/leave/files/leave-fix-makefile.diff |
97 |
deleted file mode 100644 |
98 |
index 772add57d6fb..000000000000 |
99 |
--- a/app-misc/leave/files/leave-fix-makefile.diff |
100 |
+++ /dev/null |
101 |
@@ -1,20 +0,0 @@ |
102 |
---- a/Makefile.orig 2004-10-16 23:04:50.144563171 -0400 |
103 |
-+++ b/Makefile 2004-10-16 23:57:27.639495962 -0400 |
104 |
-@@ -2,5 +2,16 @@ |
105 |
- # $FreeBSD: /repoman/r/ncvs/src/usr.bin/leave/Makefile,v 1.5 2002/02/08 22:31:41 markm Exp $ |
106 |
- |
107 |
- PROG= leave |
108 |
-+CC ?= gcc |
109 |
-+CFLAGS= |
110 |
-+LDFLAGS= |
111 |
- |
112 |
--.include <bsd.prog.mk> |
113 |
-+#.include <bsd.prog.mk> |
114 |
-+ |
115 |
-+all: $(PROG) |
116 |
-+$(PROG): leave.o |
117 |
-+ $(CC) $(LDFLAGS) leave.o -o $(PROG) |
118 |
-+leave.o: |
119 |
-+ $(CC) $(CFLAGS) -c leave.c |
120 |
-+clean: |
121 |
-+ rm -f $(PROG) *.o |
122 |
|
123 |
diff --git a/app-misc/leave/leave-20100918-r1.ebuild b/app-misc/leave/leave-20100918-r2.ebuild |
124 |
similarity index 58% |
125 |
rename from app-misc/leave/leave-20100918-r1.ebuild |
126 |
rename to app-misc/leave/leave-20100918-r2.ebuild |
127 |
index b5046a2f965a..d8ba499f34ee 100644 |
128 |
--- a/app-misc/leave/leave-20100918-r1.ebuild |
129 |
+++ b/app-misc/leave/leave-20100918-r2.ebuild |
130 |
@@ -1,7 +1,7 @@ |
131 |
-# Copyright 1999-2021 Gentoo Authors |
132 |
+# Copyright 1999-2022 Gentoo Authors |
133 |
# Distributed under the terms of the GNU General Public License v2 |
134 |
|
135 |
-EAPI=6 |
136 |
+EAPI=8 |
137 |
|
138 |
inherit toolchain-funcs |
139 |
|
140 |
@@ -14,19 +14,16 @@ SLOT="0" |
141 |
KEYWORDS="amd64 ppc x86" |
142 |
|
143 |
PATCHES=( |
144 |
- "${FILESDIR}/${PN}-fix-makefile.diff" |
145 |
+ "${FILESDIR}"/${P}-makefile.patch |
146 |
+ "${FILESDIR}"/${P}-posix.patch |
147 |
) |
148 |
|
149 |
-src_compile() { |
150 |
- cp -v "${FILESDIR}/README" . || die |
151 |
- emake \ |
152 |
- CC="$(tc-getCC)" \ |
153 |
- CFLAGS="${CFLAGS}" \ |
154 |
- LDFLAGS="${LDFLAGS}" |
155 |
+src_configure() { |
156 |
+ tc-export CC |
157 |
} |
158 |
|
159 |
src_install() { |
160 |
- dobin "${PN}" |
161 |
- doman "${PN}.1" |
162 |
- einstalldocs |
163 |
+ dobin leave |
164 |
+ doman leave.1 |
165 |
+ dodoc "${FILESDIR}"/README |
166 |
} |