From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 197481382C5 for ; Tue, 19 Jan 2021 16:56:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16DC5E08F9; Tue, 19 Jan 2021 16:56:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1002E08F6 for ; Tue, 19 Jan 2021 16:56:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 065D2340D5A for ; Tue, 19 Jan 2021 16:56:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C39224B3 for ; Tue, 19 Jan 2021 16:56:03 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1611075357.239e3a47a637630fad4a4ab8a6721a71bfbd6d13.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/scilab/scilab-6.0.2.ebuild sci-mathematics/scilab/scilab-6.1.0.ebuild X-VCS-Directories: sci-mathematics/scilab/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 239e3a47a637630fad4a4ab8a6721a71bfbd6d13 X-VCS-Branch: master Date: Tue, 19 Jan 2021 16:56:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e8e806e-f79c-4bc4-8aa1-48ddaf0b5807 X-Archives-Hash: 76c2e2c9e033725a3e6dfc2f76d82aeb commit: 239e3a47a637630fad4a4ab8a6721a71bfbd6d13 Author: Andrew Ammerlaan riseup net> AuthorDate: Tue Jan 19 16:55:57 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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