--- scilab-5.4.0.ebuild.orig	2013-04-17 03:56:22.000000000 +0200
+++ scilab-5.4.0.ebuild	2013-04-17 18:37:32.000000000 +0200
@@ -127,23 +127,30 @@
 	# increases java heap to 512M when building docs (sync with cheqreqs above)
 	use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
 
-	# use the LINGUAS variable that we set
-	sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac
-
 	# make sure the DOCBOOK_ROOT variable is set
-	sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die
+	sed -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" \
+		-i bin/scilab* || die "failed to sed bin/scilab*"
+
+	# use CXX as a linker for scilab-bin
+	sed -e '/^CCLD/ s/CC)/CXX)/' \
+		-i Makefile.in || die "failed to sed Makefile.in"
+
+	# use the LINGUAS variable that we set
+	sed -e "/^ALL_LINGUAS=/d" \
+		-e "/^ALL_LINGUAS_DOC=/d" \
+		-i configure.ac || die "failed to sed configure.ac"
 
 	#add specific gentoo java directories
 	if use gui; then
-		sed -i -e "s|/usr/lib/jogl|/usr/lib/jogl-2|" \
-			-e "s|/usr/lib64/jogl|/usr/lib64/jogl-2|" configure.ac || die
-		sed -i -e "s|/usr/lib/gluegen|/usr/lib/gluegen-2|" \
+		sed -e "s|/usr/lib/jogl|/usr/lib/jogl-2|" \
+			-e "s|/usr/lib64/jogl|/usr/lib64/jogl-2|" \
+			-e "s|/usr/lib/gluegen|/usr/lib/gluegen-2|" \
 			-e "s|/usr/lib64/gluegen|/usr/lib64/gluegen-2|" \
 			-e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \
-			configure.ac || die
+			-i configure.ac || die "failed to sed configure.ac"
 
-		sed -i -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
-			etc/librarypath.xml || die
+		sed -e "s/jogl/jogl-2/" -e "s/gluegen/gluegen-2/" \
+			-i etc/librarypath.xml || die "failed to sed etc/librarypath.xml"
 	fi
 
 	mkdir jar || die