gentoo resync : 20.03.2022

9 files changed, 149 insertions, 162 deletions

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 1483e607c9a9..eb8cd74b5ec5 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,10 +1,8 @@
-AUX fdutils-5.5-superformat-snprintf.patch 655 BLAKE2B 635b89f3a3f20a6e255e56ed7e2cd306365a7b7bfa5047cb20d551919daffe4b956d53bc3896814d9aae84ab9586a98017c9e70df3101b5efd1f02d88173e1b7 SHA512 42d6fb5beed1548815c67921d74dcdef05e76c45cbfde08ba4265de29a58f26af22b1ea7bdd5b1b71a34f0268c7cdb9063652565c7856cd6503dd0425d56171a
-AUX fdutils-5.5.20060227-gcc10.patch 531 BLAKE2B ea8519a72d6bb103d267cd5d4e9d306d7962dda43e3916808b7cf050c269962963a1e3d249aaa7534ecf6d2ecb85d66ebe4783262b6db2d193bf4a87230a209b SHA512 8c9b14ad6f90eaf0507ad52cc5899664a6c0883900d76d03ce7641118650fcec8e8c46d6e0424a8257d1db16b7463c399774665d468732766307edf400826a2e
 AUX fdutils-5.5.20060227-r1-parallel.patch 607 BLAKE2B 2fc63e7a08071afbe90c891785fb3bedcc93bb7b47077eee1af6ca19a449df3ea4c9b48885f0a6d58d6a47d0397b35c21ca7ba1aa93f5fe42e9b0b9d81b220f5 SHA512 c3ef752ae6580816e3a451cbd1d56f169d71608c723d5a7ce77cd80db5021b7ea2c85c78dddc4219f9cf59b5995248c222bb39f746b72f7244ab0c998f3cf732
-DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3 SHA512 979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
-DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
-DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252 SHA512 a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
-DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
-EBUILD fdutils-5.5.20060227-r1.ebuild 1767 BLAKE2B 3aba85bf2e67662c3ef8802d5cae14c972dfd628e0e78237d44adc6da78272449326e62d226dcafe2cb31efebda59bb57da90574437706ca7cef9b0d1ca5a648 SHA512 f00eb894aec13e064069238a93905c7e07cef26c59c17f128f914d0b97ff23b16d7b7de33fb7bea75770e4e0d97767d33d0de92a038e7275a091618db0cc75d5
-EBUILD fdutils-5.5.20060227.ebuild 1381 BLAKE2B 33bdacfdfe978c4f4ffecfe64d0cca218209d2f69008cc4bfad7c808b1dd42bb8092d5cd7324820d603428090a687a102acf3d17d588237aba53a854fdb37a19 SHA512 c19200d5d4da28ed68d2f12e683cdf1b451df762e151b9c67b99d50b4c76608bf2746f92ac228cd1aa97c231ab13f65d6f9833de67ff20c1fdb4da1c832e67c0
+AUX fdutils-5.6_p2-docs-build.patch 306 BLAKE2B e9892a241f4e02cb63e614d3ac0d5c73e3bc9a15cf5f699c8d0127c61b88883744d03b328e8c85b27ea6cc88559c9b7c5c6a48640b680d58548e3b55e2c088c4 SHA512 c5247680ab965f0a3319c08d3fe6d4b69fe0f63fcbe16927f51386121dcccd80097e382064184f9a6ba26eac4182b4385a4a987ad63c35dbd78c11400b0ad5d9
+AUX fdutils-5.6_p2-parallel.patch 752 BLAKE2B 3d759e8b0c1e91a4df0cdac95b794598ea05f0b39e8cd898796d05dff8060db61b8b67843e76405dc48a5b6e87751bfe418d76da0ac39558a198d3ad44d64c43 SHA512 c2f805a5ca01340033cf404e7481d517485fc55bcbe25476c1c9745f65524fd426e44ee4b3cac554e8953b9dd6f102f3c2eea8b39e06b027faf0f403498ef518
+AUX fdutils-5.6_p2-variable-ar.patch 780 BLAKE2B 2a6b5886abf349bbb8ae0978c7eb40128301d141e9ee784b573fa7f62067cfefd9decdd609bf92e7e8079c56afa91672f0a4be19392046b8c39e43c4f4e28246 SHA512 d69509424042dbb56a79c88f74aa4b335058a8e5e94f7b17cf150ad4e69b9331d1a03b26ad04c3bff6de88941b93c261558a24ab325bcba3096b7fe140a3e912
+DIST fdutils_5.6-2.debian.tar.xz 49420 BLAKE2B 6f21a07fc9eeea3588b5b810cfc0e20e8c9e3ba905caa4274643aceeb452cf62d9a8449d25f25d73f87933ed9fc1654fede129874218f497ea4dcba82fbb58cc SHA512 b75d3b9185de51aae9ffc6e851b43b9722bb258b6d1c7517994a04bdf4607b53648291d0c755af2822d6503fe41150b08a56e59ccc4be604f23429cb10eb60b8
+DIST fdutils_5.6.orig.tar.gz 231851 BLAKE2B 461a145f5cc698e110e699cebadd887283cc53eaa06fd06b35f34658696fa27fdd443012e26bfc29d26db5e8db15d664c91230f7c7c2d89439bcbc8ea649536f SHA512 5b8c4b4f08657f7dd8bcbddddb5943df30386731c59be8fccd7da40504569c2fab48697d91937f0f50c19a51f84f2a191803139a93fafa10f8a3003cbd75faab
+EBUILD fdutils-5.6_p2.ebuild 1634 BLAKE2B f160a65842baf7fa2dbf94cfcc158a44e5397260ec83bbf1ac65f18c573d51bbad64f84462013f7c156847f58c6a72373553210ed31b54b11254eba4820b33f6 SHA512 9b910b648817bfa13d42750f42e91772ba1c4fe24001f81fa4baa150ef8586369d081570d2c155b7514881fa6c990e73e3f0f724a6458e72704eaa98d37d0eb7
 MISC metadata.xml 251 BLAKE2B 3daf51d941d08d20be1521f01052f866b99db2e58f895cd910eecf9c80cd16544ed9efde07b581c7e3e78410c891fa36b9f2741c7cc9b86d7335572530bb17ec SHA512 f05f14802f23fd1115d7fb2dcab9f3303fe36dd8256d44ac9d45ab35196a5e26f819df32eea70db843a444fb50226cbe857038e191eac8f9556936faa1fde491
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
deleted file mode 100644
index 2c47d3562892..000000000000
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch
-
-MY_P=${PN}_5.5-20060227
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="https://fdutils.linux.lu"
-SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/f/${PN}/${MY_P}-8.debian.tar.xz
-	https://dev.gentoo.org/~robbat2/distfiles/fdutils-5.5-20060227_20081027.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-4"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/os-headers
-	doc? ( virtual/texi2dvi )"
-
-S=${WORKDIR}/${PN}-5.5-20060227
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc10.patch"
-
-	local d="${WORKDIR}"/debian/patches
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
-	# The build sets up config.h and uses some symbols, but forgots to
-	# actually include it in most places.
-	sed -i '1i#include "../config.h"' src/*.c || die #580060
-	epatch "${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch || die # 315577
-	epatch "${DISTDIR}"/fdutils-5.5-20060227_20081027.diff.gz || die # upstream did make a patch-based release after 20060227!
-	epatch "${FILESDIR}"/fdutils-5.5-superformat-snprintf.patch || die # but it had a bug that strict GCC catches
-}
-
-src_configure() {
-	econf --enable-fdmount-floppy-only
-}
-
-src_compile() {
-	emake $(use doc || echo compile)
-}
-
-src_install() {
-	dodir /etc
-	use doc && dodir /usr/share/info
-
-	emake DESTDIR="${D}" install
-
-	# The copy in sys-apps/man-pages is more recent
-	rm -f "${ED}"/usr/share/man/man4/fd.4 || die
-
-	# Rename to match binary
-	mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
-}
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
deleted file mode 100644
index 2df9ab872a03..000000000000
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch
-
-MY_P=${PN}_5.5-20060227
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="https://fdutils.linux.lu"
-SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/f/${PN}/${MY_P}-6.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-4"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/os-headers
-	doc? ( virtual/texi2dvi )"
-
-S=${WORKDIR}/${PN}-5.5-20060227
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc10.patch"
-
-	local d="${WORKDIR}"/debian/patches
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
-	# The build sets up config.h and uses some symbols, but forgots to
-	# actually include it in most places.
-	sed -i '1i#include "../config.h"' src/*.c || die #580060
-}
-
-src_configure() {
-	econf --enable-fdmount-floppy-only
-}
-
-src_compile() {
-	emake -j1 $(use doc || echo compile)
-}
-
-src_install() {
-	dodir /etc
-	use doc && dodir /usr/share/info
-
-	emake -j1 DESTDIR="${D}" install
-
-	# The copy in sys-apps/man-pages is more recent
-	rm -f "${ED}"/usr/share/man/man4/fd.4 || die
-
-	# Rename to match binary
-	mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
-}
diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild b/app-misc/fdutils/fdutils-5.6_p2.ebuild
new file mode 100644
index 000000000000..715dea769e48
--- /dev/null
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}_5.6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Utilities for configuring and debugging the Linux floppy driver"
+HOMEPAGE="https://fdutils.linux.lu"
+SRC_URI="
+	mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/f/${PN}/${MY_P}-2.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND=">=sys-fs/mtools-4"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+BDEPEND="
+	sys-apps/texinfo
+	sys-devel/autoconf-archive
+	doc? ( virtual/texi2dvi )
+"
+
+S="${WORKDIR}/${PN}-5.6"
+
+src_prepare() {
+	local debian=($(< "${WORKDIR}"/debian/patches/series)) || die
+	debian=(${debian[@]/fdmount-compilation_linux_2.6.patch/}) # exclude this patch
+	PATCHES+=("${debian[@]/#/${WORKDIR}/debian/patches/}")
+	PATCHES+=(
+		"${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch # bug 315577
+		"${FILESDIR}"/fdutils-5.6_p2-parallel.patch
+		"${FILESDIR}"/fdutils-5.6_p2-docs-build.patch
+		"${FILESDIR}"/fdutils-5.6_p2-variable-ar.patch
+	)
+
+	default
+
+	eautoreconf
+	touch ar-lib || die # bug 834874
+}
+
+src_configure() {
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	econf --enable-fdmount-floppy-only
+}
+
+src_compile() {
+	emake
+	use doc && emake doc
+}
+
+src_install() {
+	dodir /etc
+	emake DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install-man
+
+	use doc && emake DESTDIR="${D}" install-doc
+
+	# The copy in sys-apps/man-pages is more recent
+	rm -f "${ED}"/usr/share/man/man4/fd.4 || die
+
+	# Rename to match binary
+	mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
+}
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 \