dev-java/freemarker: Clean up old.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
deleted file mode 100644 (file)
index 2282b04..0000000
--- a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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}"/>\r
-         <pathelement path="${lib.rhino}"/>\r
-         <pathelement path="${java.class.path}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
-     \r
-     <path id="compile.classpath">\r
-         <path refid="compile.nojsp.classpath"/>\r
-         <pathelement path="${lib.servlet23}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
- \r
-     <path id="compile.jsp2.classpath">\r
-         <path refid="compile.nojsp.classpath"/>\r
-         <pathelement path="${lib.servlet24}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
- \r
-     <path id="compile.classpath.testcases">\r
-@@ -72,6 +75,7 @@
-         <pathelement path="${lib.jython}"/>\r
-         <pathelement path="${lib.jdom}"/>\r
-         <pathelement path="${lib.servlet23}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
- \r
-     <path id="compile.classpath.javadoc">\r
-@@ -89,12 +93,14 @@
-         <pathelement path="${src.dir}"/>\r
-         <pathelement path="${build.javacc.dir}"/>\r
-         <pathelement path="${java.class.path}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
- \r
-     <path id="compile.classpath.examples">\r
-         <pathelement path="${lib.servlet23}"/>\r
-         <pathelement path="${lib.dir}/freemarker.jar"/>\r
-         <pathelement path="${lib.struts}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
-     \r
-     <path id="full.classpath">\r
-@@ -110,6 +116,7 @@
-         <pathelement path="${lib.logkit}"/>\r
-         <pathelement path="${lib.log4j}"/>\r
-         <pathelement path="${java.class.path}"/>\r
-+        <fileset dir="lib" includes="*.jar"/>\r
-     </path>\r
-     \r
-     \r

diff --git a/dev-java/freemarker/files/freemarker-jython-2.2.patch b/dev-java/freemarker/files/freemarker-jython-2.2.patch
deleted file mode 100644 (file)
index 0d0d387..0000000
--- a/dev-java/freemarker/files/freemarker-jython-2.2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.13-r1.ebuild b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
deleted file mode 100644 (file)
index 2aa2069..0000000
--- a/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/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"
-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/*
-}

diff --git a/dev-java/freemarker/freemarker-2.3.13.ebuild b/dev-java/freemarker/freemarker-2.3.13.ebuild
deleted file mode 100644 (file)
index 73e51c2..0000000
--- a/dev-java/freemarker/freemarker-2.3.13.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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/*
-}