commit: 78dbc3076907b0fd36d77afdc710545ba9a1d329
Author: Jeffrey Lin <jeffrey <AT> icurse <DOT> nl>
AuthorDate: Sat Jun 27 22:40:40 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 14:18:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78dbc307
sci-mathematics/mathematica: declare ${M_TARGET} for uniformity
This fixes the 12.1.1 ebuild trying to use 10.3 directories.
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 | 9 +++++----
.../{mathematica-12.1.1.ebuild => mathematica-12.1.1-r1.ebuild} | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
index 51e74ad3cc9..7f5efeb8efa 100644
--- a/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
+++ b/sci-mathematics/mathematica/mathematica-10.3.1-r1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
MPN="Mathematica"
MPV=$(get_version_component_range 1-2)
M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel
WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
# we might as well list all files in all QA variables...
QA_PREBUILT="opt/*"
@@ -35,7 +36,7 @@ QA_PREBUILT="opt/*"
S=${WORKDIR}
src_unpack() {
- /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto
"-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+ /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto
"-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
}
src_install() {
@@ -51,7 +52,7 @@ src_install() {
for name in ${M_BINARIES} ; do
einfo "Generating wrapper for ${name}"
echo '#!/bin/sh' >> "${T}/${name}"
- echo
"LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1
/opt/Wolfram/${MPN}/${MPV}/Executables/${name} \$*" \
+ echo
"LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1
/${M_TARGET}/Executables/${name} \$*" \
>> "${T}/${name}"
dobin "${T}/${name}"
done
@@ -62,7 +63,7 @@ src_install() {
# fix some embedded paths and install desktop files
insinto /usr/share/applications
- for filename in $(find
"${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name
"wolfram-mathematica.desktop") ; do
+ 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}"
@@ -71,7 +72,7 @@ src_install() {
# install mime types
insinto /usr/share/mime/application
- for filename in $(find
"${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name
"application-*.xml"); do
+ for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation"
-name "application-*.xml"); do
basefilename=$(basename "${filename}")
mv "${filename}" "${T}/${basefilename#application-}"
doins "${T}/${basefilename#application-}"
diff --git a/sci-mathematics/mathematica/mathematica-12.1.1.ebuild
b/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
similarity index 85%
rename from sci-mathematics/mathematica/mathematica-12.1.1.ebuild
rename to sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
index 51e74ad3cc9..7f5efeb8efa 100644
--- a/sci-mathematics/mathematica/mathematica-12.1.1.ebuild
+++ b/sci-mathematics/mathematica/mathematica-12.1.1-r1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
MPN="Mathematica"
MPV=$(get_version_component_range 1-2)
M_BINARIES="MathKernel Mathematica MathematicaScript WolframKernel
WolframScript math mathematica mcc wolfram"
+M_TARGET="opt/Wolfram/${MPN}/${MPV}"
# we might as well list all files in all QA variables...
QA_PREBUILT="opt/*"
@@ -35,7 +36,7 @@ QA_PREBUILT="opt/*"
S=${WORKDIR}
src_unpack() {
- /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto
"-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die
+ /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto
"-targetdir=${S}/${M_TARGET}" "-execdir=${S}/opt/bin" || die
}
src_install() {
@@ -51,7 +52,7 @@ src_install() {
for name in ${M_BINARIES} ; do
einfo "Generating wrapper for ${name}"
echo '#!/bin/sh' >> "${T}/${name}"
- echo
"LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1
/opt/Wolfram/${MPN}/${MPV}/Executables/${name} \$*" \
+ echo
"LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/$(get_libdir)/libz.so.1
/${M_TARGET}/Executables/${name} \$*" \
>> "${T}/${name}"
dobin "${T}/${name}"
done
@@ -62,7 +63,7 @@ src_install() {
# fix some embedded paths and install desktop files
insinto /usr/share/applications
- for filename in $(find
"${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name
"wolfram-mathematica.desktop") ; do
+ 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}"
@@ -71,7 +72,7 @@ src_install() {
# install mime types
insinto /usr/share/mime/application
- for filename in $(find
"${D}/opt/Wolfram/Mathematica/10.3/SystemFiles/Installation" -name
"application-*.xml"); do
+ for filename in $(find "${D}/${M_TARGET}/SystemFiles/Installation"
-name "application-*.xml"); do
basefilename=$(basename "${filename}")
mv "${filename}" "${T}/${basefilename#application-}"
doins "${T}/${basefilename#application-}"
