gentoo auto-resync : 29:10:2024 - 03:04:53

7 files changed, 3 insertions, 485 deletions

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index e98acbaa6699..a2d5552e9b7f 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,11 +1,6 @@
-AUX 7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch 3424 BLAKE2B a6a9ac407882b9bda5daa3c3950a84096f5949eeaedab4494c78dd541f527b9414894086c9d9fd389e00af42e9b56e8508eb466dc4311dee6020133c57c941a8 SHA512 c72f5b37cad85c8a6f927f4efdb7107560f483b0bc64192afb64f778f68c3ab73ab646cb536600428b83d9e0fe754f04fe6e8c3fad993655630072f16fa17893
-AUX 7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch 1488 BLAKE2B fa33876ee93382de2091eb4209134ecc066d18d6b3336bfd4ef00ea2dadeed43ce53d42d491cd99d3ad50503674e8b73e4589590464cf8108dd68e7c1e447f13 SHA512 4f5d5306b29b9185a1676aca166787968b7a736012bc6fec358775f488f76b428cc3ba15da63cfe53a856165c0e05887b3563614ad0985fe1fb518e06d49e1c5
-AUX 7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch 1649 BLAKE2B d4ed598172f63c698ccf652d75b246da9d3db5256a3fde0f3692124657c19a2430a7c69c7bd1687e2677fe182e8bf2820ed1ac72cc5d25b3b84267e16dd0a6ea SHA512 c7dc124438319f4340fe75b06a2c7bc5bb6fd69dfbc445eaf5bb7ea3ba2c904cde1db71e41fc985bbdc3ff27b4a5d601633f736cf8a3a7904ece8bde2ce7f802
-AUX 7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch 1867 BLAKE2B 95dad1dd7c6a5f76f3abfd905340490f19fbfe01ab40e0512ff1fb77a491ee062a8c1f6265048aab7797274f622dd13f6a7ffa560817919b288176346850f94b SHA512 b212e99ac51e06b1bc2dd2eac6fdd5716a0f0a8ebfcfce98b1f27e5a251901c5121ca997c63b59eb79c5deed023e0d3ec07aff2aad67f590b97ea918de784499
-AUX 7.1/0005-tp-Texinfo-command_data.txt.patch 7841 BLAKE2B 47b482d95904b96af0d538c1d969e7c90e82f547d5d96bab855780209378efd5b577a7e0b1b3fef1ca32cb442bb9bee74a80f0bd62237b8a8f03764a368134ae SHA512 050e87f0a0ec5f23eabaeb8ddbc12e42a65121d67da5843210ac3c80deea5ef415b274216702e236919ad42b5e25552fbd704f78c81fb3e737188417a9405195
 DIST texinfo-7.1.1.tar.xz 5572864 BLAKE2B 64dbd315e65d5b7cb0bb06c918e9924bb15a25a4bb26322db10b7ee98e9e6626b62592f8edd0ff016256f4a84837dabacb5278c3826e34fa3e080a5e8c0fb626 SHA512 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a
-DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db
-EBUILD texinfo-7.1-r1.ebuild 2534 BLAKE2B d451b5949d7e57d010fcf3a4638d2ee899ba9bc3625441ce49559727cb5b2b5ac947f2a20b01034bddf21bb67ae31551de0b58446075c5392ad8aec76ed61185 SHA512 eba76343f12bb54891e8963d08a47ea008699402b6321326ae0b3c9abbb0fc6074c28a2d938dd7d3f072aeeb99964c7d075e89570ed26579d2ba53ba6d971694
+DIST texinfo-7.1.90.tar.xz 6694376 BLAKE2B b77771e39f8c73cea9c449c1f4268dcdb9603497b719dda036908122805f2f4f85507ee797d7d9d1f4c3e4de236a7be6837c2985d7f10960e347860d98c49a8c SHA512 ecf6359c256c3c203fac26d211b4fad738e5e7cb142005a73df22eb17888296eac17d4748551243fee1f1cf891e612deeeb85bc841c8b64acb99e7fa49d1c3ad
 EBUILD texinfo-7.1.1.ebuild 2461 BLAKE2B f6f250d33af7029937e2c78d59d7b175f50a20784fb0bcdc608ef3e517c3e3db03d1245b443cea1106725f73cca50628888eb7417134847a18905f309446c206 SHA512 32c052cdef710bfbfb65738d6099a496ecba17dcd829598c241d599f3dd67376aaaaf44d167d08867743f5bcdf3ed9cd73ad4bc665a18c9acc0e8d883c676a8a
