gentoo auto-resync : 10:10:2023 - 00:07:53

4 files changed, 34 insertions, 1 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index e38214c1b464..806e2be3fadf 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index a1b784a0d6db..8724abb9d32b 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,4 +1,5 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
+AUX gnuplot-5.4.9-unbal-braces.patch 941 BLAKE2B 522b30cd34e317853d8dbff35fe9800e0cd669388d885d45fc8ad3a8bb01e72875885c3ae592a8d062c53f8e090449fbaa9431d282b8f53b1bf5927a918e332a SHA512 9f77032cd4497e8ebe21c67d127c45834d48ef41cc5be2a932c4012790bf507893dc7f16c46da2b87ae6c4d8b508e50e835eaf3eb2a978033b7cdb09e04d55ff
 AUX gnuplot-6.1-no-picins.patch 628 BLAKE2B ab7ffcfecee328d4a8653af0c5cf80470ac65299b5576835db5083b01b461b359775b2b72ef87a757072cce406daa18d3b116bae2c89f8291cd4154e0a7300e4 SHA512 45f5db5745de1d96a2abf987f2d5e85a827bbd298675f4f4b1526ff96d22de12c4b8de75b86fb87447891aaa9e45b158531d1bf7386617824057b56c9de5f0c3
 DIST gnuplot-5.4.4.tar.gz 5639573 BLAKE2B 739849d123836c6c982c72a292274d55808cfecd34a36143ecc454b11215951d28efda1815b15048316e96a2f046789b35b8324c53655f2ac1361653235a23b6 SHA512 ec2f4f34e119a79adeaf2bc3ec1e9335147bd8808d6e689844b891b60319b6d0f627d8ec1b90c4df6bae5e6ed6373c51e1fb70373258c32b93cfc4b2ed821cb9
 DIST gnuplot-5.4.6.tar.gz 5655661 BLAKE2B a4e42679c9942936bc4692ba71a17c748002e0ce216b7980a79866d6f4090ff012b7079a8a1fb1b7d91c5df86afa8b2cb9f8c0b458184a4e0044cf7fbe715e45 SHA512 a78333f7c0ed3429b24fcdeb6296e67fb760e6f8ffc0801a6b379fcb12ae7e80cebe65a2655cb3530c2a2d4083adc34060c9a7cbe67ce98b660682c0edba174b
@@ -7,6 +8,6 @@ DIST gnuplot-5.4.9.tar.gz 5686930 BLAKE2B 5695739d67f04a3f993a8ce1515fd94f833811
 EBUILD gnuplot-5.4.4.ebuild 4984 BLAKE2B 9b213f11c3aaaae7657c94b90a5370674d7dfe62a87f286a987e7c19f21237ad9adf64cf7c6d852f7a349a75551609851324ad1d0b055cdf2b4169f18b972ee0 SHA512 8f7f27a98516897ed39cf63f65d44d371a27594b0c9ac1e66f602a93c953a74266c1cb51096a6bb540fb34d25aa779e324ea6d6611ec86458872d284ccb7addd
 EBUILD gnuplot-5.4.6.ebuild 4990 BLAKE2B f22947c3f5548c5d3bbfc948ba159f8686585e58b2e6c3a1008d393b8c3070c8f6e44693c8ea4a268f37ce29939a887ad3580cbd677760c75b7514796b4e8982 SHA512 563301a91cc95fa2f663c7b9940f20babcda74d9ba780a4f5552235e8bcbd8b4e9e0542eca5cb9e1ea106cb05672dec2fd292e39bd52c1d87be1734c6cd1c1b1
 EBUILD gnuplot-5.4.8.ebuild 4987 BLAKE2B c9ac3e3fab730958639c2730c117bdff1cce9e4fab8986d43f5273783cd3d1744e4775320cb606ee1c1dbf694a65485f862287e051caa781b1af688c675f6113 SHA512 501f38e046f00f9647124936952045bdc54496d63fa7fd7700ea820550fb945cd73b2f96b455cc77a49b5ee2589cada1e83934aedbfe30b4965d5e2d3adba1e0
-EBUILD gnuplot-5.4.9.ebuild 4991 BLAKE2B 4b38aa2b1b94950cfbf5558f232d124ef20c1e7f0ed576d576adf57bb982fabeb26055ebff85928b17eb58b52748f8ab13ec327a4732570e7dc217225bd2778c SHA512 13e7c291bb4705f02dffae8c4a2cf39e6fc2d719f06770abb7f9eeab68afa36d44b5fbc25cddc7fe9be873f21dbd1e21e4cad2bf76a00ad86ad0dd2be777b4e9
+EBUILD gnuplot-5.4.9.ebuild 5037 BLAKE2B 5d0eb6df13409fad091b9ed8e7003bf40f4da5408f96a4807ea913764fbac911df3347f9eec4aee89709c1a2466bd91d909561fcf0a440e50e79e7fc948eb568 SHA512 e435e5869ec5c5bb94a2762c04c5b97b27bae3ef126aa4b968df1d0eaefda7d58a7e47da15e8f0bdbf34e3959d7743c8334541e182d2f5d38b11beba1ffa7bc1
 EBUILD gnuplot-6.1.9999.ebuild 4901 BLAKE2B 8d6e8ff2d8af772c659b77cf1f94668ff3b855dcd1c04bd0b1039235465f641aff486e07d8924442217700fed7b8228996adb774bff602a519cc17643e3a33e0 SHA512 2e0a2e83ede7a17314b44bceae134dc6318a2142b9519898fd12cd6d7c7c8c127afa35c3315fdcdfb384eb2adc70a89ab2ef781f2a135ab65cb7c8966ed74d51
 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch
new file mode 100644
index 000000000000..3261f60e61c1
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/915492
+Patch from upstream branch-5-4-stable branch
+
+commit b5b668ca442e0d7399e2b432fe5fe5fb4c48a1a2
+Author: Peter Korsgaard <peter@korsgaard.com>
+Date:   Sun Oct 1 10:20:31 2023 +0200
+
+    term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds
+
+--- a/term/post.trm
++++ b/term/post.trm
+@@ -4000,17 +4000,16 @@ PS_image (unsigned int M, unsigned int N, coordval *image, gpiPoint *corner, t_i
+ 	cscale = 1.0;
+ 
+ #ifdef HAVE_DEFLATE_ENCODER
+-    if (ps_params->level3) {
++    if (ps_params->level3)
+ 	encoded_image = (void *)PS_encode_png_image(M, N, image, color_mode,
+ 					    bits_per_component, max_colors, cscale,
+ 					    &num_encoded_bytes);
+-    } else {
++    else
+ #endif
+ 	encoded_image = PS_encode_image(M, N, image, color_mode,
+ 					bits_per_component, max_colors, cscale,
+ 					(ps_params->level1 ? PS_ASCII_HEX : PS_ASCII85),
+ 					&num_encoded_bytes);
+-    }
+ 
+ 
+     fputs("%%%%BeginImage\n", gppsfile);
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
index 7a6239265ec3..f1d6a09bdf07 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
@@ -80,6 +80,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${PN}-5.4.9-unbal-braces.patch
 )
 
 pkg_setup() {