[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/mathematica/

[Andreas K. Hüttel]

commit:     af9f1cd5d604ab73bb6f2fdea2e5034685e35853
Author:     Jeffrey Lin <jeffrey <AT> icurse <DOT> nl>
AuthorDate: Sat Jun 27 23:41:14 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul  4 14:18:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af9f1cd5

sci-mathematics/mathematica: use domenu instead of direct insinto

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeffrey Lin <jeffrey <AT> icurse.nl>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild | 5 ++---
 sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild 
b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
index 864d3164620..a5af27f51d9 100644
--- a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
+++ b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib xdg
+inherit desktop multilib xdg
 
 DESCRIPTION="Wolfram Mathematica"
 SRC_URI="Mathematica_${PV}_LINUX.sh"
@@ -62,12 +62,11 @@ src_install() {
        done
 
        # fix some embedded paths and install desktop files
-       insinto /usr/share/applications
        for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" 
-name "wolfram-mathematica.desktop") ; do
                echo Fixing "${filename}"
                sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
                echo 
"Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
-               doins "${filename}"
+               domenu "${filename}"
        done
 
        # install mime types

diff --git a/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild 
b/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
index 864d3164620..a5af27f51d9 100644
--- a/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
+++ b/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib xdg
+inherit desktop multilib xdg
 
 DESCRIPTION="Wolfram Mathematica"
 SRC_URI="Mathematica_${PV}_LINUX.sh"
@@ -62,12 +62,11 @@ src_install() {
        done
 
        # fix some embedded paths and install desktop files
-       insinto /usr/share/applications
        for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation" 
-name "wolfram-mathematica.desktop") ; do
                echo Fixing "${filename}"
                sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}"
                echo 
"Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}"
-               doins "${filename}"
+               domenu "${filename}"
        done
 
        # install mime types