Permalink
Browse files

FL-627 Fork dev-java/freemarker, clean out dev-java/jython

  • Loading branch information...
1 parent 27e6f45 commit 943744ca7c03cec538102ce69fc1bc62d6556bd0 Ryan Harris committed Jul 15, 2013
@@ -0,0 +1 @@
+DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc
@@ -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>
+
+
@@ -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());
+ }
+ }
@@ -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 @@
+ {
+ 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());
+ }
+ }
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13-r1.ebuild,v 1.1 2012/09/27 13:38:27 sera Exp $
+
+EAPI="4"
+
+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="*"
+IUSE=""
+
+COMMON_DEP="
+ >=dev-java/jython-2.2
+ java-virtuals/servlet-api:2.3
+ java-virtuals/servlet-api:2.4
+ java-virtuals/servlet-api:2.5
+ dev-java/jaxen:1.1
+ dev-java/juel:0"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ dev-java/javacc:0"
+
+java_prepare() {
+ find -name '*.jar' -exec rm -v {} + || die
+
+ epatch "${FILESDIR}/${P}-gentoo.patch"
+
+ # for ecj-3.5
+ java-ant_rewrite-bootclasspath auto
+}
+
+src_compile() {
+ # BIG FAT WARNING:
+ # clean target removes lib/ directory!!
+ eant clean
+
+ mkdir -p lib/jsp-{1.2,2.0,2.1} || die
+ pushd lib >/dev/null || die
+ 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 --build-only javacc
+ java-pkg_jar-from juel
+ popd >/dev/null
+
+ 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_dojavadoc build/api
+ use source && java-pkg_dosrc src/*
+}
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild,v 1.6 2009/12/29 07:43:23 josejx Exp $
+
+EAPI="2"
+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:0
+ java-virtuals/servlet-api:2.3
+ java-virtuals/servlet-api:2.4
+ java-virtuals/servlet-api:2.5
+ dev-java/jaxen:1.1
+ dev-java/juel:0"
+
+DEPEND=">=virtual/jdk-1.4
+ ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEP}"
+
+java_prepare() {
+ epatch "${FILESDIR}/${P}-gentoo.patch"
+
+ # for ecj-3.5
+ java-ant_rewrite-bootclasspath auto
+
+ 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 -p lib/jsp-1.2
+ mkdir -p lib/jsp-2.0
+ mkdir -p lib/jsp-2.1
+ cd lib/
+ 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
+ java-pkg_jar-from juel
+
+ 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/*
+}
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+</pkgmetadata>
View
@@ -1,8 +1,5 @@
DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
-DIST Python-2.5.5.tgz 11606370 SHA256 03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392 SHA512 787b3e99386e3b52bca63c3191ccb90418e8c5eb5eef3f4c4d8bda76cc5dd558aa28d8146a610ee66e58c1e3967516d073986b073df326685170143f191c152c WHIRLPOOL ac504a4afe70b706b5f3bf19314d97f1ecdb49067feb0137455dfc02c010cb99a145fd4afeef230bb9e2991309499b68e81a91b4e6da588af3fe40bfdb29a60c
DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061
-DIST jython-2.5.1.tar.bz2 14470421 SHA256 23bc356ac6e1037cc305dc9791a247f4cfffe7b9e3ceb5b2a97449529cf4aa1d SHA512 c56aecf57ff8fc0872c2b10216f19f9f9456cf05e8b09486e5826007f92d99b95c74416f3272556aca3dcc964f411b116f5011122a5be7cd815f54b447f53f1d WHIRLPOOL e2910a0b97b0bc2080a9a7d32c83f22630f11d51b1a8dc9d495a51a2972fc2f5066860e9eb0ae0be89a99b8327ff106d645d773e6dedb65ddf0dd76e15c6f86a
DIST jython-2.7-b1-sources.jar 10972175 SHA256 969fd3b26975a1bb9c16f36173bff61f40b7104378a5a12dea391ed3801e4ca7 SHA512 661732242a5195cbb4c9d4635d9a5dd7c09ba270b8c6b88200badb0b4987fefe1ce322ed23995e6723e571584e4e63c8d7f603fff450ed9cb5ad0b2cac73f5ad WHIRLPOOL 7dd78af2dd3e8958a23d07b6c96c1f240dcccd3fc04b4edb322108c7d12bdde95e96a6ec477f71c390179615df92209a2de5717aa3988722f537ec524c7571ed
DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768
DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
-DIST jython_installer-2.5.2.jar 18435770 SHA256 1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29 SHA512 ea9d1573f1f86aba13554292418be65579e55d695c9ab625402cc9478a1fed56654eb7ef5e750c9ebdcfe388c7f007016d88dedd6e6652d2a61f7681963118c4 WHIRLPOOL 3621162d9cffa2d0312b775af6cd342fdb17a25b965b2b736b1d03fe70512f05a645eb336a5d01135555fb843f6d4498e43530675e306373f98c8184a375e96b
@@ -19,7 +19,7 @@ mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
LICENSE="PSF-2"
SLOT="2.2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
CDEPEND="
Oops, something went wrong.

0 comments on commit 943744c

Please sign in to comment.