commit: 5f4cc5b5a24f5ef023db2e32524f074fa40369eb Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Mar 26 05:45:06 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sun Mar 26 21:18:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4cc5b5
dev-scheme/kawa: drop 1.14-r2 Closes: https://bugs.gentoo.org/902455 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30346 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-scheme/kawa/Manifest | 2 - dev-scheme/kawa/files/kawa-1.14.patch | 24 ------- dev-scheme/kawa/kawa-1.14-r2.ebuild | 115 ---------------------------------- dev-scheme/kawa/metadata.xml | 1 - 4 files changed, 142 deletions(-) diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest index 0122d542e8e5..b63b50b53002 100644 --- a/dev-scheme/kawa/Manifest +++ b/dev-scheme/kawa/Manifest @@ -1,3 +1 @@ DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B abaea589c33ec01c49df9b376b43330a1246832428d64da2eded9899b06fb32ac5875112749f94e55b1d75ad628535b71dc41b8d7e0edf62ea7baabd20b8b182 SHA512 557fe8cc2eb7bea1e18dcbb0e4df6d82ed17e02724d55889591141b8db02245378bb0cd27acfc73e452cfbc0d6d1cbc50dd27b325fa437778eca5ce8db4211be -DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd -DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e diff --git a/dev-scheme/kawa/files/kawa-1.14.patch b/dev-scheme/kawa/files/kawa-1.14.patch deleted file mode 100644 index 8acc5e442f69..000000000000 --- a/dev-scheme/kawa/files/kawa-1.14.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur kawa-1.10.orig/Makefile.in kawa-1.10/Makefile.in ---- kawa-1.10.orig/Makefile.in 2010-09-19 01:38:24.000000000 +0200 -+++ kawa-1.10/Makefile.in 2010-09-19 01:38:59.000000000 +0200 -@@ -908,7 +908,7 @@ - | sed -e 's|./||' | sort > $@ - - gnu/kawa/util/PreProcess.class: $(srcdir)/gnu/kawa/util/PreProcess.java -- $(JAVAC) -d . $(srcdir)/gnu/kawa/util/PreProcess.java -+ $(JAVAC) $(JAVACFLAGS) -d . $(srcdir)/gnu/kawa/util/PreProcess.java - - # JDK 1.1 - select-java1: $(srcdir)/patch-source-list gnu/kawa/util/PreProcess.class -diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in ---- kawa-1.9.90.orig/bin/Makefile.in 2009-08-08 12:20:49.000000000 -0300 -+++ kawa-1.9.90/bin/Makefile.in 2009-09-21 20:15:06.000000000 -0300 -@@ -686,7 +686,7 @@ - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" --@ENABLE_KAWA_FRONTEND_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT) -+@ENABLE_KAWA_FRONTEND_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT) - @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) $(DESTDIR)$(bindir)/kawa-bin$(EXEEXT) - @ENABLE_SERVLET_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) $(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT) - diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild b/dev-scheme/kawa/kawa-1.14-r2.ebuild deleted file mode 100644 index 46c2161cc790..000000000000 --- a/dev-scheme/kawa/kawa-1.14-r2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework" -HOMEPAGE="https://www.gnu.org/software/kawa/"; -XQTS_Ver="1_0_3" -SRC_URI="mirror://gnu/kawa/${P}.tar.gz - xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )" - -LICENSE="MIT public-domain - jemacs? ( GPL-2 ) - krl? ( GPL-2 )" -SLOT="0" -KEYWORDS="x86" -IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml xqtests" - -CDEPEND=" - frontend? ( sys-libs/readline:0 ) - sax? ( dev-java/sax:0 ) - servlets? ( java-virtuals/servlet-api:3.0 )" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6 - xqtests? ( app-arch/unzip:0 )" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -xtestsuite="XQTS_${XQTS_Ver}" - -PATCHES=( - "${FILESDIR}"/${P}.patch -) - -src_unpack() { - unpack kawa-${PV}.tar.gz || die - if use xqtests; then - mkdir "${WORKDIR}/${xtestsuite}" || die - cd "${WORKDIR}/${xtestsuite}" || die - unpack ${xtestsuite}.Zip || die - fi -} - -src_prepare() { - default - - java-pkg-2_src_prepare -} - -src_configure() { - # speeds up one-shot ebuilds. - local myconf="" - if use jemacs && ! use swing; then - echo - einfo "Although the swing USE flag is disabled you chose to enable jemacs," - einfo "so swing is enabled anyway." - echo - myconf="${myconf} --with-swing" - else - myconf="${myconf} $(use_with swing)" - fi - if use xqtests; then - myconf="${myconf} $(use_with xqtests XQTS="${WORKDIR}"/${xtestsuite})" - fi - if use servlets; then - myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" - fi - - econf ${myconf} $(use_enable frontend kawa-frontend) \ - $(use_enable xml) \ - $(use_enable krl brl) \ - $(use_enable jemacs) \ - $(use_with awt) \ - $(use_with sax sax2) \ - --with-java-source=$(java-pkg_get-source) -} - -src_compile() { - emake -j1 -} - -src_install() { - emake -j1 DESTDIR="${D}" install - rm -rv "${D}"/usr/share/java/ || die "rm -rv failed" - - java-pkg_newjar kawa-${PV}.jar - - java-pkg_dolauncher "kawa" --main kawa.repl - java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery" - if use servlets; then - java-pkg_dolauncher "kawa-cgi-servlet" --main \ - gnu.kawa.servlet.CGIServletWrapper - fi - if use jemacs; then - java-pkg_dolauncher "jemacs" --main \ - gnu.jemacs.lang.ELisp - fi - - use source && java-pkg_dosrc kawa/* gnu/* - - dodoc ChangeLog TODO README NEWS - doinfo doc/kawa.info* - doman doc/*.2 - - cp doc/kawa.man doc/kawa.2 || die - cp doc/qexo.man doc/qexo.2 || die -} diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml index 2822ab30387c..32770bd52d12 100644 --- a/dev-scheme/kawa/metadata.xml +++ b/dev-scheme/kawa/metadata.xml @@ -22,7 +22,6 @@ <flag name="servlets">Build support for generating servlets with Java servletapi</flag> <flag name="swing">Assume Swing is available</flag> - <flag name="xqtests">Support XQuery Test Suite</flag> </use> <upstream> <remote-id type="gitlab">kashell/Kawa</remote-id>
