gentoo resync 08.09.2018

5 files changed, 53 insertions, 6 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index df6b1129caef..ef6d5cdd7793 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 143c0afcfc5c..01c4fec0fd5d 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -4,13 +4,15 @@ AUX clozurecl-2.patch 1505 BLAKE2B c5550f79e67dd007c970759c5e734009d1cb4fa0af728
 AUX cmucl-1.patch 1336 BLAKE2B 59767907f9f2734fa43e8d9c0e876cf2bf1f2cb0e360976ddd08b4eda9685cd1b862aa072a2f0202733db5ab91958bf0d6b48af3d20e6748f4de2e6b366f49ed SHA512 3b8c01ecbbcd87101e4e31356293216d9c2a018ddabc076905a8b87eeda27bea6cd36242ab6b9caf7553fb9187544beb620b739211c63e21afa1b2f050ef318e
 AUX ecls-2.patch 1612 BLAKE2B 1f06a895ed09844e8d42f462e4541a49de46762a3e9189073a7624785937da2b5ec0e5c54e230652f80bc47a359793c1ed25209061787c3e2b0da76025bdbc86 SHA512 cd37e62c24f24e49f264d63526615537cb088386cfc48f3eac8fcc746d16f6d79c585dee6f24c664fca355f539728a1a23cc75f3672c240a210a407e87b73141
 AUX emacs-0.patch 807 BLAKE2B 82c879f9c252c4efefb007f8553e845ddc52d76af5cbeab740a1f2bde459b5e87957e0f3e5a9d76d5c1e879ddbebdfb9a6d6b80745cc40e3ddc4379887f4e9b2 SHA512 f62d364651838ed196a2e8965930b42313cb73f912b898b953b526ffc5dc0135841b53618fbbb6a32d21d3412ba5f2bfb253bf41c640a136f68d830f43628ac4
+AUX emacs-27.patch 667 BLAKE2B 2482b30a6940b4d217c9e19485c825435ec37bd030a835ce6aaad3cf3c50170c14cb831a0aef246e75c1b5508a1a6d2e5a6e2642d2a03cea58d0ac482e254125 SHA512 8dc34146327e5ff2ab0fb84e39b240e6ee25ee4457e756e6fba6d521615b2fa9c0c86d1bd3980db6153ea1651399d359aac7a17189ad8a7f40f76392aade8bb2
 AUX rmaxima-0.patch 552 BLAKE2B 8b8ceb5ea671049490ab006be31f6e81f85d9e43950296db920b3a0d4eb8b19cd14b8b599c98e1dc82f69d441d04c631c4aec2315eaee68f791ddce75dc7ed56 SHA512 a60c8c5ac23b0342823fbcd15e27f44ea85652640271ea845e383796422fa416b221dd036eb0a1639f70f9b09473471657612c7a5f99892cfb214d52156a6907
 AUX sbcl-2.patch 1072 BLAKE2B 3e16339b7b9acbbfcd424780432be4a4267b994c3a7a8774c95ff8335d48565d15dae3cba16b127a9184e4fe20b5d6930df2e385c2a15b9f58e2d0fa597665a1 SHA512 b8df0b53f4ae04e175dfab8889206ea8ffa83c51b2408322423d5f52cf956b1084e7d1ba0c054032f9121cb1684fcc6bb9d48b1a967f9e01492ad25c035b1c62
 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
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
 DIST maxima-5.41.0.tar.gz 41540226 BLAKE2B ff726044c9026bc58d04832fa6382146ed7e7d61d801fa7131b1e7e2ed386b99e238e039481697f9aa24cea59ffd0f6811675cd28818c9fe53f023f965f9d149 SHA512 1b93ae2db055ba7fb4a95924a896667f0cfa1c675c603c104181662aeb32b10b006158526b2f3ad93a59688a23eacdc82e870bb8ffb182a89e1e51de013ec209
 EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
 EBUILD maxima-5.41.0-r1.ebuild 4890 BLAKE2B 5aa2a97dfd4dc72718a544c7de8a058d7a5ed102086b52e51906421cc69182df0252b336a7e4c2469cbe51fb761154088812edb764355859e3718eaa1b574783 SHA512 a2bfb607dfe6faa7098ae880ca4f3b7e3db808ecfa714611947df5d4fe00d7fdc6b9f7477ae9ccd3d83f25ae70c7eeffd0295105b5043ebbaeaa4c7f1bea8ee3
