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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECB6A158066 for ; Tue, 30 Apr 2024 08:15:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA457E2A0C; Tue, 30 Apr 2024 08:15:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E7B7E2A0C for ; Tue, 30 Apr 2024 08:15:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 646C8343096 for ; Tue, 30 Apr 2024 08:15:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EA481764 for ; Tue, 30 Apr 2024 08:15:38 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1714464920.8e661453d19fde1305c6b19d541504767337e593.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mozart/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mozart/mozart-2.0.1-r1.ebuild dev-lang/mozart/mozart-2.0.1.ebuild X-VCS-Directories: dev-lang/mozart/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 8e661453d19fde1305c6b19d541504767337e593 X-VCS-Branch: master Date: Tue, 30 Apr 2024 08:15:38 +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: 3010fcbf-71eb-4cce-b2fa-053ebb2a7e48 X-Archives-Hash: fae5d11f231f1f56607eb2fab7487c08 commit: 8e661453d19fde1305c6b19d541504767337e593 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Apr 26 09:18:19 2024 +0000 Commit: Florian Schmaus gentoo 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 pogatzki.net> Signed-off-by: Florian Schmaus 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}