Bump freemarker with patch to support latest jython version. see #211503 and #106239

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog
index bf2c1164d8f99867947043726348e86bf326e660..9647c480ee312ba8df5c9a1913090409cfaefcd0 100644 (file)
--- a/dev-java/freemarker/ChangeLog
+++ b/dev-java/freemarker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2008/01/21 11:06:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.18 2008/03/01 02:36:39 ali_bush Exp $
+
+*freemarker-2.3.10-r1 (01 Mar 2008)
+
+  01 Mar 2008; Alistair Bush <ali_bush@gentoo.org>
+  +files/freemarker-jython-2.2.patch, +freemarker-2.3.10-r1.ebuild:
+  Bump freemarker with patch to support latest jython version. see #211503 and
+  #106239
 
   21 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/freemarker-2.3.10-gentoo.patch, +freemarker-2.3.10.ebuild:

diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index d15bf990e1bca6a76fd6d5215c8c42e4125643b9..187661fbc1f0072d82b07f1eb70665f6cd53a333 100644 (file)
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1,8 +1,10 @@
 AUX freemarker-2.3.10-gentoo.patch 1934 RMD160 63b558825d19eb9492a728a478caf96ed522ae15 SHA1 8af8ad60fbee21c4655070da25aa74fa39f0476c SHA256 9ae7310dae12b6a12389459683e886c16ddd6f5610a353dfc92d96f0b1693266
 AUX freemarker-2.3.11-gentoo.patch 2061 RMD160 af095f67d5d546b902467c2ec4839a09317acf22 SHA1 b4a53b02bc6d5e275bf662d55f9c1851c2de7aa5 SHA256 4a54b85f8465f5476b25bac7ea355ba39f3eebcbf3c8ebe72c8b5d3d4ea7b581
+AUX freemarker-jython-2.2.patch 1132 RMD160 4a0d4357cfa9876f18f4d7b7623bfa6a176b098c SHA1 f6794b5bb2a8a4d050da503de98316aa97222edb SHA256 f46b6f48c25b170561a1bbc3d95d37294362b0f60810ad8264ab4678461958fa
 DIST freemarker-2.3.10.tar.gz 2029438 RMD160 edce21fb3df653596ff7f62d97fa3a5f16c02829 SHA1 b903d4a8a7530c72f468fe76ee9f66b37a3f6d8c SHA256 bf97f4121188b0772811f9f57a66fea9577e7d30688401302c5e673fb5b2875e
 DIST freemarker-2.3.11.tar.gz 2105172 RMD160 c565e65f9cbd70395c583cb08fd371b83550fe04 SHA1 cd16921baf37b296aa26998baaaa86e3aff5c932 SHA256 37c8442042e114fbaa74d48feed8f5790ed6986acdba15f26f999dd9c10b6d78
+EBUILD freemarker-2.3.10-r1.ebuild 1879 RMD160 910c6a22dc17bf7d05e27c947515a676c1b1208d SHA1 daaebaf2f892569470bf070712e4ddb8f34f3085 SHA256 65eb6ff01efddd4993a80f40dc80f3b2dc43d1a7c3c12c0ca78a6e4a06cbd6e2
 EBUILD freemarker-2.3.10.ebuild 1471 RMD160 f193f8ffe2bc2fdbb9f08fefcedbaa231c275cb4 SHA1 9ddc2ab24e2fcfdc03645922213fb616010538bd SHA256 b2a681fac94bb9c1293310862ea3ecc082b9aad3115c72446fcc540e6c569b53
 EBUILD freemarker-2.3.11.ebuild 1471 RMD160 6c557d912ae16a250727bf25f6e938f4640f82cf SHA1 e3ba87b66871de5923de95b4c22573191b2b401d SHA256 056003f7ac2d88ecb1b4d67d6e8c4d62a4467147b76ed25b64ed251c4a9a0491
-MISC ChangeLog 2637 RMD160 7c8f6caed16bf1afe014ae63ba370f88599eb28a SHA1 238cc53c31b616b240ed33c7877a7bdeec2dded8 SHA256 5037e12006b19765c127a151ffad031e1b09d9857d7dedf35becd74888fe81a1
+MISC ChangeLog 2883 RMD160 dbfe70a3f7e811405bf738fc10c3fbcbbea88980 SHA1 c268b0a54ad5856866748a84267a791692366447 SHA256 67815de8cc27ffcbcc6a2062ee051121a21c88980d18866c775adf17e8465862
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb

diff --git a/dev-java/freemarker/files/freemarker-jython-2.2.patch b/dev-java/freemarker/files/freemarker-jython-2.2.patch
new file mode 100644 (file)
index 0000000..0d0d387
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-jython-2.2.patch
@@ -0,0 +1,20 @@
+diff -Naur src.orig/freemarker/ext/jython/JythonHashModel.java src/freemarker/ext/jython/JythonHashModel.java
+--- src.orig/freemarker/ext/jython/JythonHashModel.java        2007-04-21 01:06:15.000000000 +1200
++++ src/freemarker/ext/jython/JythonHashModel.java     2008-02-29 18:56:57.000000000 +1300
+@@ -137,7 +137,7 @@
+         {\r
+             throw new TemplateModelException(e);\r
+         }\r
+-        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);\r
++        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.getType());\r
+     }\r
+ \r
+     /**\r
+@@ -157,6 +157,6 @@
+         {\r
+             throw new TemplateModelException(e);\r
+         }\r
+-        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);\r
++        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.getType());\r
+     }\r
+ }\r

diff --git a/dev-java/freemarker/freemarker-2.3.10-r1.ebuild b/dev-java/freemarker/freemarker-2.3.10-r1.ebuild
new file mode 100644 (file)
index 0000000..8e73004
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.10-r1.ebuild
@@ -0,0 +1,76 @@
+# 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-r1.ebuild,v 1.1 2008/03/01 02:36:39 ali_bush 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"
+IUSE=""
+
+COMMON_DEP="dev-java/javacc
+       >=dev-java/jython-2.2.1
+       =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"
+       #If you remove this patch, remove the postinst function.
+       epatch "${FILESDIR}/${PN}-jython-2.2.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/*
+}
+
+pkg_postinst() {
+       elog "This version of freemarker has been patched to allow use with"
+       elog ">=dev-java/jython-2.2.1.  This patch breaks compatibility with"
+       elog "the upstream supported jython-2.1.  Please be aware of this before"
+       elog "using and file bugs at https://bugs.gentoo.org, not upstream."
+}