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 CF8A61382C5 for ; Sat, 16 Jan 2021 10:28:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 158BAE082F; Sat, 16 Jan 2021 10:28:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 ECBD7E082F for ; Sat, 16 Jan 2021 10:28:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AD15B340CD9 for ; Sat, 16 Jan 2021 10:28:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2328476 for ; Sat, 16 Jan 2021 10:28:30 +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: <1610792870.90941e25eb97c6f9731fc6aee93362a02af4ede2.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-lang/conceptual/ X-VCS-Repository: proj/sci X-VCS-Files: dev-lang/conceptual/conceptual-1.4.ebuild dev-lang/conceptual/conceptual-1.5.1b.ebuild X-VCS-Directories: dev-lang/conceptual/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 90941e25eb97c6f9731fc6aee93362a02af4ede2 X-VCS-Branch: master Date: Sat, 16 Jan 2021 10:28:30 +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: d82e7b6c-127c-4a92-a187-9e440044a2ab X-Archives-Hash: a9ec6387199d98a21faa5201203a661c commit: 90941e25eb97c6f9731fc6aee93362a02af4ede2 Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Jan 16 10:27:50 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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 }