diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2009-12-28 14:42:05 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-12-28 14:42:05 +0000 |
commit | c34a407ceacabaa56c437b111eeb0a634aebd2ec (patch) | |
tree | a6bad7434cee3e18e6d14d7b9eecef5ad59e8b9e /dev-java/freemarker/freemarker-2.3.13.ebuild | |
parent | Migrate to EAPI 2 and fix building with ecj-3.5 reported in bug #295678. (diff) | |
download | gentoo-2-c34a407ceacabaa56c437b111eeb0a634aebd2ec.tar.gz gentoo-2-c34a407ceacabaa56c437b111eeb0a634aebd2ec.tar.bz2 gentoo-2-c34a407ceacabaa56c437b111eeb0a634aebd2ec.zip |
Fix building with ecj-3.5 reported in bug #295678.
(Portage version: 2.2_rc59/cvs/Linux i686)
Diffstat (limited to 'dev-java/freemarker/freemarker-2.3.13.ebuild')
-rw-r--r-- | dev-java/freemarker/freemarker-2.3.13.ebuild | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/dev-java/freemarker/freemarker-2.3.13.ebuild b/dev-java/freemarker/freemarker-2.3.13.ebuild index cf9c9051e386..1a43c91130ed 100644 --- a/dev-java/freemarker/freemarker-2.3.13.ebuild +++ b/dev-java/freemarker/freemarker-2.3.13.ebuild @@ -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 @@ DEPEND=">=virtual/jdk-1.4 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 @@ src_compile() { 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/* - } |