Version bump.

Package-Manager: portage-2.1.1_pre3-r4

4 files changed, 77 insertions, 1 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index 224cd4b07d1c..84c9e91f2dac 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.3 2006/07/14 14:02:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.4 2006/07/25 13:10:45 nelchael Exp $
+
+*freemarker-2.3.8 (25 Jul 2006)
+
+  25 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/freemarker-2.3.6-gentoo.patch,
+  +files/freemarker-2.3.8-gentoo.patch, -freemarker-2.3.6.ebuild,
+  +freemarker-2.3.8.ebuild:
+  Version bump.
 
   14 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   freemarker-2.3.6.ebuild:
diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.8 b/dev-java/freemarker/files/digest-freemarker-2.3.8
new file mode 100644
index 000000000000..67019364a4ae
--- /dev/null
+++ b/dev-java/freemarker/files/digest-freemarker-2.3.8
@@ -0,0 +1,3 @@
+MD5 1acd8d406245a5345960025f7ce9b109 freemarker-2.3.8.tar.gz 2012911
+RMD160 9638b9296fd1369d3c20dab6b4445c901a4c26a9 freemarker-2.3.8.tar.gz 2012911
+SHA256 cf0507fbe4901946e1842c1b63ac95e4b8ed59c0ea27b4398e207428f07633bf freemarker-2.3.8.tar.gz 2012911
diff --git a/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch
new file mode 100644
index 000000000000..21a6345724df
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch
@@ -0,0 +1,15 @@
+diff -Nru freemarker-2.3.8.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java freemarker-2.3.8/src/freemarker/ext/rhino/RhinoFunctionModel.java
+--- freemarker-2.3.8.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java	2006-07-25 14:38:15.000000000 +0200
++++ freemarker-2.3.8/src/freemarker/ext/rhino/RhinoFunctionModel.java	2006-07-25 14:39:20.000000000 +0200
+@@ -37,7 +37,11 @@
+         for (int i = 0; i < args.length; i++) {

+             args[i] = wrapper.unwrap((TemplateModel)args[i], Scriptable.class);

+         }

++		try {

+         return wrapper.wrap(((Function)getScriptable()).call(cx, 

+                 ScriptableObject.getTopLevelScope(fnThis), fnThis, args));

++		} catch (Exception e) {

++			throw new TemplateModelException(e.getMessage());

++		}

+     }

+ }

diff --git a/dev-java/freemarker/freemarker-2.3.8.ebuild b/dev-java/freemarker/freemarker-2.3.8.ebuild
new file mode 100644
index 000000000000..e06668eb1435
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.8.ebuild,v 1.1 2006/07/25 13:10:45 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output (anything from HTML to autogenerated source code) based on templates."
+HOMEPAGE="http://freemarker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="freemarker"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="source doc"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/servletapi-2.3*
+	=dev-java/jaxen-1.1*
+	dev-java/javacc"
+
+GETJARS_ARG="servletapi-2.3,jaxen-1.1"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+}
+
+src_compile() {
+
+	local antflags="jar -Djavacc.home=/usr/share/javacc/lib -lib $(java-pkg_getjars ${GETJARS_ARG})"
+	use doc && antflags="${antflags} javadoc"
+
+	eant clean ${antflags} || die "Compilation failed"
+
+}
+
+src_install() {
+
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dohtml -r build/api
+	use source && java-pkg_dosrc src
+
+}