+EBUILD texinfo-7.1.90.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b
 EBUILD texinfo-9999.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch b/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch
deleted file mode 100644
index 8aed47b7bc24..000000000000
--- a/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From c76bcd0feed005aaf9db28a76f4883f3ae98295b Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@gmail.com>
-Date: Mon, 23 Oct 2023 19:51:00 +0100
-Subject: [PATCH 1/5] * tp/Texinfo/XS/xspara.c (get_utf8_codepoint): Wrapper
- for mbrtowc/btowc. [_WIN32]: Do not call btowc, as it was tested to be very
- slow on MinGW.  Report from Eli Zaretskii.
-
----
- ChangeLog              |  7 ++++++
- tp/Texinfo/XS/xspara.c | 48 +++++++++++++++++++++++-------------------
- 2 files changed, 33 insertions(+), 22 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index e619109f5b..c4379ec56b 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2023-10-23  Gavin Smith <gavinsmith0123@gmail.com>
-+
-+	* tp/Texinfo/XS/xspara.c (get_utf8_codepoint):
-+	Wrapper for mbrtowc/btowc.
-+	[_WIN32]: Do not call btowc, as it was tested to be very slow
-+	on MinGW.  Report from Eli Zaretskii.
-+
- 2023-10-18  Gavin Smith <gavinsmith0123@gmail.com>
- 
- 	Texinfo 7.1
-diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
-index 7c6895a7ff..e1cddcdc2a 100644
---- a/tp/Texinfo/XS/xspara.c
-+++ b/tp/Texinfo/XS/xspara.c
-@@ -684,6 +684,30 @@ xspara_end (void)
- /* characters triggering an end of sentence */
- #define end_sentence_characters ".?!"
- 
-+/* Wrapper for mbrtowc.  Set *PWC and return length of codepoint in bytes. */
-+size_t
-+get_utf8_codepoint (wchar_t *pwc, const char *mbs, size_t n)
-+{
-+#ifdef _WIN32
-+  /* Use the above implementation of mbrtowc.  Do not use btowc as
-+     does not exist as standard on MS-Windows, and was tested to be
-+     very slow on MinGW. */
-+  return mbrtowc (pwc, mbs, n, NULL);
-+#else
-+  if (!PRINTABLE_ASCII(*mbs))
-+    {
-+      return mbrtowc (pwc, mbs, n, NULL);
-+    }
-+  else
-+    {
-+      /* Functionally the same as mbrtowc but (tested) slightly quicker. */
-+      *pwc = btowc (*mbs);
-+      return 1;
-+    }
-+#endif
-+}
-+
-+
- /* Add WORD to paragraph in RESULT, not refilling WORD.  If we go past the end 
-    of the line start a new one.  TRANSPARENT means that the letters in WORD
-    are ignored for the purpose of deciding whether a full stop ends a sentence
-@@ -730,18 +754,7 @@ xspara__add_next (TEXT *result, char *word, int word_len, int transparent)
-               if (!strchr (end_sentence_characters
-                            after_punctuation_characters, *p))
-                 {
--                  if (!PRINTABLE_ASCII(*p))
--                    {
--                      wchar_t wc = L'\0';
--                      mbrtowc (&wc, p, len, NULL);
--                      state.last_letter = wc;
--                      break;
--                    }
--                  else
--                    {
--                      state.last_letter = btowc (*p);
--                      break;
--                    }
-+                  get_utf8_codepoint (&state.last_letter, p, len);
-                 }
-             }
-         }
-@@ -1013,16 +1026,7 @@ xspara_add_text (char *text, int len)
-         }
- 
-       /************** Not a white space character. *****************/
--      if (!PRINTABLE_ASCII(*p))
--        {
--          char_len = mbrtowc (&wc, p, len, NULL);
--        }
--      else
--        {
--          /* Functonally the same as mbrtowc but (tested) slightly quicker. */
--          char_len = 1;
--          wc = btowc (*p);
--        }
-+      char_len = get_utf8_codepoint (&wc, p, len);
- 
-       if ((long) char_len == 0)
-         break; /* Null character. Shouldn't happen. */
--- 
-2.42.1
-
diff --git a/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch b/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch
deleted file mode 100644
index 242f90add70d..000000000000
--- a/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f038d3f13f95b5494d5523f2af9dec59ff89b79d Mon Sep 17 00:00:00 2001
-From: Eli Zaretskii <eliz@gnu.org>
-Date: Wed, 25 Oct 2023 22:35:37 +0100
-Subject: [PATCH 2/5] * tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass
- pointer to wint_t as a pointer to wchar_t, as the two types may be of
- different sizes.
-
----
- ChangeLog              | 6 ++++++
- tp/Texinfo/XS/xspara.c | 4 +++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index c4379ec56b..3d13a15517 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,9 @@
-+2023-10-25  Eli Zaretskii <eliz@gnu.org>
-+
-+	* tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass
-+	pointer to wint_t as a pointer to wchar_t, as the two types
-+	may be of different sizes.
-+
- 2023-10-23  Gavin Smith <gavinsmith0123@gmail.com>
- 
- 	* tp/Texinfo/XS/xspara.c (get_utf8_codepoint):
-diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
-index e1cddcdc2a..130e43a4db 100644
---- a/tp/Texinfo/XS/xspara.c
-+++ b/tp/Texinfo/XS/xspara.c
-@@ -754,7 +754,9 @@ xspara__add_next (TEXT *result, char *word, int word_len, int transparent)
-               if (!strchr (end_sentence_characters
-                            after_punctuation_characters, *p))
-                 {
--                  get_utf8_codepoint (&state.last_letter, p, len);
-+                  wchar_t wc;
-+                  get_utf8_codepoint (&wc, p, len);
-+                  state.last_letter = wc;
-                 }
-             }
-         }
--- 
-2.42.1
-
diff --git a/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch b/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch
deleted file mode 100644
index b3fbc85f461b..000000000000
--- a/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00001.html
-
-From 12ad80f3a1cfa78c8a7b3a45458df7e07251317d Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@gmail.com>
-Date: Sat, 4 Nov 2023 10:38:48 +0000
-Subject: [PATCH 3/5] * info/scan.c (write_tag_contents): Check if added text
- is of zero length in order to avoid subsequently calling memcpy with a null
- source argument.  Report with -fsanitize=undefined on amd64 from Sam James
- <sam@gentoo.org>.
-
----
- ChangeLog   | 7 +++++++
- info/scan.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 3d13a15517..efbb3b22d1 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2023-11-04  Gavin Smith <gavinsmith0123@gmail.com>
-+
-+	* info/scan.c (write_tag_contents): Check if added text is of
-+	zero length in order to avoid subsequently calling memcpy with
-+	a null source argument.  Report with -fsanitize=undefined on amd64
-+	from Sam James <sam@gentoo.org>.
-+
- 2023-10-25  Eli Zaretskii <eliz@gnu.org>
- 
- 	* tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass
-diff --git a/info/scan.c b/info/scan.c
-index d6183ae9ae..bdf272f9bf 100644
---- a/info/scan.c
-+++ b/info/scan.c
-@@ -925,11 +925,11 @@ write_extra_bytes_to_output (char *input, long n)
- }
- 
- /* Like write_extra_bytes_to_output, but writes bytes even when
--   preprocess_nodes=Off. */
-+   preprocess_nodes=Off.  Note n could be 0 for an index tag. */
- static void
- write_tag_contents (char *input, long n)
- {
--  if (rewrite_p)
-+  if (rewrite_p && n > 0)
-     {
-       text_buffer_add_string (&output_buf, input, n);
-       output_bytes_difference -= n;
--- 
-2.42.1
-
diff --git a/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch b/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch
deleted file mode 100644
index 6f57363fc435..000000000000
--- a/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00000.html
-https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00016.html
-https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00073.html
-
-From 81a854e22ca2449f2351436a863e5262935f5dc0 Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@gmail.com>
-Date: Mon, 13 Nov 2023 18:43:40 +0000
-Subject: [PATCH 4/5] * tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks): Call
- obstack_alignment_mask to use 8-byte alignment.  Needed for Debian on
- sparc64.  Report of "Bus error" from John Paul Adrian Glaubitz
- <glaubitz@physik.fu-berlin.de>.
-
----
- ChangeLog                      | 7 +++++++
- tp/Texinfo/XS/parsetexi/tree.c | 7 ++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index efbb3b22d1..a146820671 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2023-11-13  Gavin Smith <gavinsmith0123@gmail.com>
-+
-+	* tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks):
-+	Call obstack_alignment_mask to use 8-byte alignment.  Needed
-+	for Debian on sparc64.  Report of "Bus error" from
-+	John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>.
-+
- 2023-11-04  Gavin Smith <gavinsmith0123@gmail.com>
- 
- 	* info/scan.c (write_tag_contents): Check if added text is of
-diff --git a/tp/Texinfo/XS/parsetexi/tree.c b/tp/Texinfo/XS/parsetexi/tree.c
-index f2d69e0454..09db6fc151 100644
---- a/tp/Texinfo/XS/parsetexi/tree.c
-+++ b/tp/Texinfo/XS/parsetexi/tree.c
-@@ -43,7 +43,12 @@ reset_obstacks (void)
-   if (obs_element_first)
-     obstack_free (&obs_element, obs_element_first);
-   else
--    obstack_init (&obs_element);
-+    {
-+      /* Specify 8-byte alignment.  Needed for SPARC. */
-+      obstack_alignment_mask (&obs_element) = 7;
-+
-+      obstack_init (&obs_element);
-+    }
- 
-   obs_element_first = obstack_alloc (&obs_element, sizeof (int));
- }
--- 
-2.42.1
-
diff --git a/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch b/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch
deleted file mode 100644
index 59b590617964..000000000000
--- a/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From f1f8920d798dbcb20cb775b46a54cd81847295fd Mon Sep 17 00:00:00 2001
-From: Gavin Smith <gavinsmith0123@gmail.com>
-Date: Tue, 14 Nov 2023 21:53:49 +0000
-Subject: [PATCH 5/5] * tp/Texinfo/command_data.txt (item_LINE, itemx,
- defblock, defline, deftypeline): Remove contain_basic_inline flag.  There is
- no reason an @anchor should not occur inside @item, inside @table, or the
- other commands, as no index entry is being created with the @anchor.
-
-Report from Ihor Radchenko <yantar92@posteo.net> for Org mode manual.
----
- ChangeLog                                     | 10 +++
- tp/Texinfo/command_data.txt                   | 10 +--
- tp/t/results/invalid_nestings/in_table.pl     | 90 -------------------
- .../invalid_nestings/table_on_item_line.pl    |  9 --
- 4 files changed, 15 insertions(+), 104 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index a146820671..0dcdb1a904 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,13 @@
-+2023-11-14  Gavin Smith <gavinsmith0123@gmail.com>
-+
-+	* tp/Texinfo/command_data.txt
-+	(item_LINE, itemx, defblock, defline, deftypeline):
-+	Remove contain_basic_inline flag.  There is no reason an @anchor
-+	should not occur inside @item, inside @table, or the other
-+	commands, as no index entry is being created with the @anchor.
-+
-+	Report from Ihor Radchenko <yantar92@posteo.net> for Org mode manual.
-+
- 2023-11-13  Gavin Smith <gavinsmith0123@gmail.com>
- 
- 	* tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks):
-diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt
-index bcda173e2c..c9b5f51569 100644
---- a/tp/Texinfo/command_data.txt
-+++ b/tp/Texinfo/command_data.txt
-@@ -253,8 +253,8 @@ printindex              line,formattable_line,close_paragraph,global,contain_pla
- listoffloats            line,formattable_line,close_paragraph,global,contain_basic_inline   LINE_line
- exdent                  line,formatted_line,close_paragraph            LINE_line
- # or nobrace skipspace, depending on the context
--item_LINE               line,formatted_line,close_paragraph,contain_basic_inline    LINE_line
--itemx                   line,formatted_line,close_paragraph,contain_basic_inline    LINE_line
-+item_LINE               line,formatted_line,close_paragraph    LINE_line
-+itemx                   line,formatted_line,close_paragraph    LINE_line
- nodedescription         line,close_paragraph                               LINE_line
- # in index entries
- subentry                line,in_index,contain_basic_inline          LINE_line
-@@ -494,9 +494,9 @@ defmethod               block,def,contain_basic_inline,def_alias,close_paragraph
- deftypemethod           block,def,contain_basic_inline,def_alias,close_paragraph    BLOCK_def
- 
- # generic, no automatic index
--defblock                block,contain_basic_inline,close_paragraph       BLOCK_def
--defline                 line,def,contain_basic_inline,close_paragraph        LINE_line
--deftypeline             line,def,contain_basic_inline,close_paragraph        LINE_line
-+defblock                block,close_paragraph           BLOCK_def
-+defline                 line,def,close_paragraph        LINE_line
-+deftypeline             line,def,close_paragraph        LINE_line
- 
- # def*x
- deffnx                  line,def,contain_basic_inline,close_paragraph        LINE_line
-diff --git a/tp/t/results/invalid_nestings/in_table.pl b/tp/t/results/invalid_nestings/in_table.pl
-index f4dcef1141..76eea8b3b4 100644
---- a/tp/t/results/invalid_nestings/in_table.pl
-+++ b/tp/t/results/invalid_nestings/in_table.pl
-@@ -1107,42 +1107,6 @@ $result_errors{'in_table'} = [
-     'text' => '@indent should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @indent should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 9,
--    'macro' => '',
--    'text' => '@indent should not appear on @item line',
--    'type' => 'warning'
--  },
--  {
--    'error_line' => 'warning: @titlefont should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 9,
--    'macro' => '',
--    'text' => '@titlefont should not appear on @item line',
--    'type' => 'warning'
--  },
--  {
--    'error_line' => 'warning: @anchor should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 9,
--    'macro' => '',
--    'text' => '@anchor should not appear on @item line',
--    'type' => 'warning'
--  },
--  {
--    'error_line' => 'warning: @footnote should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 9,
--    'macro' => '',
--    'text' => '@footnote should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => 'warning: @exdent should only appear at the beginning of a line
- ',
-@@ -1161,24 +1125,6 @@ $result_errors{'in_table'} = [
-     'text' => '@exdent should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @exdent should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 9,
--    'macro' => '',
--    'text' => '@exdent should not appear on @item line',
--    'type' => 'warning'
--  },
--  {
--    'error_line' => 'warning: @ref should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 11,
--    'macro' => '',
--    'text' => '@ref should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => '@ref missing closing brace
- ',
-@@ -1206,15 +1152,6 @@ $result_errors{'in_table'} = [
-     'text' => '@center should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @center should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 13,
--    'macro' => '',
--    'text' => '@center should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => 'warning: @cindex should not appear in @item
- ',
-@@ -1224,15 +1161,6 @@ $result_errors{'in_table'} = [
-     'text' => '@cindex should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @cindex should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 14,
--    'macro' => '',
--    'text' => '@cindex should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => 'warning: @cindex should not appear in @item
- ',
-@@ -1242,15 +1170,6 @@ $result_errors{'in_table'} = [
-     'text' => '@cindex should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @cindex should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 18,
--    'macro' => '',
--    'text' => '@cindex should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => 'warning: @cindex should not appear in @item
- ',
-@@ -1260,15 +1179,6 @@ $result_errors{'in_table'} = [
-     'text' => '@cindex should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @cindex should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 21,
--    'macro' => '',
--    'text' => '@cindex should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => 'warning: empty index key in @item
- ',
-diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl b/tp/t/results/invalid_nestings/table_on_item_line.pl
-index b1184ba915..51ba523fd7 100644
---- a/tp/t/results/invalid_nestings/table_on_item_line.pl
-+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
-@@ -273,15 +273,6 @@ $result_errors{'table_on_item_line'} = [
-     'text' => '@table should not appear in @item',
-     'type' => 'warning'
-   },
--  {
--    'error_line' => 'warning: @table should not appear on @item line
--',
--    'file_name' => '',
--    'line_nr' => 2,
--    'macro' => '',
--    'text' => '@table should not appear on @item line',
--    'type' => 'warning'
--  },
-   {
-     'error_line' => 'no matching `@end table\'
- ',
--- 
-2.42.1
-
diff --git a/sys-apps/texinfo/texinfo-7.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.1.90.ebuild
index 6cb50bcb6b49..eda59950b465 100644
--- a/sys-apps/texinfo/texinfo-7.1-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.1.90.ebuild
@@ -27,7 +27,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	REGEN_BDEPEND=""
 fi
 
@@ -53,11 +53,6 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.19.6 )
 "
 
-PATCHES=(
-	# Backports from the release/7.1 branch
-	"${FILESDIR}"/7.1
-)
-
 src_prepare() {
 	default