| 1 |
commit: eaeb1debfeed05ba266e4a1b1674eacff1d0f414 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 6 00:39:02 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 00:45:54 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaeb1deb |
| 7 |
|
| 8 |
dev-libs/mpfr: partially revert patch10 (drop doc changes) from 4.1.0_p13 |
| 9 |
|
| 10 |
Avoid trying to invoke texinfo during bootstrap. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
...mpfr-4.1.0_p13-revert-doc-changes-patch10.patch | 105 +++++++++++++++++++++ |
| 15 |
dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild | 9 +- |
| 16 |
2 files changed, 113 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..304cc27f3fa |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-libs/mpfr/files/mpfr-4.1.0_p13-revert-doc-changes-patch10.patch |
| 23 |
@@ -0,0 +1,105 @@ |
| 24 |
+From: Sam James <sam@g.o> |
| 25 |
+Date: Sat, 6 Nov 2021 00:34:22 +0000 |
| 26 |
+Subject: [PATCH] Revert doc changes from mpfr-4.1.0-patch10 |
| 27 |
+ |
| 28 |
+We don't want to invoke texinfo via maintainer-mode because |
| 29 |
+of some (somewhat minor) changes to the manual from patch10. |
| 30 |
+ |
| 31 |
+See: https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed |
| 32 |
+Signed-off-by: Sam James <sam@g.o> |
| 33 |
+--- |
| 34 |
+ doc/mpfr.info | 46 +++++++++++++++++++++------------------------- |
| 35 |
+ doc/mpfr.texi | 6 ------ |
| 36 |
+ 2 files changed, 21 insertions(+), 31 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/doc/mpfr.info b/doc/mpfr.info |
| 39 |
+index 062c0c4..264896d 100644 |
| 40 |
+--- a/doc/mpfr.info |
| 41 |
++++ b/doc/mpfr.info |
| 42 |
+@@ -3217,11 +3217,7 @@ destroying, garbaging) is left to the application. |
| 43 |
+ |
| 44 |
+ Each function in this interface is also implemented as a macro for |
| 45 |
+ efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the |
| 46 |
+-macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. Note that |
| 47 |
+-the macro may evaluate arguments multiple times (or none). Moreover, |
| 48 |
+-macros implementing functions with the ‘void’ return type may not be |
| 49 |
+-used in contexts where an expression is expected, e.g., inside |
| 50 |
+-‘for(...)’ or before a comma operator. |
| 51 |
++macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. |
| 52 |
+ |
| 53 |
+ Note 1: MPFR functions may still initialize temporary floating-point |
| 54 |
+ numbers using ‘mpfr_init’ and similar functions. See Custom Allocation |
| 55 |
+@@ -4583,13 +4579,13 @@ Function and Type Index |
| 56 |
+ (line 115) |
| 57 |
+ * mpfr_csch: Transcendental Functions. |
| 58 |
+ (line 180) |
| 59 |
+-* mpfr_custom_get_exp: Custom Interface. (line 80) |
| 60 |
+-* mpfr_custom_get_kind: Custom Interface. (line 70) |
| 61 |
+-* mpfr_custom_get_significand: Custom Interface. (line 75) |
| 62 |
+-* mpfr_custom_get_size: Custom Interface. (line 41) |
| 63 |
+-* mpfr_custom_init: Custom Interface. (line 45) |
| 64 |
+-* mpfr_custom_init_set: Custom Interface. (line 52) |
| 65 |
+-* mpfr_custom_move: Custom Interface. (line 89) |
| 66 |
++* mpfr_custom_get_exp: Custom Interface. (line 76) |
| 67 |
++* mpfr_custom_get_kind: Custom Interface. (line 66) |
| 68 |
++* mpfr_custom_get_significand: Custom Interface. (line 71) |
| 69 |
++* mpfr_custom_get_size: Custom Interface. (line 37) |
| 70 |
++* mpfr_custom_init: Custom Interface. (line 41) |
| 71 |
++* mpfr_custom_init_set: Custom Interface. (line 48) |
| 72 |
++* mpfr_custom_move: Custom Interface. (line 85) |
| 73 |
+ * MPFR_DECL_INIT: Initialization Functions. |
| 74 |
+ (line 77) |
| 75 |
+ * mpfr_digamma: Transcendental Functions. |
| 76 |
+@@ -5169,19 +5165,19 @@ Node: Exception Related Functions145661 |
| 77 |
+ Node: Memory Handling Functions155904 |
| 78 |
+ Node: Compatibility with MPF157792 |
| 79 |
+ Node: Custom Interface160961 |
| 80 |
+-Node: Internals165852 |
| 81 |
+-Node: API Compatibility167396 |
| 82 |
+-Node: Type and Macro Changes169344 |
| 83 |
+-Node: Added Functions172527 |
| 84 |
+-Node: Changed Functions177334 |
| 85 |
+-Node: Removed Functions184693 |
| 86 |
+-Node: Other Changes185423 |
| 87 |
+-Node: MPFR and the IEEE 754 Standard187124 |
| 88 |
+-Node: Contributors189741 |
| 89 |
+-Node: References192880 |
| 90 |
+-Node: GNU Free Documentation License194761 |
| 91 |
+-Node: Concept Index217355 |
| 92 |
+-Node: Function and Type Index223428 |
| 93 |
++Node: Internals165592 |
| 94 |
++Node: API Compatibility167136 |
| 95 |
++Node: Type and Macro Changes169084 |
| 96 |
++Node: Added Functions172267 |
| 97 |
++Node: Changed Functions177074 |
| 98 |
++Node: Removed Functions184433 |
| 99 |
++Node: Other Changes185163 |
| 100 |
++Node: MPFR and the IEEE 754 Standard186864 |
| 101 |
++Node: Contributors189481 |
| 102 |
++Node: References192620 |
| 103 |
++Node: GNU Free Documentation License194501 |
| 104 |
++Node: Concept Index217095 |
| 105 |
++Node: Function and Type Index223168 |
| 106 |
+ |
| 107 |
+ End Tag Table |
| 108 |
+ |
| 109 |
+diff --git a/doc/mpfr.texi b/doc/mpfr.texi |
| 110 |
+index b26555a..54b6aa8 100644 |
| 111 |
+--- a/doc/mpfr.texi |
| 112 |
++++ b/doc/mpfr.texi |
| 113 |
+@@ -3817,12 +3817,6 @@ to the application. |
| 114 |
+ Each function in this interface is also implemented as a macro for |
| 115 |
+ efficiency reasons: for example @code{mpfr_custom_init (s, p)} |
| 116 |
+ uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function. |
| 117 |
+-Note that the macro may evaluate arguments multiple times (or none). |
| 118 |
+-Moreover, macros implementing functions with the @code{void} return type |
| 119 |
+-may not be used in contexts where an expression is expected, e.g., inside |
| 120 |
+-@code{for(...)} or before a comma operator. |
| 121 |
+-@c These limitations with macros cannot be avoided in a C90 compatible way. |
| 122 |
+-@c In the future, inline functions could be used. |
| 123 |
+ |
| 124 |
+ Note 1: MPFR functions may still initialize temporary floating-point numbers |
| 125 |
+ using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@. |
| 126 |
+-- |
| 127 |
+2.33.1 |
| 128 |
+ |
| 129 |
|
| 130 |
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild |
| 131 |
index 8c516b676e7..5907ed5bf1a 100644 |
| 132 |
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild |
| 133 |
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild |
| 134 |
@@ -7,6 +7,9 @@ inherit multilib-minimal |
| 135 |
|
| 136 |
# Upstream distribute patches before a new release is made |
| 137 |
# See https://www.mpfr.org/mpfr-current/#bugs for the latest version (and patches) |
| 138 |
+ |
| 139 |
+# Check whether any patches touch e.g. manuals! |
| 140 |
+# https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed |
| 141 |
MY_PV=$(ver_cut 1-3) |
| 142 |
MY_PATCH=$(ver_cut 5-) |
| 143 |
MY_P=${PN}-${MY_PV} |
| 144 |
@@ -44,6 +47,10 @@ PATCHES=() |
| 145 |
if [[ ${PV} == *_p* ]] ; then |
| 146 |
# Apply the upstream patches released out of band |
| 147 |
PATCHES+=( "${DISTDIR}"/ ) |
| 148 |
+ |
| 149 |
+ # One-off partial revert of 4.1.0_p13's patch10 |
| 150 |
+ # Won't be needed on next release. |
| 151 |
+ PATCHES+=( "${FILESDIR}"/${P}-revert-doc-changes-patch10.patch ) |
| 152 |
fi |
| 153 |
|
| 154 |
HTML_DOCS=( doc/FAQ.html ) |
| 155 |
@@ -57,7 +64,7 @@ multilib_src_configure() { |
| 156 |
} |
| 157 |
|
| 158 |
multilib_src_install_all() { |
| 159 |
- rm "${ED}"/usr/share/doc/"${P}"/COPYING* |
| 160 |
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* || die |
| 161 |
|
| 162 |
if ! use static-libs ; then |
| 163 |
find "${ED}"/usr -name '*.la' -delete || die |
Archives