1 |
commit: e42d0248b86a238a3dbde405146839eabaa47474 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 22 22:56:37 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 22 22:56:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42d0248 |
7 |
|
8 |
dev-java/freemarker: Version bump to 2.3.25 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
dev-java/freemarker/Manifest | 1 + |
13 |
dev-java/freemarker/files/build.xml.patch | 60 ++++++++++++++++++++++++ |
14 |
dev-java/freemarker/freemarker-2.3.25.ebuild | 70 ++++++++++++++++++++++++++++ |
15 |
3 files changed, 131 insertions(+) |
16 |
|
17 |
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest |
18 |
index de97f1f..39b38f1 100644 |
19 |
--- a/dev-java/freemarker/Manifest |
20 |
+++ b/dev-java/freemarker/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc |
23 |
+DIST freemarker-2.3.25.tar.gz 1873971 SHA256 4864ac056ea801e78c1f0d76080fc2d079a6979573208a0760f6dd60746278b0 SHA512 32a41a73a2f71a4e0ae8829da2c09e07204aa2b4a6899e2c7a3db0bde5d3e129ec7b44b7299a20165d7eb88f4f7d1bd9f0b7a1fd116dc11493134bec2306d1ac WHIRLPOOL f057bd1c50eb4e0aa359b1d429690fd5acef13b2f9534ec0b3060da72cadd3f4bfecbcc49d7eadbcc348748343b3e30a5b315ca75c03e19e9f9877d8156cbccc |
24 |
|
25 |
diff --git a/dev-java/freemarker/files/build.xml.patch b/dev-java/freemarker/files/build.xml.patch |
26 |
new file mode 100644 |
27 |
index 00000000..33701f8 |
28 |
--- /dev/null |
29 |
+++ b/dev-java/freemarker/files/build.xml.patch |
30 |
@@ -0,0 +1,60 @@ |
31 |
+diff -Naur a/build.xml b/build.xml |
32 |
+--- a/build.xml 2016-06-14 19:48:01.000000000 +0100 |
33 |
++++ b/build.xml 2016-12-22 22:41:41.988262564 +0000 |
34 |
+@@ -27,6 +27,10 @@ |
35 |
+ xmlns:u="http://freemarker.org/util" |
36 |
+ > |
37 |
+ |
38 |
++ <path id="gentoo.classpath"> |
39 |
++ <pathelement path="${gentoo.classpath}/"/> |
40 |
++ </path> |
41 |
++ |
42 |
+ <!-- ================================================================== --> |
43 |
+ <!-- Properties --> |
44 |
+ <!-- ================================================================== --> |
45 |
+@@ -143,13 +147,11 @@ |
46 |
+ /> |
47 |
+ |
48 |
+ <mkdir dir="${_javaccOutputDir}" /> |
49 |
+- <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" /> |
50 |
+ <javacc:generate |
51 |
+ target="src/main/javacc/FTL.jj" |
52 |
+ outputdirectory="${_javaccOutputDir}" |
53 |
+ javacchome="build/javacc-home.tmp" |
54 |
+ /> |
55 |
+- <delete dir="build/javacc-home.tmp" /> |
56 |
+ |
57 |
+ <replace |
58 |
+ file="${_javaccOutputDir}/FMParser.java" |
59 |
+@@ -271,6 +273,7 @@ |
60 |
+ verify="yes" stubversion="1.2" |
61 |
+ /> |
62 |
+ |
63 |
++<!-- |
64 |
+ <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" /> |
65 |
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" |
66 |
+ debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" |
67 |
+@@ -286,6 +289,7 @@ |
68 |
+ freemarker/ext/jsp/FreeMarkerJspFactory21.java, |
69 |
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" |
70 |
+ /> |
71 |
++!--> |
72 |
+ |
73 |
+ <!-- There's no build.jsp2.0, as those classes are part of the common build subset. --> |
74 |
+ |
75 |
+@@ -301,6 +305,7 @@ |
76 |
+ freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" |
77 |
+ /> |
78 |
+ |
79 |
++<!-- |
80 |
+ <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" /> |
81 |
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" |
82 |
+ debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" |
83 |
+@@ -325,6 +330,7 @@ |
84 |
+ includes=" |
85 |
+ freemarker/ext/jython/_Jython22VersionAdapter.java" |
86 |
+ /> |
87 |
++!--> |
88 |
+ |
89 |
+ <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" /> |
90 |
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" |
91 |
|
92 |
diff --git a/dev-java/freemarker/freemarker-2.3.25.ebuild b/dev-java/freemarker/freemarker-2.3.25.ebuild |
93 |
new file mode 100644 |
94 |
index 00000000..103c772 |
95 |
--- /dev/null |
96 |
+++ b/dev-java/freemarker/freemarker-2.3.25.ebuild |
97 |
@@ -0,0 +1,70 @@ |
98 |
+# Copyright 1999-2016 Gentoo Foundation |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+# $Id$ |
101 |
+ |
102 |
+EAPI=6 |
103 |
+ |
104 |
+MY_PN="incubator-${PN}" |
105 |
+JAVA_PKG_IUSE="doc source" |
106 |
+ |
107 |
+inherit java-pkg-2 java-ant-2 |
108 |
+ |
109 |
+DESCRIPTION="A Java tool to generate text output based on templates" |
110 |
+HOMEPAGE="http://freemarker.org/" |
111 |
+SRC_URI="https://github.com/apache/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
112 |
+LICENSE="Apache-2.0" |
113 |
+SLOT="2.3" |
114 |
+KEYWORDS="~amd64 ~x86" |
115 |
+ |
116 |
+CP_DEPEND="dev-java/avalon-logkit:2.0 |
117 |
+ dev-java/commons-logging:0 |
118 |
+ dev-java/dom4j:1 |
119 |
+ dev-java/jaxen:1.1 |
120 |
+ dev-java/jython:2.7 |
121 |
+ dev-java/log4j:0 |
122 |
+ dev-java/rhino:1.6 |
123 |
+ dev-java/slf4j-api:0 |
124 |
+ dev-java/xalan:0 |
125 |
+ java-virtuals/servlet-api:2.5" |
126 |
+ |
127 |
+RDEPEND="${CP_DEPEND} |
128 |
+ >=virtual/jre-1.7" |
129 |
+ |
130 |
+DEPEND="${CP_DEPEND} |
131 |
+ >=virtual/jdk-1.7 |
132 |
+ dev-java/javacc:0" |
133 |
+ |
134 |
+S="${WORKDIR}/${MY_PN}-${PV}" |
135 |
+ |
136 |
+PATCHES=( |
137 |
+ "${FILESDIR}"/build.xml.patch |
138 |
+) |
139 |
+ |
140 |
+EANT_BUILD_TARGET="compile" |
141 |
+EANT_EXTRA_ARGS="-Ddeps.available=true" |
142 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
143 |
+ |
144 |
+src_prepare() { |
145 |
+ default |
146 |
+ |
147 |
+ rm -rv \ |
148 |
+ src/main/java/freemarker/ext/jdom \ |
149 |
+ src/main/java/freemarker/ext/xml/_JdomNavigator.java \ |
150 |
+ src/main/java/freemarker/ext/beans/JRebelClassChangeNotifier.java || die |
151 |
+ |
152 |
+ sed -i \ |
153 |
+ -e '/<ivy:cachepath/d' \ |
154 |
+ -e 's/"ivy\.dep[^"]*"/"gentoo.classpath"/g' \ |
155 |
+ -e "s:javacchome=\"[^\"]*\":javacchome=\"${EROOT}usr/share/javacc/lib\":g" \ |
156 |
+ build.xml || die |
157 |
+ |
158 |
+ java-pkg-2_src_prepare |
159 |
+} |
160 |
+ |
161 |
+src_install() { |
162 |
+ jar cf ${PN}.jar -C build/classes . || die |
163 |
+ java-pkg_dojar ${PN}.jar |
164 |
+ |
165 |
+ dodoc README |
166 |
+ use doc && java-pkg_dojavadoc build/api |
167 |
+} |