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 CB07E15864F for ; Sat, 25 Mar 2023 17:50:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC55BE075F; Sat, 25 Mar 2023 17:50:00 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB846E075F for ; Sat, 25 Mar 2023 17:50:00 +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 B5D6D341194 for ; Sat, 25 Mar 2023 17:49:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C0F18E4 for ; Sat, 25 Mar 2023 17:49:57 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1679766547.efa47486a6e1e5d423064d89d000f4460aae6c1c.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/kawa/kawa-3.1.1-r2.ebuild X-VCS-Directories: dev-scheme/kawa/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: efa47486a6e1e5d423064d89d000f4460aae6c1c X-VCS-Branch: master Date: Sat, 25 Mar 2023 17:49:57 +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: fb482045-e368-43cf-b6b8-18eb0ceb2553 X-Archives-Hash: 4be29b3c4131720f5484e46f96c5b272 commit: efa47486a6e1e5d423064d89d000f4460aae6c1c Author: Maciej Barć gentoo org> AuthorDate: Sat Mar 25 17:49:07 2023 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sat Mar 25 17:49:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa47486 dev-scheme/kawa: use javax-servlet-api Bug: https://bugs.gentoo.org/902481 Closes: https://bugs.gentoo.org/902515 Signed-off-by: Maciej Barć gentoo.org> dev-scheme/kawa/kawa-3.1.1-r2.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dev-scheme/kawa/kawa-3.1.1-r2.ebuild b/dev-scheme/kawa/kawa-3.1.1-r2.ebuild index f4e6aadce992..6c57ed41bb73 100644 --- a/dev-scheme/kawa/kawa-3.1.1-r2.ebuild +++ b/dev-scheme/kawa/kawa-3.1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,9 +8,10 @@ JAVA_PKG_IUSE="source" inherit autotools java-pkg-2 DESCRIPTION="Java-based Scheme system & Language Framework" -HOMEPAGE="https://www.gnu.org/software/kawa/" +HOMEPAGE="https://www.gnu.org/software/kawa/ + https://gitlab.com/kashell/Kawa/" SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz" -S="${WORKDIR}/${PN^}-${PV}" +S="${WORKDIR}"/${PN^}-${PV} LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )" SLOT="0" @@ -21,11 +22,11 @@ RESTRICT="test" # fails COMMON_DEPEND=" frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) - servlets? ( java-virtuals/servlet-api:3.0 ) + servlets? ( dev-java/javax-servlet-api:3.0 ) " DEPEND=" ${COMMON_DEPEND} - || ( virtual/jdk:11 virtual/jdk:8 ) + || ( virtual/jdk:11 virtual/jdk:1.8 ) " RDEPEND=" ${COMMON_DEPEND} @@ -42,7 +43,7 @@ src_prepare() { } src_configure() { - local myconf=( + local -a myconf=( $(use_enable frontend kawa-frontend) $(use_enable jemacs) $(use_enable krl brl) @@ -61,7 +62,7 @@ src_configure() { fi if use servlets; then myconf+=( - "--with-servlet=$(java-pkg_getjar servlet-api-3.0 servlet-api.jar)" + "--with-servlet=$(java-pkg_getjar javax-servlet-api-3.0 javax-servlet-api.jar)" ) fi