gentoo resync : 20.03.2022

5 files changed, 69 insertions, 36 deletions

diff --git a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
deleted file mode 100644
index 49753478e5e6..000000000000
--- a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix of snprintf bug in upstream's 20081027 diff.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*.orig' --exclude '*~' fdutils-5.5-20060227.orig/src/superformat.c fdutils-5.5-20060227/src/superformat.c
---- fdutils-5.5-20060227.orig/src/superformat.c	2019-03-17 14:46:44.051851597 -0700
-+++ fdutils-5.5-20060227/src/superformat.c	2019-03-17 14:48:34.550873108 -0700
-@@ -1140,7 +1140,7 @@
- 		if (verbosity >= 5)
- 			printf("calling mformat\n");
- 		if (use_2m)
--			snprintf(twom_buffer, 5, "-2 %2d", fd0.dsect);
-+			snprintf(twom_buffer, 6, "-2 %2d", fd0.dsect);
- 		else
- 			twom_buffer[0]='\0';
- 		snprintf(command_buffer, 79,
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
deleted file mode 100644
index 2bda41e11255..000000000000
--- a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix ftbfs with GCC-10
-
-Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-Bug-Debian: https://bugs.debian.org/957200
-Forwarded: no
-
----
-
---- fdutils-5.5-20060227.orig/src/superformat.h
-+++ fdutils-5.5-20060227/src/superformat.h
-@@ -97,7 +97,7 @@ int compute_all_sequences(struct params
- void compute_track0_sequence(struct params *fd);
- int calc_skews(struct params *fd0, struct params *fd, int n);
- extern int verbosity;
--int header_size;
--int index_size;
-+extern int header_size;
-+extern int index_size;
- 
- #endif
diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch
new file mode 100644
index 000000000000..5f0bfccd499c
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.6_p2-docs-build.patch
@@ -0,0 +1,13 @@
+Use modern autoconf-archive macro to ensure @CC_FOR_BUILD@ and such gets
+replaced in Makefiles.
+--- a/configure.in
++++ b/configure.in
+@@ -9,7 +9,7 @@ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AX_CC_FOR_BUILD
++AX_PROG_CC_FOR_BUILD
+ 
+ AC_PATH_PROG(INSTALL_INFO, install-info, "")
+ 
diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-parallel.patch b/app-misc/fdutils/files/fdutils-5.6_p2-parallel.patch
new file mode 100644
index 000000000000..af32199c4abb
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.6_p2-parallel.patch
@@ -0,0 +1,26 @@
+From 506a2cb13ce90439331b8e4e710524a040c7d0c6 Mon Sep 17 00:00:00 2001
+From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
+Date: Wed, 2 Mar 2022 12:19:35 +0100
+Subject: [PATCH] Make fdrawcmd depend on libfdutils.a
+
+This allows parallel compilation to complete successfully.
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b094501..5959ddf 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -96,7 +96,7 @@ superformat: superformat.o libfdutils.a
+ floppymeter: floppymeter.o libfdutils.a
+ 	${CC} ${LDFLAGS} -o $@ $< $(LIBS)
+ 
+-fdrawcmd: fdrawcmd.o
++fdrawcmd: fdrawcmd.o libfdutils.a
+ 	${CC} $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ getfdprm: getfdprm.o libfdutils.a
+-- 
+2.34.1
+
diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch b/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch
new file mode 100644
index 000000000000..14a01ba20677
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch
@@ -0,0 +1,30 @@
+Add variable for ${AR}
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,7 @@ AC_PROG_MAKE_SET
+ 
+ dnl Checks for compiler
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -21,6 +21,7 @@ sysconfdir  = $(DESTDIR)@sysconfdir@
+ datarootdir = $(DESTDIR)@datarootdir@
+ 
+ CC       = @CC@
++AR       = @AR@
+ PID      = -DPIDFILE=\"@localstatedir@/run/diskseekd.pid\"
+ DEFINES  = $(DEFINES) $(PID) -DSYSCONFDIR=\"@sysconfdir@\"
+ DEFS     = @DEFS@ -DSYSCONFDIR=\"@sysconfdir@\"
+@@ -69,7 +70,7 @@ lex.%.c: %.lex
+ 	lex -P$* $<
+ 
+ libfdutils.a: $(LIBFILES)
+-	ar rcs $@ $^
++	$(AR) rcs $@ $^
+ 
+ floppycontrol.o getfdprm setfdprm: /usr/include/linux/fd.h
+ diskseekd.o superformat.o fdrawcmd.o: /usr/include/linux/fd.h \