gentoo auto-resync : 01:08:2022 - 03:14:32

4 files changed, 68 insertions, 23 deletions

diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index ec3535bd0b10..08ba40d91463 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,5 +1,5 @@
-AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
-AUX ttyrec-1.0.8-glibc-2.30.patch 695 BLAKE2B 4ecc457b74f9fd5ec1df2db0d99dacc09a9ab5b5a6d3ac6b2ee4a1acea98102662b473a95e316d49d245508cecb238b1603e35784435079e34551a0c32b3d75f SHA512 ba57f0b388c5fb686f54669e7e1dcebb83b4cd40e7f70003c6798fd2e62cc4c0089f0674a6b6a21e916a57c573e2c558be4fb26aba9f8314079fc9733bfe72c0
+AUX ttyrec-1.0.8-flags.patch 456 BLAKE2B 5664a6153997974d429bd4dabfda9152ff20f9ff78f9633b15e62de5b3429b0a92dfb9b5ea51860c241b0cfc377f2a726ef061abcebc58f745cc95e7ffb21424 SHA512 1586238ad0bab568b26a5a9a664b144f6ba4d4f08c71c1442fcd7798dbd19e0764fbfc7a11a027df150d9cff99c03225da2b52d2d47c55f7957aa6e41e351b05
+AUX ttyrec-1.0.8-glibc-2.30.patch 1470 BLAKE2B 623f5cf46c04fa7867685441526945a0b1bb38f64a3c4ca0290b0de8a1bbcda02c3ac0ee2edf83d94fd886682aa125f301c50703f7e1634912071cd45396f020 SHA512 80f191c3b5e9b4d7a04977359f2e6679e638e02f968d1d42d0ea05f23a83525a64c63d6d4680487c3561f78e41baed9fbfa3ab4cacf4c4006a70d26d0977b2dd
 DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
-EBUILD ttyrec-1.0.8-r2.ebuild 712 BLAKE2B 3f88b009d82b8996a6f7c1777c4537922f00a273b2fafd217348760810fc8f2b11c34d23bc3311b621b51c9095a97658c61d751453512d81567fb433916702f9 SHA512 16a4340fa7a1dfb4b062bf9e7cae2c8ffd22d9cbe1361b433c1a3fa6bcac5311a053a24163b6e74bebe96c67a0558ea075cbee1553f8ee869eadc74dc79d57d3
+EBUILD ttyrec-1.0.8-r3.ebuild 686 BLAKE2B 44fbb10e71371915ae7fc79845893437acb95953ee96c8d13bf49218219c6268e8d766df163fa177b10b332a305d12637fe8da2a4a356894600039c33c4d0242 SHA512 d52112d87d299b722578f2a659a5e89bdf3820a9165e3264ec9606330b1000e919619a5a6e6e4315158d5370c60043bb5db10681dca355c5861e40bf2f82e0c8
 MISC metadata.xml 576 BLAKE2B 0147e62945df0ef5560e32800cb9f94296090f6244634a3a83c9e4606f5a3af3fcc27629b651f24c5acb7c9c7e6a46775af191e51ebaa6e0634479441b52f2f7 SHA512 0eb739882db1c86ff34feafbed79c610f82d9e7df5a6b7dc6359ee7cc852ca789d10762c1eae12d496bad2d0d30030eb6d29daf0442f9757b788de418587e02d
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
index 34687d9b8b7a..28d7841fbd6f 100644
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
@@ -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 *~
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
index 174fc7786e19..79a024ac734b 100644
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
@@ -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);
  	}
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
index 87546d44a9f8..2973ae3eff7e 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r3.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 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() {