commit: 3c7a8c6c96625d9bb4bf2bc3de4bf2b331cfb37f
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan 24 21:05:08 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 21:05:08 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3c7a8c6c
sci-mathematics/scilab: merge fixes in 5.5.2 ebuild to the later versions
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-mathematics/scilab/scilab-5.5.2.ebuild | 19 +++++++++-----
sci-mathematics/scilab/scilab-6.0.2.ebuild | 40 ++++++++++++++++++------------
sci-mathematics/scilab/scilab-6.1.0.ebuild | 34 +++++++++++++++++--------
3 files changed, 60 insertions(+), 33 deletions(-)
diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild
b/sci-mathematics/scilab/scilab-5.5.2.ebuild
index 7a753e397..dffd0383b 100644
--- a/sci-mathematics/scilab/scilab-5.5.2.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.2.ebuild
@@ -10,13 +10,13 @@ inherit autotools bash-completion-r1 check-reqs eutils
flag-o-matic \
fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="http://www.scilab.org/";
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz
+HOMEPAGE="https://www.scilab.org/";
+SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz
https://raw.githubusercontent.com/gentoo/sci/4c2a07c4629c61395a998633ccfcb34d72569529/sci-mathematics/scilab/files/${P}-bug15107.patch";
LICENSE="CeCILL-2.1"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
IUSE="debug doc emf fftw +gui +matio mpi nls openmp
static-libs test tk +umfpack +xcos"
REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
@@ -50,7 +50,7 @@ CDEPEND="
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
- sci-libs/lapack[deprecated]
+ sci-libs/lapack[deprecated(-)]
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:0=
@@ -77,6 +77,7 @@ CDEPEND="
>=dev-java/jlatexmath-fop-1.0.3:1
~dev-java/jogl-2.2.4:2.2
>=dev-java/jrosetta-1.0.4:0
+ >dev-java/lucene-2:=[contrib(-)]
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
@@ -95,9 +96,11 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
- doc? ( app-text/docbook-xsl-stylesheets
+ doc? (
+ app-text/docbook-xsl-stylesheets
dev-java/xml-commons-external:1.4
- dev-java/saxon:9 )
+ dev-java/saxon:9
+ )
xcos? (
>=dev-lang/ocaml-4.06
dev-ml/num
@@ -105,6 +108,7 @@ DEPEND="${CDEPEND}
)
test? (
dev-java/junit:4
+ dev-java/ant-junit4:0
gui? ( ${VIRTUALX_DEPEND} ) )"
DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
@@ -145,6 +149,9 @@ pkg_setup() {
unset F77
java-pkg-opt-2_pkg_setup
+ # fails to compile in src/fortran/optml2.f:172:50 without this
+ append-fflags -fallow-argument-mismatch
+
ALL_L10N="en_US"
ALL_L10N_DOC="en_US"
for l in ${IUSE_L10N}; do
diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild
b/sci-mathematics/scilab/scilab-6.0.2.ebuild
index 1345ca324..3779ab745 100644
--- a/sci-mathematics/scilab/scilab-6.0.2.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -10,8 +10,8 @@ inherit autotools bash-completion-r1 check-reqs eutils
flag-o-matic \
fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="http://www.scilab.org/";
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz";
+HOMEPAGE="https://www.scilab.org/";
+SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz";
LICENSE="GPL-2"
SLOT="0"
@@ -50,10 +50,10 @@ CDEPEND="
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
+ sci-libs/lapack[deprecated(-)]
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:0=
- virtual/lapack
emf? (
dev-java/freehep-graphicsio:0
dev-java/freehep-graphicsio-emf:0
@@ -64,7 +64,7 @@ CDEPEND="
fftw? ( sci-libs/fftw:3.0 )
gui? (
dev-java/avalon-framework:4.2
- >=dev-java/batik-1.8:=
+ >=dev-java/batik-1.9:1.9
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -81,9 +81,10 @@ CDEPEND="
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
- xcos? ( dev-java/jgraphx:= )
+ xcos? ( dev-java/jgraphx:0 )
)
matio? ( >=sci-libs/matio-1.5 )
+ mpi? ( virtual/mpi[fortran] )
tk? ( dev-lang/tk:0= )
umfpack? ( sci-libs/umfpack )"
@@ -95,11 +96,16 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
- doc? ( app-text/docbook-xsl-stylesheets
- dev-java/xml-commons-external:1.4
- dev-java/saxon:9 )
- xcos? ( dev-lang/ocaml )
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ dev-java/xml-commons-external:1.4
+ dev-java/saxon:9
)
+ xcos? (
+ >=dev-lang/ocaml-4.06
+ dev-ml/num
+ )
+ )
test? (
dev-java/junit:4
dev-java/ant-junit4:0
@@ -131,7 +137,7 @@ pkg_setup() {
FORTRAN_STANDARD="77 90"
fortran-2_pkg_setup
#bug 8053
- #unset F77
+ unset F77
java-pkg-opt-2_pkg_setup
# fails to compile in src/fortran/optml2.f:172:50 without this
@@ -151,10 +157,6 @@ pkg_setup() {
src_prepare() {
default
- # works for me on x86, but users are having
- # trouble without see #282 on github
- append-ldflags $(no-as-needed)
-
# increases java heap to 512M when building docs (sync with cheqreqs
above)
use doc && eapply "${FILESDIR}/${P}-java-heap.patch"
@@ -164,6 +166,9 @@ src_prepare() {
# make sure the DOCBOOK_ROOT variable is set
sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+ # fix QA for metainfo data installation path
+ sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die
+
# remove self closing <br /> (error our with javadoc8)
# already upstream commit 2103082c
find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
@@ -195,7 +200,7 @@ src_prepare() {
java-pkg_jar-from jlatexmath-fop-1
use xcos && java-pkg_jar-from jgraphx
if use doc; then
- java-pkg_jar-from --build-only batik-1.8 batik-all.jar
+ java-pkg_jar-from --build-only batik-1.9 batik-all.jar
java-pkg_jar-from --build-only saxon-9 saxon.jar
saxon9he.jar
java-pkg_jar-from --build-only xml-commons-external-1.4
xml-apis-ext.jar
fi
@@ -272,9 +277,10 @@ src_test() {
src_install() {
default
- prune_libtool_files --all
+ find "${ED}" -name '*.la' -delete || die
rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
+ bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
> 50-"${PN}"
insinto /etc/revdep-rebuild && doins "50-${PN}"
@@ -282,6 +288,7 @@ src_install() {
pkg_postinst() {
xdg_mimeinfo_database_update
+ xdg_desktop_database_update
einfo "If you are using the NVIDIA binary drivers, and run into
graphics"
einfo "crashes, you may try to run scilab as follows:"
einfo "EGL_DRIVER=egl_glx scilab"
@@ -290,4 +297,5 @@ pkg_postinst() {
pkg_postrm() {
xdg_mimeinfo_database_update
+ xdg_desktop_database_update
}
diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index cbe726794..c1d097312 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -10,8 +10,8 @@ inherit autotools bash-completion-r1 check-reqs eutils
flag-o-matic \
fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils
DESCRIPTION="Scientific software package for numerical computations"
-HOMEPAGE="http://www.scilab.org/";
-SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz";
+HOMEPAGE="https://www.scilab.org/";
+SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz";
LICENSE="GPL-2"
SLOT="0"
@@ -50,10 +50,10 @@ CDEPEND="
dev-libs/libxml2:2
sci-libs/hdf5[mpi=]
>=sci-libs/arpack-3
+ sci-libs/lapack[deprecated(-)]
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:0=
- virtual/lapack
emf? (
dev-java/freehep-graphicsio:0
dev-java/freehep-graphicsio-emf:0
@@ -64,7 +64,7 @@ CDEPEND="
fftw? ( sci-libs/fftw:3.0 )
gui? (
dev-java/avalon-framework:4.2
- >=dev-java/batik-1.8:=
+ >=dev-java/batik-1.9:1.9
dev-java/commons-io:1
dev-java/commons-logging:0
>=dev-java/flexdock-1.2.4:0
@@ -81,9 +81,10 @@ CDEPEND="
dev-java/skinlf:0
dev-java/xmlgraphics-commons:2
virtual/opengl
- xcos? ( dev-java/jgraphx:= )
+ xcos? ( dev-java/jgraphx:0 )
)
matio? ( >=sci-libs/matio-1.5 )
+ mpi? ( virtual/mpi[fortran] )
tk? ( dev-lang/tk:0= )
umfpack? ( sci-libs/umfpack )"
@@ -95,11 +96,16 @@ DEPEND="${CDEPEND}
debug? ( dev-util/lcov )
gui? (
>=virtual/jdk-1.6
- doc? ( app-text/docbook-xsl-stylesheets
- dev-java/xml-commons-external:1.4
- dev-java/saxon:9 )
- xcos? ( dev-lang/ocaml )
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ dev-java/xml-commons-external:1.4
+ dev-java/saxon:9
)
+ xcos? (
+ >=dev-lang/ocaml-4.06
+ dev-ml/num
+ )
+ )
test? (
dev-java/junit:4
dev-java/ant-junit4:0
@@ -160,6 +166,9 @@ src_prepare() {
# make sure the DOCBOOK_ROOT variable is set
sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+ # fix QA for metainfo data installation path
+ sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die
+
# remove self closing <br /> (error our with javadoc8)
# already upstream commit 2103082c
find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die
@@ -191,7 +200,7 @@ src_prepare() {
java-pkg_jar-from jlatexmath-fop-1
use xcos && java-pkg_jar-from jgraphx
if use doc; then
- java-pkg_jar-from --build-only batik-1.8 batik-all.jar
+ java-pkg_jar-from --build-only batik-1.9 batik-all.jar
java-pkg_jar-from --build-only saxon-9 saxon.jar
saxon9he.jar
java-pkg_jar-from --build-only xml-commons-external-1.4
xml-apis-ext.jar
fi
@@ -268,9 +277,10 @@ src_test() {
src_install() {
default
- prune_libtool_files --all
+ find "${ED}" -name '*.la' -delete || die
rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die
newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}"
+ bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli
echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \
> 50-"${PN}"
insinto /etc/revdep-rebuild && doins "50-${PN}"
@@ -278,6 +288,7 @@ src_install() {
pkg_postinst() {
xdg_mimeinfo_database_update
+ xdg_desktop_database_update
einfo "If you are using the NVIDIA binary drivers, and run into
graphics"
einfo "crashes, you may try to run scilab as follows:"
einfo "EGL_DRIVER=egl_glx scilab"
@@ -286,4 +297,5 @@ pkg_postinst() {
pkg_postrm() {
xdg_mimeinfo_database_update
+ xdg_desktop_database_update
}
