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 +}
