Bump jacl to latest version.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 101 insertions, 3 deletions

diff --git a/dev-java/jacl/ChangeLog b/dev-java/jacl/ChangeLog
index d7bf3765cfc8..000448f99da0 100644
--- a/dev-java/jacl/ChangeLog
+++ b/dev-java/jacl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jacl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/ChangeLog,v 1.21 2007/06/12 09:03:55 caster Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/ChangeLog,v 1.22 2008/09/14 06:16:18 ali_bush Exp $
+
+*jacl-1.4.1 (14 Sep 2008)
+
+  14 Sep 2008; Alistair Bush <ali_bush@gentoo.org>
+  +files/jacl-1.4.1-build.patch, +jacl-1.4.1.ebuild:
+  Bump to latest version.
 
   12 Jun 2007; Vlastimil Babka <caster@gentoo.org> -jacl-1.3.1.ebuild:
   Remove old gen-1 version.
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest
index 7b8ee04afa47..9e69f0716888 100644
--- a/dev-java/jacl/Manifest
+++ b/dev-java/jacl/Manifest
@@ -1,5 +1,8 @@
 AUX 1.3.3-javacflags.patch 1184 RMD160 6fb3932737026ae6a30c2a0febeff36388aa6a0e SHA1 c3eeb7eef9d71e1d6566260cbe324974e352bb5a SHA256 baf06c08fddd20143840b9318cdc5c8444cc099782c96a3c40d29e027f8b71ff
+AUX jacl-1.4.1-build.patch 1418 RMD160 9051baecc570d2cf8e7143f92d3a4249e210804b SHA1 bff4b9a92fb58f6c4d3d67ab74ec25d5ed1ac256 SHA256 2763ef0cb6833e0bb3182651d3184d984dede5e28a2d5aabdf21b2791c50a55f
 DIST jacl1.3.3.tar.gz 999934 RMD160 e778b17ccf8d2aeab4c347facc4a36024489423d SHA1 77fe78b9e2bc968475a8f4427fd16abcb6b5f75e SHA256 9f195348cb13c6f4c9cdadb927e08654a3722ad118229c414bd86ffa86695bda
+DIST jacl1.4.1.tar.gz 1921630 RMD160 e4abe6f72ee461dd98987fad7c5e6870bed7632c SHA1 9fbda6b59b0d198d01b817921a777b453d42ef79 SHA256 0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749
 EBUILD jacl-1.3.3.ebuild 1351 RMD160 1758918a9bc3a584234b25eb584c1d6033aa8619 SHA1 35f5c23a95c8ac483cd34274ad6b865862559147 SHA256 a6ec62a2484569bbae4f305b222caa114f323aba6ba25b8eff3b0374cc4a52a6
-MISC ChangeLog 2418 RMD160 370a8102150f6526906c789044c588cf49f8ddf7 SHA1 87badda02621ad96aab8acb4f54a156b87efd70d SHA256 4910cc70c493a7a535338b8b843fa9ad4a059a8522e45a9ad0120e5fbf13c957
+EBUILD jacl-1.4.1.ebuild 1408 RMD160 7883fc3f9d2031126e8b332333bac616a8af27e9 SHA1 8b5e8dc89286ea3be67c11c46ebb5ce1818800e8 SHA256 d23d8ee16d7cab0e3f6beffce5929d2df745e2a3123e0709f7b582d312e3ab99
+MISC ChangeLog 2578 RMD160 1dddafbe5475378821a5729c414cfa6369209900 SHA1 1c7888f799e42cc6b6d73de8de85852f29c7b343 SHA256 e656437a060dbfd68d34053766f8b8bbcbf18fa827bd1c1bb76c4094784cbc67
 MISC metadata.xml 1959 RMD160 23b83238e234e46426cedd14d59ba74f19701467 SHA1 8f6d6b1036b8c137d1d147e365a8ad2c6808f544 SHA256 510ca7882bb166d65aaa8f2fc6e0c7e3d5197f4671d4cc1ea2058d4adfb9de91
