app-misc/ttyrec: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/713408
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2022-07-31 22:03:38 +02:00
parent a2cf9a7cef
commit 47a9ea7acd
3 changed files with 65 additions and 20 deletions

View File

@@ -1,19 +1,26 @@
--- a/Makefile 2017-08-26 11:47:02.981266309 +0200
+++ b/Makefile 2017-08-26 14:33:47.161600445 +0200
@@ -10,13 +10,13 @@
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-CC = gcc
-CFLAGS = -O2
VERSION = 1.0.8
TARGET = ttyrec ttyplay ttytime
@@ -9,14 +7,11 @@
all: $(TARGET)
ttyrec: ttyrec.o io.o
-ttyrec: ttyrec.o io.o
- $(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
+ttyrec: io.o
ttyplay: ttyplay.o io.o
-ttyplay: ttyplay.o io.o
- $(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
+ttyplay: io.o
ttytime: ttytime.o io.o
-ttytime: ttytime.o io.o
- $(CC) $(CFLAGS) -o ttytime ttytime.o io.o
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
+ttytime: io.o
clean:
rm -f *.o $(TARGET) ttyrecord *~

View File

@@ -1,8 +1,36 @@
diff --git a/ttyrec.c b/ttyrec.c
index 3392f70..86a59ee 100644
--- a/io.h
+++ b/io.h
@@ -9,5 +9,6 @@
int edup (int oldfd);
int edup2 (int oldfd, int newfd);
FILE* efdopen (int fd, const char *mode);
+void set_progname (const char *name);
#endif
--- a/ttyrec.c
+++ b/ttyrec.c
@@ -57,7 +57,9 @@
@@ -42,13 +42,19 @@
/*
* script
*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/file.h>
-#include <sys/signal.h>
+#include <sys/wait.h>
+#include <signal.h>
#include <stdio.h>
#include <time.h>
#include <unistd.h>
@@ -57,7 +63,9 @@
#if defined(SVR4)
#include <fcntl.h>
@@ -12,7 +40,16 @@ index 3392f70..86a59ee 100644
#endif /* SVR4 */
#include <sys/time.h>
@@ -449,6 +451,7 @@ getslave()
@@ -341,7 +349,7 @@
rtt = tt;
#if defined(SVR4)
rtt.c_iflag = 0;
- rtt.c_lflag &= ~(ISIG|ICANON|XCASE|ECHO|ECHOE|ECHOK|ECHONL);
+ rtt.c_lflag &= ~(ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHONL);
rtt.c_oflag = OPOST;
rtt.c_cc[VINTR] = CDEL;
rtt.c_cc[VQUIT] = CDEL;
@@ -449,6 +457,7 @@
perror("open(fd, O_RDWR)");
fail();
}
@@ -20,7 +57,7 @@ index 3392f70..86a59ee 100644
if (isastream(slave)) {
if (ioctl(slave, I_PUSH, "ptem") < 0) {
perror("ioctl(fd, I_PUSH, ptem)");
@@ -466,6 +469,7 @@ getslave()
@@ -466,6 +475,7 @@
#endif
(void) ioctl(0, TIOCGWINSZ, (char *)&win);
}

View File

@@ -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 flag-o-matic toolchain-funcs
@@ -12,15 +12,16 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
PATCHES=(
"${FILESDIR}/${P}-flags.patch"
"${FILESDIR}/${P}-glibc-2.30.patch"
"${FILESDIR}"/${P}-flags.patch
"${FILESDIR}"/${P}-glibc-2.30.patch
)
src_compile() {
src_configure() {
# Bug 106530
[[ ${CHOST} != *-darwin* ]] && append-cppflags -DSVR4 -D_XOPEN_SOURCE=500
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
tc-export CC
}
src_install() {