diff options
| author |   Sébastien Fabbro <sebfabbro@gmail.com> | 2012-05-29 19:15:11 +0100 |
|---|---|---|
| committer | Sébastien Fabbro <sebfabbro@gmail.com> | 2012-05-29 19:15:11 +0100 |
| commit | 6e72cf55459ff6f744f963001d1c957c94d30554 (patch) | |
| tree | 60217d3d7196b97e615be9e49a68de32d9d08515 /sci-mathematics | |
| parent | dev-java/jogl: adapted gluegen dependency (diff) | |
| download | sci-6e72cf55459ff6f744f963001d1c957c94d30554.tar.gz sci-6e72cf55459ff6f744f963001d1c957c94d30554.tar.bz2 sci-6e72cf55459ff6f744f963001d1c957c94d30554.zip | |
sci-mathematics/scilab: fix bug #375769
(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/scilab/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch | 26 | ||||
| -rw-r--r-- | sci-mathematics/scilab/scilab-5.3.3-r1.ebuild | 3 |
3 files changed, 32 insertions, 1 deletions
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog index c318d6181..71aae685c 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> scilab-5.3.3-r1.ebuild, + +files/scilab-5.3.3-gui-no-xcos.patch: + fix bug #375769 + 29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> scilab-5.3.3-r1.ebuild: More fixing for deps for gui and xcos diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch b/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch new file mode 100644 index 000000000..82ebbde8e --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch @@ -0,0 +1,26 @@ +diff -Nur scilab-5.3.3.orig/modules/graph/Makefile.am scilab-5.3.3/modules/graph/Makefile.am +--- scilab-5.3.3.orig/modules/graph/Makefile.am 2012-05-29 18:59:31.000000000 +0100 ++++ scilab-5.3.3/modules/graph/Makefile.am 2012-05-29 19:02:11.000000000 +0100 +@@ -87,5 +87,7 @@ + libscigraph_la_sci_gateway_DATA = + + if GUI ++if XCOS + USEANT=1 + endif ++endif +diff -Nur scilab-5.3.3.orig/modules/hdf5/Makefile.am scilab-5.3.3/modules/hdf5/Makefile.am +--- scilab-5.3.3.orig/modules/hdf5/Makefile.am 2012-05-29 18:59:42.000000000 +0100 ++++ scilab-5.3.3/modules/hdf5/Makefile.am 2012-05-29 19:03:04.000000000 +0100 +@@ -10,9 +10,11 @@ + if HDF5 + + if GUI ++if XCOS + # No GUI. Disable the Java build + USEANT=1 + endif ++endif + + + HDF5_SOURCES = src/c/h5_fileManagement.c \ diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild index 2791ec58f..69e71e9ed 100644 --- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild +++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild @@ -123,7 +123,8 @@ src_prepare() { "${FILESDIR}"/${P}-blas-libs.patch \ "${FILESDIR}"/${P}-no-xcos-deps.patch \ "${FILESDIR}"/${P}-javadoc-utf8.patch \ - "${FILESDIR}"/${P}-fix-random-runtime-failures.patch + "${FILESDIR}"/${P}-fix-random-runtime-failures.patch \ + "${FILESDIR}"/${P}-gui-no-xcos.patch # need serious as-needed work (inter-dependencies among modules) # "${FILESDIR}"/${P}-as-needed.patch \ |