Small fixes, removed old version.

(Portage version: 2.1.2.5)

5 files changed, 15 insertions, 68 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index bcac5495342a..d6024e24cf13 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.10 2007/03/17 16:18:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.11 2007/04/28 15:01:29 nelchael Exp $
+
+  28 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/freemarker-2.3.8-gentoo.patch, -freemarker-2.3.8.ebuild,
+  freemarker-2.3.9.ebuild:
+  Small fixes, removed old version.
 
   17 Mar 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   freemarker-2.3.8.ebuild, freemarker-2.3.9.ebuild:
diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.8 b/dev-java/freemarker/files/digest-freemarker-2.3.8
deleted file mode 100644
index 67019364a4ae..000000000000
--- a/dev-java/freemarker/files/digest-freemarker-2.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 21a6345724df..000000000000
--- a/dev-java/freemarker/files/freemarker-2.3.8-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 12386739229c..000000000000
--- a/dev-java/freemarker/freemarker-2.3.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 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.5 2007/03/17 16:18:09 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output based on templates."
-HOMEPAGE="http://freemarker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="freemarker"
-SLOT="2.3"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source doc"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/jython
-	dev-java/ant"
-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,jython"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	local antflags="-Djavacc.home=/usr/share/javacc/lib -lib $(java-pkg_getjars ${GETJARS_ARG})"
-	eant clean jar $(use_doc) ${antflags}
-}
-
-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/*
-}
diff --git a/dev-java/freemarker/freemarker-2.3.9.ebuild b/dev-java/freemarker/freemarker-2.3.9.ebuild
index a79a5b2e472d..4d0e820a9bb9 100644
--- a/dev-java/freemarker/freemarker-2.3.9.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.9.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.9.ebuild,v 1.3 2007/03/17 16:18:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.9.ebuild,v 1.4 2007/04/28 15:01:29 nelchael Exp $
 
+JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-nodeps"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -13,16 +14,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="freemarker"
 SLOT="2.3"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source doc"
+IUSE=""
 
-DEPEND=">=virtual/jdk-1.4
-	dev-java/javacc
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4
+COMMON_DEP="dev-java/javacc
 	dev-java/jython
 	=dev-java/servletapi-2.3*
 	=dev-java/jaxen-1.1*"
 
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
 src_unpack() {
 
 	unpack ${A}