dev-libs/mpfr: Don't call makeinfo, forbidden during bootstrap

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

2 files changed, 9 insertions, 109 deletions

diff --git a/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch b/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch
deleted file mode 100644
index 304cc27f3fae..000000000000
--- a/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Sat, 6 Nov 2021 00:34:22 +0000
-Subject: [PATCH] Revert doc changes from mpfr-4.1.0-patch10
-
-We don't want to invoke	texinfo	via maintainer-mode because
-of some	(somewhat minor) changes to the	manual from patch10.
-
-See: https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
-Signed-off-by: Sam James <sam@gentoo.org>
----
- doc/mpfr.info | 46 +++++++++++++++++++++-------------------------
- doc/mpfr.texi |  6 ------
- 2 files changed, 21 insertions(+), 31 deletions(-)
-
-diff --git a/doc/mpfr.info b/doc/mpfr.info
-index 062c0c4..264896d 100644
---- a/doc/mpfr.info
-+++ b/doc/mpfr.info
-@@ -3217,11 +3217,7 @@ destroying, garbaging) is left to the application.
- 
-    Each function in this interface is also implemented as a macro for
- efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the
--macro, while ‘(mpfr_custom_init) (s, p)’ uses the function.  Note that
--the macro may evaluate arguments multiple times (or none).  Moreover,
--macros implementing functions with the ‘void’ return type may not be
--used in contexts where an expression is expected, e.g., inside
--‘for(...)’ or before a comma operator.
-+macro, while ‘(mpfr_custom_init) (s, p)’ uses the function.
- 
-    Note 1: MPFR functions may still initialize temporary floating-point
- numbers using ‘mpfr_init’ and similar functions.  See Custom Allocation
-@@ -4583,13 +4579,13 @@ Function and Type Index
-                                                               (line 115)
- * mpfr_csch:                             Transcendental Functions.
-                                                               (line 180)
--* mpfr_custom_get_exp:                   Custom Interface.    (line  80)
--* mpfr_custom_get_kind:                  Custom Interface.    (line  70)
--* mpfr_custom_get_significand:           Custom Interface.    (line  75)
--* mpfr_custom_get_size:                  Custom Interface.    (line  41)
--* mpfr_custom_init:                      Custom Interface.    (line  45)
--* mpfr_custom_init_set:                  Custom Interface.    (line  52)
--* mpfr_custom_move:                      Custom Interface.    (line  89)
-+* mpfr_custom_get_exp:                   Custom Interface.    (line  76)
-+* mpfr_custom_get_kind:                  Custom Interface.    (line  66)
-+* mpfr_custom_get_significand:           Custom Interface.    (line  71)
-+* mpfr_custom_get_size:                  Custom Interface.    (line  37)
-+* mpfr_custom_init:                      Custom Interface.    (line  41)
-+* mpfr_custom_init_set:                  Custom Interface.    (line  48)
-+* mpfr_custom_move:                      Custom Interface.    (line  85)
- * MPFR_DECL_INIT:                        Initialization Functions.
-                                                               (line  77)
- * mpfr_digamma:                          Transcendental Functions.
-@@ -5169,19 +5165,19 @@ Node: Exception Related Functions145661
- Node: Memory Handling Functions155904
- Node: Compatibility with MPF157792
- Node: Custom Interface160961
--Node: Internals165852
--Node: API Compatibility167396
--Node: Type and Macro Changes169344
--Node: Added Functions172527
--Node: Changed Functions177334
--Node: Removed Functions184693
--Node: Other Changes185423
--Node: MPFR and the IEEE 754 Standard187124
--Node: Contributors189741
--Node: References192880
--Node: GNU Free Documentation License194761
--Node: Concept Index217355
--Node: Function and Type Index223428
-+Node: Internals165592
-+Node: API Compatibility167136
-+Node: Type and Macro Changes169084
-+Node: Added Functions172267
-+Node: Changed Functions177074
-+Node: Removed Functions184433
-+Node: Other Changes185163
-+Node: MPFR and the IEEE 754 Standard186864
-+Node: Contributors189481
-+Node: References192620
-+Node: GNU Free Documentation License194501
-+Node: Concept Index217095
-+Node: Function and Type Index223168
- 
- End Tag Table
- 
-diff --git a/doc/mpfr.texi b/doc/mpfr.texi
-index b26555a..54b6aa8 100644
---- a/doc/mpfr.texi
-+++ b/doc/mpfr.texi
-@@ -3817,12 +3817,6 @@ to the application.
- Each function in this interface is also implemented as a macro for
- efficiency reasons: for example @code{mpfr_custom_init (s, p)}
- uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function.
--Note that the macro may evaluate arguments multiple times (or none).
--Moreover, macros implementing functions with the @code{void} return type
--may not be used in contexts where an expression is expected, e.g., inside
--@code{for(...)} or before a comma operator.
--@c These limitations with macros cannot be avoided in a C90 compatible way.
--@c In the future, inline functions could be used.
- 
- Note 1: MPFR functions may still initialize temporary floating-point numbers
- using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@.
--- 
-2.33.1
-
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
index 5907ed5bf1a1..14639036b47e 100644
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -47,14 +47,19 @@ PATCHES=()
 if [[ ${PV} == *_p* ]] ; then
 	# Apply the upstream patches released out of band
 	PATCHES+=( "${DISTDIR}"/ )
-
-	# One-off partial revert of 4.1.0_p13's patch10
-	# Won't be needed on next release.
-	PATCHES+=( "${FILESDIR}"/${P}-revert-doc-changes-patch10.patch )
 fi
 
 HTML_DOCS=( doc/FAQ.html )
 
+src_prepare() {
+	default
+
+	# 4.1.0_p13's patch10 patches a .texi file *and* the corresponding
+	# info file. We need to make sure the info file is newer, so the
+	# build doesn't try to run makeinfo. Won't be needed on next release.
+	touch "${S}/doc/mpfr.info" || die
+}
+
 multilib_src_configure() {
 	# bug 476336#19
 	# Make sure mpfr doesn't go probing toolchains it shouldn't