* [gentoo-commits] repo/gentoo:master commit in: dev-java/freemarker/files/, dev-java/freemarker/
@ 2016-01-20 22:15 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2016-01-20 22:15 UTC (permalink / raw
To: gentoo-commits
commit: b92032a4fd044fcc0049dc5a77990f7dda0c3718
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 22:11:16 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 22:14:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92032a4
dev-java/freemarker: Clean up old.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../files/freemarker-2.3.10-gentoo.patch | 54 ----------------
.../freemarker/files/freemarker-jython-2.2.patch | 20 ------
dev-java/freemarker/freemarker-2.3.13-r1.ebuild | 68 --------------------
dev-java/freemarker/freemarker-2.3.13.ebuild | 73 ----------------------
4 files changed, 215 deletions(-)
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
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}"/>
- <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>
-
-
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
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 @@
- {
- 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 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
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/*
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/freemarker/files/, dev-java/freemarker/
@ 2016-12-22 22:56 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2016-12-22 22:56 UTC (permalink / raw
To: gentoo-commits
commit: e42d0248b86a238a3dbde405146839eabaa47474
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 22:56:37 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 22:56:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42d0248
dev-java/freemarker: Version bump to 2.3.25
Package-Manager: portage-2.3.3
dev-java/freemarker/Manifest | 1 +
dev-java/freemarker/files/build.xml.patch | 60 ++++++++++++++++++++++++
dev-java/freemarker/freemarker-2.3.25.ebuild | 70 ++++++++++++++++++++++++++++
3 files changed, 131 insertions(+)
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index de97f1f..39b38f1 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -1 +1,2 @@
DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc
+DIST freemarker-2.3.25.tar.gz 1873971 SHA256 4864ac056ea801e78c1f0d76080fc2d079a6979573208a0760f6dd60746278b0 SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac WHIRLPOOL f057bd1c50eb4e0aa359b1d429690fd5acef13b2f9534ec0b3060da72cadd3f4bfecbcc49d7eadbcc348748343b3e30a5b315ca75c03e19e9f9877d8156cbccc
diff --git a/dev-java/freemarker/files/build.xml.patch b/dev-java/freemarker/files/build.xml.patch
new file mode 100644
index 00000000..33701f8
--- /dev/null
+++ b/dev-java/freemarker/files/build.xml.patch
@@ -0,0 +1,60 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml 2016-06-14 19:48:01.000000000 +0100
++++ b/build.xml 2016-12-22 22:41:41.988262564 +0000
+@@ -27,6 +27,10 @@
+ xmlns:u="http://freemarker.org/util"
+ >
+
++ <path id="gentoo.classpath">
++ <pathelement path="${gentoo.classpath}/"/>
++ </path>
++
+ <!-- ================================================================== -->
+ <!-- Properties -->
+ <!-- ================================================================== -->
+@@ -143,13 +147,11 @@
+ />
+
+ <mkdir dir="${_javaccOutputDir}" />
+- <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" />
+ <javacc:generate
+ target="src/main/javacc/FTL.jj"
+ outputdirectory="${_javaccOutputDir}"
+ javacchome="build/javacc-home.tmp"
+ />
+- <delete dir="build/javacc-home.tmp" />
+
+ <replace
+ file="${_javaccOutputDir}/FMParser.java"
+@@ -271,6 +273,7 @@
+ verify="yes" stubversion="1.2"
+ />
+
++<!--
+ <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" />
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
+ debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+@@ -286,6 +289,7 @@
+ freemarker/ext/jsp/FreeMarkerJspFactory21.java,
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
+ />
++!-->
+
+ <!-- There's no build.jsp2.0, as those classes are part of the common build subset. -->
+
+@@ -301,6 +305,7 @@
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
+ />
+
++<!--
+ <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
+ debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+@@ -325,6 +330,7 @@
+ includes="
+ freemarker/ext/jython/_Jython22VersionAdapter.java"
+ />
++!-->
+
+ <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild
new file mode 100644
index 00000000..103c772
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.25.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="incubator-${PN}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java tool to generate text output based on templates"
+HOMEPAGE="http://freemarker.org/"
+SRC_URI="https://github.com/apache/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/avalon-logkit:2.0
+ dev-java/commons-logging:0
+ dev-java/dom4j:1
+ dev-java/jaxen:1.1
+ dev-java/jython:2.7
+ dev-java/log4j:0
+ dev-java/rhino:1.6
+ dev-java/slf4j-api:0
+ dev-java/xalan:0
+ java-virtuals/servlet-api:2.5"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.7"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.7
+ dev-java/javacc:0"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/build.xml.patch
+)
+
+EANT_BUILD_TARGET="compile"
+EANT_EXTRA_ARGS="-Ddeps.available=true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+ default
+
+ rm -rv \
+ src/main/java/freemarker/ext/jdom \
+ src/main/java/freemarker/ext/xml/_JdomNavigator.java \
+ src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java || die
+
+ sed -i \
+ -e '/<ivy:cachepath/d' \
+ -e 's/"ivy\.dep[^"]*"/"gentoo.classpath"/g' \
+ -e "s:javacchome=\"[^\"]*\":javacchome=\"${EROOT}usr/share/javacc/lib\":g" \
+ build.xml || die
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ jar cf ${PN}.jar -C build/classes . || die
+ java-pkg_dojar ${PN}.jar
+
+ dodoc README
+ use doc && java-pkg_dojavadoc build/api
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-22 22:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-20 22:15 [gentoo-commits] repo/gentoo:master commit in: dev-java/freemarker/files/, dev-java/freemarker/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2016-12-22 22:56 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox