From: Krzysztof Pawlik Date: Sat, 17 Mar 2007 14:24:05 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a299c1b0ea0e5c0dd614039569c86a6e27a550d;p=gentoo.git Version bump. Package-Manager: portage-2.1.2.2 --- diff --git a/dev-java/freemarker/ChangeLog b/dev-java/freemarker/ChangeLog index 3c8083fbdd4d..1419df00b1aa 100644 --- a/dev-java/freemarker/ChangeLog +++ b/dev-java/freemarker/ChangeLog @@ -1,6 +1,12 @@ # 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.7 2007/01/26 23:17:56 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.8 2007/03/17 14:24:05 nelchael Exp $ + +*freemarker-2.3.9 (17 Mar 2007) + + 17 Mar 2007; Krzysiek Pawlik + +files/freemarker-2.3.9-gentoo.patch, +freemarker-2.3.9.ebuild: + Version bump. 26 Jan 2007; Krzysiek Pawlik freemarker-2.3.8.ebuild: diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest index 4f1766aa2c53..67633c88b4fa 100644 --- a/dev-java/freemarker/Manifest +++ b/dev-java/freemarker/Manifest @@ -5,15 +5,24 @@ AUX freemarker-2.3.8-gentoo.patch 789 RMD160 d19c3be69848b6b2e4f12d89862d03441a7 MD5 dbeddba11d9598366718929d24c16384 files/freemarker-2.3.8-gentoo.patch 789 RMD160 d19c3be69848b6b2e4f12d89862d03441a776ccf files/freemarker-2.3.8-gentoo.patch 789 SHA256 ca7d30c3c09ed163472e5e4af7a5d0498a0871e3982d22f69f21776425381961 files/freemarker-2.3.8-gentoo.patch 789 +AUX freemarker-2.3.9-gentoo.patch 2477 RMD160 67e7cf681ee8ee999e0b2a5625f682d185839722 SHA1 c7a411218394a07a9d3f1bac7f7b133cfbc005fa SHA256 b567c5d975a820af31b8b5cc13e17529fee05cd8178fd38125de681ac9a42744 +MD5 03ec18b10011301b5dc0c52a6b420de0 files/freemarker-2.3.9-gentoo.patch 2477 +RMD160 67e7cf681ee8ee999e0b2a5625f682d185839722 files/freemarker-2.3.9-gentoo.patch 2477 +SHA256 b567c5d975a820af31b8b5cc13e17529fee05cd8178fd38125de681ac9a42744 files/freemarker-2.3.9-gentoo.patch 2477 DIST freemarker-2.3.8.tar.gz 2012911 RMD160 9638b9296fd1369d3c20dab6b4445c901a4c26a9 SHA1 59a40b3da9d38d64774a95708e7a980808ded0f6 SHA256 cf0507fbe4901946e1842c1b63ac95e4b8ed59c0ea27b4398e207428f07633bf +DIST freemarker-2.3.9.tar.gz 2016244 RMD160 b12965adcf7d33e887b7a0367caa94a01a2c5bb7 SHA1 38c8c1db197ea0db3da61a3df80cb96c76b3d138 SHA256 f9b462312bfbf22058e5d43683754a0a87294e5dff9bc1696b6ee48b0dafeefa EBUILD freemarker-2.3.8.ebuild 1176 RMD160 1ccb43a509f292695e9a7a77d06cbd22fe01dcf9 SHA1 47c571dd7e3a4aecf4eda5e7b847c242d29cd8a3 SHA256 5a87ca638af082b5a18c3f436d48d0a9721c9c5f65cef17dc13a0e0afc7c56dd MD5 22e8a1b581605befa5bf0c154526541f freemarker-2.3.8.ebuild 1176 RMD160 1ccb43a509f292695e9a7a77d06cbd22fe01dcf9 freemarker-2.3.8.ebuild 1176 SHA256 5a87ca638af082b5a18c3f436d48d0a9721c9c5f65cef17dc13a0e0afc7c56dd freemarker-2.3.8.ebuild 1176 -MISC ChangeLog 1139 RMD160 c7abd07b029a1cb9dd25ec2aadcd66770be90993 SHA1 57fce502ed2e19317d260108051a82a81a4a8755 SHA256 1cf9506215f160dff02bf93af9c8c1c56317a48a8ed67f1c90188eafcbccdb74 -MD5 50fbef7909e0e6efcdbd88d48a62a9b9 ChangeLog 1139 -RMD160 c7abd07b029a1cb9dd25ec2aadcd66770be90993 ChangeLog 1139 -SHA256 1cf9506215f160dff02bf93af9c8c1c56317a48a8ed67f1c90188eafcbccdb74 ChangeLog 1139 +EBUILD freemarker-2.3.9.ebuild 1469 RMD160 4cdfb5bdf227b2894c578e3e1e732ad145de2f86 SHA1 9477a7fc77f707613f908af7079abc2061eb30e7 SHA256 5d239f1993295088db861acda1649e8471b8c7923f69df9bb6d0b8946d286cc7 +MD5 a532d2318bbf7f8a126558970611ce85 freemarker-2.3.9.ebuild 1469 +RMD160 4cdfb5bdf227b2894c578e3e1e732ad145de2f86 freemarker-2.3.9.ebuild 1469 +SHA256 5d239f1993295088db861acda1649e8471b8c7923f69df9bb6d0b8946d286cc7 freemarker-2.3.9.ebuild 1469 +MISC ChangeLog 1308 RMD160 d48afaeac6ea78ed02bb155bddefe276cbf6c42b SHA1 6b1fd1e9bc81677fbf4a159096969546bcea0b90 SHA256 f3db5e282fb1974dabd37d161452da2dde721c884fc72cb740190b365ace2a3e +MD5 ccc83893298a08f3f6546301ac261fe0 ChangeLog 1308 +RMD160 d48afaeac6ea78ed02bb155bddefe276cbf6c42b ChangeLog 1308 +SHA256 f3db5e282fb1974dabd37d161452da2dde721c884fc72cb740190b365ace2a3e ChangeLog 1308 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229 @@ -21,10 +30,13 @@ SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata MD5 77299b15ef833c9e165b092ba4deddf3 files/digest-freemarker-2.3.8 253 RMD160 463b4563edf3c38ebfcdf66cab52db346d68c0b6 files/digest-freemarker-2.3.8 253 SHA256 71b172470989ef1a126d008c229fce0eace3477c8c0b67a91d2b427db6e4d993 files/digest-freemarker-2.3.8 253 +MD5 44334ec3c158e1618813fb32f501080e files/digest-freemarker-2.3.9 253 +RMD160 e8d086f81140a9e26606fda2f4acd03bf31e8dab files/digest-freemarker-2.3.9 253 +SHA256 f419df8f4a06374d4a560a2f967e48d2a81b5ec10dc60666731067406e96c950 files/digest-freemarker-2.3.9 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFuoyDgo/w9rxVVVERArgyAKCgVotN/tL08erqcyNdsZUEwTVB1gCeK71W -boLQaDbXhynJd2vchEtHv2U= -=JqeF +iD8DBQFF+/q6go/w9rxVVVERAsxQAKCn1yJ8LvEAmrQcQvEEc5F7/FgsHgCgw/v0 +b7DOuMj2PXjwPAhYTRDCbzg= +=YrbW -----END PGP SIGNATURE----- diff --git a/dev-java/freemarker/files/digest-freemarker-2.3.9 b/dev-java/freemarker/files/digest-freemarker-2.3.9 new file mode 100644 index 000000000000..7bfc21bd3ee5 --- /dev/null +++ b/dev-java/freemarker/files/digest-freemarker-2.3.9 @@ -0,0 +1,3 @@ +MD5 1798edc2bb37a6235ed0fc81456a91a0 freemarker-2.3.9.tar.gz 2016244 +RMD160 b12965adcf7d33e887b7a0367caa94a01a2c5bb7 freemarker-2.3.9.tar.gz 2016244 +SHA256 f9b462312bfbf22058e5d43683754a0a87294e5dff9bc1696b6ee48b0dafeefa freemarker-2.3.9.tar.gz 2016244 diff --git a/dev-java/freemarker/files/freemarker-2.3.9-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.9-gentoo.patch new file mode 100644 index 000000000000..7e34a18010b7 --- /dev/null +++ b/dev-java/freemarker/files/freemarker-2.3.9-gentoo.patch @@ -0,0 +1,63 @@ +diff -Nru freemarker-2.3.9.vanilla/build.xml freemarker-2.3.9/build.xml +--- freemarker-2.3.9.vanilla/build.xml 2007-03-09 15:38:44.000000000 +0100 ++++ freemarker-2.3.9/build.xml 2007-03-17 15:21:33.000000000 +0100 +@@ -60,11 +60,13 @@ + + + ++ + + + + + ++ + + + +@@ -72,6 +74,7 @@ + + + ++ + + + +@@ -89,12 +92,14 @@ + + + ++ + + + + + + ++ + + + +@@ -110,6 +115,7 @@ + + + ++ + + + +diff -Nru freemarker-2.3.9.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java freemarker-2.3.9/src/freemarker/ext/rhino/RhinoFunctionModel.java +--- freemarker-2.3.9.vanilla/src/freemarker/ext/rhino/RhinoFunctionModel.java 2007-03-09 15:38:42.000000000 +0100 ++++ freemarker-2.3.9/src/freemarker/ext/rhino/RhinoFunctionModel.java 2007-03-09 15:39:25.000000000 +0100 +@@ -37,7 +37,11 @@ + for (int i = 0; i < args.length; i++) { + args[i] = wrapper.unwrap((TemplateModel)args[i]); + } ++ try { + return wrapper.wrap(((Function)getScriptable()).call(cx, + ScriptableObject.getTopLevelScope(fnThis), fnThis, args)); ++ } catch (Exception e) { ++ throw new TemplateModelException(e); ++ } + } + } diff --git a/dev-java/freemarker/freemarker-2.3.9.ebuild b/dev-java/freemarker/freemarker-2.3.9.ebuild new file mode 100644 index 000000000000..91e524cbad9f --- /dev/null +++ b/dev-java/freemarker/freemarker-2.3.9.ebuild @@ -0,0 +1,66 @@ +# 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.1 2007/03/17 14:24:05 nelchael Exp $ + +inherit java-pkg-2 java-ant-2 eutils + +DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output (anything from HTML to autogenerated source code) 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/javacc + source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.4 + dev-java/jython + =dev-java/servletapi-2.3* + =dev-java/jaxen-1.1*" + +WANT_ANT_TASKS="ant-nodeps" + +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 + + use doc && java-pkg_dohtml -r build/api + use source && java-pkg_dosrc src/* + +}