[gentoo-commits] gentoo-x86 commit in dev-java/freemarker: ChangeLog freemarker-2.3.13.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    09/12/28 14:42:06

  Modified:             ChangeLog freemarker-2.3.13.ebuild
  Log:
  Fix building with ecj-3.5 reported in bug #295678.
  (Portage version: 2.2_rc59/cvs/Linux i686)

Revision  Changes    Path
1.26                 dev-java/freemarker/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	11 Sep 2009 22:45:17 -0000	1.25
+++ ChangeLog	28 Dec 2009 14:42:05 -0000	1.26
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/freemarker
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.25 2009/09/11 22:45:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/ChangeLog,v 1.26 2009/12/28 14:42:05 betelgeuse Exp $
+
+  28 Dec 2009; Petteri Räty <betelgeuse@g.o>
+  freemarker-2.3.13.ebuild:
+  Fix building with ecj-3.5 reported in bug #295678.
 
   11 Sep 2009; Markus Meier <maekke@g.o> freemarker-2.3.13.ebuild:
   amd64/x86 stable, bug #284326



1.5                  dev-java/freemarker/freemarker-2.3.13.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild?r1=1.4&r2=1.5

Index: freemarker-2.3.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freemarker-2.3.13.ebuild	11 Sep 2009 22:45:17 -0000	1.4
+++ freemarker-2.3.13.ebuild	28 Dec 2009 14:42:05 -0000	1.5
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild,v 1.4 2009/09/11 22:45:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/freemarker/freemarker-2.3.13.ebuild,v 1.5 2009/12/28 14:42:05 betelgeuse Exp $
 
-EAPI="1"
+EAPI="2"
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-nodeps"
 
@@ -30,23 +30,20 @@
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
+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
@@ -65,15 +62,12 @@
 
 	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/*
-
 }