gentoo new year resync : 01.01.2021

4 files changed, 29 insertions, 4 deletions

diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 290dc7f13e8a..2f91ec084048 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,9 +1,10 @@
 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 1727 BLAKE2B d3d56facbd81c613526ab722d59fc9a11e5c4f17f6bdc3b49e7c6cb0b0a2d873e469abd02fc95fea5a0db6212771c742af2b5189f32ad5c878d8e225140d991b SHA512 6ac168d7f5b0ce3fec16c8f9027f4f9eaeb11e0d47f997c6215fd6c33ac62d56c0a24df7fddd160c09cb91b0e3dc035b2dafd4b3b62e71a33fd1b2c33dbe4833
-EBUILD fdutils-5.5.20060227.ebuild 1344 BLAKE2B 3e80aef85d10e768ba7a18aabc9e25e746adf1eb4ff7b4c9b7a340e3158159901bdf7c071abdb817afba9c805708bdd8ed3c2b97a668793929fa534ce65b69ce SHA512 52042b4a2d05e325a64cd85703c777af4c154d6e79e59ac04fb138f1798ccaa60dfc9f5312390a382214d41ef59dcd933bf40b8c369952747ecea8a4791d95e9
+EBUILD fdutils-5.5.20060227-r1.ebuild 1767 BLAKE2B 117b01b2c946b2385f7a3b76347de2bb58df31d5bfd9e54a0ca990e2e53e1e5231ca0ef1f908e6bd4cd01121d00254d57008da3142c014d51a2c3dde3b514a3e SHA512 a8abf363536ed5745809e2ce7b30917f69595a60805cc97882e2cccccd8248e4dbc2d8572fff57b552ba2a09a82b8283796b6db5242a70124df70f4184d0d99b
+EBUILD fdutils-5.5.20060227.ebuild 1381 BLAKE2B db59f53f90778a26c442908a13af1fffff8281c1d9383877b4fd2bbeeb620ee6a491f6452910d7767ddbf55016dec952d2aa0b8c18d5f315a0768f4baadb66b5 SHA512 75040032be4a0ffea770ff95c857ead59cf1b841c39e923e992e3350afdd98048239b9c8aa6462b34bcde911d61247a052a51d5d49ef66789bce134c7f14b6c1
 MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
index d234389a9e19..b0196c0d391c 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 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
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
index 1116db851a7f..632a26a8982b 100644
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 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
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
new file mode 100644
index 000000000000..2bda41e11255
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch
@@ -0,0 +1,20 @@
+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