Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci

8 files changed, 26 insertions, 4 deletions

diff --git a/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
new file mode 100644
index 000000000..39b4302a8
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-accessviolation.patch
@@ -0,0 +1,21 @@
+--- bin/scilab.orig	2013-10-28 01:08:06.623143085 -0400
++++ bin/scilab	2013-10-30 22:57:00.781289235 -0400
+@@ -650,11 +650,13 @@
+ # libEGL may be partially supported by the closed-source NVIDIA driver.
+ # Until they release an EGL driver, we force the egl_glx driver.
+ # http://bugzilla.scilab.org/show_bug.cgi?id=12940
+-if test -x /usr/bin/glxinfo; then
+-    NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
+-    if test ! -z "$NVIDIA_GLX_VENDOR"; then
+-        EGL_DRIVER=egl_glx
+-        export EGL_DRIVER
++if test $SCILAB_MODE != "nw"; then
++    if test -x /usr/bin/glxinfo; then
++    	NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation")
++    	if test ! -z "$NVIDIA_GLX_VENDOR"; then
++            EGL_DRIVER=egl_glx
++            export EGL_DRIVER
++    	fi
+     fi
+ fi
+ 
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch
index 309e45c06..309e45c06 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-always-use-dynamic-stack.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-always-use-dynamic-stack.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-disable-static-systemlib.patch
index ce5b03293..ce5b03293 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-disable-static-systemlib.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-fix-random-runtime-failure.patch
index 92ac45339..92ac45339 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-fix-random-runtime-failure.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-fix-random-runtime-failure.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch
index 118df3b1a..118df3b1a 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-followlinks.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-followlinks.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-gluegen.patch
index 64717a75a..64717a75a 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-gluegen.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-gluegen.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-java-heap.patch
index 990f967f4..990f967f4 100644
--- a/sci-mathematics/scilab/files/scilab-5.5.0-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.5.0_beta1-java-heap.patch
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
index 15b592ea7..8816f2681 100644
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.5.0_beta1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="manual"
 inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
 	fortran-2 java-pkg-opt-2 toolchain-funcs virtualx
 
-MY_PV="${PV}-beta-1"
+MY_PV="${PV/_beta1/-beta-1}"
 MY_P="$PN"-"$MY_PV"
 
 # Things that don't work:
@@ -51,7 +51,7 @@ CDEPEND="dev-libs/libpcre
 		dev-java/avalon-framework:4.2
 		dev-java/batik:1.7
 		dev-java/commons-io:1
-		>=dev-java/flexdock-1.2.3:0
+		>=dev-java/flexdock-1.2.4:0
 		dev-java/fop:0
 		dev-java/gluegen:2
 		dev-java/javahelp:0
@@ -66,7 +66,7 @@ CDEPEND="dev-libs/libpcre
 		virtual/opengl
 		doc? ( dev-java/saxon:9 )
 		xcos? ( dev-java/commons-logging:0 ) )
-	matio? ( <sci-libs/matio-1.5 )
+	matio? ( >=sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )
 	umfpack? ( sci-libs/umfpack )"
 
@@ -122,7 +122,8 @@ src_prepare() {
 		"${FILESDIR}/${P}-gluegen.patch" \
 		"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \
 		"${FILESDIR}/${P}-disable-static-systemlib.patch" \
-		"${FILESDIR}/${P}-always-use-dynamic-stack.patch"
+		"${FILESDIR}/${P}-always-use-dynamic-stack.patch" \
+		"${FILESDIR}/${P}-accessviolation.patch"
 
 	append-ldflags $(no-as-needed)