[gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     239e3a47a637630fad4a4ab8a6721a71bfbd6d13
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 16:55:57 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 16:55:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=239e3a47

sci-mathematics/scilab: add default for use flag

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../{scilab-6.1.0.ebuild => scilab-6.0.2.ebuild}     | 20 ++++++++++++--------
 sci-mathematics/scilab/scilab-6.1.0.ebuild           |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.0.2.ebuild
similarity index 94%
copy from sci-mathematics/scilab/scilab-6.1.0.ebuild
copy to sci-mathematics/scilab/scilab-6.0.2.ebuild
index c2a4bf0e5..1345ca324 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.0.2.ebuild
@@ -77,7 +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/lucene-2:=[contrib(-)]
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:2
 		virtual/opengl
@@ -108,12 +108,12 @@ DEPEND="${CDEPEND}
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
 PATCHES=(
-	"${FILESDIR}/${P}-followlinks.patch"
-	"${FILESDIR}/${P}-gluegen.patch"
-	"${FILESDIR}/${P}-accessviolation.patch"
-	"${FILESDIR}/${P}-missinglib.patch"
-	"${FILESDIR}/${P}-freehep.patch"
-	"${FILESDIR}/${P}-libxml.patch"
+	"${FILESDIR}/${PN}-6.1.0-followlinks.patch"
+	"${FILESDIR}/${PN}-6.1.0-gluegen.patch"
+	"${FILESDIR}/${PN}-6.1.0-accessviolation.patch"
+	"${FILESDIR}/${PN}-6.1.0-missinglib.patch"
+	"${FILESDIR}/${PN}-6.1.0-freehep.patch"
+	"${FILESDIR}/${PN}-6.1.0-libxml.patch"
 )
 
 pkg_pretend() {
@@ -131,7 +131,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,6 +151,10 @@ 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"
 

diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index c2a4bf0e5..cbe726794 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -77,7 +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/lucene-2:=[contrib(-)]
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:2
 		virtual/opengl