[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/files/, dev-scheme/kawa/

[David Seifert]

commit:     fa1980c65dfac5066bd630bfd023ae8b2a9c7dcc
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Fri Dec  1 18:09:40 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 13:02:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1980c6

dev-scheme/kawa: Remove old (EAPI3)

Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6385

 dev-scheme/kawa/Manifest              |   2 -
 dev-scheme/kawa/files/kawa-1.10.patch |  24 --------
 dev-scheme/kawa/kawa-1.10.ebuild      | 109 ----------------------------------
 3 files changed, 135 deletions(-)

diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 34f11bd199f..30befbadd4d 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,4 +1,2 @@
-DIST XQTS_1_0_2.zip 19879467 SHA256 923361362d70a20818c6442eb52a6401fe9d2e53e4f52ee8b4d7fb1c841b4443 SHA512 a9c35ee02871b2b9629ce87125886347ef407133871c63e7628bfc8b99a60045c0187a2fbfa1a6f02dc572d7ac1b27cac24e467dd07f95acdedc6b4c7ffd969a WHIRLPOOL 43628d3650e0996c97f7bc05da2255661d8dcedfa45ddbb325311a3aec0d9e7e6f6383f73ed2f65a77bd5a26158c069dcfe1eac04b418da21c14bfcdf2a55a0f
 DIST XQTS_1_0_3.zip 30956043 SHA256 1a6c9dd8761f021e78105efd4f46d5d35bb8b73b18e14bfde0512661e6be78ec SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd WHIRLPOOL 57ac5b2d5a38446d89df7bd7d06dbe09a592b6243ceb415fac4d2d0bf154a8cf51307194feab7eef14643bdd8f24e87f307b2cb521f5f81ef412814bf9fddc8b
-DIST kawa-1.10.tar.gz 2238130 SHA256 f697f5784b55b1945f0644954459f88a0eb9511bb60d695b1a9767b58eb7492e SHA512 4ab27331f7be6d6107272e75508179ed7d14c475e1fffaceeb7a16600e3ba4e54fc63506788ed89fca1f2d390477d2e3e685f29b015a28214fcb4f62016c943d WHIRLPOOL 2dc4c85ae4d8496b0425d6faf9c6077fe66906a107d0780b60d19fc91992b0a06f066857c4aa45fb81e29495ec4f9c7d9bac9d6f9a210874d2ffaf79dbf851eb
 DIST kawa-1.14.tar.gz 2691484 SHA256 2201cf3f4c57f49f15cf929d8634855cb8ef4ffe79158cecd66ebd5bd9b4b909 SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e WHIRLPOOL 6f7e32e38ecea68e4d7faffc2cb1df16d33b384010391d23507397714891ad1588a35aa7d0b4c1079322acc3250f25459c94ddb68f90a14f04a552f847542d6a

diff --git a/dev-scheme/kawa/files/kawa-1.10.patch b/dev-scheme/kawa/files/kawa-1.10.patch
deleted file mode 100644
index 8acc5e442f6..00000000000
--- a/dev-scheme/kawa/files/kawa-1.10.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.10.ebuild b/dev-scheme/kawa/kawa-1.10.ebuild
deleted file mode 100644
index 74950542bec..00000000000
--- a/dev-scheme/kawa/kawa-1.10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
-HOMEPAGE="https://www.gnu.org/software/kawa/"
-XQTS_Ver="1_0_2"
-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 echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
-
-COMMON_DEPEND="( >=virtual/jdk-1.5 )
-			   frontend? ( sys-libs/readline:0 )
-			   sax? ( dev-java/sax:0 )
-			   echo2? ( dev-java/echo2 )
-			   swt? ( dev-java/swt:3.5 )
-			   servlets? ( dev-java/servletapi:2.4 )"
-DEPEND="${COMMON_DEPEND}
-		xqtests? ( app-arch/unzip:0 )"
-RDEPEND="${COMMON_DEPEND}"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-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() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-	# speeds up one-shot ebuilds.
-	myconf="--disable-dependency-tracking"
-	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
-	if use swt; then
-		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3.5 swt.jar)"
-	fi
-
-	econf ${myconf} $(use_enable frontend kawa-frontend) \
-		  $(use_enable xml) \
-		  $(use_enable krl brl) \
-		  $(use_enable echo2) \
-		  $(use_enable jemacs) \
-		  $(use_with awt) \
-		  $(use_with sax sax2) \
-		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
-}
-
-src_compile() {
-	emake -j1 || die "emake failed."
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-	java-pkg_newjar kawa-${PV}.jar || die
-
-	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-		"--xquery" || die "dolauncher qexo failed"
-	if use servlets; then
-		java-pkg_dolauncher "kawa-cgi-servlet" --main \
-			gnu.kawa.servlet.CGIServletWrapper || die
-	fi
-	if use jemacs; then
-		java-pkg_dolauncher "jemacs" --main \
-			gnu.jemacs.lang.ELisp || die
-	fi
-
-	use source && java-pkg_dosrc kawa/* gnu/*
-
-	dodoc ChangeLog TODO README NEWS || die
-	doinfo doc/kawa.info* || die
-	cp doc/kawa.man doc/kawa.2 || die
-	cp doc/qexo.man doc/qexo.2 || die
-	doman doc/*.2 || die
-}