-EBUILD maxima-5.41.0.ebuild 4826 BLAKE2B 2e0083e13d70aa1f946af706b480785a2dc4ed646ddfb22b06a5c9523e6d495130f0fe0682db6c9ffcfd1b199479db01a1010d91882d537115e7d62cdf7e9988 SHA512 dd5a2bf511a9018b6576e9ebff7ac98806d1b8ed02b0b8b1c3c21809060485290131339a02e0284b717163e23af745e36c0176891167e2e476a5fb1a7e5ec2a1
+EBUILD maxima-5.41.0-r2.ebuild 4919 BLAKE2B 3f0de627f910ab9f749983c1dda434834738c2d9fed5749260a7d97bef9af64de6347a236a185e61312bd851afbd98d3fbbe769cbdff135188a99d7269011a6f SHA512 4cd6fff9032366c57bdc314716c58f72a2bfe61961db813cd3eab3b8a1c31349215ec338927dfface779d3386a85b32802a46beb90a3096690da8e4880a69902
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/files/emacs-27.patch b/sci-mathematics/maxima/files/emacs-27.patch
new file mode 100644
index 000000000000..ded116599008
--- /dev/null
+++ b/sci-mathematics/maxima/files/emacs-27.patch
@@ -0,0 +1,10 @@
+diff -r -U2 maxima-5.41.0.orig/interfaces/emacs/imaxima/imaxima.el maxima-5.41.0/interfaces/emacs/imaxima/imaxima.el
+--- maxima-5.41.0.orig/interfaces/emacs/imaxima/imaxima.el	2016-04-03 03:42:45.000000000 +0600
++++ maxima-5.41.0/interfaces/emacs/imaxima/imaxima.el	2018-09-05 20:29:46.843231210 +0700
+@@ -528,5 +528,5 @@
+     (set-process-filter imaxima-gs-process 'imaxima-gs-filter)
+     (imaxima-gs-wait)
+-    (process-kill-without-query imaxima-gs-process nil)
++    (set-process-query-on-exit-flag imaxima-gs-process nil)
+     (unless (eq (process-status imaxima-gs-process) 'run)
+       (setq output (shell-command-to-string (concat imaxima-gs-program " -h")))
diff --git a/sci-mathematics/maxima/files/xdg-utils-1.patch b/sci-mathematics/maxima/files/xdg-utils-1.patch
new file mode 100644
index 000000000000..4150eb52cb9b
--- /dev/null
+++ b/sci-mathematics/maxima/files/xdg-utils-1.patch
@@ -0,0 +1,31 @@
+diff -r -U2 maxima-5.41.0.orig/interfaces/emacs/misc/bookmode.el maxima-5.41.0/interfaces/emacs/misc/bookmode.el
+--- maxima-5.41.0.orig/interfaces/emacs/misc/bookmode.el	2017-05-29 05:30:43.000000000 +0700
++++ maxima-5.41.0/interfaces/emacs/misc/bookmode.el	2018-09-05 20:53:02.518172515 +0700
+@@ -681,5 +681,5 @@
+ 		  (and tem
+ 		       (list (concat "View "(nth 1 tem))
+-			     'call-process  "ghostview" nil nil nil
++			     'call-process  "xdg-open" nil nil nil
+ 			     (expand-file-name(nth 1 tem))
+ 			     ))
+@@ -706,5 +706,5 @@
+ 			  (cond ((looking-at "%PS") "")
+ 				(t "gzip -dc | "))
+-			  "ghostview -")
++			  "xdg-open -")
+ 			 
+ 	)))
+diff -r -U2 maxima-5.41.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl maxima-5.41.0/interfaces/xmaxima/Tkmaxima/Constants.tcl
+--- maxima-5.41.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl	2016-04-03 03:42:45.000000000 +0600
++++ maxima-5.41.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2018-09-05 20:55:25.180166516 +0700
+@@ -154,7 +154,7 @@
+     image/png  netmath
+     image/jpeg netmath
+-    application/postscript "ghostview -safer %s"
+-    application/pdf "acroread %s"
+-    application/x-dvi "xdvi %s"
++    application/postscript "xdg-open %s"
++    application/pdf "xdg-open %s"
++    application/x-dvi "xdg-open %s"
+ }
+ set maxima_priv(imagecounter) 0
diff --git a/sci-mathematics/maxima/maxima-5.41.0.ebuild b/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild
index cf8753a2f9e6..c09441ad8026 100644
--- a/sci-mathematics/maxima/maxima-5.41.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.41.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools elisp-common eutils
+inherit autotools elisp-common eutils xdg-utils
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
 HOMEPAGE="http://maxima.sourceforge.net/"
@@ -95,21 +95,23 @@ pkg_setup() {
 
 src_prepare() {
 	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 )
+	PATCHES=( emacs-0 emacs-27 rmaxima-0 wish-2 xdg-utils-1 )
 
 	n=${#PATCHES[*]}
 	for ((n--; n >= 0; n--)); do
-		epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+		eapply "${FILESDIR}"/${PATCHES[${n}]}.patch
 	done
 
 	n=${#LISPS[*]}
 	for ((n--; n >= 0; n--)); do
 		v=${PATCH_V[${n}]}
 		if [ "${v}" != "." ]; then
-			epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+			eapply "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
 		fi
 	done
 
+	eapply_user
+
 	# bug #343331
 	rm share/Makefile.in || die
 	rm src/Makefile.in || die
@@ -194,6 +196,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_mimeinfo_database_update
 	if use emacs; then
 		elisp-site-regen
 		mktexlsr
@@ -201,6 +204,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	xdg_mimeinfo_database_update
 	if use emacs; then
 		elisp-site-regen
 		mktexlsr