sci-mathematics/octave: Fix >=qscintilla-2.10 detection

Gentoo-bug: 617024
Package-Manager: Portage-2.3.11, Repoman-2.3.3

diff --git a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
index 9d18b6a6d7ce961178fab8a657e67f1377a8a4c8..ea714ecbfbbf34027266e9180a5ab4d409981c92 100644 (file)
--- a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
+++ b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
@@ -8,7 +8,7 @@ as its Qt4 variant.
      5)
        QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
 -      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+      octave_qscintilla_libnames=qscintilla2
++      octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
      ;;
      *)
        AC_MSG_ERROR([Unrecognized Qt version $qt_version])

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild b/sci-mathematics/octave/octave-4.2.1.ebuild
index 00a2d44ce48e6b9485d06cc66765602dff893fcf..e7ecf516cc42983dd271b56eb2a450f9214a799c 100644 (file)
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -175,3 +175,13 @@ src_install() {
        echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
        doenvd 99octave
 }
+
+pkg_postinst() {
+       xdg_mimeinfo_database_update
+       xdg_desktop_database_update
+}
+
+pkg_postrm() {
+       xdg_mimeinfo_database_update
+       xdg_desktop_database_update
+}