cleanup

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

3 files changed, 0 insertions, 199 deletions

diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
deleted file mode 100644
index 7489093f..00000000
--- a/dev-java/freemarker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX freemarker-2.3.13-gentoo.patch 5228 RMD160 5c053ee78b5bf0084ac4d47919ae3870c41cb999 SHA1 73bd0f98997bdb258c40dc4e08aa712a84f510f6 SHA256 6bb4a5f0aa7696bbd1fb3666ec21605a90c0946c0fb131480282aab0d6cc97ad
-EBUILD freemarker-2.3.13-r1.ebuild 1642 RMD160 2c7742491877e1daf72a20fb0a0559026a8dbbdc SHA1 fa4171afed48e7b75a893fc45da48a99d64a3f49 SHA256 f70a882a3d8851a2188eb2211c778028e6a8574b06f53714de1a6acd9ef8baca
-DIST freemarker-2.3.13.tar.gz 2136791 RMD160 beaaf510c992d435dd9b842733e4583e9512a4f5 SHA1 f1a93bf620f0542a35c2ed3da7b3caea8276c337 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5
diff --git a/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch
deleted file mode 100644
index 9eca29a8..00000000
--- a/dev-java/freemarker/files/freemarker-2.3.13-gentoo.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-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.13-r1.ebuild b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
deleted file mode 100644
index 05452828..00000000
--- a/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="~amd64 ~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.5
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	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() {
-	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/*
-}