Gentoo Archives: gentoo-commits

From: "Patrice Clement (monsieurp)" <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/freemarker: freemarker-2.3.13-r2.ebuild ChangeLog
Date: Sun, 05 Jul 2015 08:16:37
Message-Id: 20150705081630.69D4A74E@oystercatcher.gentoo.org
1 monsieurp 15/07/05 08:16:30
2
3 Modified: ChangeLog
4 Added: freemarker-2.3.13-r2.ebuild
5 Log:
6 EAPI 5 bump. dev-java/jython SLOT bump from :0 to :2.7. Patch to add missing imports due to jython:2.7 move. Drop ppc. Fix bug 553900.
7
8 Signed-off-by: Patrice Clement <monsieurp@g.o>
9 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
10
11 Revision Changes Path
12 1.33 dev-java/freemarker/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/ChangeLog?rev=1.33&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/ChangeLog?rev=1.33&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/ChangeLog?r1=1.32&r2=1.33
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v
21 retrieving revision 1.32
22 retrieving revision 1.33
23 diff -u -r1.32 -r1.33
24 --- ChangeLog 9 Jun 2015 13:36:18 -0000 1.32
25 +++ ChangeLog 5 Jul 2015 08:16:30 -0000 1.33
26 @@ -1,6 +1,13 @@
27 # ChangeLog for dev-java/freemarker
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.32 2015/06/09 13:36:18 jlec Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.33 2015/07/05 08:16:30 monsieurp Exp $
31 +
32 +*freemarker-2.3.13-r2 (05 Jul 2015)
33 +
34 + 05 Jul 2015; Patrice Clement <monsieurp@g.o>
35 + +files/freemarker-2.3.13-PyJavaInstance.patch, +freemarker-2.3.13-r2.ebuild:
36 + EAPI 5 bump. dev-java/jython SLOT bump from :0 to :2.7. Patch to add missing
37 + imports due to jython:2.7 move. Drop ppc. Fix bug 553900.
38
39 09 Jun 2015; Justin Lecher <jlec@g.o> metadata.xml:
40 Updating remote-id in metadata.xml
41
42
43
44 1.1 dev-java/freemarker/freemarker-2.3.13-r2.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/freemarker-2.3.13-r2.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/freemarker-2.3.13-r2.ebuild?rev=1.1&content-type=text/plain
48
49 Index: freemarker-2.3.13-r2.ebuild
50 ===================================================================
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13-r2.ebuild,v 1.1 2015/07/05 08:16:30 monsieurp Exp $
54
55 EAPI="5"
56
57 JAVA_PKG_IUSE="doc source"
58 WANT_ANT_TASKS="ant-nodeps"
59
60 inherit java-pkg-2 java-ant-2 eutils
61
62 DESCRIPTION=" FreeMarker is a template engine; a generic tool to generate text output based on templates"
63 HOMEPAGE="http://freemarker.sourceforge.net/"
64 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
65
66 LICENSE="freemarker"
67 SLOT="2.3"
68 KEYWORDS="~amd64 ~x86"
69 IUSE=""
70
71 CDEPEND="dev-java/jython:2.7
72 java-virtuals/servlet-api:2.3
73 java-virtuals/servlet-api:2.4
74 java-virtuals/servlet-api:2.5
75 dev-java/jaxen:1.1
76 dev-java/juel:0"
77 RDEPEND="${CDEPEND}
78 >=virtual/jre-1.6"
79 DEPEND="${CDEPEND}
80 >=virtual/jdk-1.6
81 dev-java/javacc:0"
82
83 # [0]: Patch so that we can compile the package
84 # against Jython-2.7.
85 # [1]: Gentoo specific stuff.
86 PATCHES=(
87 "${FILESDIR}"/${P}-PyJavaInstance.patch
88 "${FILESDIR}"/${P}-gentoo.patch
89 )
90
91 java_prepare() {
92 # Do away with bundled jar files.
93 find -name '*.jar' -exec rm -v {} + || die
94
95 # Apply patches.
96 epatch ${PATCHES[@]}
97
98 # Weed out comments (some contain UTF-8 chars javac cannnot deal with).
99 sed -i -e '/*/d;' \
100 src/freemarker/template/LocalizedString.java
101
102 # For ecj-3.5.
103 java-ant_rewrite-bootclasspath auto
104 }
105
106 src_compile() {
107 # BIG FAT WARNING:
108 # clean target removes lib/ directory!!
109 eant clean
110
111 mkdir -p lib/jsp-{1.2,2.0,2.1} || die
112 pushd lib >/dev/null || die
113 java-pkg_jar-from --virtual --into jsp-1.2 servlet-api-2.3
114 java-pkg_jar-from --virtual --into jsp-2.0 servlet-api-2.4
115 java-pkg_jar-from --virtual --into jsp-2.1 servlet-api-2.5
116 java-pkg_jar-from jaxen-1.1
117 java-pkg_jar-from jython-2.7
118 java-pkg_jar-from --build-only javacc
119 java-pkg_jar-from juel
120 popd >/dev/null
121
122 eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
123 }
124
125 src_install() {
126 java-pkg_dojar lib/${PN}.jar
127 dodoc README.txt
128
129 use doc && java-pkg_dojavadoc build/api
130 use source && java-pkg_dosrc src/*
131 }