gentoo auto-resync : 15:11:2022 - 06:52:13

4 files changed, 48 insertions, 1 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 45b1875c4913..12efd267862f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index ae1bf5102003..38516b807e54 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -4,6 +4,7 @@ AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b4
 AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 AUX octave-6.4.0-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c399b0bf7af26be7f79e35c29fc2963124852067429f7ee25325402ad6983c047398a5c43c2d9f44d3a96e5c3db49282f826ecab82 SHA512 a1edd69d06aadd5c9772b12f32468bcd25b181883d3c303cd5ff58175e95021ed661d363137002a50073ec9c90564442c8b968ea1a3ad6fe56a80cf27e2efc3a
 AUX octave-6.4.0-slibtool.patch 1416 BLAKE2B e4b487481490b41a4da499bb5eceff0f6a25a7e25d4f6c76088c3703259ab4899a354b0cf67eecb989bf4c4c05836be09881cce72145b3badca1393bd386a85f SHA512 cac0d183b3c555a25db37df250b2517ae4b762b7bc0d65ba0cb1093133f6f7ada42f6745b060d17f59c2177976841dafabcda61cf03d9cd14028399472f28ed7
+AUX octave-7.3.0-docs-texinfo-7.0.patch 1623 BLAKE2B 36a6ceda753083171ece9e4045af8551121f7073901d9f32facfd6c2bb88a10226f5aa719a79e8677c7a0cb7f26a226f2da190d9b4281b3fd666f570af3ac761 SHA512 0ac71393c59681a2188316356235ddb876e5c7cbf4a2ff1752bd3dddde7babeb456e0619ed65e32d5048d754416fb33c949aa0979748f7282e3e9d2589931612
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
@@ -12,5 +13,5 @@ EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c019459
 EBUILD octave-6.4.0-r3.ebuild 6043 BLAKE2B a99d2325249cbd29bcc3b00e734b28f7de4b61025f8f2133d5b7c53ad7bbb14bdbbd068ac204e3f7af80143c3797ec97688487b70361f8966dffd06569b3612d SHA512 559c07c35ecc7011e0f44a23fb2ad392a1562221f7218c0b5d89a2a9a2dd60e9f68e9cf3345b226d572d5da85d63cbe051643363bc9e1896ce4820817317f605
 EBUILD octave-6.4.0-r4.ebuild 6031 BLAKE2B 30bbe11d7ac6fea759463681cfc49a5779cec4eb99aaf5917bf9d8955bc03d63ec6e7c45b8589a54e7ca79dfe302ee60f6f20ab8a667c3a2ebb2d5d9e5e6bc56 SHA512 dcf58e44d24a894d18b2478727f970ac39f81ccd38947147dabc3f88ba8e637b6d783b136073bc2a5d4155b065d387e3f183131bc838a98c1a52bb6274c6bad1
 EBUILD octave-7.2.0-r1.ebuild 5527 BLAKE2B 799a3175791ed82cc0f46bca34f6280a5b51b0e42381e627b748f195fa965a84fda6f562d8c6e6a20b3074a225d87a9b5ab1f8ba41b8978d3187d14df569ba0e SHA512 cfa3e263ce589e39b47b5c9240c63fe006a8751b81bf03850dc91848965fb46bc67db069550e86db5a4f3bc653ae7ab7744930753bbfbcfbcbde3efa91b4e5a0
-EBUILD octave-7.3.0-r1.ebuild 6599 BLAKE2B 04882a116b9c33d4cd536b446205edf7c858cd5a57aa3bcc927313a81e94ba26f195b6eaca795e45f8938afec9e8392342272224075d1901611bfb217fbc574e SHA512 291902d0fbf8a1ebb099e98629a9341d0ff655c2a8efaf9f304d6c7c93c9716606985451dad7425e9b4138e20595e71136dc18b0292bab85ed47c7a171bbd62e
+EBUILD octave-7.3.0-r1.ebuild 6642 BLAKE2B 9fd71ca76e0969c76fd43ac631713706b2feea06782947982c1dc2cc6d1429facfcccd9fc00664b55893adb2a3da78c8311f7d92075d8f52e645cdc281a5fb7b SHA512 c0a04936e0b6443d0d13605a17dbc9407b42d6474609e7a6c7b0c09b9c39c670b1cf3dc8bdab149170bd8efb371496d410fe8aa5c40790e539206b1448d99d90
 MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8
diff --git a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
new file mode 100644
index 000000000000..7a6249ae80d4
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
@@ -0,0 +1,45 @@
+https://savannah.gnu.org/bugs/?62648#comment22
+https://bugs.gentoo.org/880623
+
+# HG changeset patch
+# User Rik <rik@octave.org>
+# Date 1668451079 28800
+#      Mon Nov 14 10:37:59 2022 -0800
+# Node ID 67d5b2d119e254efc3d9f2658de47b293ac1f6eb
+# Parent  9f4a9dd4a6ee34ddc6e8d0a87d0c703782af7358
+doc: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648)
+
+* mk-qthelp.pl: Update regular expressions that find the start of data in
+index.html and Function-index.html to include additional pattern generated by
+Texinfo 7.0.
+
+--- a/doc/interpreter/mk-qthelp.pl
++++ b/doc/interpreter/mk-qthelp.pl
+@@ -26,8 +26,11 @@ if ($#ARGV != 1)
+ open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
+ 
+ # Skip through preamble of file to find start of list
+-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
+-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
++while (defined ($_ = <$HTML>) and ! /^<div class="contents">/ ) {;}
++while (defined ($_ = <$HTML>)
++         and ! /^<ul class="(?:no-bullet|toc-numbered-mark)">/ ) {;}
++
++die "index.html: reached EOF without finding data start pattern" if eof ($HTML);
+ 
+ $level = 0;
+ while (<$HTML>)
+@@ -68,7 +71,11 @@ die "Failed to parse index.html" if ($le
+ open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
+ 
+ # Skip through preamble of file to find start of list
+-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
++while (defined ($_ = <$HTML>)
++         and ! /^<table class="(?:index-fn|fn-entries)/ ) {;}
++
++die "Function-Index.html: reached EOF without finding data start pattern"
++  if eof ($HTML);
+ 
+ while (<$HTML>)
+ {
+
diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 05285cf1f3e5..0901c51c9f76 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -131,6 +131,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
 	"${FILESDIR}"/${PN}-6.4.0-slibtool.patch
 	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+	"${FILESDIR}"/${P}-docs-texinfo-7.0.patch
 )
 
 src_prepare() {