Version bump.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-tuxonice-r5 x86_64)

4 files changed, 149 insertions, 67 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index cdad93107f09..ee3f1971eb30 100644
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2008/06/20 21:51:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.21 2008/06/20 22:51:58 nelchael Exp $
+
+*freemarker-2.3.13 (20 Jun 2008)
+
+  20 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/freemarker-2.3.11-gentoo.patch,
+  +files/freemarker-2.3.13-gentoo.patch, -freemarker-2.3.11.ebuild,
+  +freemarker-2.3.13.ebuild:
+  Version bump.
 
   20 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +freemarker-2.3.10-r1.ebuild:
diff --git a/dev-java/freemarker/files/freemarker-2.3.11-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.11-gentoo.patch
deleted file mode 100644
index 5e05dc00d44f..000000000000
--- a/dev-java/freemarker/files/freemarker-2.3.11-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nru freemarker-2.3.11.vanilla/build.xml freemarker-2.3.11/build.xml
---- freemarker-2.3.11.vanilla/build.xml	2008-01-15 09:38:19.000000000 +0100
-+++ freemarker-2.3.11/build.xml	2008-01-15 09:39:30.000000000 +0100
-@@ -69,21 +69,25 @@
-         <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.jsp21}"/>
-+        <fileset dir="lib" includes="*.jar"/>
-     </path>
- 
-     <path id="compile.jsp1.classpath">
-         <path refid="compile.nojsp.classpath"/>
-         <pathelement path="${lib.jsp12}"/>
-+        <fileset dir="lib" includes="*.jar"/>
-     </path>
- 
-     <path id="compile.jsp2.classpath">
- 	<path refid="compile.nojsp.classpath"/>
- 	<pathelement path="${lib.jsp20}"/>
-+        <fileset dir="lib" includes="*.jar"/>
-     </path>
-     
-     <path id="compile.classpath.testcases">
-@@ -92,6 +96,7 @@
-         <pathelement path="${lib.jdom}"/>
-         <pathelement path="${lib.servlet}"/>
-         <pathelement path="${lib.jsp20}"/>
-+        <fileset dir="lib" includes="*.jar"/>
-     </path>
- 
-     <path id="compile.classpath.javadoc">
-@@ -110,12 +115,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.servlet}"/>
-         <pathelement path="${lib.dir}/freemarker.jar"/>
-         <pathelement path="${lib.struts}"/>
-+        <fileset dir="lib" includes="*.jar"/>
-     </path>
-     
-     <path id="full.classpath">
-@@ -131,6 +138,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/files/freemarker-2.3.13-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch
new file mode 100644
index 000000000000..9eca29a827ad
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch
@@ -0,0 +1,126 @@
+diff -Nru freemarker-2.3.13.vanilla/build.xml freemarker-2.3.13/build.xml
+--- freemarker-2.3.13.vanilla/build.xml	2008-06-21 00:46:08.000000000 +0200
++++ freemarker-2.3.13/build.xml	2008-06-21 00:46:48.000000000 +0200
+@@ -69,21 +69,28 @@
+         <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.jsp21}"/>
++        <fileset dir="lib" includes="*.jar"/>
++		<fileset dir="lib/jsp-2.1" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.jsp1.classpath">
+         <path refid="compile.nojsp.classpath"/>
+         <pathelement path="${lib.jsp12}"/>
++        <fileset dir="lib" includes="*.jar"/>
++		<fileset dir="lib/jsp-1.2" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.jsp2.classpath">
+ 	<path refid="compile.nojsp.classpath"/>
+ 	<pathelement path="${lib.jsp20}"/>
++	<fileset dir="lib" includes="*.jar"/>
++	<fileset dir="lib/jsp-2.0" includes="*.jar"/>
+     </path>
+     
+     <path id="compile.classpath.testcases">
+@@ -92,6 +99,7 @@
+         <pathelement path="${lib.jdom}"/>
+         <pathelement path="${lib.servlet}"/>
+         <pathelement path="${lib.jsp20}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+ 
+     <path id="compile.classpath.javadoc">
+@@ -110,12 +118,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.servlet}"/>
+         <pathelement path="${lib.dir}/freemarker.jar"/>
+         <pathelement path="${lib.struts}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     <path id="full.classpath">
+@@ -131,6 +141,7 @@
+         <pathelement path="${lib.logkit}"/>
+         <pathelement path="${lib.log4j}"/>
+         <pathelement path="${java.class.path}"/>
++        <fileset dir="lib" includes="*.jar"/>
+     </path>
+     
+     
+@@ -180,7 +191,6 @@
+ 
+     <patternset id="freemarker.compile.jdk15">
+         <include name="freemarker/ext/beans/EnumModels.java"/>
+-        <include name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>

