4 files changed, 131 insertions, 1 deletions
diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index b99a7d33facd..bf2c1164d8f9 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.16 2008/01/15 08:42:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.17 2008/01/21 11:06:50 nelchael Exp $
+
+  21 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/freemarker-2.3.10-gentoo.patch, +freemarker-2.3.10.ebuild:
+  Restore 2.3.10
 
 *freemarker-2.3.11 (15 Jan 2008)
 
diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.10 b/dev-java/freemarker/files/digest-freemarker-2.3.10
new file mode 100644
index 000000000000..b70e565de039
--- /dev/null
+++ b/dev-java/freemarker/files/digest-freemarker-2.3.10
@@ -0,0 +1,3 @@
+MD5 0fbf40be3cbf5b1ff5852aab3cc8392c freemarker-2.3.10.tar.gz 2029438
+RMD160 edce21fb3df653596ff7f62d97fa3a5f16c02829 freemarker-2.3.10.tar.gz 2029438
+SHA256 bf97f4121188b0772811f9f57a66fea9577e7d30688401302c5e673fb5b2875e freemarker-2.3.10.tar.gz 2029438
diff --git a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
new file mode 100644
index 000000000000..2282b04de165
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Nru freemarker-2.3.10.vanilla/build.xml freemarker-2.3.10/build.xml
+--- freemarker-2.3.10.vanilla/build.xml	2007-05-06 11:46:06.000000000 +0200
++++ freemarker-2.3.10/build.xml	2007-05-06 11:48:55.000000000 +0200
+@@ -55,16 +55,19 @@
+         <pathelement path="${lib.log4j}"/>
+         <pathelement path="${lib.rhino}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     <path id="compile.classpath">
+         <path refid="compile.nojsp.classpath"/>
+         <pathelement path="${lib.servlet23}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.jsp2.classpath">
+         <path refid="compile.nojsp.classpath"/>
+         <pathelement path="${lib.servlet24}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.classpath.testcases">
+@@ -72,6 +75,7 @@
+         <pathelement path="${lib.jython}"/>
+         <pathelement path="${lib.jdom}"/>
+         <pathelement path="${lib.servlet23}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.classpath.javadoc">
+@@ -89,12 +93,14 @@
+         <pathelement path="${src.dir}"/>
+         <pathelement path="${build.javacc.dir}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.classpath.examples">
+         <pathelement path="${lib.servlet23}"/>
+         <pathelement path="${lib.dir}/freemarker.jar"/>
+         <pathelement path="${lib.struts}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     <path id="full.classpath">
+@@ -110,6 +116,7 @@
+         <pathelement path="${lib.logkit}"/>
+         <pathelement path="${lib.log4j}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     
diff --git a/dev-java/freemarker/freemarker-2.3.10.ebuild b/dev-java/freemarker/freemarker-2.3.10.ebuild
new file mode 100644
index 000000000000..32f4858731b7
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.10.ebuild,v 1.4 2008/01/21 11:06:50 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+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 ~x86-fbsd"
+IUSE=""
+
+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}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	cd "${S}/lib/"
+	rm -f *.jar
+
+	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/taglib2.jar"
+	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/lib/taglib-foo.jar"
+
+}
+
+src_compile() {
+
+	# BIG FAT WARNING:
+	# clean target removes lib/ directory!!
+	eant clean
+
+	mkdir lib/
+	cd lib/
+	java-pkg_jar-from servletapi-2.3
+	java-pkg_jar-from jaxen-1.1
+	java-pkg_jar-from jython
+
+	cd "${S}"
+	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
+
+}
+
+src_install() {
+
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc build/api
+	use source && java-pkg_dosrc src/*
+
+}