gentoo resync : 20.03.2022

4 files changed, 121 insertions, 11 deletions

diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 14f32fd671ed..d062db1e7068 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,7 +1,8 @@
+AUX mtools-4.0.38-strtoi-definition.patch 3484 BLAKE2B 85ef88843620e9d467382ad5323eb9f4f02fd1dd9c766ac451454c0bae24a0f490b62d17b3cf6c0fe7e67d85f148e8304e979d66a2cd09827fee7a2aa2c0b2c2 SHA512 ee56002b7beda7adeb59fee7a9f98400e78abebc6d15d2c70ddc5b99c3efa6dec3c0f12f08c0941ea7befa11532062bcf014b7189e1e5cb1d191de49b722bace
 DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10
-DIST mtools-4.0.36.tar.bz2 445920 BLAKE2B 753ee3e412452572b36d15805982255f28bc277764ce66a0fe8483e19a3488fbb282b873a6be85e87e82a71bf7fda517e1234e1911f0b7c3f3992e25f8d18322 SHA512 2425ee0e39c06ea201a5303ab09a0aa9f0c59341522e2c15abc4f079320fd3d67d28afeb2870ee508d472bba6904c542e11c02b92652c8eda1bf338bab372d07
 DIST mtools-4.0.37.tar.bz2 441076 BLAKE2B a84ff9e532a1896706589dfe7e62b1e400baf0ab9b86cc3d4a09bd4a0a24d1e86f504b9005c98765f62d735d227d0a1d5ab78354c587c88e2d42a4146d127dc1 SHA512 5ff4da9050dd5d5c0929dd9977866086085bd8fef577f3c6ce2ed6fb958eec2304db612c0766e6be1a048819e29f62023cb0f0a9464a84ed7cc21de9561fadce
+DIST mtools-4.0.38.tar.bz2 440491 BLAKE2B 4d486b9bcbf31c9056ed6460d3d7ccb160f2d3d68e2b9a87590821251513a299ab321df825821722c41e13f608250eecad52e828c901ab956e471cd56871a50c SHA512 045e7dba159699c53abefd69e2065c116e2e360e7ec537df1e4d38309fb03587c600bb930363ecffef48cef1c8c118146691cf9a35c36abbb40e4546e532ce4a
 EBUILD mtools-4.0.35.ebuild 1039 BLAKE2B 589196fa40f2b431f37fd57202bcafeff5b9983c39ea7af707657909105e7a45976628db2ff42be2f8636902b6cc20e4d59399063a02eeba7637a25cbbef4e88 SHA512 24d053a6446ab3d1752fd9fd07bc378f0f7e69a596b088a5a690dcb065aaf146e895223ef9141beaa5c3461382ebb94025cb5aa9e653c5da9d9643250d247a05
-EBUILD mtools-4.0.36.ebuild 1046 BLAKE2B 56ef115a96cff7dae2e40d5e5d32b0c175052bd0bb3bb87b136bb47ffd85d965d65ee0f17a21e51ed558eeea073028784b55c3ef21c980a5575d93ac05703840 SHA512 860c7b5189e8794ef1c59096120c387404a5248fed1f304aa6de7c0daf2d4b45ccf9d74734f0881f513f00c023573bcfd45afe90b280695e13309ce54537afe9
-EBUILD mtools-4.0.37.ebuild 1067 BLAKE2B 0c2c5c80d4d80912a06a834a29251f154c22a95d0306f4bbbc6b97dde3512c02ece7af64c375e236231426bd6ef74e35fd69ff7c63389a62d7ff43607026392a SHA512 638fe9b332a90679c36d561e1e831b4aefd21d7f804342dd0ce614cc968600f85605926db5e9b7c52f887769d8f2736bb2a7b0ee9df0293dc486e2f127622a35
+EBUILD mtools-4.0.37.ebuild 1060 BLAKE2B caeed9304847d8a1d33982f3a406a9e089885df0b726ec0b87059e691548126f2aceabf518d6819c7c7ed56fe654f7b8ebd39b4962bcfadcc900afda233a9b3f SHA512 06ad2c7dd3ad0de7758a96e20fca19987f96e1d1dab02bcda2654d0a429c4f48614eaa911167fa3ee2c8fbcac8d66f0f822a0bc18b9177c1704573c64a299558
+EBUILD mtools-4.0.38.ebuild 1216 BLAKE2B 0d5355381636bfebb11efb427ec1c5c24af74096e84e8da78d8b2bb1ca2c0b8d4fd4947ec3ab7ec9d08eab53975d87cfa7f41f567d2a6aa1f0080e292bdfdd99 SHA512 0a930e771a7a5a3bf7835369293eebaa67e639f6bfeca309793ff3227ae3e781886e370f9f744a4fbce8231a898e25a4ffc059c80ca07dc95b4f7148ceccb909
 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316