+     </patternset>
+ 
+     <patternset id="freemarker.compile.xalan">
+@@ -311,7 +321,6 @@
+                 <available file="lib/xalan.jar"/>

+             </and>
+         </condition>
+-        <antcall target="fetchlibs"/>
+         <available
+             property="log4j.available"
+             classname="org.apache.log4j.Logger"
+diff -Nru freemarker-2.3.13.vanilla/src/freemarker/ext/jsp/FreeMarkerPageContext21.java freemarker-2.3.13/src/freemarker/ext/jsp/FreeMarkerPageContext21.java
+--- freemarker-2.3.13.vanilla/src/freemarker/ext/jsp/FreeMarkerPageContext21.java	2008-06-21 00:46:08.000000000 +0200
++++ freemarker-2.3.13/src/freemarker/ext/jsp/FreeMarkerPageContext21.java	2008-06-21 00:46:12.000000000 +0200
+@@ -2,11 +2,13 @@
+ 
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import java.util.Enumeration;
+ 
+ import javax.el.ELContext;
+ import javax.servlet.jsp.JspApplicationContext;
+ import javax.servlet.jsp.JspContext;
+ import javax.servlet.jsp.JspFactory;
++import javax.servlet.jsp.ErrorData;
+ import javax.servlet.jsp.PageContext;
+ import javax.servlet.jsp.el.ELException;
+ import javax.servlet.jsp.el.ExpressionEvaluator;
+@@ -24,6 +26,9 @@
+ class FreeMarkerPageContext21 extends FreeMarkerPageContext {
+     private static final Logger logger = Logger.getLogger("freemarker.jsp");
+ 
++	public ErrorData getErrorData() { return null; }
++	public Enumeration getAttributeNames() { return getServletContext().getAttributeNames(); }
++
+     static {
+         if(JspFactory.getDefaultFactory() == null) {
+             JspFactory.setDefaultFactory(new FreeMarkerJspFactory21());
+diff -Nru freemarker-2.3.13.vanilla/src/freemarker/ext/jython/JythonHashModel.java freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java
+--- freemarker-2.3.13.vanilla/src/freemarker/ext/jython/JythonHashModel.java	2008-06-21 00:46:08.000000000 +0200
++++ freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java	2008-06-21 00:46:12.000000000 +0200
+@@ -137,7 +137,7 @@
+         {
+             throw new TemplateModelException(e);
+         }
+-        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
++        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType());
+     }
+ 
+     /**
+@@ -157,6 +157,6 @@
+         {
+             throw new TemplateModelException(e);
+         }
+-        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
++        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType());
+     }
+ }
diff --git a/dev-java/freemarker/freemarker-2.3.11.ebuild b/dev-java/freemarker/freemarker-2.3.13.ebuild
index 883d620bad56..18052ae1d877 100644
--- a/dev-java/freemarker/freemarker-2.3.11.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.13.ebuild
@@ -1,7 +1,8 @@
 # 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.11.ebuild,v 1.1 2008/01/15 08:42:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild,v 1.1 2008/06/20 22:51:58 nelchael Exp $
 
+EAPI="1"
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-nodeps"
 
@@ -13,13 +14,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="freemarker"
 SLOT="2.3"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/javacc
 	dev-java/jython
-	=dev-java/servletapi-2.3*
-	=dev-java/jaxen-1.1*"
+	java-virtuals/servlet-api:2.3
+	java-virtuals/servlet-api:2.4
+	java-virtuals/servlet-api:2.5
+	dev-java/jaxen:1.1"
 
 DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEP}"
@@ -47,11 +50,16 @@ src_compile() {
 	# clean target removes lib/ directory!!
 	eant clean
 
-	mkdir lib/
+	mkdir -p lib/jsp-1.2
+	mkdir -p lib/jsp-2.0
+	mkdir -p lib/jsp-2.1
 	cd lib/
-	java-pkg_jar-from servletapi-2.3
+	java-pkg_jar-from --virtual --into jsp-1.2 servlet-api-2.3
+	java-pkg_jar-from --virtual --into jsp-2.0 servlet-api-2.4
+	java-pkg_jar-from --virtual --into jsp-2.1 servlet-api-2.5
 	java-pkg_jar-from jaxen-1.1
 	java-pkg_jar-from jython
+	java-pkg_jar-from javacc
 
 	cd "${S}"
 	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib