[gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/files/, dev-libs/mpfr/

["Sam James" <sam@gentoo.org>]

commit:     eaeb1debfeed05ba266e4a1b1674eacff1d0f414
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  6 00:39:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 00:45:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaeb1deb

dev-libs/mpfr: partially revert patch10 (drop doc changes) from 4.1.0_p13

Avoid trying to invoke texinfo during bootstrap.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...mpfr-4.1.0_p13-revert-doc-changes-patch10.patch | 105 +++++++++++++++++++++
 dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild             |   9 +-
 2 files changed, 113 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..304cc27f3fa
--- /dev/null
+++ b/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch
@@ -0,0 +1,105 @@
+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 Functions\x7f145661
+ Node: Memory Handling Functions\x7f155904
+ Node: Compatibility with MPF\x7f157792
+ Node: Custom Interface\x7f160961
+-Node: Internals\x7f165852
+-Node: API Compatibility\x7f167396
+-Node: Type and Macro Changes\x7f169344
+-Node: Added Functions\x7f172527
+-Node: Changed Functions\x7f177334
+-Node: Removed Functions\x7f184693
+-Node: Other Changes\x7f185423
+-Node: MPFR and the IEEE 754 Standard\x7f187124
+-Node: Contributors\x7f189741
+-Node: References\x7f192880
+-Node: GNU Free Documentation License\x7f194761
+-Node: Concept Index\x7f217355
+-Node: Function and Type Index\x7f223428
++Node: Internals\x7f165592
++Node: API Compatibility\x7f167136
++Node: Type and Macro Changes\x7f169084
++Node: Added Functions\x7f172267
++Node: Changed Functions\x7f177074
++Node: Removed Functions\x7f184433
++Node: Other Changes\x7f185163
++Node: MPFR and the IEEE 754 Standard\x7f186864
++Node: Contributors\x7f189481
++Node: References\x7f192620
++Node: GNU Free Documentation License\x7f194501
++Node: Concept Index\x7f217095
++Node: Function and Type Index\x7f223168
+ \x1f
+ 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 8c516b676e7..5907ed5bf1a 100644
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -7,6 +7,9 @@ inherit multilib-minimal
 
 # Upstream distribute patches before a new release is made
 # See https://www.mpfr.org/mpfr-current/#bugs for the latest version (and patches)
+
+# Check whether any patches touch e.g. manuals!
+# https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
 MY_PV=$(ver_cut 1-3)
 MY_PATCH=$(ver_cut 5-)
 MY_P=${PN}-${MY_PV}
@@ -44,6 +47,10 @@ 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 )
@@ -57,7 +64,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
 
 	if ! use static-libs ; then
 		find "${ED}"/usr -name '*.la' -delete || die