Version bump.

(Portage version: 2.1.4)

5 files changed, 74 insertions, 60 deletions

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index b1d3e30dd178..b99a7d33facd 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.15 2008/01/12 16:45:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.16 2008/01/15 08:42:43 nelchael Exp $
+
+*freemarker-2.3.11 (15 Jan 2008)
+
+  15 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/freemarker-2.3.10-gentoo.patch,
+  +files/freemarker-2.3.11-gentoo.patch, -freemarker-2.3.10.ebuild,
+  +freemarker-2.3.11.ebuild:
+  Version bump.
 
   12 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml:
   Remove myself from <maintainer>.
diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.10 b/dev-java/freemarker/files/digest-freemarker-2.3.10
deleted file mode 100644
index b70e565de039..000000000000
--- a/dev-java/freemarker/files/digest-freemarker-2.3.10
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-freemarker-2.3.11 b/dev-java/freemarker/files/digest-freemarker-2.3.11
new file mode 100644
index 000000000000..86aa5b0b98be
--- /dev/null
+++ b/dev-java/freemarker/files/digest-freemarker-2.3.11
@@ -0,0 +1,3 @@
+MD5 e9b36b6cdeb3f181234847e2a33d0457 freemarker-2.3.11.tar.gz 2105172
+RMD160 c565e65f9cbd70395c583cb08fd371b83550fe04 freemarker-2.3.11.tar.gz 2105172
+SHA256 37c8442042e114fbaa74d48feed8f5790ed6986acdba15f26f999dd9c10b6d78 freemarker-2.3.11.tar.gz 2105172
diff --git a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.11-gentoo.patch
index 2282b04de165..5e05dc00d44f 100644
--- a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
+++ b/dev-java/freemarker/files/freemarker-2.3.11-gentoo.patch
@@ -1,54 +1,60 @@
-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 -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/freemarker-2.3.10.ebuild b/dev-java/freemarker/freemarker-2.3.11.ebuild
index f9638377a692..883d620bad56 100644
--- a/dev-java/freemarker/freemarker-2.3.10.ebuild
+++ b/dev-java/freemarker/freemarker-2.3.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2 2007/06/18 17:29:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.11.ebuild,v 1.1 2008/01/15 08:42:43 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-nodeps"