From 31d8e8c0d62bd2eeb76c5a2f17897c1e3ce913fa Mon Sep 17 00:00:00 2001 From: Maciej Barć Date: Fri, 10 Dec 2021 11:18:26 +0100 Subject: dev-scheme/kawa: correct java-pkg_getjar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/828695 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Maciej Barć --- dev-scheme/kawa/kawa-3.1.1-r1.ebuild | 91 ++++++++++++++++++++++++++++++++++++ dev-scheme/kawa/kawa-3.1.1.ebuild | 91 ------------------------------------ 2 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 dev-scheme/kawa/kawa-3.1.1-r1.ebuild delete mode 100644 dev-scheme/kawa/kawa-3.1.1.ebuild (limited to 'dev-scheme') diff --git a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild new file mode 100644 index 000000000000..bbe8642c2a1c --- /dev/null +++ b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source" + +inherit autotools java-pkg-2 + +DESCRIPTION=" Java-based Scheme system & Language Framework" +HOMEPAGE="https://www.gnu.org/software/kawa/" +SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz" +S="${WORKDIR}/${PN^}-${PV}" + +LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml" +RESTRICT="test" # fails + +COMMON_DEPEND=" + frontend? ( sys-libs/readline:0 ) + sax? ( dev-java/sax:0 ) + servlets? ( java-virtuals/servlet-api:3.0 ) +" +DEPEND=" + ${COMMON_DEPEND} + >=virtual/jdk-1.8 +" +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.8 +" + +PATCHES=( "${FILESDIR}"/${PN}-${PV}-configure.ac-single_AM_INIT_AUTOMAKE.patch ) + +src_prepare() { + default + + java-pkg-2_src_prepare + eautoreconf +} + +src_configure() { + local myconf=( + $(use_enable frontend kawa-frontend) + $(use_enable jemacs) + $(use_enable krl brl) + $(use_enable xml) + $(use_with awt) + $(use_with sax sax2) + --with-java-source="$(java-pkg_get-source)" + ) + + if use jemacs && ! use swing; then + einfo "Although the swing USE flag is disabled you chose to enable jemacs," + einfo "so swing is enabled anyway." + myconf+=( "--with-swing" ) + else + myconf+=( "$(use_with swing)" ) + fi + if use servlets; then + myconf+=( + "--with-servlet=$(java-pkg_getjar servlet-api-3.0 servlet-api.jar)" + ) + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake -j1 +} + +src_install() { + use source && java-pkg_dosrc ./kawa/* ./gnu/* + java-pkg_newjar ./lib/kawa.jar + + java-pkg_dolauncher "kawa" --main kawa.repl + java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery" + use servlets && + java-pkg_dolauncher "kawa-cgi-servlet" --main gnu.kawa.servlet.CGIServletWrapper + use jemacs && + java-pkg_dolauncher "jemacs" --main gnu.jemacs.lang.ELisp + + einstalldocs + doinfo doc/kawa.info* + cp doc/kawa.man doc/kawa.1 || die + cp doc/qexo.man doc/qexo.1 || die + doman doc/*.1 +} diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild b/dev-scheme/kawa/kawa-3.1.1.ebuild deleted file mode 100644 index 3efe3ba8f69b..000000000000 --- a/dev-scheme/kawa/kawa-3.1.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source" - -inherit autotools java-pkg-2 - -DESCRIPTION=" Java-based Scheme system & Language Framework" -HOMEPAGE="https://www.gnu.org/software/kawa/" -SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz" -S="${WORKDIR}/${PN^}-${PV}" - -LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml" -RESTRICT="test" # fails - -COMMON_DEPEND=" - frontend? ( sys-libs/readline:0 ) - sax? ( dev-java/sax:0 ) - servlets? ( java-virtuals/servlet-api:3.0 ) -" -DEPEND=" - ${COMMON_DEPEND} - >=virtual/jdk-1.8 -" -RDEPEND=" - ${COMMON_DEPEND} - >=virtual/jre-1.8 -" - -PATCHES=( "${FILESDIR}"/${PN}-${PV}-configure.ac-single_AM_INIT_AUTOMAKE.patch ) - -src_prepare() { - default - - java-pkg-2_src_prepare - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable frontend kawa-frontend) - $(use_enable jemacs) - $(use_enable krl brl) - $(use_enable xml) - $(use_with awt) - $(use_with sax sax2) - --with-java-source="$(java-pkg_get-source)" - ) - - if use jemacs && ! use swing; then - einfo "Although the swing USE flag is disabled you chose to enable jemacs," - einfo "so swing is enabled anyway." - myconf+=( "--with-swing" ) - else - myconf+=( "$(use_with swing)" ) - fi - if use servlets; then - myconf+=( - "--with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" - ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake -j1 -} - -src_install() { - use source && java-pkg_dosrc ./kawa/* ./gnu/* - java-pkg_newjar ./lib/kawa.jar - - java-pkg_dolauncher "kawa" --main kawa.repl - java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery" - use servlets && - java-pkg_dolauncher "kawa-cgi-servlet" --main gnu.kawa.servlet.CGIServletWrapper - use jemacs && - java-pkg_dolauncher "jemacs" --main gnu.jemacs.lang.ELisp - - einstalldocs - doinfo doc/kawa.info* - cp doc/kawa.man doc/kawa.1 || die - cp doc/qexo.man doc/qexo.1 || die - doman doc/*.1 -} -- cgit v1.2.3-65-gdbad