gentoo resync : 20.10.2021

6 files changed, 33 insertions, 4 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 925389f627f2..09c118227aa7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index c25265d744c7..d624968a9ddb 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,8 +1,9 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
+AUX gnuplot-5.4.2-signed-char.patch 911 BLAKE2B 1387aee900be9686906743e3f98e011164a913744b4fb1b9617e9a9235a35a1e39456a97372f41aa1767603164be11a36a602fa986848b770fcde08e4ff0baf7 SHA512 ce89ff63565640aa3764d39056430dbabf7bba7bc73ebff5a9f9fd2ad8d6a570d01629dca13fb46a293f86b240cdc6e4d7cdcb820bf497383a085137f0360d85
 AUX gnuplot-5.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
 DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
 EBUILD gnuplot-5.4.1-r2.ebuild 5042 BLAKE2B 6fa53714315ccba15617f2d1432b16954fdd1ae4149092b969d3e290ee3c6db4ec25bcde7c2df8463c8869b2a41b18498b1a7032bf5b7ca88a6f12d289363e01 SHA512 9da90847f61f7ae65c0c277c4e7acbf9a6f4526fd00910c74e1b425014d112a641ab0bc0239f6de6ffccaf3feb61991568216b75181e139f6f62e36df477f4e3
-EBUILD gnuplot-5.4.2.ebuild 5096 BLAKE2B bc29b277ef40de413d55353622d0966ac6858282e42f5abb11b5a813ef67f6706fd31d8cdaadbc33eed46b1d323d1aae33ccc79f4d2f68ef5b4ef596835f5f38 SHA512 d0158630db9c0da56c2f10785be76fd70b8d408384b029992d966e848906692cb299137b43df1d741351e53e8da091d3be90628434323ca3963c3d36f26045d2
+EBUILD gnuplot-5.4.2-r1.ebuild 5132 BLAKE2B d62973527e704672085b63a389504f604ea72b0c21a7b057eaa6340799fc6b859c62dfb6f434b74dcf260572fbbbad4f099b2c0ab998e5f98ff5fcc7f6751426 SHA512 fbab1c26a64d601fb73222460a0a269853d9380aa58a7a448c22cdbdaf34572601936bf44dd9c9025d4ea90c74bfa9411c69ca2afb6e7a4b72b0cdf4ff71695c
 EBUILD gnuplot-5.5.9999-r1.ebuild 5091 BLAKE2B 70e126dfefdf64242cd31672e9a783f98b0f85d45d29f5efcc0f92447258b8aa2d1185f981bec5b50eccd56777eac3fa5a35b84ee162e68104fd7156b9304baa SHA512 bd590b42775e62687c335e967cc025095847f6c1237c96ad657bc2fa910069854833d2dcc80aeff1b3b2506ce6223e3d2be76f2a720d632de46be6298e7dfd07
 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
new file mode 100644
index 000000000000..091dbbc88d8a
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
@@ -0,0 +1,27 @@
+char defaults to unsigned on ARM, causing a test failure.
+Patch from upstream.
+https://bugs.gentoo.org/811927
+https://sourceforge.net/p/gnuplot/bugs/2467/
+
+--- a/src/marching_cubes.h
++++ b/src/marching_cubes.h
+@@ -58,7 +58,7 @@ static const short cube_edge_flags[256]=
+          First official public domain release
+               Version 3.00 dated 8-6-94
+  */
+-static char triangle_table[256][13]=
++static signed char triangle_table[256][13]=
+ {
+     {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+     { 8, 3, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+--- a/src/qt_table.h
++++ b/src/qt_table.h
+@@ -10,7 +10,7 @@
+  *     collapsed them into quadrangles.
+  *     So there is room for improvement in this table.
+  */ 
+-static char qt_table[256][13] = 
++static signed char qt_table[256][13] = 
+ {
+     {  -1, -1, -1, -1,  -1, -1, -1, -1,  -1, -1, -1, -1,  -1},
+     {   8,  3,  0, -1,  -1, -1, -1, -1,  -1, -1, -1, -1,  -1},
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
index e5291b4e9988..bc1482bf1048 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -80,6 +80,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${P}-signed-char.patch
 )
 
 pkg_setup() {
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 4464bd52171c..23bd263fb423 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -2,5 +2,5 @@ AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b66
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
 EBUILD quickplot-0.10.6-r1.ebuild 913 BLAKE2B ffbddeef6843c940e33fad83c0f2445e7e9e28b8094085307d24bef00753ba81c109afd28ed354c562ca04005d1b8d2a02212c64ab1bd2b4038593d3efd1ef75 SHA512 08a9c86b2a0fda0edd61124765a5d53220dcfb0ad960b420d878cd34a84b6374b23b74b3784b10f6caf9eec985c3458177b716619616c4014acbde4a07def11a
-EBUILD quickplot-1.0.1_rc.ebuild 1045 BLAKE2B 5259ca25ce3b38513b2e59bd3a926f0091a755c45bcba3287aa322838fd0851e444ff317d9d019268466c812de1bde30f3a2e648bdd3ddc85febbc0cb8a91a79 SHA512 ae4cc45a02c89bda473e90c02f0f787aaf2e1fd36bab9a9c15b01b38766ab7c3ad8b5cb2c93b24bd6ec6f4d3f5955a10c4b3618238deadc1882cd4b2d31e499a
+EBUILD quickplot-1.0.1_rc.ebuild 1049 BLAKE2B 95da406e7bbf6ba8d6a58e0b0f04c93d14db32885999940cf90a6aba396d4b0216d9eb7dacf4918f0f78c2ca051c76714ce6aaa3d1571216036d17976aa08b65 SHA512 747c65570b6a7d49bbbabaf2c1a256300bf15c0d7e4959269f38ec3fe6fa0e220e0b96d3f7f32015583a2f846506cacda7601dd39bcd0163602c2544ca36a884
 MISC metadata.xml 854 BLAKE2B 4e2e7c92a5714b9caf303651c86572e1e4ba1a600d37a094ec75c6565497e73babe209be92c60c04b79add70b1784284a4061b094baed4d3a5583da461164934 SHA512 df7c990e32ce3f14d741d2b701e406a1bc6a1655d318d7ac50cf661fbe4a1a3be8c8ffa64322f66dea201f1886fb604fef6245a666f1a8f79b0d7739eb233710
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 688dc57516ed..08a6ff3d92ce 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	media-gfx/imagemagick[png]
+	virtual/imagemagick-tools[png]
 	virtual/pkgconfig
 	www-client/lynx
 	dev-vcs/git"