diff --git a/dev-java/jacl/files/jacl-1.4.1-build.patch b/dev-java/jacl/files/jacl-1.4.1-build.patch
new file mode 100644
index 000000000000..5f2ccf946492
--- /dev/null
+++ b/dev-java/jacl/files/jacl-1.4.1-build.patch
@@ -0,0 +1,39 @@
+diff -Naur jacl1.4.1.bak/Makefile.in jacl1.4.1/Makefile.in
+--- jacl1.4.1.bak/Makefile.in	2008-09-14 14:44:18.000000000 +1200
++++ jacl1.4.1/Makefile.in	2008-09-14 14:46:31.000000000 +1200
+@@ -54,7 +54,7 @@
+ XTERM			= xterm
+ JAVA_FLAGS		= @JAVA_FLAGS@
+ JAVA_G_FLAGS		= @JAVA_G_FLAGS@
+-JAVAC_FLAGS		= @JAVAC_FLAGS@
++JAVAC_FLAGS		?= @JAVAC_FLAGS@
+ JAVAC_D_FLAG		= @JAVAC_D_FLAG@
+ JAR_EXTRACT_FLAGS	= @JAR_EXTRACT_FLAGS@
+ JAR_COMPRESS_FLAGS	= @JAR_COMPRESS_FLAGS@
+@@ -983,8 +983,8 @@
+ 	$(JAVAC) $(JAVAC_FLAGS) \
+ 	$(JAVAC_D_FLAG) $(TCLJAVA_BUILD_DIR) \
+ 		tcl/lang/*.java
+-	mkdir $(TCLJAVA_BUILD_DIR)/tcl/lang/library
+-	mkdir $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java
++	mkdir -p $(TCLJAVA_BUILD_DIR)/tcl/lang/library
++	mkdir -p $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java
+ 	cp -fr $(TCLJAVA_SRC_DIR)/tcl/lang/library/java/*.tcl \
+ 		$(TCLJAVA_BUILD_DIR)/tcl/lang/library/java
+ 
+diff -Naur jacl1.4.1.bak/tcljava.m4 jacl1.4.1/tcljava.m4
+--- jacl1.4.1.bak/tcljava.m4	2008-09-14 14:44:18.000000000 +1200
++++ jacl1.4.1/tcljava.m4	2008-09-14 14:44:30.000000000 +1200
+@@ -226,9 +226,9 @@
+     # Look for a setting for the CLASSPATH, we might need one to run JAVAC
+     AC_JAVA_CLASSPATH
+ 
+-    # FIXME : add detection of command line arguments for JAVAC
+-
+-    JAVAC_FLAGS=-g
++    if test "x${JAVAC_FLAGS}" = "x"; then
++        JAVAC_FLAGS=-g
++    fi
+     JAVAC_D_FLAG=-d
+ 
+     dnl Test out the Java compiler with an empty class
diff --git a/dev-java/jacl/jacl-1.4.1.ebuild b/dev-java/jacl/jacl-1.4.1.ebuild
new file mode 100644
index 000000000000..1de411e580bb
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jacl/jacl-1.4.1.ebuild,v 1.1 2008/09/14 06:16:18 ali_bush Exp $
+
+inherit base java-pkg-2
+
+DESCRIPTION="Jacl is an implementation of Tcl written in Java."
+HOMEPAGE="http://tcljava.sourceforge.net"
+MY_P="${P//-}"
+SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/tcl-8.4.5
+	>=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
+# jikes support disabled for now.
+# refer to bug #100020 and bug #89711
+
+src_compile() {
+	local jflags="$(java-pkg_javac-args)"
+	JAVAC_FLAGS="${jflags}" \
+		econf --enable-jacl --without-jikes || die
+	#ali_bush: Fails intermitently with MAKEOPTS="-j3"
+	JAVAC_FLAGS="${jflags}" \
+		MAKEOPTS="-j2" \
+		emake DESTDIR="/usr/share/${PN}" || die "emake failed"
+}
+
+src_test() {
+	emake check || die "Tests failed"
+	einfo "Some tests are known to fail. We didn't restrict them"
+	einfo "because the ebuild doesn't die."
+}
+
+src_install() {
+	#emake DESTDIR="${D}" install || die "emake install failed"
+	java-pkg_dojar *.jar
+	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+	dodoc README ChangeLog known_issues.txt || die
+	use doc && java-pkg_dohtml -r docs/*
+}