commit: 8e661453d19fde1305c6b19d541504767337e593 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Apr 26 09:18:19 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Apr 30 08:15:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e661453
dev-lang/mozart: restrict to <=virtual/jdk-17:* also switch to >=dev-java/ant-1.10.14-r3 Closes: https://bugs.gentoo.org/916882 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../mozart/{mozart-2.0.1.ebuild => mozart-2.0.1-r1.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1-r1.ebuild similarity index 92% rename from dev-lang/mozart/mozart-2.0.1.ebuild rename to dev-lang/mozart/mozart-2.0.1-r1.ebuild index a3b0cc28394c..a575d07c66a9 100644 --- a/dev-lang/mozart/mozart-2.0.1.ebuild +++ b/dev-lang/mozart/mozart-2.0.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake elisp-common java-pkg-2 java-ant-2 @@ -11,6 +11,7 @@ DESCRIPTION="Advanced development platform for intelligent, distributed applicat HOMEPAGE="http://mozart2.org/"; SRC_URI="https://github.com/mozart/mozart2/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"; +S="${WORKDIR}/${PN}2-${PV}" LICENSE="BSD-2" SLOT="0" @@ -24,16 +25,15 @@ RDEPEND="dev-libs/boost:= dev-lang/tk:0 emacs? ( >=app-editors/emacs-23.1:* )" +# https://bugs.gentoo.org/916882 restrict to <=virtual/jdk-17:* DEPEND="${RDEPEND} - dev-java/ant-core - >=virtual/jdk-1.8:= + >=dev-java/ant-1.10.14-r3:0 + <=virtual/jdk-17:* dev-lang/scala:2.12 test? ( dev-cpp/gtest:= )" SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${PN}2-${PV}" - src_prepare() { if [[ -d "${WORKDIR}"/${PV} ]] ; then eapply "${WORKDIR}"/${PV}
