gentoo resync : 03.11.2019

3 files changed, 15 insertions, 2 deletions

diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 75f0cc6cdd62..ed60fb4f4c93 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -8,6 +8,7 @@ AUX ecls-3.patch 2147 BLAKE2B d454b620f01d734d6a774f64dbac67f0996aeacc2a029225cc
 AUX emacs-0.patch 807 BLAKE2B 82c879f9c252c4efefb007f8553e845ddc52d76af5cbeab740a1f2bde459b5e87957e0f3e5a9d76d5c1e879ddbebdfb9a6d6b80745cc40e3ddc4379887f4e9b2 SHA512 f62d364651838ed196a2e8965930b42313cb73f912b898b953b526ffc5dc0135841b53618fbbb6a32d21d3412ba5f2bfb253bf41c640a136f68d830f43628ac4
 AUX rmaxima-0.patch 552 BLAKE2B 8b8ceb5ea671049490ab006be31f6e81f85d9e43950296db920b3a0d4eb8b19cd14b8b599c98e1dc82f69d441d04c631c4aec2315eaee68f791ddce75dc7ed56 SHA512 a60c8c5ac23b0342823fbcd15e27f44ea85652640271ea845e383796422fa416b221dd036eb0a1639f70f9b09473471657612c7a5f99892cfb214d52156a6907
 AUX sbcl-2.patch 1072 BLAKE2B 3e16339b7b9acbbfcd424780432be4a4267b994c3a7a8774c95ff8335d48565d15dae3cba16b127a9184e4fe20b5d6930df2e385c2a15b9f58e2d0fa597665a1 SHA512 b8df0b53f4ae04e175dfab8889206ea8ffa83c51b2408322423d5f52cf956b1084e7d1ba0c054032f9121cb1684fcc6bb9d48b1a967f9e01492ad25c035b1c62
+AUX texinfo-0.patch 369 BLAKE2B 55d543054f7e50f9fe8a123eaaede8bdfebf256675b19f3bcc4e616d7ca8b165a700bf55983cb156885e8adb484ea8e3da601416842f7e772c3284a564087625 SHA512 42faa61859dfb64cdf616c5fabc06f215a52c1170067ad14721273fc997fa2d6f0b644d816b50707474a621c55c58a8e0276ff76c5114f53be7a43c40a627227
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68193e92fce4b23e03a0430ae095891183497e5deb969f1ba5e68f2423a9576c7465b137300bc2b096803 SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
@@ -18,5 +19,5 @@ DIST maxima-5.43.0.tar.gz 34605709 BLAKE2B db9db75b7eff0454d4b9595120d726969b4e8
 EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
 EBUILD maxima-5.42.1.ebuild 4904 BLAKE2B 9e3ebeec6da72caab22651f9e2421d36b7eed178a3aa86d07e7cdc62cba8af5a762ff6394a002138a83f03e313c3c0c80a9f2bf3343a1cb85b3a2182ffae8332 SHA512 0d6ce53ea40e4d34de1958a9e9739ff95179b424ac816b108c30f711784d5c1aed240a16c1b7c26f16b95a4b468c6113b79e434fc4a823dbf60697eff986f54e
 EBUILD maxima-5.42.2.ebuild 4907 BLAKE2B e01606981d1a4bb47d35ba0eece7ed52397cda03a913c1c9d198346db458fd6906d33cde56ac29881c864ac4c7fc14e93d111544005b1a20bfe0836eb0a5822b SHA512 afdc36255024bb493e1b119cda07cf37a9aa871c6b49af412121e45e12be2e510211ea8ad828dda76686d6cf2df435c8eccca7e264297f0abac8138b72d8a56f
-EBUILD maxima-5.43.0.ebuild 4949 BLAKE2B 01d050edf6f5a4677c9e9919d644de24a2ee073f2f104b126b55d06c46a247150171b160d437b893da1828df12f32665bd2d7bef78f8b565f7ec7e38c304dda6 SHA512 1729fc4fe938e78d0926cf4a0fb2b9dce261ccdc8454557037218dc8f65a850fe95fc9bf6b294348a82a784a50ccd984df5a5fda48f9a27774d1386feb0d501e
+EBUILD maxima-5.43.0.ebuild 4959 BLAKE2B b11cbeae9caa8c629f0225ddbb311c3dbf283b27220ac43feef11891aa5d90ab4bf1ee5f605e7d029df026ff4a74d362d4375bf8b608e157001ce142a35d6d14 SHA512 5023e9230297bd2550e47e6b65d2fa050e1aeddb6d9c3dd4ca43e8b7c6f6c9a12787cec4e8d330d8b0d01cc90e930225c3b5a367d170b29b65fb37f288fb284d
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/files/texinfo-0.patch b/sci-mathematics/maxima/files/texinfo-0.patch
new file mode 100644
index 000000000000..9b8782dffce6
--- /dev/null
+++ b/sci-mathematics/maxima/files/texinfo-0.patch
@@ -0,0 +1,12 @@
+Fix build with texinfo-6.7.
+https://bugs.gentoo.org/697494
+
+--- maxima-5.43.0.orig/interfaces/emacs/imaxima/imaxima.texi
++++ maxima-5.43.0/interfaces/emacs/imaxima/imaxima.texi
+@@ -1,5 +1,6 @@
+ \input texinfo                  @c -*-texinfo-*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename imaxima.info
+ @settitle Imaxima Manual
+ @paragraphindent 0
diff --git a/sci-mathematics/maxima/maxima-5.43.0.ebuild b/sci-mathematics/maxima/maxima-5.43.0.ebuild
index c537cea53d2c..3d2e01212877 100644
--- a/sci-mathematics/maxima/maxima-5.43.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.43.0.ebuild
@@ -96,7 +96,7 @@ pkg_setup() {
 
 src_prepare() {
 	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 )
+	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-1 texinfo-0 )
 
 	n=${#PATCHES[*]}
 	for ((n--; n >= 0; n--)); do