diff --git a/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch b/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch
new file mode 100644
index 000000000000..637e9193f43f
--- /dev/null
+++ b/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch
@@ -0,0 +1,94 @@
+https://lists.gnu.org/archive/html/info-mtools/2022-03/msg00001.html
+
+From d36dea2ea7f246f28719dcb01b7a8ad7ad8ed1f6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Mar 2022 02:36:03 +0000
+Subject: [PATCH] Use own definition of strtoi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Before this change, build resulted in implicit function declarations like:
+```
+* config.c:269:57: warning: implicit declaration of function ‘strtoi’; did you mean ‘strtoui’? [-Wimplicit-function-declaration]
+* floppyd_io.c:473:20: warning: implicit declaration of function ‘strtoi’; did you mean ‘strtoui’? [-Wimplicit-function-declaration]
+```
+
+The include(s) for inttypes.h are guarded by HAVE_INTTYPES_H
+(normal autoconf pattern) but we're not checking for inttypes.h
+in configure. But adding this doesn't solve the issue.
+
+If libbsd is installed, configure discovers the strtoi
+provided by libbsd  although the included version may still
+end up being glibc's as the include path doesn't change
+(glibc has its own which doesn't feature strtoi).
+
+If trying to use libbsd's, we end up with a build failure:
+```
+config.c: In function ‘get_env_conf’:
+config.c:269:57: error: too few arguments to function ‘strtoi’
+  269 |                 * ((int *)global_switches[i].address) = strtoi(s,0,0);
+      |                                                         ^~~~~~
+In file included from sysincludes.h:174,
+                 from config.c:18:
+/usr/include/bsd/inttypes.h:43:10: note: declared here
+   43 | intmax_t strtoi(const char *__restrict nptr, char **__restrict endptr,
+      |          ^~~~~~
+```
+
+So, it seems best to just always use our own definition of strtoi,
+given our definition doesn't match libbsd's anyway. This avoids
+the build failure as well as the implicit declaration warnings.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in  | 2 +-
+ mtools.h      | 2 --
+ sysincludes.h | 4 ----
+ 3 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 72cf205..eb1c754 100644
+--- a/configure.in
++++ b/configure.in
+@@ -218,7 +218,7 @@ dnl Checks for library functions.
+ AC_TYPE_SIGNAL
+ AC_CHECK_FUNCS(strerror random srandom strchr strrchr lockf flock \
+ strcasecmp strncasecmp strnlen atexit on_exit getpass memmove \
+-strdup strndup strcspn strspn strtoul strtol strtoll strtoi strtoui \
++strdup strndup strcspn strspn strtoul strtol strtoll strtoui \
+ memcpy strpbrk memset setenv seteuid setresuid setpgrp \
+ tcsetattr tcflush basename fchdir media_oldaliases  \
+ snprintf setlocale toupper_l strncasecmp_l \
+diff --git a/mtools.h b/mtools.h
+index b3fd3c8..190ddf8 100644
+--- a/mtools.h
++++ b/mtools.h
+@@ -188,9 +188,7 @@ off_t str_to_offset(char *str);
+ uint32_t parseSize(char *sizeStr);
+ unsigned int strtoui(const char *nptr, char **endptr, int base);
+ unsigned int atoui(const char *nptr);
+-#ifndef HAVE_STRTOI
+ int strtoi(const char *nptr, char **endptr, int base);
+-#endif
+ unsigned long atoul(const char *nptr);
+ uint8_t strtou8(const char *nptr, char **endptr, int base);
+ uint8_t atou8(const char *str);
+diff --git a/sysincludes.h b/sysincludes.h
+index 6dccded..0c17fb5 100644
+--- a/sysincludes.h
++++ b/sysincludes.h
+@@ -169,10 +169,6 @@ typedef unsigned char _Bool;
+ # define __bool_true_false_are_defined 1
+ #endif
+ 
+-#ifdef HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#endif
+-
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+-- 
+2.35.1
+
diff --git a/sys-fs/mtools/mtools-4.0.37.ebuild b/sys-fs/mtools/mtools-4.0.37.ebuild
index dfa7a6a4f20f..1b4c09b1ccb3 100644
--- a/sys-fs/mtools/mtools-4.0.37.ebuild
+++ b/sys-fs/mtools/mtools-4.0.37.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X"
 
 RDEPEND="!elibc_glibc? ( virtual/libiconv )
diff --git a/sys-fs/mtools/mtools-4.0.36.ebuild b/sys-fs/mtools/mtools-4.0.38.ebuild
index 52f5d5207032..18ce60a45f39 100644
--- a/sys-fs/mtools/mtools-4.0.36.ebuild
+++ b/sys-fs/mtools/mtools-4.0.38.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
 HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X"
 
-RDEPEND="
-	!elibc_glibc? ( virtual/libiconv )
+RDEPEND="!elibc_glibc? ( virtual/libiconv )
 	X? (
 		x11-libs/libICE
 		x11-libs/libXau
@@ -25,12 +24,28 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.38-strtoi-definition.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for strtoi patch
+	eautoreconf
+}
+
 src_configure() {
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	if ! use elibc_glibc && ! use elibc_musl ; then
+		# bug #447688
+		append-libs "-liconv"
+	fi
+
 	local myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -41,6 +56,6 @@ src_install() {
 	insinto /etc/mtools
 	doins mtools.conf
 
-	# default is fine
+	# Default is fine
 	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
 }