commit: efa47486a6e1e5d423064d89d000f4460aae6c1c Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Sat Mar 25 17:49:07 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> 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ć <xgqt <AT> 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
