[gentoo-commits] proj/sci:master commit in: dev-lang/conceptual/

[Andrew Ammerlaan]

commit:     90941e25eb97c6f9731fc6aee93362a02af4ede2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 16 10:27:50 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 16 10:27:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=90941e25

dev-lang/conceptual: version bump, fix fetch

still stuck on python2_7, but works

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

 .../{conceptual-1.4.ebuild => conceptual-1.5.1b.ebuild}    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-lang/conceptual/conceptual-1.4.ebuild 
b/dev-lang/conceptual/conceptual-1.5.1b.ebuild
similarity index 77%
rename from dev-lang/conceptual/conceptual-1.4.ebuild
rename to dev-lang/conceptual/conceptual-1.5.1b.ebuild
index 58da5001f..d2e6046d2 100644
--- a/dev-lang/conceptual/conceptual-1.4.ebuild
+++ b/dev-lang/conceptual/conceptual-1.5.1b.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 JAVA_PKG_OPT_USE="gui"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-IUSE="gui test"
+IUSE="gui"
 KEYWORDS="~amd64"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -22,7 +22,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
        virtual/mpi
        ${PYTHON_DEPS}
-       gui? ( virtual/jdk:* )"
+       gui? (
+               virtual/jdk:*
+               dev-java/jython
+       )"
 DEPEND="${RDEPEND}"
 
 src_compile() {
@@ -33,7 +36,8 @@ src_compile() {
 src_install () {
        default
        if use gui; then
-               java-pkg_newjar gui/ncptlGUI-1.4.jar ${PN}.jar
+               java-pkg_newjar gui/ncptlGUI-1.5.1b.jar ${PN}.jar
                java-pkg_dolauncher
        fi
+       python_optimize
 }